优化

platform-dao/src/main/java/com/platform/dao/dto/sb/SbInfoDTO.java

@@ -27,6 +27,36 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoDTO extends BaseDTO implements Serializable {
+    /**
+     * 设备识别码
+     */
+    private String identifyNo;
+
+    /**
+     * 使用证号
+     */
+    private String useNo;
+
+    /**
+     * 设备代号
+     */
+    private String sbCode;
+
+    /**
+     * 安装单位
+     */
+    private String installUnit;
+
+    /**
+     * 检验结论
+     */
+    private String examResult;
+
+    /**
+     * 单位内部使用地点
+     */
+    private String usePosition;
+
     /**
      * 状态变更原因
      */

platform-dao/src/main/java/com/platform/dao/entity/sb/SbInfo.java

@@ -20,6 +20,37 @@ import java.time.LocalDateTime;
 @Table(name = "t_sb_info")
 @Data
 public class SbInfo implements Serializable {
+    /**
+     * 设备识别码
+     */
+    private String identifyNo;
+
+    /**
+     * 使用证号
+     */
+    private String useNo;
+
+    /**
+     * 设备代号
+     */
+    private String sbCode;
+
+    /**
+     * 安装单位
+     */
+    private String installUnit;
+
+    /**
+     * 检验结论
+     */
+    private String examResult;
+
+    /**
+     * 单位内部使用地点
+     */
+    private String usePosition;
+
+
     private Integer sortNum;
     /**
      * 自定义参数列表

platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -25,6 +25,37 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbInfoVO extends BaseVO implements Serializable {
+    /**
+     * 设备识别码
+     */
+    private String identifyNo;
+
+    /**
+     * 使用证号
+     */
+    private String useNo;
+
+    /**
+     * 设备代号
+     */
+    private String sbCode;
+
+    /**
+     * 安装单位
+     */
+    private String installUnit;
+
+    /**
+     * 检验结论
+     */
+    private String examResult;
+
+    /**
+     * 单位内部使用地点
+     */
+    private String usePosition;
+
+
     private String parentSbTypeName;
     private String sbTypeName;
     private String ParentPositionName;

platform-rest/src/main/resources/application-dev.yml

@@ -85,6 +85,7 @@ ignore:
     - /sb/types/**
     - /report/sb/infos/**
     - /sb/measure-logs/**
+    - /sb/positions/**
 platform:
   slf4j:
     data: D://xajg

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -118,7 +118,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         }
         // 如果选择了设备停机，则要修改设备状态，记录设备状态变更变
         if (model.getNeedStop() != null && model.getNeedStop().intValue() == RepairApplicationFormStopEnum.STOP.getValue()) {
-            info.setStatus(SbInfoStatusEnum.IN_STOP.getValue());
+//            info.setStatus(SbInfoStatusEnum.IN_STOP.getValue());
             updateSb = true;
         }
         if (updateSb) {

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -70,6 +70,10 @@ public class YongyouServiceImpl implements YongyouService {
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
+    private String token_key1 = "yongyou-token-1";
+    private String token_key2 = "yongyou-token-2";
+    private String Conn_key1 = "yongyou-Conn-1";
+    private String Conn_key2 = "yongyou-Conn-2";
 
     private String geToken() {
         String token = RedisUtils.getString(token_key);
@@ -80,12 +84,17 @@ public class YongyouServiceImpl implements YongyouService {
         }
     }
     private String geToken(Integer type) {
-//        String token = RedisUtils.getString(token_key);
-//        if (StringUtils.isBlank(token)) {
+        String token = null;
+        if (type==1) {
+            token = RedisUtils.getString(token_key1);
+        }else if (type==2){
+            token = RedisUtils.getString(token_key2);
+        }
+        if (StringUtils.isBlank(token)) {
             return geTokenForce(type);
-//        } else {
-//            return token;
-//        }
+        } else {
+            return token;
+        }
     }
 
     /**
@@ -136,15 +145,29 @@ public class YongyouServiceImpl implements YongyouService {
         }
         Login login = response.getData();
         String token = login.getToken();
-        RedisUtils.setString(token_key, token, 1800);
-        RedisUtils.setString(Conn_key, login.getConn(), 1800);
-        RedisUtils.setString(cAcc_ID_key, login.getCAcc_ID(), 1800);
+        if (type==1){
+            RedisUtils.setString(token_key1, token, 1800);
+            RedisUtils.setString(Conn_key1, login.getConn(), 1800);
+        }else if (type==2){
+            RedisUtils.setString(token_key2, token, 1800);
+            RedisUtils.setString(Conn_key2, login.getConn(), 1800);
+        }
+//        RedisUtils.setString(Conn_key, login.getConn(), 1800);
+//        RedisUtils.setString(cAcc_ID_key, login.getCAcc_ID(), 1800);
         return token;
     }
 
     private String getConn() {
         return RedisUtils.getString(Conn_key);
     }
+    private String getConn2(Integer type) {
+        if (type==1) {
+            return RedisUtils.getString(Conn_key1);
+        }else if (type==2){
+            return RedisUtils.getString(Conn_key2);
+        }
+        return null;
+    }
 
     private String getCAccId() {
         return RedisUtils.getString(cAcc_ID_key);
@@ -164,8 +187,13 @@ public class YongyouServiceImpl implements YongyouService {
         GetCurrentStockHandler handler = new GetCurrentStockHandler();
         GetCurrentStockRequest req = new GetCurrentStockRequest();
         req.setToken(geToken(record.getTokenType()));
-        req.setConn(getConn());
-        req.setCAcc_ID(getCAccId());
+        req.setConn(getConn2(record.getTokenType()));
+        if (record.getTokenType()==1){
+            req.setCAcc_ID("005");
+        }else if (record.getTokenType()==2){
+            req.setCAcc_ID("004");
+        }
+//        req.setCAcc_ID(getCAccId());
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
         StringBuffer whereStr = new StringBuffer(" 1=1 ");