Merge remote-tracking branch 'origin/master'

huimv-admin/src/main/java/com/huimv/admin/controller/ProtDataController.java

@@ -32,6 +32,11 @@ public class ProtDataController {
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return protDataService.list(httpServletRequest,paramsMap);
     }
+
+    @RequestMapping("/listAllScreen")
+    public Result listAllScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+        return protDataService.listAllScreen(httpServletRequest,paramsMap);
+    }
     @RequestMapping("/listFlowScreen")
     public Result listFlowScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
         return protDataService.listFlowScreen(httpServletRequest,paramsMap);

huimv-admin/src/main/java/com/huimv/admin/mapper/ProtDataMapper.java

@@ -34,4 +34,6 @@ public interface ProtDataMapper extends BaseMapper<ProtData> {
     List<ProCountVo> listFlowYear(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
 
     ProtData flowCount(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper);
+
+    List<ProtData> listAllScreen(@Param(Constants.WRAPPER) QueryWrapper<ProtData> queryWrapper );
 }

huimv-admin/src/main/java/com/huimv/admin/server/EnvInputServerHandler.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.sound.midi.Soundbank;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
@@ -86,27 +87,35 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
 
 
     private void handleClientAskCmd(String clientAskText, ChannelHandlerContext ctx) throws ParseException, IOException {
+        try {
+            System.out.println("接收到消息: " + clientAskText + "  时间: " + System.currentTimeMillis());
+            EnvironmentalData parse = HJ212Parser.parse(clientAskText.replace("##", ""));
+            ProtData protData = new ProtData();
+            protData.setPh(parse.getCpData().getParameters().get("w01001").getAvg());
+//        protData.setOther1(parse.getCpData().getParameters().get("w01010").getAvg());
+            protData.setCod(parse.getCpData().getParameters().get("w01018").getAvg());
+            protData.setNh3n(parse.getCpData().getParameters().get("w21003").getAvg());
+            protData.setOther2(parse.getCpData().getParameters().get("w00000").getAvg());
 
-        System.out.println("接收到消息: " + clientAskText + "  时间: " + System.currentTimeMillis());
-        EnvironmentalData parse = HJ212Parser.parse(clientAskText.replace("##", ""));
-        ProtData protData = new ProtData();
-        protData.setPh(parse.getCpData().getParameters().get("w01001").getAvg());
-        protData.setOther1(parse.getCpData().getParameters().get("w01010").getAvg());
-        protData.setCod(parse.getCpData().getParameters().get("w01018").getAvg());
-        protData.setNh3n(parse.getCpData().getParameters().get("w21003").getAvg());
-        protData.setOther2(parse.getCpData().getParameters().get("w00000").getAvg());
-        protData.setLoctionType(1);
-        String mn = parse.getHeader().getMn();
-        if ("01523162079470".equals(mn)){
-            protData.setFarmId(30);
-        }else {
-            protData.setFarmId(28);
+            protData.setLoctionType(1);
+            String mn = parse.getHeader().getMn();
+            if ("01523162079470".equals(mn)){
+                protData.setFarmId(30);
+            }else {
+                protData.setFarmId(28);
+            }
+            protData.setOther3(clientAskText);
+            protData.setCreateDate(new Date());
+
+            protDataMapper.insert(protData);
+            askTextSb.delete(0, askTextSb.length());
+        }catch (Exception e){
+            System.out.println(e);
+            askTextSb.delete(0, askTextSb.length());
         }
-        protData.setOther3(clientAskText);
-        protData.setCreateDate(new Date());
 
-        protDataMapper.insert(protData);
-        askTextSb.delete(0, askTextSb.length());
+        //##0349QN=20250414111200085;ST=32;CN=2011;PW=123456;MN=01523162079470;Flag=4;CP=&&DataTime=20250414111200;w01018-SampleTime=20250414100000,w01018-Rtd=74.2,w01018-Flag=N;w00000-SampleTime=20250414111048,w00000-Rtd=1.968,w00000-Flag=N;w01001-Rtd=7.26,w01001-Flag=N;w01010-Rtd=21,w01010-Flag=N;w21003-SampleTime=20250414100000,w21003-Rtd=0.422,w21003-Flag=N&&3600
+
     }
     //QN	20250412142007184	请求编号（21位时间戳：2025-04-12 14:20:07.184）
     //ST	32	系统类型（32表示污水处理设施）

huimv-admin/src/main/java/com/huimv/admin/service/IProtDataService.java

@@ -29,5 +29,7 @@ public interface IProtDataService extends IService<ProtData> {
 
     Result listFlowScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
+    Result listAllScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
 //    Result listFlowScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/ProtDataServiceImpl.java

@@ -1097,6 +1097,30 @@ public class ProtDataServiceImpl extends ServiceImpl<ProtDataMapper, ProtData> i
         return new Result(ResultCode.SUCCESS,maps);
     }
 
+    @Override
+    public Result listAllScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<ProtData> queryWrapper = new QueryWrapper<ProtData>().eq("farm_id", farmId);
+        Date date = new Date();
+        List list   = new ArrayList();
+        for (int i = 0; i < 8; i++) {
+            DateTime dateTime = DateUtil.offsetDay(date, -i);
+            queryWrapper.select("create_date,MAX(CAST(ph AS DECIMAL(10,3) )) ph , MAX(CAST(cod AS DECIMAL(10,2) )) cod, MAX(CAST(NH3N AS DECIMAL(10,3) )) NH3N");
+            queryWrapper.between("create_date",DateUtil.beginOfDay(dateTime),DateUtil.endOfDay(dateTime));
+            ProtData protData = protDataMapper.selectOne(queryWrapper);
+            if (ObjectUtil.isEmpty(protData)){
+                protData = new ProtData();
+                protData.setPh("0");
+                protData.setOther2("0");
+                protData.setNh3n("0");
+                protData.setCod("0");
+                protData.setCreateDate(dateTime);
+            }
+            list.add(protData);
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
+
     private ProtData getListFlowScreenWrapper(QueryWrapper<ProtData> protDataQueryWrapper, int loctionType ,DateTime dateTime,String farmId) {
         protDataQueryWrapper.clear();
         protDataQueryWrapper.eq("farm_id",farmId);

huimv-admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-#spring.profiles.active=dev
-spring.profiles.active=prod
+spring.profiles.active=dev
+#spring.profiles.active=prod
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

huimv-admin/src/main/resources/com/huimv/admin/mapper/ProtDataMapper.xml

@@ -100,4 +100,5 @@
         ${ew.customSqlSegment}
         group BY DATE_FORMAT(create_date,'%Y')
     </select>
+    <select id="listAllScreen" resultType="com.huimv.admin.entity.ProtData"></select>
 </mapper>