下发设备开柜指令

common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DeviceNotifyPdu.java

+package com.mortals.xhx.common.pdu.device;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 下发设备消息
+ */
+@Data
+public class DeviceNotifyPdu {
+    private List<String> deviceCodeList;
+    private String action;
+    private String content;
+}

common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceFeign.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.feign.device;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DeviceNotifyPdu;
 import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
@@ -58,7 +59,13 @@ public interface IDeviceFeign extends IFeign {
     @PostMapping(value = "/device/save")
     Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization);
 
-
+    /**
+     * 接收第三方平台下发设备消息
+     * @param deviceNotifyPdu
+     * @return
+     */
+    @PostMapping(value = "/notify/downMsg")
+    Rest<String> downMsg(@RequestBody DeviceNotifyPdu deviceNotifyPdu);
 }
 
 
@@ -87,6 +94,11 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
             public Rest<RespData<DevicePdu>> save(DevicePdu devicePdu, String authorization) {
                 return Rest.fail("暂时无法保存设备，请稍后再试!");
             }
+
+            @Override
+            public Rest<String> downMsg(DeviceNotifyPdu deviceNotifyPdu) {
+                return Rest.fail("暂时无法接收第三方平台下发设备消息，请稍后再试!");
+            }
         };
     }
 }

sst-manager/db/add_db.sql

@@ -193,4 +193,7 @@ CREATE TABLE mortals_xhx_user_matter_examine(
     `updateUserId` bigint(20)      COMMENT '更新用户',
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报事项审批';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报事项审批';
\ No newline at end of file
+
+--------待执行脚本
+ALTER TABLE `mortals_xhx_sst_basic` ADD COLUMN `countdown` tinyint(2)   DEFAULT '0'  COMMENT '操作倒计时单位分' AFTER `elderEnable`;
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -11,6 +11,7 @@ import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.device.DeviceAlarmPdu;
 import com.mortals.xhx.common.pdu.device.DeviceModuleUsePdu;
+import com.mortals.xhx.common.pdu.device.DeviceNotifyPdu;
 import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.feign.device.IDeviceAlarmFeign;
@@ -247,4 +248,40 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
         return ret;
     }
+
+    @PostMapping({"openBox"})
+    @UnAuth
+    public Rest<Object> openBox(@RequestBody DeviceEntity device) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "设备开柜";
+
+        int code=1;
+        try {
+            DeviceNotifyPdu pdu = new DeviceNotifyPdu();
+            List<String> deviceCodeList = new ArrayList<>();
+            deviceCodeList.add(device.getDeviceCode());
+            pdu.setDeviceCodeList(deviceCodeList);
+            pdu.setAction("openBox");
+            Rest<String> rest = deviceFeign.downMsg(pdu);
+            if(rest.getCode()==1) {
+                model.put("message_info", busiDesc + "成功");
+            }else {
+                code = -1;
+                model.put("message_info", busiDesc + "失败");
+            }
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 }
\ No newline at end of file