微调

detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java

@@ -736,6 +736,14 @@ public class SocketDevResponseService {
                             socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + stepTag + sourceIssues.get(0).getType());
                             SocketManager.sendMsg(param.getUserPageId() + handlerSourceStr, JSON.toJSONString(socketMsg));
 
+
+                            //告诉前端当前项开始了
+                            WebSocketVO<Object> webSocketVO = new WebSocketVO();
+                            webSocketVO.setRequestId(sourceIssues.get(0).getType() + stepBegin);
+                            webSocketVO.setDesc(null);
+                            webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
+
+
                         } else if (SourceOperateCodeEnum.PRE_TEST.getValue().equals(param.getOperateType()) || SourceOperateCodeEnum.COEFFICIENT_TEST.getValue().equals(param.getOperateType())) {
                             //预检测的相序检测 以及系数校验都需要进行相序检测
                             issueParam.setIsPhaseSequence(SourceOperateCodeEnum.PHASE_TEST.getValue());
@@ -923,6 +931,7 @@ public class SocketDevResponseService {
 
 
     List<DevLineTestResult> allDevTestList = new ArrayList<>();
+
     /**
      * 正式检测
      */
@@ -989,7 +998,8 @@ public class SocketDevResponseService {
                     if (tem == 0) {
                         System.out.println(sourceIssue.getType() + sourceIssue.getIndex() + "当前测试大项已经全部结束》》》》》》》》");
                         //当val为0则认为大项中的小项已经全部跑完，开始组装信息推送给前端
-                        List<DevLineTestResult> resultList = new ArrayList<>();                        Map<String,List<DevLineTestResult>> map = allDevTestList.stream().collect(Collectors.groupingBy(DevLineTestResult::getDeviceId));
+                        List<DevLineTestResult> resultList = new ArrayList<>();
+                        Map<String, List<DevLineTestResult>> map = allDevTestList.stream().collect(Collectors.groupingBy(DevLineTestResult::getDeviceId));
                         map.forEach((dev, list) -> {
                             DevLineTestResult devTem = new DevLineTestResult();
                             devTem.setDeviceId(dev);
@@ -1101,7 +1111,6 @@ public class SocketDevResponseService {
     }
 
 
-
     /**
      * 退出检测返回
      */

detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java

@@ -56,7 +56,6 @@ public class SocketSourceResponseService {
     private List<String> monitorIdList = new ArrayList<>();
 
 
-
     public void deal(PreDetectionParam param, String msg) throws Exception {
         SocketDataMsg socketDataMsg = MsgUtil.socketDataMsg(msg);
         String[] tem = socketDataMsg.getRequestId().split(stepTag);
@@ -94,7 +93,6 @@ public class SocketSourceResponseService {
     }
 
 
-
     /**
      * 系数校验源数据返回处理
      */
@@ -119,7 +117,6 @@ public class SocketSourceResponseService {
                     SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
 
 
-
                     break;
                 case UNPROCESSED_BUSINESS:
                     webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
@@ -199,7 +196,6 @@ public class SocketSourceResponseService {
                     break;
 
 
-
                 default:
                     socketMsg = new SocketMsg<>();
                     socketMsg.setRequestId(socketDataMsg.getRequestId());
@@ -259,7 +255,6 @@ public class SocketSourceResponseService {
     }
 
 
-
     /**
      * 组装和装置要数据
      *
@@ -315,7 +310,6 @@ public class SocketSourceResponseService {
                     SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
 
 
-
                     List<DevLineTestResult> devListRes = new ArrayList<>();
                     devList.forEach(item -> {
                         DevLineTestResult devLineTestResult = new DevLineTestResult();
@@ -325,24 +319,10 @@ public class SocketSourceResponseService {
                     });
 
                     WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
-                    if(SocketManager.getSourceList().get(0).getIndex() == 1){
-                        //告诉前端当前项开始了
-                        webSocketVO.setRequestId(SocketManager.getSourceList().get(0).getType()+stepBegin);
-                        webSocketVO.setDesc(null);
-                        webSocketVO.setData(devListRes);
-                        webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
-
-
-                        webSocketVO.setRequestId(SocketManager.getSourceList().get(0).getType()+stepBegin);
-                        webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc());
-                        webSocketVO.setData(devListRes);
-                        webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
-                    }else {
                     webSocketVO.setRequestId(socketDataMsg.getRequestId().split(stepTag)[1] + stepBegin);
                     webSocketVO.setDesc(SocketManager.getSourceList().get(0).getDesc());
                     webSocketVO.setData(devListRes);
                     webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(webSocketVO));
-                    }
 
 
                     break;

storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java

@@ -20,8 +20,10 @@ import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult;
 import com.njcn.gather.storage.pojo.vo.RawDataVO;
 import com.njcn.gather.storage.pojo.vo.RawResultDataVO;
 import com.njcn.gather.storage.service.AdHarmonicService;
+import com.njcn.gather.system.dictionary.mapper.DictTreeMapper;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
+import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -43,6 +45,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
 
     private final AdNonHarmonicMapper adNonHarmonicMapper;
     private final IDictDataService dictDataService;
+    private final DictTreeMapper dictTreeMapper;
 
     @Override
     public List<AdBaseResult> get(String scriptId, List<Integer> sort, String deviceId, String chnNum, Integer code) {
@@ -136,7 +139,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl<AdHarmonicMappper, AdHarm
         if(CollUtil.isNotEmpty(adHarmonicResults)){
             List<Double> harmNum = param.getHarmNum();
             RawResultDataVO dataVO;
-            DictData dictData = dictDataService.getDictDataById(adHarmonicResults.get(0).getAdType());
+            DictTree dictData = dictTreeMapper.selectById(adHarmonicResults.get(0).getAdType());
             String unit;
             if(DictDataEnum.I2_50.getCode().equals(dictData.getCode())||DictDataEnum.SI_1_49.getCode().equals(dictData.getCode())){
                 unit="A";