1.增加ng口打开/关闭

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -5,10 +5,7 @@ import com.google.common.base.Strings;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.common.utils.Constants;
-import com.neotel.smfcore.common.utils.QueryHelp;
-import com.neotel.smfcore.common.utils.SecurityUtils;
-import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.common.utils.*;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.bean.BoxStatusBean;
 import com.neotel.smfcore.core.device.bean.BoxStatusBean;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.bean.StatusBean;
@@ -374,6 +371,31 @@ public class BoxKanbanController {
         throw new ValidateException("smfcore.posNotExist", "仓位不存在");
         throw new ValidateException("smfcore.posNotExist", "仓位不存在");
     }
     }
 
 
+    //{opValue: "doit", cid: "SMD_DUO", opKey: "openNgLock"}
+    @ApiOperation("打开或者关闭ng门")
+    @RequestMapping("api/boxkanban/boxNgDoorOp")
+    @AnonymousAccess
+    public ResultBean boxNgDoorOp(@RequestBody Map<String, Object> paramList) {
+        log.info("{}收到数据为:{}", "boxNgDoorOp", JsonUtil.toJsonStr(paramList));
+        String cid = paramList.get("cid").toString();
+        String opValue = paramList.get("opValue").toString();
+        String opKey = paramList.get("opKey").toString();
+        StatusBean statusBean = DevicesStatusUtil.getStatusBean(cid);
+        if (statusBean == null || statusBean.timeOut()) {
+            //return ResultBean.newErrorResult(1, "smfcore.duo.offline", "设备{0}离线", new String[]{cid});
+        }
+        if (ObjectUtil.isNotEmpty(opKey)) {
+            String openLock = statusBean.getData().getOrDefault(opKey, "");
+            if (openLock.equals("enable")) {
+                log.info("boxDoorOp:cid=" + cid + "," + opKey + "=" + opValue);
+                DevicesStatusUtil.addOp(cid, opKey, opValue);
+                return ResultBean.newOkResult("smfcore.msg.ok", "操作成功");
+            }
+        }
+        return ResultBean.newErrorResult(2, "smfcore.msg.op.fail", "操作失败");
+    }
+
+
     private BoxKanbanDto getKanBan(List<DataLog> allTasks,Locale local) {
     private BoxKanbanDto getKanBan(List<DataLog> allTasks,Locale local) {
 
 
         int allCount = allTasks.size();
         int allCount = allTasks.size();