代码优化

2024-12-27 12:34:31 +08:00 · 2024-12-27 09:51:40 +08:00 · 2024-12-26 15:29:42 +08:00 · 2024-12-26 15:22:41 +08:00 · 2024-12-24 10:39:37 +08:00 · 2024-12-23 17:41:12 +08:00
11 changed files with 117 additions and 77 deletions
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java
@@ -82,6 +82,10 @@ public class RspDataDto {

        @SerializedName("Capacity_A")
        private Double capacityA;
+
+        @SerializedName("StatCycle")
+        @ApiModelProperty("接线方式")
+        private Integer StatCycle;
    }

    /**
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -406,6 +406,7 @@ public class MqttMessageHandler {
                                            csLineParam.setPtRatio(item.getPtRatio());
                                            csLineParam.setCtRatio(item.getCtRatio());
                                            csLineParam.setConType(item.getConType());
+                                            csLineParam.setLineInterval(item.getStatCycle());
                                            csLineFeignClient.updateLine(csLineParam);
                                            //生成监测点限值
                                            Overlimit overlimit = COverlimitUtil.globalAssemble(item.getVolGrade().floatValue(),10f,10f,10f,0,0);
@@ -429,6 +430,7 @@ public class MqttMessageHandler {
                                            csLineParam.setPtRatio(item.getPtRatio());
                                            csLineParam.setCtRatio(item.getCtRatio());
                                            csLineParam.setConType(item.getConType());
+                                            csLineParam.setLineInterval(item.getStatCycle());
                                            csLineFeignClient.updateLine(csLineParam);
                                        });
                                    }
--- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
@@ -33,7 +33,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -98,78 +97,93 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
        String expiredKey = message.toString();
        if(expiredKey.startsWith("MQTT:")){
            String nDid = expiredKey.split(":")[1];
-            String version = csTopicService.getVersion(nDid);
-            ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-            executeMainTask(scheduler,nDid,version);
+            executeMainTask(nDid);
        }
    }

    //主任务
    //1.装置心跳断连
    //2.MQTT客户端不在线
-    private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) {
+    private void executeMainTask(String nDid) {
        log.info("{}->装置离线", nDid);
        DeviceLogDTO logDto = new DeviceLogDTO();
        logDto.setUserName("运维管理员");
        logDto.setLoginName("njcnyw");
-        //判断mqtt
-        String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
-        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
-        //心跳异常，但是客户端在线，则发送接入请求
-        if (mqttClient) {
-            csDeviceService.devAccessAskTemplate(nDid,version,1);
-            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
-            try {
-                Thread.sleep(5000);
-                Object object = redisUtil.getObjectByKey("online" + nDid);
-                if (Objects.nonNull(object)) {
-                    scheduler.shutdown();
-                    logDto.setOperate(nDid + "客户端在线重连成功");
-                } else {
-                    //装置下线
-                    csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
-                    //装置调整为注册状态
-                    csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
-                    //startScheduledTask(scheduler,nDid,version);
-                    //logDto.setOperate(nDid +"客户端离线进入定时任务");
-                    logDto.setOperate(nDid +"装置离线");
-                    sendMessage(nDid);
-
-                    //记录装置掉线时间
-                    CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
-                    record.setOfflineTime(LocalDateTime.now());
-                    onlineLogsService.updateById(record);
-
-                    scheduler.shutdown();
-                }
-            } catch (InterruptedException e) {
-                scheduler.shutdown();
-                throw new RuntimeException(e);
-            }
-            csLogsFeignClient.addUserLog(logDto);
-        }
-        //客户端不在线则修改装置状态，进入定时任务
-        else {
-            //装置下线
-            csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
-            //装置调整为注册状态
-            csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
-            logDto.setOperate(nDid +"主任务执行失败，装置下线");
-            //logDto.setOperate(nDid +"主任务执行失败，装置下线，进入定时任务");
-            csLogsFeignClient.addUserLog(logDto);
-            //log.info("客户端离线进入定时任务...");
-            //startScheduledTask(scheduler,nDid,version);
-            sendMessage(nDid);
-
-            //记录装置掉线时间
-            CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
-            record.setOfflineTime(LocalDateTime.now());
-            onlineLogsService.updateById(record);
-
-            scheduler.shutdown();
-        }
+        //装置下线
+        csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
+        //装置调整为注册状态
+        csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
+        logDto.setOperate(nDid +"装置离线");
+        sendMessage(nDid);
+        //记录装置掉线时间
+        CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
+        record.setOfflineTime(LocalDateTime.now());
+        onlineLogsService.updateById(record);
+        csLogsFeignClient.addUserLog(logDto);
    }

+    //主任务
+    //1.装置心跳断连
+    //2.MQTT客户端不在线
+//    private void executeMainTask(String nDid, String version) {
+//        ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+//        log.info("{}->装置离线", nDid);
+//        DeviceLogDTO logDto = new DeviceLogDTO();
+//        logDto.setUserName("运维管理员");
+//        logDto.setLoginName("njcnyw");
+//        //判断mqtt
+//        String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+//        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+//        //心跳异常，但是客户端在线，则发送接入请求
+//        if (mqttClient) {
+//            csDeviceService.devAccessAskTemplate(nDid,version,1);
+//            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
+//            try {
+//                Thread.sleep(5000);
+//                Object object = redisUtil.getObjectByKey("online" + nDid);
+//                if (Objects.nonNull(object)) {
+//                    scheduler.shutdown();
+//                    logDto.setOperate(nDid + "客户端在线重连成功");
+//                } else {
+//                    //装置下线
+//                    csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
+//                    //装置调整为注册状态
+//                    csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
+//                    logDto.setOperate(nDid +"装置离线");
+//                    sendMessage(nDid);
+//
+//                    //记录装置掉线时间
+//                    CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
+//                    record.setOfflineTime(LocalDateTime.now());
+//                    onlineLogsService.updateById(record);
+//
+//                    scheduler.shutdown();
+//                }
+//            } catch (InterruptedException e) {
+//                scheduler.shutdown();
+//                throw new RuntimeException(e);
+//            }
+//            csLogsFeignClient.addUserLog(logDto);
+//        }
+//        //客户端不在线则修改装置状态，进入定时任务
+//        else {
+//            //装置下线
+//            csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
+//            //装置调整为注册状态
+//            csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
+//            logDto.setOperate(nDid +"主任务执行失败，装置下线");
+//            csLogsFeignClient.addUserLog(logDto);
+//            sendMessage(nDid);
+//
+//            //记录装置掉线时间
+//            CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
+//            record.setOfflineTime(LocalDateTime.now());
+//            onlineLogsService.updateById(record);
+//
+//            scheduler.shutdown();
+//        }
+//    }
+
    private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) {
        synchronized (lock) {
            //判断是否推送消息
--- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
@@ -8,6 +8,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicTreeEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -45,7 +46,7 @@ public class AccessApplicationRunner implements ApplicationRunner {
    public void run(ApplicationArguments args) {
        //项目启动60s后发起自动接入
        Runnable task = () -> {
-            log.info("系统重启,所有符合条件的装置全部接入!");
+            log.info("系统重启,所有符合条件的装置发起接入!");
            List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getOnlineDev();
            if (CollUtil.isNotEmpty(list)) {
                ExecutorService executor = Executors.newFixedThreadPool(10);
@@ -92,8 +93,8 @@ public class AccessApplicationRunner implements ApplicationRunner {
            String version = csTopicService.getVersion(item.getNdid());
            if (!Objects.isNull(version)){
                //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入
-                String code = dictTreeFeignClient.queryById(item.getDevModel()).getData().getCode();
-                if (Objects.equals(code,DicTreeEnum.PQV_520.getCode()) && Objects.equals(item.getStatus(),1)) {
+                String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode();
+                if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),1)) {
                    csDeviceService.wlDevRegister(item.getNdid());
                } else {
                    csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
--- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
@@ -8,6 +8,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicTreeEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -83,12 +84,12 @@ public class AutoAccessTimer implements ApplicationRunner {

    public void accessDev(List<CsEquipmentDeliveryPO> list) {
        list.forEach(item->{
-            System.out.println(Thread.currentThread().getName() + ": reboot : nDid : " + item.getNdid());
+            System.out.println(Thread.currentThread().getName() + ": auto : nDid : " + item.getNdid());
            String version = csTopicService.getVersion(item.getNdid());
            if (!Objects.isNull(version)){
                //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入
-                String code = dictTreeFeignClient.queryById(item.getDevModel()).getData().getCode();
-                if (Objects.equals(code, DicTreeEnum.PQV_520.getCode()) && Objects.equals(item.getStatus(),1)) {
+                String code = dictTreeFeignClient.queryById(item.getDevType()).getData().getCode();
+                if (Objects.equals(code, DicDataEnum.PORTABLE.getCode()) && Objects.equals(item.getStatus(),1)) {
                    csDeviceService.wlDevRegister(item.getNdid());
                } else {
                    csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDataSetServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDataSetServiceImpl.java
@@ -33,6 +33,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
    public List<CsDataSet> getDataSetData(String modelId) {
        return this.lambdaQuery()
                .eq(CsDataSet::getPid, modelId)
+                .and(item->item.eq(CsDataSet::getConType,1).or().isNull(CsDataSet::getConType))
                .and(item->item.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
                .list();
    }
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
@@ -370,7 +370,6 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
    public String wlDevRegister(String nDid) {
        String result = "fail";
        // 设备状态判断
@@ -439,6 +438,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
            csDevModelRelationAddParm.setDid(modelList.get(0).getDid());
            csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm);
            //5.发起自动接入请求
+            Thread.sleep(2000);
            devAccessAskTemplate(nDid,version,1);
            //6.修改流程,便携式设备接入成功即为实际环境
            csEquipmentDeliveryService.updateProcessBynDid(nDid,4);
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -120,7 +120,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
        List<CsEquipmentDeliveryPO> list = this.lambdaQuery()
                .eq(CsEquipmentDeliveryPO::getRunStatus,AccessEnum.OFFLINE.getCode())
                .eq(CsEquipmentDeliveryPO::getUsageStatus,1)
-                .eq(CsEquipmentDeliveryPO::getStatus, AccessEnum.REGISTERED.getCode())
                .list();
        list.forEach(item->{
            String clientName = "NJCN-" + item.getNdid().substring(item.getNdid().length() - 6);
--- a/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java
+++ b/iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java
@@ -85,7 +85,7 @@ public class RtServiceImpl implements IRtService {
        }
        //fixme 目前实时数据只有基础数据和谐波数据，后期拓展，这边需要再判断
        else {
-            HarmRealDataSet harmRealDataSet = harmData(dataArrayList,item);
+            HarmRealDataSet harmRealDataSet = harmData(dataArrayList,item,dataSet.getDataLevel(),po.getCtRatio());
            harmRealDataSet.setUserId(userId);
            harmRealDataSet.setLineId(lineId);
            harmRealDataSet.setPt(po.getPtRatio().floatValue());
@@ -228,7 +228,7 @@ public class RtServiceImpl implements IRtService {
        return baseRealDataSet;
    }

-    public HarmRealDataSet harmData(List<CsDataArray> dataArrayList, AppAutoDataMessage.DataArray dataArray) {
+    public HarmRealDataSet harmData(List<CsDataArray> dataArrayList, AppAutoDataMessage.DataArray dataArray, String dataLevel, Double ct) {
        HarmRealDataSet harmRealDataSet = new HarmRealDataSet();
        List<HarmData> harmDataList = new ArrayList<>();
        //解码
@@ -259,7 +259,14 @@ public class RtServiceImpl implements IRtService {
        //通过反射将数据赋值
        Class<?> clazz = HarmRealDataSet.class;
        maxDataList.forEach(item->{
-            if (Objects.equals(item.getHarmName(),"Pq_RmsFundI") || Objects.equals(item.getHarmName(),"Pq_RmsFundU")) {
+            if (Objects.equals(item.getHarmName(),"Pq_RmsFundI")) {
+                if ("Secondary".equals(dataLevel)) {
+                    double data = item.getData() * ct;
+                    harmRealDataSet.setData1(FloatUtils.get2Float((float)data));
+                } else {
+                    harmRealDataSet.setData1(FloatUtils.get2Float(item.getData()));
+                }
+            } else if (Objects.equals(item.getHarmName(),"Pq_RmsFundU")) {
                harmRealDataSet.setData1(FloatUtils.get2Float(item.getData()));
            } else {
                String numberStr = item.getHarmName().substring(item.getHarmName().lastIndexOf('_') + 1);
@@ -267,7 +274,16 @@ public class RtServiceImpl implements IRtService {
                try {
                    Field field = clazz.getDeclaredField(fieldName);
                    field.setAccessible(true);
-                    field.set(harmRealDataSet,FloatUtils.get2Float(item.getData()));
+                    if (item.getHarmName().contains("Pq_HarmI_")) {
+                        if ("Secondary".equals(dataLevel)) {
+                            double data = item.getData() * ct;
+                            field.set(harmRealDataSet,FloatUtils.get2Float((float)data));
+                        } else {
+                            field.set(harmRealDataSet,FloatUtils.get2Float(item.getData()));
+                        }
+                    } else {
+                        field.set(harmRealDataSet,FloatUtils.get2Float(item.getData()));
+                    }
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
@@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.influxdb.InfluxDB;
 import org.influxdb.dto.BatchPoints;
 import org.influxdb.dto.Point;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

@@ -200,7 +201,7 @@ public class EventServiceImpl implements IEventService {
            if (!Objects.isNull(record)) {
                if (!Objects.equals(item.getPrjTimeEnd(),-1L)) {
                    WlRecordParam.UpdateRecord wlRecord = new WlRecordParam.UpdateRecord();
-                    wlRecord.setId(record.getId());
+                    BeanUtils.copyProperties(record,wlRecord);
                    wlRecord.setProEndTime(timestampToDatetime((item.getPrjTimeEnd() - 8*3600)));
                    wlRecordFeignClient.updateTestRecord(wlRecord);
                }
@@ -208,7 +209,7 @@ public class EventServiceImpl implements IEventService {
                //新项目入库
                WlRecord wlRecord = new WlRecord();
                wlRecord.setId(IdUtil.simpleUUID());
-                wlRecord.setItemName("基础数据");
+                wlRecord.setItemName("在线监测");
                wlRecord.setGcName(item.getPrjName());
                wlRecord.setDevId(vo.getId());
                wlRecord.setLineId(appEventMessage.getId() + item.getClDid().toString());
@@ -227,6 +228,9 @@ public class EventServiceImpl implements IEventService {
                //fixme 电流接线方式 这边系统没有字典，录入字典通用性不强，采用装置上送值存储
                wlRecord.setCurConSel(item.getCurConSel().toString());
                wlRecord.setStartTime(timestampToDatetime((item.getPrjTimeStart() - 8*3600)));
+                if (!Objects.equals(item.getPrjTimeEnd(),-1L)) {
+                    wlRecord.setEndTime(timestampToDatetime((item.getPrjTimeEnd() - 8*3600)));
+                }
                wlRecord.setType(1);
                wlRecord.setState(1);
                wlRecord.setGcDataPath(item.getPrjDataPath());
--- a/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java
+++ b/iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java
@@ -46,8 +46,6 @@ public class AppAutoDataConsumer extends EnhanceConsumerMessageHandler<AppAutoDa
    private RocketMqLogFeignClient rocketMqLogFeignClient;
    @Resource
    private RtFeignClient rtFeignClient;
-//    @Resource
-//    private WlRecordFeignClient wlRecordFeignClient

    @Override
    protected void handleMessage(AppAutoDataMessage appAutoDataMessage) {
Author	SHA1	Message	Date
xy	da3b99f663	代码优化	2024-12-27 12:34:31 +08:00
xy	04fd2409cf	代码优化	2024-12-27 09:51:40 +08:00
xy	b014aa7c8c	代码优化	2024-12-26 15:29:42 +08:00
xy	67be8404d5	代码优化	2024-12-26 15:22:41 +08:00
xy	19f1c54ade	代码优化	2024-12-24 10:39:37 +08:00
xy	f211713f2e	实时数据一次值二次值判断	2024-12-23 17:41:12 +08:00
xy	d9708580db	代码优化	2024-12-20 13:24:30 +08:00
xy	af96a91303	代码优化	2024-12-20 11:26:36 +08:00
xy	4006d26d5f	bug调整	2024-12-19 11:20:25 +08:00
xy	885fc36739	bug调整	2024-12-19 10:29:34 +08:00
xy	eed276c9b3	功能优化	2024-12-06 15:25:21 +08:00
xy	24cf6e8d56	添加监测点统计间隔	2024-12-04 17:15:17 +08:00