通风口开发

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

@@ -0,0 +1,20 @@
+package com.chinaitop.depot.intelligent.common;
+
+/**
+ * @author qingsong.han
+ * @description: 常量类
+ * @create 2021-09-13 16:49
+ */
+public class ConstantClass {
+    /**
+     * 用于字符串拼接类型判定
+     */
+    public static final int TYPE_BUILDER = 1;
+    public static final int TYPE_BUFFER = 2;
+    // 清除控制柜已发送指令(PLC断开操作-控制柜下-指令为3位0x)
+    public static final String CLEAN_NLL = "00 00 00";
+    // 通风口 操作状态
+    public static final String TYPE_NO = "1"; // 开启
+    public static final String TYPE_OFF = "0"; // 关闭
+
+}

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

@@ -0,0 +1,53 @@
+package com.chinaitop.depot.intelligent.factoryObject;
+
+import com.chinaitop.depot.intelligent.common.ConstantClass;
+import com.chinaitop.depot.intelligent.factoryObject.factoryInterface.StringFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author qingsong.han
+ * @description: 用于字符串连接简单工厂模式 类
+ * @create 2021-09-08 10:46
+ */
+@Component
+public class StringJoinFactory implements StringFactory {
+    /**
+     * 创建拼接字符串方法
+     *
+     * @param type  1: stringBuild,2: stringBuffer 默认 stringBuild
+     * @param value 参数 按照传入的顺序拼接(例: a b c = abc)
+     * @return string
+     */
+    @Override
+    public String joinString(int type, String... value) {
+        switch (type) {
+            case ConstantClass.TYPE_BUILDER:
+                return stringBuilderJoin(value);
+            case ConstantClass.TYPE_BUFFER:
+                return stringBufferJoin(value);
+            default:
+                return stringBuilderJoin(value);
+        }
+    }
+
+    /**
+     * 内部拼接方法
+     */
+    private String stringBuilderJoin(String... value) {
+        StringBuilder builder = new StringBuilder();
+        for (String s : value) {
+            builder.append(s);
+        }
+        return builder.toString();
+    }
+
+    @SuppressWarnings("all")
+    private String stringBufferJoin(String... value) {
+        StringBuffer buffer = new StringBuffer();
+        for (String s : value) {
+            buffer.append(s);
+        }
+        return buffer.toString();
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.intelligent.factoryObject.factoryInterface;
+
+/**
+ * @author qingsong.han
+ * @description: 简单工厂-字符串接口
+ * @create 2021-09-15 15:51
+ */
+public interface StringFactory {
+
+    /**
+     * 字符串拼接接口
+     * @param type 1(ConstantClass.TYPE_BUILDER): StringBuilder
+     *             2(ConstantClass.TYPE_BUFFER): StringBuffer
+     * @param value 传入参数需按拼接先后顺序传入 (例: a b c => abc)
+     * @return string
+     */
+    String joinString(int type, String... value);
+
+}

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

@@ -0,0 +1,144 @@
+package com.chinaitop.depot.intelligent.socket;
+
+import com.chinaitop.depot.intelligent.common.ConstantClass;
+import com.chinaitop.depot.intelligent.factoryObject.StringJoinFactory;
+import com.chinaitop.depot.intelligent.factoryObject.factoryInterface.StringFactory;
+import com.chinaitop.depot.intelligent.utils.DataUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.*;
+import java.time.LocalDateTime;
+
+/**
+ * @author qingsong.han
+ * @description: socketServer 服务监听
+ * @create 2021-09-06 16:52
+ */
+@Component
+public class SocketServer {
+    private final static Logger log = LoggerFactory.getLogger(SocketServer.class);
+    /**
+     * 硬件配置端口 client 为 ip:2001
+     * SocketServer 监听地址为10.100.208.233:2002(衡水深州库固定SocketClient地址为10.100.208.233)
+     */
+    private static final int port = 0x7D2;
+    // 连续请求积压数>1,否则为50
+    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 = 0x29;
+    // 本类注入ServerSocket
+    private ServerSocket serverSocket;
+    // client 默认端口全部为2001
+    private static final String clientPort = ":2001";
+    // 注入字符串拼接工厂接口
+    private StringFactory stringFactory;
+
+    @Autowired
+    public void setStringFactory(StringFactory stringFactory) {
+        this.stringFactory = stringFactory;
+    }
+
+    public SocketServer() throws IOException {
+        /*
+         * 获取服务器ip.硬件配置固定地址,所以服务器也必须固定
+         * 衡水深州内网固定服务端(DNS):
+         * 测试环境
+         *  IP地址: 10.100.208.233
+         *  子网掩码: 255.255.254.0
+         *  默认网关: 10.100.209.254
+         * 生产环境(服务器ip地址)
+         *  IP地址: 10.100.209.27
+         */
+        InetAddress localHost = InetAddress.getLocalHost(); // 获取本机ip
+        serverSocket = new ServerSocket(port, backlog, localHost); // 连接请求队列的长度为3
+        log.info("SocketServer服务器启动!");
+    }
+
+    public void service(String ip, String orders) {
+        while (true) {
+            Socket socket = null;
+            try {
+                serverSocket.setSoTimeout(timeout); // 连接超时时间
+                socket = serverSocket.accept(); // 从连接请求队列中取出连接
+                String clientAddress = socket.getRemoteSocketAddress().toString(); // 获取远程客户机
+                log.info("New connection accepted: {}", clientAddress);
+                // 连接字符串
+                String clientIP = stringFactory.joinString(ConstantClass.TYPE_BUILDER, "/", ip, clientPort);
+                // 判断是否存在client 连接(ip:2001)
+                if (clientAddress.equals(clientIP)) {
+                    log.info(LocalDateTime.now() + "***连接成功,设备的ip及其端口号: {}", socket.getRemoteSocketAddress());
+                    outByte(socket, orders); // 输出指令
+                    log.info(LocalDateTime.now() + "***指令发送成功: {}", orders);
+                    inputByte(socket); // 接收返回
+                    // 清除PLC控制柜指令,使其断开连接上一条指令(如有其它断开PLC指令使用else if 添加判断)
+                    Thread.sleep(sleepTime);
+                    int length = orders.length();
+                    if (length == ConstantClass.CLEAN_NLL.length()) {
+                        outByte(socket, ConstantClass.CLEAN_NLL);
+                        log.info(LocalDateTime.now() + "***PLC断开指令发送成功:{}", ConstantClass.CLEAN_NLL);
+                    }
+                    break;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    if (socket != null)
+                        socket.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            temp++;
+            if (temp == tempCount) {
+                log.info("设备ID配置有误,与数据库没有匹配的设备");
+                break;
+            }
+        }
+    }
+
+    /**
+     * 发送socket输出流指令编码
+     *
+     * @param socket tcp
+     * @param orders 十六进制字符串编码
+     * @throws IOException
+     */
+    private void outByte(Socket socket, String orders) throws IOException {
+        // 字符串转十六进制byte数组
+        byte[] bytes = DataUtils.hexStringToByteArray(orders);
+        // socket输出流
+        OutputStream os = socket.getOutputStream();
+        os.write(bytes);
+        os.flush();
+    }
+
+    /**
+     * TODO 未使用 没有返回编码解释 已测出: 成功: 01, 启动或关闭超时: A3 本地模式: 54
+     * TODO 注: 如何远程清除故障
+     * socket 接收PLC调用回写编码
+     *
+     * @param socket tcp
+     * @throws IOException
+     */
+    private void inputByte(Socket socket) throws IOException {
+        // socket 接收返回输入信号
+        InputStream inputStream = socket.getInputStream();
+        int read = inputStream.read();
+        // 十进制转十六进制 占位2 并格式化大写(示例: 01)
+        String result = String.format("%02x", read).toUpperCase();
+        log.info(LocalDateTime.now() + "***接收到PLC返回编码: {}", result);
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationRecordController.java

@@ -1,8 +1,7 @@
 package com.chinaitop.depot.intelligent.ventilation.controller;
 
-import com.chinaitop.depot.intelligent.socket.SocketClient;
-import com.chinaitop.depot.intelligent.utils.ConstUtils;
-import com.chinaitop.depot.intelligent.utils.HexConvertUtils;
+import com.chinaitop.depot.intelligent.common.ConstantClass;
+import com.chinaitop.depot.intelligent.socket.SocketServer;
 import com.chinaitop.depot.intelligent.utils.ParameterUtil;
 import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfo;
 import com.chinaitop.depot.intelligent.ventilation.model.TCtldevinfoBype;
@@ -27,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.List;
 
@@ -39,9 +39,10 @@ public class AerationRecordController {
     private AerationRecordService aerationRecordService;
     @Autowired
     private AerationParameterService aerationParameterService;
-
     @Autowired
     private AerationBypeService bypeService;
+    @Resource
+    private SocketServer socketServer;
 
 
     @RequestMapping(value = "/getList", method = RequestMethod.GET)
@@ -52,13 +53,13 @@ public class AerationRecordController {
             @ApiImplicitParam(name = "vDevKindCode", value = "设备类型", paramType = "query"),
             @ApiImplicitParam(name = "vCfCode", value = "仓库名称", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TVentilation>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDevKindCode,String type) {
+    public ResponseEntity<PageInfo<TVentilation>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDevKindCode, String type) {
         List<TVentilation> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = aerationRecordService.getList(vCfCode, vDevKindCode,type);
+            list = aerationRecordService.getList(vCfCode, vDevKindCode, type);
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());
@@ -67,10 +68,7 @@ public class AerationRecordController {
         return ResponseEntity.ok(pageInfo);
     }
 
-    @Autowired
-    private SocketClient socketClient;
-
-  //新增
+    //新增
     @RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
     @ApiImplicitParams({
@@ -82,59 +80,47 @@ public class AerationRecordController {
     public ResponseEntity save(String task, String aerationTaskControl, Integer orgId, String saveType) {
         ObjectMapper mapper = new ObjectMapper();
         mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
-        String result = "";
         try {
             //注意，这里如果打开通风设备关闭不了的话请查看---通风操作打开的需要通风操作关闭，熏蒸操作并不能管理通风操作的通风设备。
             if (ParameterUtil.isnotnull(saveType) && ParameterUtil.isequal(saveType, "fumigationData")) {//新增熏蒸的通风控制
                 aerationRecordService.saveFumigation(task, aerationTaskControl, orgId);
             } else {//新增通风控制
                 // 通风指令发送
-            	
-            	if(task!=null){
-            		
-            		String devinfo = "";
-            		if(!task.contains("[") && !task.contains("]")){
-            		   devinfo = "["+task+"]";  //task 包括id和vstatue
-            		}else{
-            			devinfo = task;
-            		}
-            		List<TCtldevinfo> idObject = mapper.readValue(devinfo, new TypeReference<List<TCtldevinfo>>() {});
-            		TCtldevinfo tCtldevinfo = new TCtldevinfo();
-	                for(int i = 0;i<idObject.size();i++){
-	                    tCtldevinfo = aerationParameterService.getById(idObject.get(i).getId());
-	                  /*  tCtldevinfo.setVstatue(idObject.get(i).getVstatue());
-                        String dir = ConstUtils.directiveJoint("00", tCtldevinfo.getVcfcode(), tCtldevinfo.getVdevcode(), tCtldevinfo.getVdevkindcode(), "0" + tCtldevinfo.getVstatue(), "");
-	                    System.out.println(dir);
-	                    // 16进制字符串转byte数组
-	                    byte[] bytes = HexConvertUtils.hexStringToByte(dir);
-	                    // 发送指令
-//	                    String soc = socketClient.startClient(bytes);*/
-//	                    result = TypeEnum.resultDispose(soc);
+                if (task != null) {
+                    String devinfo = "";
+                    if (!task.contains("[") && !task.contains("]")) {
+                        devinfo = "[" + task + "]";  //task 包括id和vstatue
+                    } else {
+                        devinfo = task;
+                    }
+                    List<TCtldevinfo> idObject = mapper.readValue(devinfo, new TypeReference<List<TCtldevinfo>>() {
+                    });
+                    for (int i = 0; i < idObject.size(); i++) {
+                        TCtldevinfo tCtldevinfo = aerationParameterService.getById(idObject.get(i).getId());
                         //获取设备指令信息
                         TCtldevinfoBype aByte = bypeService.getByte(Integer.valueOf(tCtldevinfo.getVdevkindcode()));
-                        //0:关闭,1:打开,2:反转,3:停止
-                        String vstatue = tCtldevinfo.getVstatue();
-                        String tcStop = "";
-                        if (vstatue.equals("0")){
-                            tcStop = aByte.getTcStop();
-                        }else if (vstatue.equals("1")){
-                            tcStop = aByte.getTcStart();
+                        //0:关闭,1:打开,2:反转,3:停止 上次操作在库里保存的 状态
+//                        String vstatue = tCtldevinfo.getVstatue();
+                        // 用户操作的是开启还是关闭
+                        String userUseState = idObject.get(i).getVstatue();
+                        String stopOrStart = "";
+                        if (userUseState.equals(ConstantClass.TYPE_OFF)) {
+                            stopOrStart = aByte.getTcStop();
+                        } else if (userUseState.equals(ConstantClass.TYPE_NO)) {
+                            stopOrStart = aByte.getTcStart();
                         }
-
-                        aerationRecordService.switchingMethod(tCtldevinfo.getCtIp(),tcStop);
+                        // 调用socketServer,发送指令
+                        socketServer.service(tCtldevinfo.getCtIp(), stopOrStart);// 新增通风作业记录
                         aerationRecordService.save(tCtldevinfo, aerationTaskControl, orgId);
-                      /*  if(TypeEnum.S_SOH.getDesc().equals(result) && tCtldevinfo.getVstatue().equals(tCtldevinfo.getVstatue())){
-	                    }*/
-	                    Thread.currentThread().sleep(2000);
-	                }
-            	}
-            	
+                    }
+                }
+
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return ResponseEntity.failed("设备连接异常！！");
+            return ResponseEntity.failed(TypeEnum.S_STX.getDesc());
         }
-        return ResponseEntity.ok(result);
+        return ResponseEntity.ok(TypeEnum.C_SOH.getDesc());
     }
 
     //根据仓房和设备名称查询通风的记录
@@ -154,23 +140,23 @@ public class AerationRecordController {
         return ResponseEntity.ok(tVentilation);
     }
 
-    
+
     @RequestMapping(value = "/add", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tVentilationJson", value = "表数据json串", paramType = "form")
     })
-    public ResponseEntity add(String tVentilationJson,Integer orgId) {
+    public ResponseEntity add(String tVentilationJson, Integer orgId) {
         try {
-        	aerationRecordService.add(tVentilationJson,orgId);
+            aerationRecordService.add(tVentilationJson, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());
         }
         return ResponseEntity.ok();
     }
-    
-    
+
+
     @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
     @ApiOperation(value = "根据粮情id删除信息", notes = "根据粮情id删除信息")
     @ApiImplicitParams({
@@ -188,19 +174,32 @@ public class AerationRecordController {
         }
         return ResponseEntity.failed("ID数据有误!");
     }
-    
+
     @RequestMapping(value = "/getById", method = RequestMethod.POST)
     @ApiOperation(value = "根据id查询信息", notes = "根据id查询信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", paramType = "query")
     })
     public ResponseEntity<TVentilation> getById(String id) {
-    	TVentilation tVentilation = null;
+        TVentilation tVentilation = null;
         if (StringUtils.isNotBlank(id)) {
-        	tVentilation = aerationRecordService.getById(id);
+            tVentilation = aerationRecordService.getById(id);
         } else {
             return ResponseEntity.failed("ID数据有误!");
         }
         return ResponseEntity.ok(tVentilation);
     }
+
+
+    /**
+     * TODO /test 测试ServerSocket 接口
+     * http://localhost:9028/intelligents/aerationRecord/test?ip=10.100.208.225&orders=AA 00 00
+     * @param ip
+     * @param orders
+     */
+    @RequestMapping(value = "/test", method = RequestMethod.GET)
+    public void test(String ip, String orders) {
+        socketServer.service(ip, orders);
+    }
+
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/AerationRecordService.java

@@ -25,5 +25,5 @@ public interface AerationRecordService {
 
 	TVentilation getById(String id);
 
-	void switchingMethod(String ip,String bype)throws Exception;
+//	void switchingMethod(String ip,String bype)throws Exception;
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationParameterServiceImpl.java

@@ -66,11 +66,11 @@ public class AerationParameterServiceImpl implements AerationParameterService {
 //				SendEntity.cxfFactor().saveWindDevice(SendEntity.sendAndConvert(jsonObject, "U"));
 			} else {
 				// 获取Max+1值
-				Map<String, Object> valueMax = wareHouseBasicInfoService.getCode("t_ctldevinfo", "sitecode", "vdevcode", null);
+				Map<String, Object> valueMax = wareHouseBasicInfoService.getCode("t_ctldevinfo", "vdevcode");
 				// 替换值
 //				jsonObject.put("vdevcode",valueMax.get("column2"));
-				tCtldevinfo.setVdevcode(valueMax.get("column2").toString());
-				tCtldevinfo.setId(uUidUtils.getCodeId(String.valueOf(orgId), "t_ctldevinfo"));
+				tCtldevinfo.setVdevcode(valueMax.get("column1").toString());
+				tCtldevinfo.setId(UuidUtils.getCode());
 				tCtldevinfo.setDelFlag(1); //未删除
                 tCtldevinfoMapper.insert(tCtldevinfo);
 				// 推送数据并返回结果

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationRecordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.intelligent.ventilation.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.intelligent.common.ConstantClass;
 import com.chinaitop.depot.intelligent.fumigation.model.TFumigationPlan;
 import com.chinaitop.depot.intelligent.utils.DataUtils;
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
@@ -40,8 +41,8 @@ public class AerationRecordServiceImpl implements AerationRecordService {
     @Autowired
     private AerationParameterService aerationParameterService;
 
-    @Autowired
-    private ServerSocket serverSocket;
+    /*@Autowired
+    private ServerSocket serverSocket;*/
 
     @Override
     public List<TVentilation> getList(String vCfCode, String vDevKindCode, String type) {
@@ -80,7 +81,7 @@ public class AerationRecordServiceImpl implements AerationRecordService {
             tVentilation.setvDistinguishState(0); //通风
             tVentilation.setvUpdateTime(new Date());
 
-            if (tCtldevinfo.getVstatue().equals(1)) { //vState的状态是手动的状态  vStatue是系统里的  1是打开
+            if (tCtldevinfo.getVstatue().equals(ConstantClass.TYPE_NO)) { //vState的状态是手动的状态  vStatue是系统里的  1是打开
                 String id = UuidUtils.getCode();
                 Date date1 = new Date();
                 tVentilation.setvStartTime(date1); //开始时间
@@ -99,7 +100,7 @@ public class AerationRecordServiceImpl implements AerationRecordService {
                 tJobMapper.updateByKey(tJob);
             }
 
-            if (tCtldevinfo.getVstatue().equals(0)) { //0是关闭
+            if (tCtldevinfo.getVstatue().equals(ConstantClass.TYPE_OFF)) { //0是关闭
                 Date date = new Date();
                 //记录表
                 TVentilationExample example = new TVentilationExample();
@@ -275,33 +276,4 @@ public class AerationRecordServiceImpl implements AerationRecordService {
         // TODO Auto-generated method stub
         return tVentilationMapper.selectByPrimaryKey(id);
     }
-
-    @Override
-    public void switchingMethod(String ip, String oders) throws Exception {
-        //计数防止死循环
-        int temp = 0;
-        while (true) {
-            //超过10秒没有连接返回数据自动断开连接
-            serverSocket.setSoTimeout(10000);
-            Socket socket = serverSocket.accept();
-            String sket = socket.getRemoteSocketAddress().toString();
-            if (sket.contains(ip)) {
-                log.info(new Date().toString() + "***连接成功,设备的ip及其端口号***" + socket.getRemoteSocketAddress());
-                byte[] bytes1 = DataUtils.hexStringToByteArray(oders);
-                log.info(new Date().toString() + "***实际发送指令：" + oders);
-                OutputStream os = socket.getOutputStream();
-                os.write(bytes1);
-                log.info(new Date().toString() + "***指令发送成功");
-                os.flush();
-            }
-            if (socket != null) {
-                socket.close();
-            }
-            temp++;
-            if (temp == 41) {
-                log.info("设备ID配置有误,与数据库没有匹配的设备");
-                break;
-            }
-        }
-    }
 }

src/main/java/com/unissoft/model/TypeEnum.java

@@ -12,7 +12,10 @@ public enum TypeEnum {
     S_EOT("S_EOT", "未知原因!"),
     S_2D_SOH("S_2D_SOH", "本地模式,无法远程控制!"),
     S_EM("S_EM", "仓房号为空!"),
-    SM("SM", "设备正忙!");
+    SM("SM", "设备正忙!"),
+    // 通风
+    C_SOH("C_SOH", "指令发送成功!")
+    ;
 
     private String code;
     private String desc;