修改道闸设备控制

.gitignore

@@ -0,0 +1,6 @@
+/**/logs
+/**/*.iml
+/**/.idea
+/**/target
+/**/.DS_Store
+/**/.back*

src/main/java/com/jepsoninfo/config/MqttConfig.java

@@ -38,28 +38,28 @@ public class MqttConfig {
         config = commonConfigDao.selectByName("mqtt_clientid");
         ConstUtil.MQTT_CLIENTID = config.getCnValue();
 
-//        config = commonConfigDao.selectByName("mqtt_device_broker");
+       config = commonConfigDao.selectByName("mqtt_device_broker");
-//        ConstUtil.MQTT_DEVICE_BROKER = config.getCnValue();
+       ConstUtil.MQTT_DEVICE_BROKER = config.getCnValue();
-//
+
-//        config = commonConfigDao.selectByName("mqtt_device_topic_prefix");
+       config = commonConfigDao.selectByName("mqtt_device_topic_prefix");
-//        ConstUtil.MQTT_DEVICE_TOPIC = config.getCnValue();
+       ConstUtil.MQTT_DEVICE_TOPIC = config.getCnValue();
-//
+
-//        config = commonConfigDao.selectByName("mqtt_device_user_name");
+       config = commonConfigDao.selectByName("mqtt_device_user_name");
-//        ConstUtil.MQTT_DEVICE_USER_NAME = config.getCnValue();
+       ConstUtil.MQTT_DEVICE_USER_NAME = config.getCnValue();
-//
+
-//        config = commonConfigDao.selectByName("mqtt_device_password");
+       config = commonConfigDao.selectByName("mqtt_device_password");
-//        ConstUtil.MQTT_DEVICE_PASSWORD = config.getCnValue();
+       ConstUtil.MQTT_DEVICE_PASSWORD = config.getCnValue();
-//
+
-//        config = commonConfigDao.selectByName("mqtt_device_clientid");
+       config = commonConfigDao.selectByName("mqtt_device_clientid");
-//        ConstUtil.MQTT_DEVICE_CLIENTID = config.getCnValue();
+       ConstUtil.MQTT_DEVICE_CLIENTID = config.getCnValue();
-//
+
-//        config = commonConfigDao.selectByName("mqtt_device_type");
+       config = commonConfigDao.selectByName("mqtt_device_type");
-//        ConstUtil.MQTT_DEVICE_TYPE = config.getCnValue();
+       ConstUtil.MQTT_DEVICE_TYPE = config.getCnValue();
 
         ThreadRecvCmdMqtt thread = new ThreadRecvCmdMqtt(hardService);
         thread.start();
 
-//        ThreadDeviceCmdMqtt devThread = new ThreadDeviceCmdMqtt(hardService);
+       ThreadDeviceCmdMqtt devThread = new ThreadDeviceCmdMqtt(hardService);
-//        devThread.start();
+       devThread.start();
     }
 }

src/main/java/com/jepsoninfo/req/DorMsg.java

@@ -0,0 +1,70 @@
+package com.jepsoninfo.req;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class DorMsg {
+
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * sn
+     */
+    private String sn;
+    /**
+     * name
+     */
+    private String name = "gpio_out";
+    /**
+     * version
+     */
+    private String version = "1.0";
+    /**
+     * timestamp
+     */
+    private Long timestamp;
+    /**
+     * payload
+     */
+    private Payload payload;
+
+    /**
+     * Payload
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Payload {
+        /**
+         * type
+         */
+        private String type = "gpio_out";
+        /**
+         * body
+         */
+        private Body body;
+
+        /**
+         * Body
+         */
+        @Data
+        @Accessors(chain = true)
+        public static class Body {
+            /**
+             * delay
+             */
+            private Integer delay = 500;
+            /**
+             * io
+             */
+            private Integer io;
+            /**
+             * value
+             */
+            private Integer value = 2;
+        }
+    }
+}

src/main/java/com/jepsoninfo/service/HardService.java

