提供首页数据接口

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/domain/DmEnvHistoryData.java

@@ -72,7 +72,7 @@ public class DmEnvHistoryData extends BaseEntity implements Serializable {
     private Integer deviceState;
 
     @OneToMany(fetch = FetchType.EAGER,cascade = {CascadeType.REFRESH})
-    @JoinColumn(name = "device_identifier")
+    @JoinColumn(name = "device_identifier",referencedColumnName = "device_identifier")
     private Set<DmEnvHistoryModbusData> dmEnvHistoryModbusDataSet;
 
     public void copy(DmEnvHistoryData source){

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/repository/DmEnvHistoryDataRepository.java

@@ -18,6 +18,12 @@ package me.zhengjie.modules.dm.envmonitor.historydata.repository;
 import me.zhengjie.modules.dm.envmonitor.historydata.domain.DmEnvHistoryData;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.Timestamp;
 
 /**
 * @website https://el-admin.vip
@@ -25,4 +31,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 * @date 2022-05-19
 **/
 public interface DmEnvHistoryDataRepository extends JpaRepository<DmEnvHistoryData, Long>, JpaSpecificationExecutor<DmEnvHistoryData> {
+   @Transactional
+   @Modifying
+   @Query(value = "update dm_env_history_data set update_time = :timestamp,device_state = :status where device_identifier= :deviceId",nativeQuery = true)
+    int updateTime(@Param("timestamp") Timestamp timestamp,@Param("deviceId") Long deviceId,@Param("status") String status);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/DmEnvHistoryDataService.java

@@ -19,6 +19,8 @@ import me.zhengjie.modules.dm.envmonitor.historydata.domain.DmEnvHistoryData;
 import me.zhengjie.modules.dm.envmonitor.historydata.service.dto.DmEnvHistoryDataDto;
 import me.zhengjie.modules.dm.envmonitor.historydata.service.dto.DmEnvHistoryDataQueryCriteria;
 import org.springframework.data.domain.Pageable;
+
+import java.sql.Timestamp;
 import java.util.Map;
 import java.util.List;
 import java.io.IOException;
@@ -80,4 +82,6 @@ public interface DmEnvHistoryDataService {
     * @throws IOException /
     */
     void download(List<DmEnvHistoryDataDto> all, HttpServletResponse response) throws IOException;
+
+    int updateTime(Timestamp timestamp, Long deviceId,String status);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historydata/service/impl/DmEnvHistoryDataServiceImpl.java

@@ -30,6 +30,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
+
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -108,4 +110,9 @@ public class DmEnvHistoryDataServiceImpl implements DmEnvHistoryDataService {
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    @Override
+    public int updateTime(Timestamp timestamp, Long deviceId, String status) {
+        return dmEnvHistoryDataRepository.updateTime(timestamp,deviceId,status);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historymodbusdata/domain/DmEnvHistoryModbusData.java

@@ -73,7 +73,8 @@ public class DmEnvHistoryModbusData implements Serializable {
 
     @Column(name = "device_identifier")
     @ApiModelProperty(value = "关联对象id")
-    private Long dataId;
+    @JSONField(serializeUsing = ToStringSerializer.class)
+    private Long deviceIdentifier;
 
     @Column(name = "create_time")
     @ApiModelProperty(value = "时间")

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historymodbusdata/service/dto/DmEnvHistoryModbusDataDto.java

@@ -52,7 +52,7 @@ public class DmEnvHistoryModbusDataDto implements Serializable {
 
     /** 关联对象id */
     @JSONField(serializeUsing = ToStringSerializer.class)
-    private Long dataId;
+    private Long deviceIdentifier;
 
     private Date createTime;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/envmonitor/historymodbusdata/service/impl/DmEnvHistoryModbusDataServiceImpl.java

@@ -107,7 +107,7 @@ public class DmEnvHistoryModbusDataServiceImpl implements DmEnvHistoryModbusData
             map.put(" pm25",  dmEnvHistoryModbusData.getPm25());
             map.put(" t",  dmEnvHistoryModbusData.getT());
             map.put(" voc",  dmEnvHistoryModbusData.getVoc());
-            map.put("关联对象id", dmEnvHistoryModbusData.getDataId());
+            map.put("关联对象id", dmEnvHistoryModbusData.getDeviceIdentifier());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/channel/domain/DmModbusChannel.java

@@ -102,7 +102,7 @@ public class DmModbusChannel extends BaseEntity implements Serializable {
     private Long driveId;
 
     @ApiModelProperty(value = "关联的驱动channel_id")
-    @OneToMany(fetch = FetchType.LAZY,cascade = {CascadeType.REFRESH})
+    @OneToMany(fetch = FetchType.LAZY)
     @JoinColumn(name = "channel_id")
     private Set<DmModbusDevice> dmModbusDevice;
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/device/domain/DmModbusDevice.java

@@ -133,7 +133,7 @@ public class DmModbusDevice extends BaseEntity implements Serializable {
     private String deviceStatus;
 
     @ApiModelProperty(value = "关联的分组")
-    @OneToMany(fetch = FetchType.LAZY,cascade = {CascadeType.REFRESH})
+    @OneToMany(fetch = FetchType.LAZY)
     @JoinColumn(name = "device_id")
     private Set<DmModbusGroup> dmModbusGroup;
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/device/repository/DmModbusDeviceRepository.java

@@ -18,7 +18,12 @@ package me.zhengjie.modules.dm.modbus.device.repository;
 import me.zhengjie.modules.dm.modbus.device.domain.DmModbusDevice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.sql.Timestamp;
 
 /**
 * @website https://el-admin.vip
@@ -28,4 +33,9 @@ import org.springframework.data.jpa.repository.Query;
 public interface DmModbusDeviceRepository extends JpaRepository<DmModbusDevice, Long>, JpaSpecificationExecutor<DmModbusDevice> {
    @Query(value = " select count(distinct(device_id)) from dm_modbus_device where  if(:status IS NOT NULL,device_status = :status,1=1 ) ",nativeQuery = true)
     Long getModbusCount(Integer status);
+
+   @Transactional
+   @Modifying
+   @Query(value = "update dm_modbus_device set update_time = :timestamp,device_status = :status where device_id = :deviceId",nativeQuery = true)
+    int updateDeviceStatus(@Param("timestamp") Timestamp timestamp,@Param("deviceId") Long deviceId,@Param("status") String status);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/device/service/DmModbusDeviceService.java

@@ -19,6 +19,8 @@ import me.zhengjie.modules.dm.modbus.device.domain.DmModbusDevice;
 import me.zhengjie.modules.dm.modbus.device.service.dto.DmModbusDeviceDto;
 import me.zhengjie.modules.dm.modbus.device.service.dto.DmModbusDeviceQueryCriteria;
 import org.springframework.data.domain.Pageable;
+
+import java.sql.Timestamp;
 import java.util.Map;
 import java.util.List;
 import java.io.IOException;
@@ -82,4 +84,6 @@ public interface DmModbusDeviceService {
     void download(List<DmModbusDeviceDto> all, HttpServletResponse response) throws IOException;
 
     Long getModbusCount(Integer status);
+
+    int updateDeviceStatus(Timestamp timestamp, Long deviceId, String status);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/device/service/impl/DmModbusDeviceServiceImpl.java

@@ -32,6 +32,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
+
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
@@ -126,4 +128,9 @@ public class DmModbusDeviceServiceImpl implements DmModbusDeviceService {
     public Long getModbusCount(Integer status) {
         return dmModbusDeviceRepository.getModbusCount(status);
     }
+
+    @Override
+    public int updateDeviceStatus(Timestamp timestamp, Long deviceId, String status) {
+        return dmModbusDeviceRepository.updateDeviceStatus(timestamp,deviceId,status);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/rest/DmModbusDeviceStatusController.java

@@ -46,7 +46,7 @@ public class DmModbusDeviceStatusController {
     @Log("导出数据")
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('dmModbusDeviceStatus:list')")
+//    @PreAuthorize("@el.check('dmModbusDeviceStatus:list')")
     public void download(HttpServletResponse response, DmModbusDeviceStatusQueryCriteria criteria) throws IOException {
         dmModbusDeviceStatusService.download(dmModbusDeviceStatusService.queryAll(criteria), response);
     }
@@ -54,7 +54,7 @@ public class DmModbusDeviceStatusController {
     @GetMapping
     @Log("查询设备在线日志管理")
     @ApiOperation("查询设备在线日志管理")
-    @PreAuthorize("@el.check('dmModbusDeviceStatus:list')")
+//    @PreAuthorize("@el.check('dmModbusDeviceStatus:list')")
     public ResponseEntity<Object> query(DmModbusDeviceStatusQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(dmModbusDeviceStatusService.queryAll(criteria,pageable),HttpStatus.OK);
     }
@@ -62,7 +62,7 @@ public class DmModbusDeviceStatusController {
     @PostMapping
     @Log("新增设备在线日志管理")
     @ApiOperation("新增设备在线日志管理")
-    @PreAuthorize("@el.check('dmModbusDeviceStatus:add')")
+//    @PreAuthorize("@el.check('dmModbusDeviceStatus:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody DmModbusDeviceStatus resources){
         return new ResponseEntity<>(dmModbusDeviceStatusService.create(resources),HttpStatus.CREATED);
     }
@@ -70,7 +70,7 @@ public class DmModbusDeviceStatusController {
     @PutMapping
     @Log("修改设备在线日志管理")
     @ApiOperation("修改设备在线日志管理")
-    @PreAuthorize("@el.check('dmModbusDeviceStatus:edit')")
+//    @PreAuthorize("@el.check('dmModbusDeviceStatus:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody DmModbusDeviceStatus resources){
         dmModbusDeviceStatusService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -78,7 +78,7 @@ public class DmModbusDeviceStatusController {
 
     @Log("删除设备在线日志管理")
     @ApiOperation("删除设备在线日志管理")
-    @PreAuthorize("@el.check('dmModbusDeviceStatus:del')")
+//    @PreAuthorize("@el.check('dmModbusDeviceStatus:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
         dmModbusDeviceStatusService.deleteAll(ids);

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/deviceStatus/service/dto/DmModbusDeviceStatusDto.java

@@ -36,6 +36,7 @@ public class DmModbusDeviceStatusDto implements Serializable {
     private Long id;
 
     /** 设备id */
+    @JSONField(serializeUsing = ToStringSerializer.class)
     private Long deviceId;
 
     /** 设备状态 */

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/drive/domain/DmModbusDrive.java

@@ -68,7 +68,7 @@ public class DmModbusDrive extends BaseEntity implements Serializable {
     @JSONField(serializeUsing = ToStringSerializer.class)
     private Long pollTime;
 
-    @OneToMany(fetch = FetchType.EAGER,cascade = {CascadeType.REFRESH})
+    @OneToMany(fetch = FetchType.EAGER)
     @JoinColumn(name = "drive_id")
     private Set<DmModbusChannel> channels;
 

eladmin-system/src/main/java/me/zhengjie/modules/dm/modbus/group/domain/DmModbusGroup.java

@@ -64,7 +64,7 @@ public class DmModbusGroup extends BaseEntity implements Serializable {
     private Long deviceId;
 
     @ApiModelProperty(value = "通过分组id关联数据")
-    @OneToMany(fetch = FetchType.EAGER,cascade = {CascadeType.REFRESH})
+    @OneToMany(fetch = FetchType.EAGER)
     @JoinColumn(name = "group_id")
     private List<DmModbusData> dmModbusData;
 

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ModbusTask.java

@@ -28,6 +28,8 @@ import io.netty.buffer.ByteBuf;
 import io.netty.util.ReferenceCountUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.modules.dm.envmonitor.historydata.domain.DmEnvHistoryData;
+import me.zhengjie.modules.dm.envmonitor.historydata.service.DmEnvHistoryDataService;
 import me.zhengjie.modules.dm.envmonitor.historymodbusdata.domain.DmEnvHistoryModbusData;
 import me.zhengjie.modules.dm.envmonitor.historymodbusdata.service.DmEnvHistoryModbusDataService;
 import me.zhengjie.modules.dm.envmonitor.historywarn.domain.DmEnvHistoryWarn;
@@ -37,6 +39,7 @@ import me.zhengjie.modules.dm.envmonitor.historywarnconfig.service.DmEnvHistoryW
 import me.zhengjie.modules.dm.modbus.channel.domain.DmModbusChannel;
 import me.zhengjie.modules.dm.modbus.data.domain.DmModbusData;
 import me.zhengjie.modules.dm.modbus.device.domain.DmModbusDevice;
+import me.zhengjie.modules.dm.modbus.device.service.DmModbusDeviceService;
 import me.zhengjie.modules.dm.modbus.deviceStatus.domain.DmModbusDeviceStatus;
 import me.zhengjie.modules.dm.modbus.deviceStatus.service.DmModbusDeviceStatusService;
 import me.zhengjie.modules.dm.modbus.drive.service.DmModbusDriveService;
@@ -69,6 +72,8 @@ public class ModbusTask {
 
     private final DmModbusDriveService dmModbusDriveService;
 
+    private final DmModbusDeviceService dmModbusDeviceService;
+
     private final DmEnvHistoryModbusDataService dmEnvHistoryModbusDataService;
 
     private final DmEnvHistoryWarnConfigService dmEnvHistoryWarnConfigService;
@@ -77,6 +82,8 @@ public class ModbusTask {
 
     private final DmModbusDeviceStatusService dmModbusDeviceStatusService;
 
+    private final DmEnvHistoryDataService dmEnvHistoryDataService;
+
     @Value("${modbusUrl}")
     private String modbusUrl; // modbus默认地址
     private final int modbusPort = 502; // modbus默认端口号
@@ -308,17 +315,36 @@ public class ModbusTask {
                                               });
 
                                               if (!ObjectUtil.isEmpty(dmEnvHistoryModbusData)){
-                                                  //设置关联id
-                                                  dmEnvHistoryModbusData.setDataId(Long.valueOf(F.get()));
-                                                  dmEnvHistoryModbusData.setCreateTime(new Date());
-                                                  dmEnvHistoryModbusDataService.create(dmEnvHistoryModbusData);
-                                                  log.info("添加的modbus的数据，{}" + JSONObject.toJSONString(dmEnvHistoryModbusData) );
-                                              }else {
-                                                   DmModbusDeviceStatus dmModbusDeviceStatus = new DmModbusDeviceStatus();
-                                                   dmModbusDeviceStatus.setDeviceId(Long.valueOf(F.get()));
-                                                   dmModbusDeviceStatus.setCreateTime(new Timestamp(System.currentTimeMillis()));
-                                                   dmModbusDeviceStatus.setDeviceStatus("0");
-                                                   dmModbusDeviceStatusService.create(dmModbusDeviceStatus);
+                                                  // 判断数据是否为0
+                                                  if (dmEnvHistoryModbusData.getCho().equals("0") && dmEnvHistoryModbusData.getCo2().equals("0") && dmEnvHistoryModbusData.getH().equals("0") && dmEnvHistoryModbusData.getT().equals("0") && dmEnvHistoryModbusData.getPm10().equals("0") && dmEnvHistoryModbusData.getPm25().equals("0") && dmEnvHistoryModbusData.getVoc().equals("0")){
+                                                      DmModbusDeviceStatus dmModbusDeviceStatus = new DmModbusDeviceStatus();
+                                                      dmModbusDeviceStatus.setDeviceId(device.getDeviceId());
+                                                      dmModbusDeviceStatus.setCreateTime(new Timestamp(System.currentTimeMillis()));
+                                                      dmModbusDeviceStatus.setDeviceStatus("0");
+                                                      //修改设备状态
+                                                      dmModbusDeviceService.updateDeviceStatus(new Timestamp(System.currentTimeMillis()),device.getDeviceId(),"0");
+                                                      //新增设备状态数据
+                                                      dmModbusDeviceStatusService.create(dmModbusDeviceStatus);
+                                                      // 修改历史数据设备
+                                                      dmEnvHistoryDataService.updateTime(new Timestamp(System.currentTimeMillis()),device.getDeviceId(),"0");
+                                                  }else {
+                                                      DmModbusDeviceStatus dmModbusDeviceStatus = new DmModbusDeviceStatus();
+                                                      dmModbusDeviceStatus.setDeviceId(device.getDeviceId());
+                                                      dmModbusDeviceStatus.setCreateTime(new Timestamp(System.currentTimeMillis()));
+                                                      dmModbusDeviceStatus.setDeviceStatus("1");
+                                                      //设置关联id
+                                                      dmEnvHistoryModbusData.setDeviceIdentifier(device.getDeviceId());
+                                                      dmEnvHistoryModbusData.setCreateTime(new Date());
+                                                      //修改设备状态
+                                                      dmModbusDeviceService.updateDeviceStatus(new Timestamp(System.currentTimeMillis()),device.getDeviceId(),"1");
+                                                      //新增设备状态日志
+                                                      dmModbusDeviceStatusService.create(dmModbusDeviceStatus);
+                                                      //新增设备数据
+                                                      dmEnvHistoryModbusDataService.create(dmEnvHistoryModbusData);
+                                                      // 修改历史数据设备
+                                                      dmEnvHistoryDataService.updateTime(new Timestamp(System.currentTimeMillis()),device.getDeviceId(),"1");
+                                                      log.info("添加的modbus的数据，{}" + JSONObject.toJSONString(dmEnvHistoryModbusData) );
+                                                  }
                                               }
                                           }
                                      });