diff --git a/detection/pom.xml b/detection/pom.xml
index 2d8526b8..09036292 100644
--- a/detection/pom.xml
+++ b/detection/pom.xml
@@ -48,6 +48,12 @@
fastjson
1.2.83
+
+ com.njcn.gather
+ storage
+ 1.0.0
+ compile
+
\ No newline at end of file
diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
index 8aa4086d..e981516b 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
@@ -21,6 +21,7 @@ import com.njcn.gather.device.device.service.IPqDevService;
import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
import com.njcn.gather.device.script.pojo.po.SourceIssue;
import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@ public class SocketDevResponseService {
*/
List devInfo = new ArrayList<>();
- Map devDataMap = new HashMap<>();
+ Map devDataMap = new HashMap<>();
/**
* 成功结束的装置
*/
@@ -76,22 +77,30 @@ public class SocketDevResponseService {
List successXieyi3 = new ArrayList<>();
+ List adNonHarmonicResultList = new ArrayList<>();
+
+
public void deal(PreDetectionParam param, String msg) {
SocketDataMsg socketDataMsg = MsgUtil.socketDataMsg(msg);
-
SourceOperateCodeEnum sourceOperateCodeEnum = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getRequestId());
- String userKey = param.getUserPageId() + handlerStr;
-
switch (sourceOperateCodeEnum) {
+ //设备通讯校验
case YJC_SBTXJY:
devComm(socketDataMsg, param, msg);
break;
+ //协议校验
case YJC_XYJY:
devXieyi(socketDataMsg, param, msg);
break;
+ //相序校验
case YJC_XUJY:
devXu(param, socketDataMsg);
break;
+ //获取实时数据
+ case FORMAL_REAL:
+ realDeal(param, socketDataMsg);
+ break;
+ //退出关闭
case QUITE:
quitDeal(socketDataMsg, param, msg);
break;
@@ -100,8 +109,6 @@ public class SocketDevResponseService {
}
- private Map> reloverMap = new HashMap<>();
-
/**
* 装置通讯检测
@@ -110,10 +117,10 @@ public class SocketDevResponseService {
SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
String s = param.getUserPageId() + handlerStr;
SocketMsg socketMsg = new SocketMsg();
- switch (dictDataEnumByCode) {
+ switch (Objects.requireNonNull(dictDataEnumByCode)) {
case SUCCESS:
//通讯校验成功
- webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg,devNameMapComm,1));
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 1));
String mId = JSON.parseObject(msg).get("data").toString();
successComm.add(mId);
@@ -124,12 +131,12 @@ public class SocketDevResponseService {
temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
temMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(temMsg) );
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg));
//开始进行协议校验
List devList = iPqDevService.getDevInfo(param.getDevIds());
- Map> map = new HashMap(1);
+ Map> map = new HashMap<>(1);
map.put("deviceList", devList);
String jsonString = JSON.toJSONString(map);
socketMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue());
@@ -148,12 +155,14 @@ public class SocketDevResponseService {
break;
case DEV_ERROR:
- webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
-
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
+ quitSend(param, socketMsg);
+ quitSendSource(param, socketMsg);
break;
case DEV_TARGET:
- webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
-
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
+ quitSend(param, socketMsg);
+ quitSendSource(param, socketMsg);
break;
case RE_OPERATE:
//出现已经初始化情况，发送用户用户确认是否继续检测
@@ -180,17 +189,16 @@ public class SocketDevResponseService {
SocketMsg socketMsg = new SocketMsg();
String s = param.getUserPageId() + handlerStr;
- switch (dictDataEnumByCode) {
+ switch (Objects.requireNonNull(dictDataEnumByCode)) {
case SUCCESS:
- webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg,devNameMapComm,2));
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
if (socketDataMsg.getOperateCode().equals(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue())) {
successXieyi.add(socketDataMsg.getData());
-
if (successXieyi.size() == monitorIdListComm.size()) {
- for(String string :successXieyi){
+ for (String string : successXieyi) {
//模拟统计协议校验，通讯校验已经校验过，模拟直接推送
@@ -199,7 +207,7 @@ public class SocketDevResponseService {
webSend.setCode(SourceResponseCodeEnum.SUCCESS.getCode());
webSend.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue());
webSend.setData(string);
- webSocketHandler.sendMsgToUser(param.getUserPageId(),MsgUtil.msgToWebData(webSend,devNameMapComm,1));
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(webSend, devNameMapComm, 1));
}
//协议3校验
@@ -224,15 +232,11 @@ public class SocketDevResponseService {
if (successXieyi3.size() == monitorIdListComm.size()) {
-
-
-
-
SocketDataMsg temMsg = new SocketDataMsg();
temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
temMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_03.getValue());
temMsg.setRequestId(SourceOperateCodeEnum.YJC_XYJY.getValue());
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(temMsg) );
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg));
System.out.println("开始相序校验++++++++++");
@@ -243,12 +247,20 @@ public class SocketDevResponseService {
issueParam.setIsPhaseSequence(true);
issueParam.setDevIds(param.getDevIds());
List sourceIssues = pqScriptDtlsService.listSourceIssue(issueParam);
+
+
if (CollUtil.isNotEmpty(sourceIssues)) {
SocketMsg xuMsg = new SocketMsg();
- xuMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
xuMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
- SocketManager.sendMsg(param.getUserPageId() +handlerSourceStr, MsgUtil.toJsonWithNewLinePlain(xuMsg));
+ if (SourceOperateCodeEnum.FORMAL_TEST.getValue().equals(param.getOperateType())) {
+ //正式检测
+ xuMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue());
+ } else if (SourceOperateCodeEnum.PRE_TEST.getValue().equals(param.getOperateType())) {
+ //预检测
+ xuMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
+ }
+ SocketManager.sendMsg(param.getUserPageId() + handlerSourceStr, MsgUtil.toJsonWithNewLinePlain(xuMsg));
}
}
}
@@ -256,9 +268,18 @@ public class SocketDevResponseService {
break;
case UNPROCESSED_BUSINESS:
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(socketDataMsg));
-
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+ case DEV_ERROR:
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
+ quitSend(param, socketMsg);
+ quitSendSource(param, socketMsg);
break;
+ case DEV_TARGET:
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
+ quitSend(param, socketMsg);
+ quitSendSource(param, socketMsg);
+ break;
+
case RE_OPERATE:
//出现已经初始化情况，发送用户用户确认是否继续检测
webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
@@ -273,7 +294,9 @@ public class SocketDevResponseService {
}
-
+ /**
+ * 相序校验
+ */
public void devXu(PreDetectionParam param, SocketDataMsg socketDataMsg) {
String data = socketDataMsg.getData();
DevData devData = JSON.parseObject(data, DevData.class);
@@ -298,38 +321,45 @@ public class SocketDevResponseService {
info.addAll(devIsSource(dev, sourceIssues.get(0)));
}
}
- if(CollUtil.isNotEmpty(info)){
+ if (CollUtil.isNotEmpty(info)) {
SocketDataMsg dataMsg = new SocketDataMsg();
dataMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
dataMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
dataMsg.setCode(SourceResponseCodeEnum.SUCCESS.getCode());
-
- for(SourceCompareDev sourceCompareDev : info){
- dataMsg.setData(sourceCompareDev.getDevName()+"_"+sourceCompareDev.getLineNum()+sourceCompareDev.getDesc()+"校验结果:"+(sourceCompareDev.getIsQualified()?"合格":"不合格"));
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(dataMsg) );
+ for (SourceCompareDev sourceCompareDev : info) {
+ dataMsg.setData(sourceCompareDev.getDevName() + "_" + sourceCompareDev.getLineNum() + sourceCompareDev.getDesc() + "校验结果:" + (sourceCompareDev.getIsQualified() ? "合格" : "不合格"));
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(dataMsg));
}
}
String userSource = param.getUserPageId() + handlerSourceStr;
SocketMsg msg = new SocketMsg();
- msg.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
+
+ msg.setRequestId(SourceOperateCodeEnum.QUITE_SOURCE.getValue());
msg.setOperateCode(SourceOperateCodeEnum.CLOSE_GATHER.getValue());
Map map = new HashMap<>(1);
map.put("sourceId", sourceIssues.get(0).getSourceId());
msg.setData(JSON.toJSONString(map));
SocketManager.sendMsg(userSource, MsgUtil.toJsonWithNewLinePlain(msg));
- SocketManager.removeUser(userSource);
- SocketManager.removeUser(param.getUserPageId() + handlerStr);
+
+ //同时关闭设备三个步骤
+ SocketMsg quitDevMsg = new SocketMsg();
+ quitSend(param, quitDevMsg);
//向前端推送消息
- // webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
-
SocketDataMsg temMsg = new SocketDataMsg();
temMsg.setCode(SourceResponseCodeEnum.DEV_COMM_ALL_SUCCESS.getCode());
temMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
temMsg.setRequestId(SourceOperateCodeEnum.YJC_XUJY.getValue());
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(temMsg) );
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(temMsg));
+
+
+ //如果是正式校验需要继续校验
+ if (SourceOperateCodeEnum.FORMAL_TEST.getValue().equals(param.getOperateType())) {
+
+ }
+
}
break;
case UNPROCESSED_BUSINESS:
@@ -338,6 +368,16 @@ public class SocketDevResponseService {
case NORMAL_RESPONSE:
devInfo.add(devData);
break;
+ case DEV_ERROR:
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
+ quitSend(param, socketMsg);
+ quitSendSource(param, socketMsg);
+ break;
+ case DEV_TARGET:
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), MsgUtil.msgToWebData(socketDataMsg, devNameMapComm, 2));
+ quitSend(param, socketMsg);
+ quitSendSource(param, socketMsg);
+ break;
case RE_OPERATE:
break;
default:
@@ -352,11 +392,53 @@ public class SocketDevResponseService {
}
+ /**
+ * 实时数据
+ */
+ public void realDeal(PreDetectionParam param, SocketDataMsg socketDataMsg) {
+ String data = socketDataMsg.getData();
+ DevData devData = JSON.parseObject(data, DevData.class);
+ SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
+ if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
+ SocketMsg socketMsg = new SocketMsg();
+ switch (dictDataEnumByCode) {
+ case SUCCESS:
+ List sqlDataDTOList = devData.getSqlData();
+ for (DevData.SqlDataDTO item : sqlDataDTOList) {
+
+ }
+ AdNonHarmonicResult adNonHarmonicResult = new AdNonHarmonicResult();
+
+ break;
+ case UNPROCESSED_BUSINESS:
+ break;
+
+ case NORMAL_RESPONSE:
+ break;
+ case DEV_ERROR:
+
+ break;
+ case DEV_TARGET:
+
+ break;
+ case RE_OPERATE:
+ break;
+ default:
+ socketMsg.setRequestId(socketDataMsg.getRequestId());
+ socketMsg.setOperateCode(socketDataMsg.getOperateCode());
+ socketMsg.setData(dictDataEnumByCode.getMessage());
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg));
+ break;
+ }
+ }
+
+ }
+
/**
- * 退出检测
+ * 退出检测返回
*/
- private void quitDeal(SocketDataMsg socketDataMsg,PreDetectionParam param, String msg) {
+ private void quitDeal(SocketDataMsg socketDataMsg, PreDetectionParam param, String msg) {
SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
SourceOperateCodeEnum operateCodeEnum = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getOperateCode());
SocketMsg socketMsg = new SocketMsg();
@@ -415,9 +497,16 @@ public class SocketDevResponseService {
socketMsg.setRequestId(SourceOperateCodeEnum.QUITE.getValue());
socketMsg.setOperateCode(SourceOperateCodeEnum.QUIT_INIT_03.getValue());
SocketManager.sendMsg(param.getUserPageId() + handlerStr, JSON.toJSONString(socketMsg));
-
}
+ /**
+ * 关闭源连接
+ */
+ private void quitSendSource(PreDetectionParam param, SocketMsg socketMsg) {
+ socketMsg.setRequestId(SourceOperateCodeEnum.QUITE_SOURCE.getValue());
+ socketMsg.setOperateCode(SourceOperateCodeEnum.CLOSE_GATHER.getValue());
+ SocketManager.sendMsg(param.getUserPageId() + handlerSourceStr, JSON.toJSONString(socketMsg));
+ }
private List devIsSource(DevData dev, SourceIssue issue) {
@@ -523,6 +612,8 @@ public class SocketDevResponseService {
this.success = new ArrayList<>();
this.devDataMap = new HashMap<>();
+ adNonHarmonicResultList.clear();
+
List pqDevList = iPqDevService.getDevInfo(param.getDevIds());
this.monitorIdListComm = pqDevList.stream().flatMap(x -> x.getMonitorList().stream())
diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
index 2c041306..7a6a99c4 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
@@ -51,15 +51,21 @@ public class SocketSourceResponseService {
SourceOperateCodeEnum enumByCode = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getRequestId());
if (ObjectUtil.isNotNull(enumByCode)) {
switch (enumByCode) {
+ //源初始化
case YJC_YTXJY:
detectionDev(param, socketDataMsg);
break;
+ //相序检测
case YJC_XUJY:
phaseSequenceDev(param, socketDataMsg);
break;
+ //正式检测
+ case FORMAL_REAL:
+ openSource(param, socketDataMsg);
+ break;
case QUITE_SOURCE:
- // System.out.println("关闭源回调："+msg);
- SocketManager.removeUser(param.getUserPageId()+source);
+ // System.out.println("关闭源回调："+msg);
+ SocketManager.removeUser(param.getUserPageId() + source);
break;
}
@@ -85,7 +91,7 @@ public class SocketSourceResponseService {
case SUCCESS:
//todo 前端推送收到的消息暂未处理好
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(socketDataMsg) );
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
String s = param.getUserPageId() + "_Dev";
//开始设备通讯检测(发送设备初始化)
List devList = iPqDevService.getDevInfo(param.getDevIds());
@@ -96,11 +102,11 @@ public class SocketSourceResponseService {
socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
socketMsg.setData(jsonString);
String json = JSON.toJSONString(socketMsg);
- // SocketManager.sendMsg(s,json);
+ // SocketManager.sendMsg(s,json);
NettyClient.socketClient(ip, port, param.getUserPageId(), json, new NettyDevClientHandler(param, socketDevResponseService));
break;
case UNPROCESSED_BUSINESS:
- webSocketHandler.sendMsgToUser(param.getUserPageId(),JSON.toJSONString(socketDataMsg) );
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
break;
default:
socketMsg = new SocketMsg();
@@ -156,4 +162,49 @@ public class SocketSourceResponseService {
}
}
+
+
+ /**
+ * 正式检测源输出
+ *
+ * @param param
+ * @param socketDataMsg
+ */
+ private void openSource(PreDetectionParam param, SocketDataMsg socketDataMsg) {
+ SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
+ if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
+ SocketMsg socketMsg = new SocketMsg();
+ switch (dictDataEnumByCode) {
+ case SUCCESS:
+ //向前端推送信息
+ // webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+
+ String s = param.getUserPageId() + DEV;
+ socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue());
+ socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue());
+ List pqDevList = iPqDevService.getDevInfo(param.getDevIds());
+ List moniterIdList = pqDevList.stream().flatMap(x -> x.getMonitorList().stream())
+ .map(PreDetection.MonitorListDTO::getLineId)
+ .collect(Collectors.toList());
+ DevPhaseSequenceParam phaseSequenceParam = new DevPhaseSequenceParam();
+ phaseSequenceParam.setMoniterIdList(moniterIdList);
+ phaseSequenceParam.setDataType(Arrays.asList("实时数据/电压有效值", "实时数据/电流有效值"));
+ phaseSequenceParam.setReadCount(20);
+ phaseSequenceParam.setIgnoreCount(10);
+ socketMsg.setData(JSON.toJSONString(phaseSequenceParam));
+ SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
+ break;
+ case UNPROCESSED_BUSINESS:
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+ break;
+ default:
+ socketMsg.setRequestId(socketDataMsg.getRequestId());
+ socketMsg.setOperateCode(socketDataMsg.getOperateCode());
+ socketMsg.setData(dictDataEnumByCode.getMessage());
+ webSocketHandler.sendMsgToUser(param.getUserPageId(), JSON.toJSONString(socketMsg));
+ break;
+ }
+ }
+ }
+
}
diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java b/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java
index a681e70c..ac1bc846 100644
--- a/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java
+++ b/detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java
@@ -43,8 +43,19 @@ public enum SourceOperateCodeEnum {
YJC_XYJY("yjc_xyjy", "预检测_协议校验"),
YJC_XUJY("YJC_xujy", "预检测_相序校验"),
+ FORMAL_REAL("formal_real","正式检测_获取实时数据"),
+ FORMAL_STATISTIC("formal_statistic","正式检测_获取统计数据"),
+ FORMAL_EVENT("formal_event","正式检测_获取暂态数据"),
+
QUITE("quit","预监测_关闭设备通讯初始化"),
- QUITE_SOURCE("close_source","预监测_关闭源通讯")
+ QUITE_SOURCE("close_source","预监测_关闭源通讯"),
+
+
+
+ PRE_TEST("0","预检测"),
+ FORMAL_TEST("1","正式检测"),
+ TIME_TEST("2","守时检测")
+
;
diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java b/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java
index 8f31dc30..4b02698c 100644
--- a/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java
+++ b/detection/src/main/java/com/njcn/gather/detection/pojo/param/PreDetectionParam.java
@@ -12,6 +12,12 @@ import java.util.List;
@Data
public class PreDetectionParam {
+ /**
+ * 操作类型 0.预检测 1.正式检测
+ */
+ private String operateType = "0";
+
+
/**
* 检测计划id
*/
diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
index b5c1300f..7aca5e00 100644
--- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
@@ -20,6 +20,7 @@ import com.njcn.gather.detection.util.socket.cilent.NettyClient;
import com.njcn.gather.detection.util.socket.cilent.NettySourceClientHandler;
import com.njcn.gather.device.device.service.IPqDevService;
import com.njcn.gather.device.script.service.IPqScriptDtlsService;
+import com.njcn.gather.device.source.pojo.po.PqSource;
import com.njcn.gather.device.source.pojo.po.SourceInitialize;
import com.njcn.gather.device.source.service.IPqSourceService;
import com.njcn.gather.plan.pojo.po.AdPlan;
@@ -104,6 +105,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
查询计划什么模式的（除了对比式，其他都是一个计划对应一个源）
*/
AdPlan plan = iAdPlanService.getById(param.getPlanId());
+ PqSource pqSource = pqSourceService.getById(plan.getDatasourceId());
if (ObjectUtil.isNotNull(plan)) {
String code = dictDataService.getDictDataById(plan.getPattern()).getCode();
DictDataEnum dictDataEnumByCode = DictDataEnum.getDictDataEnumByCode(code);
diff --git a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml
index 7eaa8519..210325bf 100644
--- a/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml
+++ b/storage/src/main/java/com/njcn/gather/storage/mapper/mapping/TableGenMapper.xml
@@ -9,10 +9,10 @@
Script_Dtls_Id CHAR(32) NOT NULL COMMENT '检测脚本子表Id，字典表',
AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',
Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',
- A_Value FLOAT NOT NULL COMMENT 'A相值',
- B_Value FLOAT NOT NULL COMMENT 'B相值',
- C_Value FLOAT NOT NULL COMMENT 'C相值',
- T_Value FLOAT NOT NULL COMMENT 'T相值(没有相别的则存这里)',
+ A_Value varchar(30) NOT NULL COMMENT 'A相值',
+ B_Value varchar(30) NOT NULL COMMENT 'B相值',
+ C_Value varchar(30) NOT NULL COMMENT 'C相值',
+ T_Value varchar(30) NOT NULL COMMENT 'T相值(没有相别的则存这里)',
PRIMARY KEY (Monitor_Id, Time_Id, Script_Dtls_Id, AD_Type, Data_Type)
) COMMENT='监测数据表';
@@ -31,10 +31,10 @@
AD_Type CHAR(32) NOT NULL COMMENT '检测指标，字典表',
Data_Type CHAR(32) NOT NULL COMMENT '数据指标，只有数据源为分钟统计时候才会使用（最大、最小、平均、CP95，默认平均值），字典表',
Result_Flag int(1) NOT NULL COMMENT '0.不合格 1.合格',
- A_Value FLOAT NOT NULL COMMENT 'A相值',
- B_Value FLOAT NOT NULL COMMENT 'B相值',
- C_Value FLOAT NOT NULL COMMENT 'C相值',
- T_Value FLOAT NOT NULL COMMENT 'T相值(没有相别的则存这里)',
+ A_Value varchar(30) NOT NULL COMMENT 'A相值',
+ B_Value varchar(30) NOT NULL COMMENT 'B相值',
+ C_Value varchar(30) NOT NULL COMMENT 'C相值',
+ T_Value varchar(30) NOT NULL COMMENT 'T相值(没有相别的则存这里)',
PRIMARY KEY (Monitor_Id, Time_Id, Script_Dtls_Id, AD_Type, Data_Type)
) COMMENT='监测数据表';
diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java
index a3935cb2..18fffeff 100644
--- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java
+++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdHarmonicResult.java
@@ -54,752 +54,752 @@ public class AdHarmonicResult {
/**
* A相基波
*/
- private Float aValue1;
+ private String aValue1;
/**
* 2次A相谐波
*/
- private Float aValue2;
+ private String aValue2;
/**
* 3次A相谐波
*/
- private Float aValue3;
+ private String aValue3;
/**
* 4次A相谐波
*/
- private Float aValue4;
+ private String aValue4;
/**
* 5次A相谐波
*/
- private Float aValue5;
+ private String aValue5;
/**
* 6次A相谐波
*/
- private Float aValue6;
+ private String aValue6;
/**
* 7次A相谐波
*/
- private Float aValue7;
+ private String aValue7;
/**
* 8次A相谐波
*/
- private Float aValue8;
+ private String aValue8;
/**
* 9次A相谐波
*/
- private Float aValue9;
+ private String aValue9;
/**
* 10次A相谐波
*/
- private Float aValue10;
+ private String aValue10;
/**
* 11次A相谐波
*/
- private Float aValue11;
+ private String aValue11;
/**
* 12次A相谐波
*/
- private Float aValue12;
+ private String aValue12;
/**
* 13次A相谐波
*/
- private Float aValue13;
+ private String aValue13;
/**
* 14次A相谐波
*/
- private Float aValue14;
+ private String aValue14;
/**
* 15次A相谐波
*/
- private Float aValue15;
+ private String aValue15;
/**
* 16次A相谐波
*/
- private Float aValue16;
+ private String aValue16;
/**
* 17次A相谐波
*/
- private Float aValue17;
+ private String aValue17;
/**
* 18次A相谐波
*/
- private Float aValue18;
+ private String aValue18;
/**
* 19次A相谐波
*/
- private Float aValue19;
+ private String aValue19;
/**
* 20次A相谐波
*/
- private Float aValue20;
+ private String aValue20;
/**
* 21次A相谐波
*/
- private Float aValue21;
+ private String aValue21;
/**
* 22次A相谐波
*/
- private Float aValue22;
+ private String aValue22;
/**
* 23次A相谐波
*/
- private Float aValue23;
+ private String aValue23;
/**
* 24次A相谐波
*/
- private Float aValue24;
+ private String aValue24;
/**
* 25次A相谐波
*/
- private Float aValue25;
+ private String aValue25;
/**
* 26次A相谐波
*/
- private Float aValue26;
+ private String aValue26;
/**
* 27次A相谐波
*/
- private Float aValue27;
+ private String aValue27;
/**
* 28次A相谐波
*/
- private Float aValue28;
+ private String aValue28;
/**
* 29次A相谐波
*/
- private Float aValue29;
+ private String aValue29;
/**
* 30次A相谐波
*/
- private Float aValue30;
+ private String aValue30;
/**
* 31次A相谐波
*/
- private Float aValue31;
+ private String aValue31;
/**
* 32次A相谐波
*/
- private Float aValue32;
+ private String aValue32;
/**
* 33次A相谐波
*/
- private Float aValue33;
+ private String aValue33;
/**
* 34次A相谐波
*/
- private Float aValue34;
+ private String aValue34;
/**
* 35次A相谐波
*/
- private Float aValue35;
+ private String aValue35;
/**
* 36次A相谐波
*/
- private Float aValue36;
+ private String aValue36;
/**
* 37次A相谐波
*/
- private Float aValue37;
+ private String aValue37;
/**
* 38次A相谐波
*/
- private Float aValue38;
+ private String aValue38;
/**
* 39次A相谐波
*/
- private Float aValue39;
+ private String aValue39;
/**
* 40次A相谐波
*/
- private Float aValue40;
+ private String aValue40;
/**
* 41次A相谐波
*/
- private Float aValue41;
+ private String aValue41;
/**
* 42次A相谐波
*/
- private Float aValue42;
+ private String aValue42;
/**
* 43次A相谐波
*/
- private Float aValue43;
+ private String aValue43;
/**
* 44次A相谐波
*/
- private Float aValue44;
+ private String aValue44;
/**
* 45次A相谐波
*/
- private Float aValue45;
+ private String aValue45;
/**
* 46次A相谐波
*/
- private Float aValue46;
+ private String aValue46;
/**
* 47次A相谐波
*/
- private Float aValue47;
+ private String aValue47;
/**
* 48次A相谐波
*/
- private Float aValue48;
+ private String aValue48;
/**
* 49次A相谐波
*/
- private Float aValue49;
+ private String aValue49;
/**
* 50次A相谐波
*/
- private Float aValue50;
+ private String aValue50;
/**
* B相基波
*/
- private Float bValue1;
+ private String bValue1;
/**
* 2次B相谐波
*/
- private Float bValue2;
+ private String bValue2;
/**
* 3次B相谐波
*/
- private Float bValue3;
+ private String bValue3;
/**
* 4次B相谐波
*/
- private Float bValue4;
+ private String bValue4;
/**
* 5次B相谐波
*/
- private Float bValue5;
+ private String bValue5;
/**
* 6次B相谐波
*/
- private Float bValue6;
+ private String bValue6;
/**
* 7次B相谐波
*/
- private Float bValue7;
+ private String bValue7;
/**
* 8次B相谐波
*/
- private Float bValue8;
+ private String bValue8;
/**
* 9次B相谐波
*/
- private Float bValue9;
+ private String bValue9;
/**
* 10次B相谐波
*/
- private Float bValue10;
+ private String bValue10;
/**
* 11次B相谐波
*/
- private Float bValue11;
+ private String bValue11;
/**
* 12次B相谐波
*/
- private Float bValue12;
+ private String bValue12;
/**
* 13次B相谐波
*/
- private Float bValue13;
+ private String bValue13;
/**
* 14次B相谐波
*/
- private Float bValue14;
+ private String bValue14;
/**
* 15次B相谐波
*/
- private Float bValue15;
+ private String bValue15;
/**
* 16次B相谐波
*/
- private Float bValue16;
+ private String bValue16;
/**
* 17次B相谐波
*/
- private Float bValue17;
+ private String bValue17;
/**
* 18次B相谐波
*/
- private Float bValue18;
+ private String bValue18;
/**
* 19次B相谐波
*/
- private Float bValue19;
+ private String bValue19;
/**
* 20次B相谐波
*/
- private Float bValue20;
+ private String bValue20;
/**
* 21次B相谐波
*/
- private Float bValue21;
+ private String bValue21;
/**
* 22次B相谐波
*/
- private Float bValue22;
+ private String bValue22;
/**
* 23次B相谐波
*/
- private Float bValue23;
+ private String bValue23;
/**
* 24次B相谐波
*/
- private Float bValue24;
+ private String bValue24;
/**
* 25次B相谐波
*/
- private Float bValue25;
+ private String bValue25;
/**
* 26次B相谐波
*/
- private Float bValue26;
+ private String bValue26;
/**
* 27次B相谐波
*/
- private Float bValue27;
+ private String bValue27;
/**
* 28次B相谐波
*/
- private Float bValue28;
+ private String bValue28;
/**
* 29次B相谐波
*/
- private Float bValue29;
+ private String bValue29;
/**
* 30次B相谐波
*/
- private Float bValue30;
+ private String bValue30;
/**
* 31次B相谐波
*/
- private Float bValue31;
+ private String bValue31;
/**
* 32次B相谐波
*/
- private Float bValue32;
+ private String bValue32;
/**
* 33次B相谐波
*/
- private Float bValue33;
+ private String bValue33;
/**
* 34次B相谐波
*/
- private Float bValue34;
+ private String bValue34;
/**
* 35次B相谐波
*/
- private Float bValue35;
+ private String bValue35;
/**
* 36次B相谐波
*/
- private Float bValue36;
+ private String bValue36;
/**
* 37次B相谐波
*/
- private Float bValue37;
+ private String bValue37;
/**
* 38次B相谐波
*/
- private Float bValue38;
+ private String bValue38;
/**
* 39次B相谐波
*/
- private Float bValue39;
+ private String bValue39;
/**
* 40次B相谐波
*/
- private Float bValue40;
+ private String bValue40;
/**
* 41次B相谐波
*/
- private Float bValue41;
+ private String bValue41;
/**
* 42次B相谐波
*/
- private Float bValue42;
+ private String bValue42;
/**
* 43次B相谐波
*/
- private Float bValue43;
+ private String bValue43;
/**
* 44次B相谐波
*/
- private Float bValue44;
+ private String bValue44;
/**
* 45次B相谐波
*/
- private Float bValue45;
+ private String bValue45;
/**
* 46次B相谐波
*/
- private Float bValue46;
+ private String bValue46;
/**
* 47次B相谐波
*/
- private Float bValue47;
+ private String bValue47;
/**
* 48次B相谐波
*/
- private Float bValue48;
+ private String bValue48;
/**
* 49次B相谐波
*/
- private Float bValue49;
+ private String bValue49;
/**
* 50次B相谐波
*/
- private Float bValue50;
+ private String bValue50;
/**
* C相基波
*/
- private Float cValue1;
+ private String cValue1;
/**
* 2次C相谐波
*/
- private Float cValue2;
+ private String cValue2;
/**
* 3次C相谐波
*/
- private Float cValue3;
+ private String cValue3;
/**
* 4次C相谐波
*/
- private Float cValue4;
+ private String cValue4;
/**
* 5次C相谐波
*/
- private Float cValue5;
+ private String cValue5;
/**
* 6次C相谐波
*/
- private Float cValue6;
+ private String cValue6;
/**
* 7次C相谐波
*/
- private Float cValue7;
+ private String cValue7;
/**
* 8次C相谐波
*/
- private Float cValue8;
+ private String cValue8;
/**
* 9次C相谐波
*/
- private Float cValue9;
+ private String cValue9;
/**
* 10次C相谐波
*/
- private Float cValue10;
+ private String cValue10;
/**
* 11次C相谐波
*/
- private Float cValue11;
+ private String cValue11;
/**
* 12次C相谐波
*/
- private Float cValue12;
+ private String cValue12;
/**
* 13次C相谐波
*/
- private Float cValue13;
+ private String cValue13;
/**
* 14次C相谐波
*/
- private Float cValue14;
+ private String cValue14;
/**
* 15次C相谐波
*/
- private Float cValue15;
+ private String cValue15;
/**
* 16次C相谐波
*/
- private Float cValue16;
+ private String cValue16;
/**
* 17次C相谐波
*/
- private Float cValue17;
+ private String cValue17;
/**
* 18次C相谐波
*/
- private Float cValue18;
+ private String cValue18;
/**
* 19次C相谐波
*/
- private Float cValue19;
+ private String cValue19;
/**
* 20次C相谐波
*/
- private Float cValue20;
+ private String cValue20;
/**
* 21次C相谐波
*/
- private Float cValue21;
+ private String cValue21;
/**
* 22次C相谐波
*/
- private Float cValue22;
+ private String cValue22;
/**
* 23次C相谐波
*/
- private Float cValue23;
+ private String cValue23;
/**
* 24次C相谐波
*/
- private Float cValue24;
+ private String cValue24;
/**
* 25次C相谐波
*/
- private Float cValue25;
+ private String cValue25;
/**
* 26次C相谐波
*/
- private Float cValue26;
+ private String cValue26;
/**
* 27次C相谐波
*/
- private Float cValue27;
+ private String cValue27;
/**
* 28次C相谐波
*/
- private Float cValue28;
+ private String cValue28;
/**
* 29次C相谐波
*/
- private Float cValue29;
+ private String cValue29;
/**
* 30次C相谐波
*/
- private Float cValue30;
+ private String cValue30;
/**
* 31次C相谐波
*/
- private Float cValue31;
+ private String cValue31;
/**
* 32次C相谐波
*/
- private Float cValue32;
+ private String cValue32;
/**
* 33次C相谐波
*/
- private Float cValue33;
+ private String cValue33;
/**
* 34次C相谐波
*/
- private Float cValue34;
+ private String cValue34;
/**
* 35次C相谐波
*/
- private Float cValue35;
+ private String cValue35;
/**
* 36次C相谐波
*/
- private Float cValue36;
+ private String cValue36;
/**
* 37次C相谐波
*/
- private Float cValue37;
+ private String cValue37;
/**
* 38次C相谐波
*/
- private Float cValue38;
+ private String cValue38;
/**
* 39次C相谐波
*/
- private Float cValue39;
+ private String cValue39;
/**
* 40次C相谐波
*/
- private Float cValue40;
+ private String cValue40;
/**
* 41次C相谐波
*/
- private Float cValue41;
+ private String cValue41;
/**
* 42次C相谐波
*/
- private Float cValue42;
+ private String cValue42;
/**
* 43次C相谐波
*/
- private Float cValue43;
+ private String cValue43;
/**
* 44次C相谐波
*/
- private Float cValue44;
+ private String cValue44;
/**
* 45次C相谐波
*/
- private Float cValue45;
+ private String cValue45;
/**
* 46次C相谐波
*/
- private Float cValue46;
+ private String cValue46;
/**
* 47次C相谐波
*/
- private Float cValue47;
+ private String cValue47;
/**
* 48次C相谐波
*/
- private Float cValue48;
+ private String cValue48;
/**
* 49次C相谐波
*/
- private Float cValue49;
+ private String cValue49;
/**
* 50次C相谐波
*/
- private Float cValue50;
+ private String cValue50;
}
diff --git a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java
index ff465fbb..cab4b5f9 100644
--- a/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java
+++ b/storage/src/main/java/com/njcn/gather/storage/pojo/po/AdNonHarmonicResult.java
@@ -54,22 +54,22 @@ public class AdNonHarmonicResult {
/**
* A相值
*/
- private Float aValue;
+ private String aValue;
/**
* B相值
*/
- private Float bValue;
+ private String bValue;
/**
* C相值
*/
- private Float cValue;
+ private String cValue;
/**
* T相值(没有相别的则存这里)
*/
- private Float tValue;
+ private String tValue;
}
diff --git a/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java b/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java
index 476ba2b1..f16cda00 100644
--- a/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java
+++ b/storage/src/main/java/com/njcn/gather/storage/service/DetectionDataDealService.java
@@ -9,6 +9,7 @@ import java.util.List;
public interface DetectionDataDealService extends IService {
+
Boolean acceptAdNon(List adNonHarmonicResultList,String code);
Boolean acceptAd(List adHarmonicResultList,String code);
diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
index 06250d23..f1cfeeea 100644
--- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
+++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
- *
+ * 接收检测的原始数据以及计算后的结果
* @author chendaofei
*/
@Service
diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java
index e92e97f4..f0ce3135 100644
--- a/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java
+++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/TableGenServiceImpl.java
@@ -25,13 +25,13 @@ public class TableGenServiceImpl implements TableGenService {
StringBuilder C = new StringBuilder();
for(int i=1;i<=50;i++){
if(i == 1){
- A.append("A_Value_").append(i).append(" FLOAT NOT NULL COMMENT 'A相基波',");
- B.append("B_Value_").append(i).append(" FLOAT NOT NULL COMMENT 'B相基波',");
- C.append("C_Value_").append(i).append(" FLOAT NOT NULL COMMENT 'C相基波',");
+ A.append("A_Value_").append(i).append(" varchar(30) NOT NULL COMMENT 'A相基波',");
+ B.append("B_Value_").append(i).append(" varchar(30) NOT NULL COMMENT 'B相基波',");
+ C.append("C_Value_").append(i).append(" varchar(30) NOT NULL COMMENT 'C相基波',");
}else {
- A.append("A_Value_").append(i).append(" FLOAT NOT NULL COMMENT '").append(i).append("次A相谐波',");
- B.append("B_Value_").append(i).append(" FLOAT NOT NULL COMMENT '").append(i).append("次B相谐波',");
- C.append("C_Value_").append(i).append(" FLOAT NOT NULL COMMENT '").append(i).append("次C相谐波',");
+ A.append("A_Value_").append(i).append(" varchar(30) NOT NULL COMMENT '").append(i).append("次A相谐波',");
+ B.append("B_Value_").append(i).append(" varchar(30) NOT NULL COMMENT '").append(i).append("次B相谐波',");
+ C.append("C_Value_").append(i).append(" varchar(30) NOT NULL COMMENT '").append(i).append("次C相谐波',");
}
}