ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码调整

Browse Source
This commit is contained in:
caozehui
2025-04-01 09:50:53 +08:00
parent 00bda55ddd
commit 9b1b21dad5
9 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java
View File

@@ -149,32 +149,32 @@ public class PreDetectionController extends BaseController {
/** /**
* 测试 * 测试
*/ */
@PostMapping("/startTest") // @PostMapping("/startTest")
@OperateInfo // @OperateInfo
@ApiOperation("测试") // @ApiOperation("测试")
@ApiImplicitParam(name = "param", value = "查询参数", required = true) // @ApiImplicitParam(name = "param", value = "查询参数", required = true)
public HttpResult<String> startTest(@RequestBody PreDetectionParam param) { // public HttpResult<String> startTest(@RequestBody PreDetectionParam param) {
String methodDescribe = getMethodDescribe("startTest"); // String methodDescribe = getMethodDescribe("startTest");
//preDetectionService.startTest(param); // //preDetectionService.startTest(param);
//
//
List<PreDetection> pqDevList = iPqDevService.getDevInfo(param.getDevIds()); // List<PreDetection> pqDevList = iPqDevService.getDevInfo(param.getDevIds());
XiNumberManager.xiDevList = pqDevList; // XiNumberManager.xiDevList = pqDevList;
String s = param.getUserPageId() + "_Dev"; // String s = param.getUserPageId() + "_Dev";
SocketMsg<String> socketMsg = new SocketMsg<>(); // SocketMsg<String> socketMsg = new SocketMsg<>();
socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue()); // socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue()); // socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue());
PreDetection preDetection = pqDevList.get(0); // PreDetection preDetection = pqDevList.get(0);
Map<String, Object> map = new HashMap<>(); // Map<String, Object> map = new HashMap<>();
map.put("devIP", preDetection.getDevIP()); // map.put("devIP", preDetection.getDevIP());
map.put("chnNum", preDetection.getDevChns()); // map.put("chnNum", preDetection.getDevChns());
socketMsg.setData(JSON.toJSONString(map)); // socketMsg.setData(JSON.toJSONString(map));
//
//
NettyClient.socketClient("192.168.1.138", 61000, param, JSON.toJSONString(socketMsg), new NettyDevClientHandler(param, socketDevResponseService)); // NettyClient.socketClient("192.168.1.138", 61000, param, JSON.toJSONString(socketMsg), new NettyDevClientHandler(param, socketDevResponseService));
//
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); // return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
} // }
} }