@@ -29,6 +29,8 @@ import java.util.List;
 @Service
 public class HardService {
     private final Logger logger = LoggerFactory.getLogger("HardService.class");// Logger.getLogger("HardService.class");
+    public MqttClient recvClient;
+    public MqttClient deviceClient;
     @Autowired
     private IntegratedMachineConfigDao integratedMachineConfigDao;
     @Autowired
@@ -41,8 +43,6 @@ public class HardService {
     private DisplayConfigDao displayConfigDao;
     @Autowired
     private MessageConfigDao messageConfigDao;
-    public MqttClient recvClient;
-    public MqttClient deviceClient;
 
     public void plateRecognize(RecognizeAlarmInfoPlate req) {
         ReturnCode result;
@@ -515,46 +515,87 @@ public class HardService {
     }
 
     public int mqttOpenDoor(DoorReq req) {
-        String[] TOPIC_ARRAY = {
+        logger.info("开门请求: {}", req);
-                ConstUtil.MQTT_DEVICE_TOPIC + "user/get"};
+
+        // String[] TOPIC_ARRAY = {"/message/down/gpio_out"};
         String carNo = req.getCarNo();
-        String devNo = req.getDeviceNo();
+        String deviceNo = req.getDeviceNo();
+        String devNo = deviceNo;
         String laneName = "";
         String optName = "开闸";
         IntegratedMachineConfig integratedCond = new IntegratedMachineConfig();
 
-        integratedCond.setDevNo(req.getDeviceNo());
+        integratedCond.setDevNo(deviceNo);
         // 获取一体机配置
         IntegratedMachineConfig integratedCfg = integratedMachineConfigDao.selectByCond(integratedCond);
-
+        int i = integratedCfg.getIoPort().intValue();
         laneName = integratedCfg.getLaneName();
         String msgId = System.currentTimeMillis() + RandomUtil.getRandomStr(7);
 
-        RecognizePlateResultAckQy ack = new RecognizePlateResultAckQy();
+        /* RecognizePlateResultAckQy ack = new RecognizePlateResultAckQy();
         ack.setCmd("iooutput");
         ack.setMsg_id(msgId);
         ack.setIonum(1);
         ack.setAction("on");
-        ack.setUtc_ts(1);
+        ack.setUtc_ts(1); */
+
+        long time = new Date().getTime();
+        DorMsg dorMsg = new DorMsg()
+                .setId("open" + time)
+                .setSn(deviceNo)
+                .setTimestamp(time)
+                .setPayload(new DorMsg.Payload()
+                        .setBody(new DorMsg.Payload.Body()
+                                .setIo(i)
+                        ));
 
         MqttMessage ackMsg = new MqttMessage();
-        String strPayload = JSONObject.toJSONString(ack);
+        String strPayload = JSONObject.toJSONString(dorMsg);
 
         ackMsg.setPayload(strPayload.getBytes(StandardCharsets.UTF_8));
         try {
-            String topic = ConstUtil.MQTT_DEVICE_TYPE  + req.getDeviceNo() + TOPIC_ARRAY[0];
+            String topic = "device/" + deviceNo + "/message/down/gpio_out";
+            logger.info("主题: {},开门数据: {}", topic, strPayload);
             printDate(carNo, devNo, laneName, optName, "开闸主题:" + topic);
             printDate(carNo, devNo, laneName, optName, "开闸消息:" + strPayload);
             deviceClient.publish(topic, ackMsg);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("开门失败", e);
         }
 
         printDate(carNo, devNo, laneName, optName, "开闸结束");
-
+        if (deviceNo.equals("e6141562-e3ca0602")) {
+            rollerDoor();
+        }
         return 1;
     }
 
+    void rollerDoor() {
+        logger.info("开卷闸门");
+        long time = new Date().getTime();
+        String sn = "5417bd21-ca9f6a6b";
+        DorMsg dorMsg = new DorMsg()
+                .setId("open" + time)
+                .setSn(sn)
+                .setTimestamp(time)
+                .setPayload(new DorMsg.Payload()
+                        .setBody(new DorMsg.Payload.Body()
+                                .setIo(1)
+                        ));
+
+        MqttMessage ackMsg = new MqttMessage();
+        String strPayload = JSONObject.toJSONString(dorMsg);
+
+        ackMsg.setPayload(strPayload.getBytes(StandardCharsets.UTF_8));
+        try {
+            String topic = "device/" + sn + "/message/down/gpio_out";
+            logger.info("主题: {},开门数据: {}", topic, strPayload);
+            deviceClient.publish(topic, ackMsg);
+        } catch (Exception e) {
+            logger.error("开门失败", e);
+        }
+    }
+
     public int mqttCloseDoor(DoorReq req) {
         String[] TOPIC_ARRAY = {
                 ConstUtil.MQTT_DEVICE_TOPIC + "user/get"};
@@ -670,7 +711,8 @@ public class HardService {
                 }
                 clearCmd += " IA==";
                 clearCmd += " " + Base64.encodeBase64String(ConstUtil.DEFAULT_ADVERT_1.getBytes("UTF-8"));
-                clearCmd += " " + Base64.encodeBase64String(ConstUtil.DEFAULT_ADVERT_2.getBytes("UTF-8"));;
+                clearCmd += " " + Base64.encodeBase64String(ConstUtil.DEFAULT_ADVERT_2.getBytes("UTF-8"));
+                ;
                 if (displayCfg.getRs485Port().intValue() >= 0) {
                     cmd += " " + displayCfg.getRs485Port();
                     clearCmd += " " + displayCfg.getRs485Port();
@@ -690,6 +732,7 @@ public class HardService {
 
         return 1;
     }
+
     public int mqttDisplayInfo(DisplayInfoReq req) {
         String[] TOPIC_ARRAY = {
                 ConstUtil.MQTT_DEVICE_TOPIC + "user/get"};

src/main/java/com/jepsoninfo/service/ThreadDeviceCmdMqtt.java

@@ -22,6 +22,9 @@ public class ThreadDeviceCmdMqtt extends Thread{
     public void run() {
         logger.info("ThreadDeviceCmdMqtt mqtt init");
 
+        /* String[] TOPIC_ARRAY = {
+                ConstUtil.MQTT_DEVICE_TOPIC + "user/get",
+                ConstUtil.MQTT_DEVICE_TOPIC + "user/update"}; */
         String[] TOPIC_ARRAY = {
                 ConstUtil.MQTT_DEVICE_TOPIC + "user/get",
                 ConstUtil.MQTT_DEVICE_TOPIC + "user/update"};