已读未读

huimv-env-admin/src/main/java/com/huimv/env/admin/controller/PortWarningInfoController.java

@@ -89,8 +89,9 @@ public class PortWarningInfoController {
     @PostMapping("/read")
     public Result read(HttpServletRequest httpServletRequest, @RequestBody WarningReadParam warningReadParam){
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        String farmId = warningReadParam.getFarmId();
         Integer warningId = warningReadParam.getWarningId();
-        redisTemplate.opsForSet().add("User:"+userId+":read",warningId);
+        redisTemplate.opsForSet().add("farmId:"+farmId+":User:"+userId+":read",warningId);
         return Result.SUCCESS();
     }
 
@@ -99,7 +100,7 @@ public class PortWarningInfoController {
         Integer userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
         Integer farmId = warningUnReadCountParam.getFarmId();
         int count = portWarningInfoService.count(new QueryWrapper<PortWarningInfo>().lambda().eq(PortWarningInfo::getFarmId,farmId));
-        Set<Integer> members = redisTemplate.opsForSet().members("User:" + userId + ":read");
+        Set<Integer> members = redisTemplate.opsForSet().members("farmId:"+farmId+":User:" + userId + ":read");
         int size = members.size();
         return new Result(ResultCode.SUCCESS,count - size);
     }

huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/WarningReadParam.java

@@ -5,4 +5,5 @@ import lombok.Data;
 @Data
 public class WarningReadParam {
     private Integer warningId;
+    private String farmId;
 }

huimv-env-input/src/main/java/com/huimv/env/input/entity/EnergyElectricity.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -74,6 +76,7 @@ public class EnergyElectricity implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**

huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java

@@ -1,5 +1,6 @@
 package com.huimv.env.input.server;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -416,7 +417,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                     System.out.println("执行脚本");
                     BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()));
                     String line = reader.readLine();
-                    if (!ObjectUtils.isEmpty(line)){
+                    if (ObjectUtil.isNotEmpty(line)){
                         System.out.println("python执行结果"+line);
                     }
                     reader.close();
@@ -424,7 +425,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                     System.out.println("Python script exited with code " + exitCode);
 
                     TerminalPort deviceCode = terminalPortService.getOne(new QueryWrapper<TerminalPort>().eq("device_code", gateWayCode + terminalCode + terminalPortCode));
-                    if (ObjectUtils.isEmpty(deviceCode)){
+                    if (ObjectUtil.isEmpty(deviceCode)){
                         log.info(String.format("无端口设备--> %s" ,askText));
                         return;
                     }
@@ -696,7 +697,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         answerCmd(ans,ctx);
         String gateWayCode = dataArray[2];
         String terminalCode = dataArray[3];
-        String originalData = getNum(dataArray[4]);
+        String originalData = dataArray[4];
         Terminal terminal = terminalService.getOne(new QueryWrapper<Terminal>().lambda().eq(Terminal::getDeviceCode, gateWayCode + terminalCode));
         if (ObjectUtils.isEmpty(terminal)){
             log.error("无终端数据 --> %s",gateWayCode + terminalCode);
@@ -715,14 +716,18 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         energyElectricity.setFloorId(terminal.getFloorId());
         energyElectricity.setTerminalCode(gateWayCode + terminalCode);
         energyElectricity.setGatwayCode(gateWayCode);
-        energyElectricity.setOriginalValue(originalData);
 
-        BigDecimal lastEle = new BigDecimal(0);
         BigDecimal originalEle = new BigDecimal(originalData);
+        if (originalEle.compareTo(BigDecimal.ZERO) > 0){
+            originalEle = originalEle.divide(new BigDecimal(1000));
+        }
+        energyElectricity.setOriginalValue(originalEle.toString());
+
+        BigDecimal lastEle = new BigDecimal(0);
 
         EnergyElectricity lastElectricity = energyElectricityService.getOne(new QueryWrapper<EnergyElectricity>().lambda().eq(EnergyElectricity::getTerminalCode, gateWayCode + terminalCode).orderByDesc(EnergyElectricity::getId).last("limit 1"));
-        if (!ObjectUtils.isEmpty(lastElectricity)){
-            lastEle = new BigDecimal(lastElectricity.getOriginalData());
+        if (ObjectUtil.isNotEmpty(lastElectricity)){
+            lastEle = new BigDecimal(lastElectricity.getOriginalValue());
         }
         BigDecimal electricityValue = originalEle.subtract(lastEle);
         energyElectricity.setElectricityValue(electricityValue.toString());
@@ -855,7 +860,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                     System.out.println("执行脚本");
                     BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()));
                     String line = null;
-                    if (!ObjectUtils.isEmpty(line)){
+                    if (ObjectUtil.isNotEmpty(line)){
                         System.out.println("python执行结果"+line);
                     }
                     reader.close();
@@ -863,7 +868,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                     System.out.println("Python script exited with code " + exitCode);
 
                     TerminalPort deviceCode = terminalPortService.getOne(new QueryWrapper<TerminalPort>().eq("device_code", gateWayCode + terminalCode + terminalPortCode));
-                    if (ObjectUtils.isEmpty(deviceCode)){
+                    if (ObjectUtil.isEmpty(deviceCode)){
                         log.info(String.format("无端口设备--> %s" ,askText));
                         return;
                     }