8
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -93,7 +93,7 @@ public class SocketDevResponseService {
*/ */
List<DevData> devInfo = new ArrayList<>(); List<DevData> devInfo = new ArrayList<>();
Map<String, DevData> devDataMap = new HashMap<>(); //Map<String, DevData> devDataMap = new HashMap<>();
/** /**
* 成功结束的测点 * 成功结束的测点
@@ -785,14 +785,16 @@ public class SocketDevResponseService {
storageParam.setScriptId(param.getScriptId()); storageParam.setScriptId(param.getScriptId());
List<Integer> indexes = adHarmonicService.getIndex(storageParam, true); List<Integer> indexes = adHarmonicService.getIndex(storageParam, true);
issueParam.setIndexList(indexes); issueParam.setIndexList(indexes);
issueParam.setIsPhaseSequence(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue()); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.RE_ERROR_TEST.getValue());
} else { } else {
issueParam.setIsPhaseSequence(SourceOperateCodeEnum.FORMAL_TEST.getValue()); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.FORMAL_TEST.getValue());
} }
//正式检测 //正式检测
sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam); sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
sourceIssues = sourceIssues.stream().sorted(Comparator.comparing(SourceIssue::getIndex)).collect(Collectors.toList()); sourceIssues = sourceIssues.stream().sorted(Comparator.comparing(SourceIssue::getIndex)).collect(Collectors.toList());
// 存放所有检测小项
SocketManager.addSourceList(sourceIssues); SocketManager.addSourceList(sourceIssues);
// 按照大项分组。key为大项code，value为小项个数
Map<String, Long> sourceIssueMap = sourceIssues.stream().collect(Collectors.groupingBy(SourceIssue::getType, Collectors.counting())); Map<String, Long> sourceIssueMap = sourceIssues.stream().collect(Collectors.groupingBy(SourceIssue::getType, Collectors.counting()));
SocketManager.initMap(sourceIssueMap); SocketManager.initMap(sourceIssueMap);
@@ -1468,7 +1470,7 @@ public class SocketDevResponseService {
//初始化相序集合 //初始化相序集合
this.devInfo.clear(); this.devInfo.clear();
this.devDataMap.clear(); //this.devDataMap.clear(); //好像没有用到
FormalTestManager.realDataXiList.clear(); FormalTestManager.realDataXiList.clear();
this.targetTestMap.clear(); this.targetTestMap.clear();

1
detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
View File

@@ -64,6 +64,7 @@ public class SocketSourceResponseService {
if (ObjectUtil.isNotNull(param.getPlanId())) { if (ObjectUtil.isNotNull(param.getPlanId())) {
detectionDev(param, socketDataMsg); detectionDev(param, socketDataMsg);
} else { } else {
// 程控源-源通信校验
handleYtxjySimulate(param, socketDataMsg); handleYtxjySimulate(param, socketDataMsg);
} }
break; break;

5
detection/src/main/java/com/njcn/gather/detection/pojo/enums/DetectionResponseEnum.java
View File

@@ -14,7 +14,10 @@ public enum DetectionResponseEnum {
PLAN_AND_SOURCE_NOT("A020003", "计划和源关系不存在"), PLAN_AND_SOURCE_NOT("A020003", "计划和源关系不存在"),
ITEM_TEST_NOT("A020004", "检测项为空"), ITEM_TEST_NOT("A020004", "检测项为空"),
PLAN_DEV_IP_HAS("A20005","当前计划检测装置ip重复"), PLAN_DEV_IP_HAS("A20005","当前计划检测装置ip重复"),
SOURCE_NOT_CONNECT("A020006", "源未连接"); SOURCE_NOT_CONNECT("A020006", "源未连接"),
SCRIPT_CHECK_DATA_NOT_EXIST("A020040","测试脚本项暂无配置" );
private final String code; private final String code;
private final String message; private final String message;

3
detection/src/main/java/com/njcn/gather/detection/service/PreDetectionService.java
View File

@@ -24,9 +24,6 @@ public interface PreDetectionService {
void coefficientCheck(PreDetectionParam param); void coefficientCheck(PreDetectionParam param);
boolean startTest(PreDetectionParam param);
boolean temStopTest(); boolean temStopTest();

12
detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
View File

@@ -162,9 +162,6 @@ public class PreDetectionServiceImpl implements PreDetectionService {
param.setSourceId(sourceParam.getSourceId()); param.setSourceId(sourceParam.getSourceId());
WebServiceManager.addPreDetectionParam(param); WebServiceManager.addPreDetectionParam(param);
if (ObjectUtil.isNotNull(sourceParam)) { if (ObjectUtil.isNotNull(sourceParam)) {
//开始组装socket报文请求头
//socketDevResponseService.initList(param);
//socketSourceResponseService.initList(param);
SocketMsg<String> socketMsg = new SocketMsg<>(); SocketMsg<String> socketMsg = new SocketMsg<>();
socketMsg.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue()); socketMsg.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
socketMsg.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue()); socketMsg.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue());
@@ -175,15 +172,6 @@ public class PreDetectionServiceImpl implements PreDetectionService {
} }
} }
@Override
public boolean startTest(PreDetectionParam param) {
socketDevResponseService.initList(param);
NettyClient.socketClient(ip, port, param, "start\n", new NettySourceClientHandler(param, sourceResponseService));
return true;
}
@Override @Override
public boolean temStopTest() { public boolean temStopTest() {
FormalTestManager.stopFlag = true; FormalTestManager.stopFlag = true;

3
detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java
View File

@@ -19,7 +19,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
*/ */
public class SocketManager { public class SocketManager {
// key为userId（xxx_Source、xxx_Dev），value为channel
private static final Map<String, Channel> socketSessions = new ConcurrentHashMap<>(); private static final Map<String, Channel> socketSessions = new ConcurrentHashMap<>();
// key为userId（xxx_Source、xxx_Dev），value为group
private static final Map<String, NioEventLoopGroup> socketGroup = new ConcurrentHashMap<>(); private static final Map<String, NioEventLoopGroup> socketGroup = new ConcurrentHashMap<>();
public static void addUser(String userId, Channel channel) { public static void addUser(String userId, Channel channel) {

2
detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java
View File

@@ -37,6 +37,6 @@ public class PqScriptIssueParam {
@ApiModelProperty("表明指标类型（例如：Freq频率下的影响、Base额定下的影响、VOL电压下的影响）") @ApiModelProperty("表明指标类型（例如：Freq频率下的影响、Base额定下的影响、VOL电压下的影响）")
private String scriptSubType; private String scriptSubType;
@ApiModelProperty("脚本下发类型") @ApiModelProperty("脚本下发类型") //在程控源功能中使用。因为在程控源功能中，不知道装置的类型，即不知道额定电压、额定电流；而在正式检测时，知道装置的类型。为了区分，0表示正式检测，1表示程控源功能。
private int type; private int type;
} }

4
detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum; import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum;
import com.njcn.gather.script.mapper.PqScriptCheckDataMapper; import com.njcn.gather.script.mapper.PqScriptCheckDataMapper;
import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam;
import com.njcn.gather.script.pojo.po.PqScriptCheckData; import com.njcn.gather.script.pojo.po.PqScriptCheckData;
@@ -80,7 +81,8 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl<PqScriptCheckDataM
.eq(PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode()); .eq(PqScriptCheckData::getEnable, DataStateEnum.ENABLE.getCode());
List<PqScriptCheckData> pqScriptCheckData = this.baseMapper.selectList(queryWrapper); List<PqScriptCheckData> pqScriptCheckData = this.baseMapper.selectList(queryWrapper);
if(CollUtil.isEmpty(pqScriptCheckData)){ if(CollUtil.isEmpty(pqScriptCheckData)){
throw new BusinessException(CommonResponseEnum.FAIL,"测试脚本项暂无配置"); // throw new BusinessException(CommonResponseEnum.FAIL,"测试脚本项暂无配置");
throw new BusinessException(DetectionResponseEnum.SCRIPT_CHECK_DATA_NOT_EXIST);
} }
List<String> valueTypeList = pqScriptCheckData.stream().map(PqScriptCheckData::getValueType).distinct().collect(Collectors.toList()); List<String> valueTypeList = pqScriptCheckData.stream().map(PqScriptCheckData::getValueType).distinct().collect(Collectors.toList());
LambdaQueryWrapper<DictTree> dictTreeLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DictTree> dictTreeLambdaQueryWrapper = new LambdaQueryWrapper<>();