feat(消费服务): 代码优化

检查消费设备的bean.copy改为mapstruct映射

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/CheckBusiness.java

@@ -180,7 +180,6 @@ public class CheckBusiness {
         long userNo = ObjectUtil.isEmpty(bo.getUserNo()) ? 0 : bo.getUserNo();
         String userNumb = bo.getUserNumb() == null ? null : bo.getUserNumb();
 
-
         // 卡流水号检查
         if (cardNo > 0) {
             return checkCardNo(bo, userAccountVo, userCardVo);
@@ -215,7 +214,6 @@ public class CheckBusiness {
             remoteXfTermVo = remoteXfTermService.queryByNo(bo.getTermNo(), tenantId);
         } else {
             remoteXfTermVo = remoteXfTermService.queryByMac(bo.getTermMac());
-            bo.setTermNo(remoteXfTermVo.getTermNo());
         }
         if (ObjectUtil.isEmpty(remoteXfTermVo)) {
             ErrorInfo errorInfo = new ErrorInfo(400, "", "设备不存在",
@@ -223,7 +221,9 @@ public class CheckBusiness {
 
             return R.fail(errorInfo);
         }
+        bo.setTermNo(remoteXfTermVo.getTermNo());
         BeanUtil.copyProperties(remoteXfTermVo, useTermVo);
+        RemoteVoConvert.INSTANCE.copyRemoteTermVo(useTermVo, remoteXfTermVo);
         return R.ok();
     }
 
@@ -379,9 +379,9 @@ public class CheckBusiness {
         bo.setExpireDate(accountVo.getLifespan());
         bo.setDeptName(accountVo.getDeptName());
         // BeanUtil.copyProperties(accountVo, userAccountVo);
-        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(accountVo, userAccountVo);
+        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(userAccountVo,accountVo);
         // BeanUtil.copyProperties(cardVo, userCardVo);
-        RemoteVoConvert.INSTANCE.copyRemoteCardVo(cardVo, userCardVo);
+        RemoteVoConvert.INSTANCE.copyRemoteCardVo(userCardVo,cardVo);
         return R.ok();
     }
 
@@ -415,9 +415,9 @@ public class CheckBusiness {
         bo.setExpireDate(accountVo.getLifespan());
         bo.setDeptName(accountVo.getDeptName());
         // BeanUtil.copyProperties(accountVo, userAccountVo);
-        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(accountVo, userAccountVo);
+        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(userAccountVo,accountVo);
         // BeanUtil.copyProperties(cardVo, userCardVo);
-        RemoteVoConvert.INSTANCE.copyRemoteCardVo(cardVo, userCardVo);
+        RemoteVoConvert.INSTANCE.copyRemoteCardVo(userCardVo,cardVo);
         return R.ok();
     }
 
@@ -461,9 +461,9 @@ public class CheckBusiness {
         bo.setExpireDate(accountVo.getLifespan());
         bo.setDeptName(accountVo.getDeptName());
         // BeanUtil.copyProperties(accountVo, userAccountVo);
-        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(accountVo, userAccountVo);
+        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(userAccountVo,accountVo);
         // BeanUtil.copyProperties(cardVo, userCardVo);
-        RemoteVoConvert.INSTANCE.copyRemoteCardVo(cardVo, userCardVo);
+        RemoteVoConvert.INSTANCE.copyRemoteCardVo(userCardVo,cardVo);
         return R.ok();
     }
 
@@ -508,9 +508,9 @@ public class CheckBusiness {
         bo.setCardTypeName(cardVo.getCardTypeName());
 
         // BeanUtil.copyProperties(accountVo, userAccountVo);
-        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(accountVo, userAccountVo);
+        RemoteVoConvert.INSTANCE.copyRemoteUserAccountVo(userAccountVo,accountVo);
         // BeanUtil.copyProperties(cardVo, userCardVo);
-        RemoteVoConvert.INSTANCE.copyRemoteCardVo(cardVo, userCardVo);
+        RemoteVoConvert.INSTANCE.copyRemoteCardVo(userCardVo,cardVo);
 
         return R.ok();
     }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/domain/convert/RemoteVoConvert.java

@@ -2,6 +2,8 @@ package org.dromara.server.consume.domain.convert;
 
 import org.dromara.backstage.api.domain.vo.RemoteCardVo;
 import org.dromara.backstage.api.domain.vo.RemoteUserAccountVo;
+import org.dromara.backstage.api.domain.vo.RemoteXfTermVo;
+import org.dromara.server.consume.domain.vo.XfTermVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 import org.mapstruct.MappingTarget;
@@ -24,4 +26,6 @@ public interface RemoteVoConvert {
     void copyRemoteUserAccountVo(@MappingTarget RemoteUserAccountVo target, RemoteUserAccountVo source);
 
     void copyRemoteCardVo(@MappingTarget RemoteCardVo target, RemoteCardVo source);
+
+    void copyRemoteTermVo(@MappingTarget XfTermVo target, RemoteXfTermVo source);
 }