测气数据计算落库

src/main/java/com/chinaitop/depot/intelligent/common/ConstantClass.java

@@ -10,12 +10,20 @@ public class ConstantClass {
     /**
      * 用于字符串拼接类型判定
      */
-    public static final int TYPE_BUILDER = 1;
-    public static final int TYPE_BUFFER = 2;
+    public static final int TYPE_ZRO = 0;
+    public static final int TYPE_ONE = 1;
+    public static final int TYPE_TWO = 2;
+
+    // 公用休眠时间 1000 毫秒
+    public static final long TYPE_SLEEP = 0x3E8L;
+
     // 清除控制柜已发送指令(PLC断开操作-控制柜下-指令为3位0x)
     public static final String CLEAN_NLL_DOWN = "00 00 00";
     public static final String CLEAN_NLL_UP = "00 00 00 00 00";
+    // 测气指令
     public static final String TYPE_ON = "00 00 00 00 02"; // 测气必须先开启电源
+    public static final String TYPE_SC = "00 00 00 00 08"; // 测气指令
+
     // 通风口 操作状态
     public static final String TYPE_NO = "1"; // 开启
     public static final String TYPE_OFF = "0"; // 关闭

src/main/java/com/chinaitop/depot/intelligent/factoryObject/StringJoinFactory.java

@@ -21,9 +21,9 @@ public class StringJoinFactory implements StringFactory {
     @Override
     public String joinString(int type, String... value) {
         switch (type) {
-            case ConstantClass.TYPE_BUILDER:
+            case ConstantClass.TYPE_ONE:
                 return stringBuilderJoin(value);
-            case ConstantClass.TYPE_BUFFER:
+            case ConstantClass.TYPE_TWO:
                 return stringBufferJoin(value);
             default:
                 return stringBuilderJoin(value);

src/main/java/com/chinaitop/depot/intelligent/factoryObject/factoryInterface/StringFactory.java

@@ -9,8 +9,8 @@ public interface StringFactory {
 
     /**
      * 字符串拼接接口
-     * @param type 1(ConstantClass.TYPE_BUILDER): StringBuilder
-     *             2(ConstantClass.TYPE_BUFFER): StringBuffer
+     * @param type 1(ConstantClass.TYPE_ONE): StringBuilder
+     *             2(ConstantClass.TYPE_TWO): StringBuffer
      * @param value 传入参数需按拼接先后顺序传入 (例: a b c => abc)
      * @return string
      */

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/GasConfigController.java

@@ -41,7 +41,7 @@ public class GasConfigController {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            PageInfo<TGasConfig> pageInfo = gasConfigService.getList(storeCode);
+            PageInfo<TGasConfig> pageInfo = gasConfigService.getList(storeCode, null);
             return ResponseEntity.ok(pageInfo);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/GasDetectionController.java

@@ -1,8 +1,11 @@
 package com.chinaitop.depot.intelligent.grainsituation.controller;
 
+import com.chinaitop.depot.intelligent.common.ConstantClass;
+import com.chinaitop.depot.intelligent.grainsituation.model.TGasConfig;
 import com.chinaitop.depot.intelligent.grainsituation.model.TGasData;
 import com.chinaitop.depot.intelligent.grainsituation.model.TQtdevinfoValue;
 import com.chinaitop.depot.intelligent.grainsituation.model.TTestdata;
+import com.chinaitop.depot.intelligent.grainsituation.service.GasConfigService;
 import com.chinaitop.depot.intelligent.grainsituation.service.GasDetectionService;
 import com.chinaitop.depot.intelligent.socket.SocketClient;
 import com.chinaitop.depot.intelligent.socket.SocketServer;
@@ -151,13 +154,16 @@ public class GasDetectionController {
     private SocketServer socketServer;
     @Autowired
     private ConstUtils constUtils;
+    @Resource
+    private GasConfigService gasConfigService;
+
     /**
      * 单仓检测接口
      *
      * @param vCfCode
      * @return
      */
-    @RequestMapping(value = "/sendOnlyGasDetection", method = RequestMethod.POST)
+    @RequestMapping(value = "/sendOnlyGasDetection", method = RequestMethod.GET)
     @ApiOperation(value = "单仓气体实时检测", notes = "单仓气体实时检测")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "storeCode", defaultValue = "001", value = "仓库编号", paramType = "query"),
@@ -165,9 +171,21 @@ public class GasDetectionController {
     })
     public ResponseEntity sendOnlyInsectPestDetection(String storeCode, String orgId) {
         String result = "";
-        // 1.获取仓房ip和指令
-//        socketServer.service()
-        return ResponseEntity.ok(result);
+        try {
+            // 1.获取仓房ip
+            String rangeIp = gasConfigService.getList(storeCode,null).getList().get(ConstantClass.TYPE_ZRO).getRangeIp();
+            // 2.发送测气指令指令
+            String service = socketServer.service(rangeIp, ConstantClass.TYPE_ON, ConstantClass.TYPE_ONE);// 先开启测气电源
+            if (service.equals(ConstantClass.C_SOH_z)) { // "00" 未开启远程模式
+                return ResponseEntity.ok(TypeEnum.S_2D_SOH.getDesc()); // 本地模式,无法远程控制
+            }
+            Thread.sleep(ConstantClass.TYPE_SLEEP);
+            result = socketServer.service(rangeIp, ConstantClass.TYPE_SC, ConstantClass.TYPE_ONE); // 发送测气指令
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            return ResponseEntity.failed(TypeEnum.S_NUL.getDesc());
+        }
+        return ResponseEntity.ok(socketServer.responseResultForPLC(result));
     }
 
     /**
@@ -181,11 +199,27 @@ public class GasDetectionController {
     public ResponseEntity sendTemperatureDetectionAll(String orgId) {
         String result = "";
         try {
+            // 获取所有仓房测气配置
+            List<TGasConfig> list = gasConfigService.getList(null, null).getList();
+            // 发送单仓检测
+            for (TGasConfig gasConfig : list) {
+                String rangeIp = gasConfig.getRangeIp();
+                // 2.发送测气指令指令
+                String service = socketServer.service(gasConfig.getRangeIp(), ConstantClass.TYPE_ON, ConstantClass.TYPE_ONE);// 先开启测气电源
+                if (service.equals(ConstantClass.C_SOH_z)) { // "00" 未开启远程模式
+                    return ResponseEntity.ok(TypeEnum.S_2D_SOH.getDesc()); // 本地模式,无法远程控制
+                }
+                Thread.sleep(ConstantClass.TYPE_SLEEP);
+                result = socketServer.service(rangeIp, ConstantClass.TYPE_SC, ConstantClass.TYPE_ONE); // 发送测气指令
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            return ResponseEntity.failed(TypeEnum.S_EOT.getDesc());
         } catch (Exception e) {
             e.printStackTrace();
-            return ResponseEntity.ok("设备连接异常！");
+            return ResponseEntity.failed(TypeEnum.S_STX.getDesc());
         }
-        return ResponseEntity.ok(result);
+        return ResponseEntity.ok(socketServer.responseResultForPLC(result));
     }
 
     /**

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/GasConfigService.java

@@ -9,7 +9,7 @@ import com.github.pagehelper.PageInfo;
  * @create 2021-10-15 14:27
  */
 public interface GasConfigService {
-    PageInfo<TGasConfig> getList(String storeCode);
+    PageInfo<TGasConfig> getList(String storeCode, String ip);
 
     TGasConfig getById(String id);
 

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/GasDetectionService.java

@@ -1,10 +1,8 @@
 package com.chinaitop.depot.intelligent.grainsituation.service;
 
-import com.chinaitop.depot.intelligent.basicdata.model.TDcsqtinfo;
 import com.chinaitop.depot.intelligent.basicdata.model.TQtdevinfo;
 import com.chinaitop.depot.intelligent.grainsituation.model.TDcsdata;
 import com.chinaitop.depot.intelligent.grainsituation.model.TGasData;
-import com.chinaitop.depot.intelligent.grainsituation.model.TQtdevinfoValue;
 
 import java.util.Date;
 import java.util.List;
@@ -43,4 +41,7 @@ public interface GasDetectionService {
     List<TGasData> getGasList(String storeCode, String startTime, String endTime);
 
     List<TGasData> getGasCheckGroupList(String storeCode);
+
+
+    void saveGasData(List<List<Float>> objects1, String ip);
 }

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/GasConfigServiceImpl.java

@@ -26,12 +26,15 @@ public class GasConfigServiceImpl implements GasConfigService {
     }
 
     @Override
-    public PageInfo<TGasConfig> getList(String storeCode) {
+    public PageInfo<TGasConfig> getList(String storeCode, String ip) {
         TGasConfigExample example = new TGasConfigExample();
         TGasConfigExample.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(storeCode)) {
             criteria.andStoreCodeEqualTo(storeCode);
         }
+        if (StringUtils.isNotBlank(ip)) {
+            criteria.andRangeIpEqualTo(ip);
+        }
         return new PageInfo<>(gasConfigMapper.selectByExample(example));
     }
 

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/GasDetectionServiceImpl.java

@@ -6,25 +6,27 @@ import com.chinaitop.depot.intelligent.basicdata.model.TDcsqtinfo;
 import com.chinaitop.depot.intelligent.basicdata.model.TDcsqtinfoExample;
 import com.chinaitop.depot.intelligent.basicdata.model.TQtdevinfo;
 import com.chinaitop.depot.intelligent.basicdata.model.TQtdevinfoExample;
+import com.chinaitop.depot.intelligent.common.ConstantClass;
 import com.chinaitop.depot.intelligent.factoryObject.factoryInterface.StringFactory;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TDcsdataMapper;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TGasDataMapper;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TQtdevinfoValueMapper;
 import com.chinaitop.depot.intelligent.grainsituation.model.*;
+import com.chinaitop.depot.intelligent.grainsituation.service.GasConfigService;
 import com.chinaitop.depot.intelligent.grainsituation.service.GasDetectionService;
 import com.chinaitop.depot.intelligent.utils.DateUtils;
 import com.chinaitop.depot.intelligent.utils.ParameterUtil;
+import com.chinaitop.depot.intelligent.utils.UuidUtils;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import reactor.util.annotation.Nullable;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class GasDetectionServiceImpl implements GasDetectionService {
@@ -117,7 +119,7 @@ public class GasDetectionServiceImpl implements GasDetectionService {
         if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
             Date startDate = DateUtils.stringToData(stringFactory.joinString(1, startTime, DateUtils.startTime));
             Date endDate = DateUtils.stringToData(stringFactory.joinString(1, endTime, DateUtils.endTime));
-            criteria.andResultTimeBetween(startDate,endDate);
+            criteria.andResultTimeBetween(startDate, endDate);
         }
         return gasDataMapper.selectByExample(example);
     }
@@ -127,5 +129,69 @@ public class GasDetectionServiceImpl implements GasDetectionService {
         return gasDataMapper.getGasCheckGroupList(storeCode);
     }
 
+    @Resource
+    private GasConfigService gasConfigService;
+
+    @Override
+    public void saveGasData(List<List<Float>> objects1, String ip) {
+        if (objects1.size() > 0 && StringUtils.isNotBlank(ip)) {
+            // 根据ip获取仓房信息
+            TGasConfig gasConfig = gasConfigService.getList(null, ip).getList().get(ConstantClass.TYPE_ZRO);
+            String orgId = gasConfig.getOrgId();
+            String storeCode = gasConfig.getStoreCode();
+            // 数据list
+            ArrayList<TGasData> gases = Lists.newArrayList();
+            objects1.forEach(data -> {
+                if (data.size() > 12) {
+                    TGasData gasData = new TGasData();
+                    gasData.setNowO2(data.get(0)); // 氧气实时
+                    gasData.setNowPh3(data.get(1)); // 磷化氢实时
+                    gasData.setSouthO2(data.get(2)); // 南检测结果 氧气
+                    gasData.setSouthPh3(data.get(3)); // 南检测结果 磷化氢
+                    gasData.setEastO2(data.get(4)); // 东检测结果 氧气
+                    gasData.setEastPh3(data.get(5)); // 东检测结果 磷化氢
+                    gasData.setNorthO2(data.get(6)); // 北检测结果 氧气
+                    gasData.setNorthPh3(data.get(7)); // 北检测结果 磷化氢
+                    gasData.setWestO2(data.get(8)); // 西检测结果 氧气
+                    gasData.setWestPh3(data.get(9)); // 西检测结果 磷化氢
+                    gasData.setInO2(data.get(10)); // 中检测结果 氧气
+                    gasData.setInPh3(data.get(11)); // 中检测结果 磷化氢
+                    gases.add(gasData);
+                }
+            });
+            // 保存对象
+            TGasData saveOnlyGasData = new TGasData();
+            saveOnlyGasData.setId(UuidUtils.getCode()); // id
+            saveOnlyGasData.setOrgId(orgId); // 组织机构编码
+            saveOnlyGasData.setStoreCode(storeCode); // 仓房编码
+            // 计算平均值
+            float avgNowO2 = (float) gases.stream().mapToDouble(TGasData::getNowO2).average().getAsDouble();
+            float avgNowPh3 = (float) gases.stream().mapToDouble(TGasData::getNowPh3).average().getAsDouble();
+            float avgSouthO2 = (float) gases.stream().mapToDouble(TGasData::getSouthO2).average().getAsDouble();
+            float avgSouthPh3 = (float) gases.stream().mapToDouble(TGasData::getSouthPh3).average().getAsDouble();
+            float avgEastO2 = (float) gases.stream().mapToDouble(TGasData::getEastO2).average().getAsDouble();
+            float avgEastPh3 = (float) gases.stream().mapToDouble(TGasData::getEastPh3).average().getAsDouble();
+            float avgNorthO2 = (float) gases.stream().mapToDouble(TGasData::getNorthO2).average().getAsDouble();
+            float avgNorthPh3 = (float) gases.stream().mapToDouble(TGasData::getNorthPh3).average().getAsDouble();
+            float avgWestO2 = (float) gases.stream().mapToDouble(TGasData::getWestO2).average().getAsDouble();
+            float avgWestPh3 = (float) gases.stream().mapToDouble(TGasData::getWestPh3).average().getAsDouble();
+            float avgInO2 = (float) gases.stream().mapToDouble(TGasData::getInO2).average().getAsDouble();
+            float avgInPh3 = (float) gases.stream().mapToDouble(TGasData::getInPh3).average().getAsDouble();
+            saveOnlyGasData.setNowO2(avgNowO2);
+            saveOnlyGasData.setNowPh3(avgNowPh3);
+            saveOnlyGasData.setSouthO2(avgSouthO2);
+            saveOnlyGasData.setSouthPh3(avgSouthPh3);
+            saveOnlyGasData.setEastO2(avgEastO2);
+            saveOnlyGasData.setEastPh3(avgEastPh3);
+            saveOnlyGasData.setNorthO2(avgNorthO2);
+            saveOnlyGasData.setNorthPh3(avgNorthPh3);
+            saveOnlyGasData.setWestO2(avgWestO2);
+            saveOnlyGasData.setWestPh3(avgWestPh3);
+            saveOnlyGasData.setInO2(avgInO2);
+            saveOnlyGasData.setInPh3(avgInPh3);
+            // 保存
+            gasDataMapper.insert(saveOnlyGasData);
+        }
+    }
 
 }

src/main/java/com/chinaitop/depot/intelligent/socket/ServerThread.java

@@ -1,10 +1,12 @@
 package com.chinaitop.depot.intelligent.socket;
 
 import com.alibaba.fastjson.JSON;
+import com.chinaitop.depot.intelligent.grainsituation.service.GasDetectionService;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Resource;
 import java.io.*;
 import java.net.Socket;
 import java.text.NumberFormat;
@@ -19,6 +21,8 @@ public class ServerThread implements Runnable {
     private final static Logger log = LoggerFactory.getLogger(ServerThread.class);
 
     private Socket socket;
+    @Resource
+    private GasDetectionService gasDetectionService;
 
     ServerThread(Socket socket) {
         this.socket = socket;
@@ -82,7 +86,7 @@ public class ServerThread implements Runnable {
                  * 中检测结果 氧气 110-113
                  * 中检测结果 磷化氢 114-117
                  */
-                gasDataHandle(data); // 处理数据
+                gasDataHandle(data, socket.getInetAddress().getHostAddress()); // 处理数据
                 socket.shutdownInput(); // 关闭输入流
             }
         } catch (IOException e) {
@@ -102,7 +106,7 @@ public class ServerThread implements Runnable {
         }
     }
 
-    private void gasDataHandle(Integer[] data) {
+    private void gasDataHandle(Integer[] data, String ip) {
         // 1.将数据前16位排除
         Integer[] integers = Arrays.copyOfRange(data, 16, data.length);
         // 2.将数据分成51组,每组117个位
@@ -159,7 +163,7 @@ public class ServerThread implements Runnable {
         });
         log.info("处理后的PLC测气返回数据: {}", JSON.toJSON(objects1));
         // 将数据保存到数据库
-
+        gasDetectionService.saveGasData(objects1, ip);
     }
 
     /*public static void main(String[] args) {

src/main/java/com/chinaitop/depot/intelligent/socket/SocketServer.java

@@ -35,8 +35,6 @@ public class SocketServer {
     private static final int backlog = 3;
     // 设置连接超时时间
     private static final int timeout = 0x2BF20;
-    // 休眠时间
-    private static final long sleepTime = 0x3E8L;
     // 计数防止死循环
     private int temp = 0;
     private static final int tempCount = 0x40;
@@ -83,7 +81,7 @@ public class SocketServer {
                     outByte(socket, orders); // 输出指令
                     log.info(LocalDateTime.now() + "***指令发送成功: {}", orders);
                     // 清除PLC控制柜指令,使其断开连接上一条指令(如有其它断开PLC指令使用else if 添加判断)
-                    Thread.sleep(sleepTime);
+                    Thread.sleep(ConstantClass.TYPE_SLEEP);
                     int length = orders.length();
                     if (length == ConstantClass.CLEAN_NLL_DOWN.length()) {
                         outByte(socket, ConstantClass.CLEAN_NLL_DOWN);