获取便携式设备基础数据功能

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/EventDto.java

@@ -82,6 +82,79 @@ public class EventDto {
 
         @SerializedName("Parm")
         private List<Param> param;
+
+
+        @SerializedName("PrjName")
+        @ApiModelProperty("工程名称")
+        private String prjName;
+
+        @SerializedName("PrjTimeStart")
+        @ApiModelProperty("装置启动时间")
+        private Long prjTimeStart;
+
+        @SerializedName("PrjTimeEnd")
+        @ApiModelProperty("装置结束时间")
+        private Long prjTimeEnd;
+
+        @SerializedName("PrjDataPath")
+        @ApiModelProperty("装置数据路径")
+        private String prjDataPath;
+
+        @SerializedName("DevType")
+        @ApiModelProperty("装置型号")
+        private String devType;
+
+        @SerializedName("DevMac")
+        @ApiModelProperty("装置mac地址")
+        private String devMac;
+
+        @SerializedName("AppVersion")
+        @ApiModelProperty("装置程序版本")
+        private String appVersion;
+
+        @SerializedName("Cldid")
+        @ApiModelProperty("逻辑子设备id")
+        private Integer clDid;
+
+        @SerializedName("StatCycle")
+        @ApiModelProperty("统计间隔")
+        private Integer statCycle;
+
+        @SerializedName("VolGrade")
+        @ApiModelProperty("电压等级")
+        private Float volGrade;
+
+        @SerializedName("VolConType")
+        @ApiModelProperty("电压接线方式（0-星型, 1-角型, 2-V型）")
+        private Integer volConType;
+
+        @SerializedName("CurConSel")
+        @ApiModelProperty("电流接线方式（0-正常, 1-合成IB, 2-合成IC）")
+        private Integer curConSel;
+
+        @SerializedName("PtRatio")
+        @ApiModelProperty("PT变比")
+        private Integer ptRatio;
+
+        @SerializedName("CtRatio")
+        @ApiModelProperty("ct变比")
+        private Integer ctRatio;
+
+        @SerializedName("CapacitySscb")
+        @ApiModelProperty("基准短路容量")
+        private Float capacitySscb;
+
+        @SerializedName("CapacitySscmin")
+        @ApiModelProperty("最小短路容量")
+        private Float capacitySscmin;
+
+        @SerializedName("CapacitySt")
+        @ApiModelProperty("供电设备容量")
+        private Float capacitySt;
+
+        @SerializedName("CapacitySi")
+        @ApiModelProperty("用户协议容量")
+        private Float capacitySi;
     }
 
     @Data

iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java

@@ -105,6 +105,16 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
             executeMainTask(scheduler,nDid,version);
         }
+        //自动接入
+        else if (expiredKey.startsWith("autoAccess")) {
+            List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
+            list.forEach(item->{
+                String version = csTopicService.getVersion(item.getNdid());
+                if (!Objects.isNull(version)){
+                    csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
+                }
+            });
+        }
     }
 
     //主任务

iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java

@@ -1,17 +1,12 @@
 package com.njcn.access.runner;
 
-import com.njcn.access.service.ICsEquipmentDeliveryService;
-import com.njcn.access.service.ICsTopicService;
-import com.njcn.access.service.impl.CsDeviceServiceImpl;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 类的介绍：用来重新发起设备的接入，存在程序意外停止了，缓存失效导致无法更新装置的状态，所以需要在程序启动时发起设备的接入
@@ -25,21 +20,11 @@ import java.util.Objects;
 public class AccessApplicationRunner implements ApplicationRunner {
 
     @Resource
-    private CsDeviceServiceImpl csDeviceService;
-    @Resource
-    private ICsTopicService csTopicService;
-    @Resource
-    private ICsEquipmentDeliveryService csEquipmentDeliveryService;
+    private RedisUtil redisUtil;
 
     @Override
-    public void run(ApplicationArguments args){
-        List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
-        list.forEach(item->{
-            String version = csTopicService.getVersion(item.getNdid());
-            if (!Objects.isNull(version)){
-                csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
-            }
-        });
+    public void run(ApplicationArguments args) {
+        redisUtil.saveByKeyWithExpire("autoAccess",null,60L);
     }
 
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java

@@ -42,6 +42,7 @@ import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -64,49 +65,26 @@ import java.util.stream.Collectors;
 public class CsDevModelServiceImpl implements ICsDevModelService {
 
     private final FileStorageUtil fileStorageUtil;
-
     private final DevModelFeignClient devModelFeignClient;
-
     private final EpdFeignClient epdFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
-
     private final EleEvtFeignClient eleEvtFeignClient;
-
     private final ICsDataSetService csDataSetService;
-
     private final ICsDataArrayService csDataArrayService;
-
     private final CsDevModelMapper csDevModelMapper;
-
     private final ICsLineModelService csLineModelService;
-
     private final ICsGroupService csGroupService;
-
     private final ICsGroArrService csGroArrService;
-
     private final CsLogsFeignClient csLogsFeignClient;
-
     private final EleWaveFeignClient waveFeignClient;
-
     private final DictTreeFeignClient dictTreeFeignClient;
-
     private final MqttPublisher publisher;
-
     private final ICsTopicService csTopicService;
-
-    private final ICsEquipmentDeliveryService csEquipmentDeliveryService;
-
     private final RedisUtil redisUtil;
 
-    private final MqttMessageHandler mqttMessageHandler;
-
     @Override
     public void refreshDevModelCache() {
 
-
-
-
     }
 
     @Override