通信设备相关接口更新

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAnalogVariableListController.java

@@ -93,7 +93,7 @@ public class DeviceAnalogVariableListController {
     }
 
     /**
-     * 站点管理-变量列表-新增
+     * 监控设备-变量列表-新增
      *
      * @param deviceAnalogVariableListId 变量列表ID 英文逗号隔开
      * @param monitoringEquipmentId      监控设备ID

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -102,24 +102,24 @@ public class DeviceController {
     /**
      * 设备管理-通信设备-新增
      *
-     * @param correspondDeviceVOT
+     * @param device
      * @return
      */
     @PostMapping("correspondDeviceAdd")
-    public ApiResult<Void> correspondDeviceAdd(@RequestBody CorrespondDeviceVOT correspondDeviceVOT) {
-        deviceService.correspondDeviceAdd(correspondDeviceVOT);
+    public ApiResult<Void> correspondDeviceAdd(@RequestBody Device device) {
+        deviceService.correspondDeviceAdd(device);
         return ApiResult.success();
     }
 
     /**
      * 设备管理-通信设备-修改
      *
-     * @param correspondDeviceVOT
+     * @param device
      * @return
      */
     @PostMapping("correspondDeviceUpdate")
-    public ApiResult<Void> correspondDeviceUpdate(@RequestBody CorrespondDeviceVOT correspondDeviceVOT) {
-        deviceService.correspondDeviceUpdate(correspondDeviceVOT);
+    public ApiResult<Void> correspondDeviceUpdate(@RequestBody Device device) {
+        deviceService.correspondDeviceUpdate(device);
         return ApiResult.success();
     }
 

fiveep-model/src/main/java/com/bizmatics/model/DeviceStatus.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -47,7 +49,7 @@ public class DeviceStatus implements Serializable {
     /**
      * 发生时间
      */
-    private LocalDateTime statusTime;
+    private Date statusTime;
 
 
 }

fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -40,9 +40,9 @@ public interface DeviceService extends CrudService<Device> {
 
     List<Device> dataManagementDeviceList(int siteId, int deviceType);
 
-    void correspondDeviceAdd(CorrespondDeviceVOT correspondDeviceVOT);
+    void correspondDeviceAdd(Device device);
 
-    void correspondDeviceUpdate(CorrespondDeviceVOT correspondDeviceVOT);
+    void correspondDeviceUpdate(Device device);
 
     void correspondDeviceDel(int id);
 

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -9,14 +9,17 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceList;
+import com.bizmatics.model.DeviceStatus;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import com.bizmatics.service.DeviceService;
+import com.bizmatics.service.DeviceStatusService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.enums.DeviceType;
+import com.bizmatics.service.es.RtAnalogService;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
@@ -40,6 +43,8 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
 
     @Autowired
     private DeviceAnalogVariableListService deviceAnalogVariableListService;
+    @Autowired
+    private DeviceStatusService deviceStatusService;
 
     @Override
     public DeviceCountVO selectDeviceCount(Date startTime, Date endTime) {
@@ -102,41 +107,50 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public void correspondDeviceAdd(CorrespondDeviceVOT correspondDeviceVOT) {
+    public void correspondDeviceAdd(Device device) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        Device device = correspondDeviceVOT.getDevice();
+//        Device device = correspondDeviceVOT.getDevice();
         device.setEnable(1);
         device.setInstallTime(new Date());
         device.setCreator(user.getUserName());
-        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
+//        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
         this.save(device);
-        int ID = device.getId();
-        if (DeviceAnalogVariableList.size() > 0) {
-            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
-                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
-                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
-                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
-                DeviceAnalogVariableList.get(i).setStatus(1);
-                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
-            }
-        }
+        String deviceCode = device.getDeviceCode();
+        Integer siteId = device.getSiteId();
+        DeviceStatus deviceStatus = new DeviceStatus();
+        deviceStatus.setDeviceStatus(1);
+        deviceStatus.setDeviceCode(deviceCode);
+        deviceStatus.setStatusTime(new Date());
+        deviceStatus.setSiteId(siteId);
+        deviceStatusService.save(deviceStatus);
+
+//        int ID = device.getId();
+//        if (DeviceAnalogVariableList.size() > 0) {
+//            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
+//                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
+//                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
+//                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
+//                DeviceAnalogVariableList.get(i).setStatus(1);
+//                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
+//            }
+//        }
     }
 
     @Override
-    public void correspondDeviceUpdate(CorrespondDeviceVOT correspondDeviceVOT) {
+    public void correspondDeviceUpdate(Device device) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
-        this.updateById(correspondDeviceVOT.getDevice());
-        int ID = correspondDeviceVOT.getDevice().getId();
-        if (DeviceAnalogVariableList.size() > 0) {
-            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
-                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
-                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
-                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
-                DeviceAnalogVariableList.get(i).setStatus(1);
-                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
-            }
-        }
+//        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
+        this.updateById(device);
+//        int ID = correspondDeviceVOT.getDevice().getId();
+//        if (DeviceAnalogVariableList.size() > 0) {
+//            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
+//                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
+//                DeviceAnalogVariableList.get(i).setCreateTime(new Date());
+//                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
+//                DeviceAnalogVariableList.get(i).setStatus(1);
+//                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
+//            }
+//        }
     }
 
     @Override