增加NS200，增加删除设备接口

src/main/java/com/neotel/smfcore/core/equipment/enums/EquipmentType.java

@@ -16,6 +16,11 @@ public enum EquipmentType {
     NEOSCAN(),
     NEOSCAN(),
 
 
     /**
     /**
+     * NS200
+     */
+    NS200(),
+
+    /**
      * 2 点料机
      * 2 点料机
      */
      */
     COUNTING(),
     COUNTING(),

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipCommunicationController.java

 package com.neotel.smfcore.core.equipment.rest;
 package com.neotel.smfcore.core.equipment.rest;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.equipment.util.EquipmentCache;
 import com.neotel.smfcore.core.equipment.util.EquipmentCache;
 import com.neotel.smfcore.core.equipment.bean.EquipStatusBean;
 import com.neotel.smfcore.core.equipment.bean.EquipStatusBean;
@@ -86,4 +87,27 @@ public class EquipCommunicationController {
         return statusBean;
         return statusBean;
     }
     }
 
 
+
+    @ApiOperation("设备客户端定时通信接口")
+    @GetMapping(value = "/service/equipment/remove")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean removeEquip(String cid) {
+        try {
+
+            Equipment equipment = equipmentCache.getEquipment(cid);
+            if (equipment == null) {
+                return ResultBean.newErrorResult(-1, "", "未找到设备");
+            } else {
+                log.info("删除设备：" + equipment.getCid() + "_" + equipment.getName());
+
+                equipmentCache.removeEquipment(equipment);
+                return ResultBean.newOkResult("OK");
+            }
+        } catch (Exception e) {
+            log.error("", e);
+            return ResultBean.newErrorResult(-1, "", e.toString());
+        }
+    }
+
 }
 }

src/main/java/com/neotel/smfcore/core/equipment/util/EquipmentCache.java

 package com.neotel.smfcore.core.equipment.util;
 package com.neotel.smfcore.core.equipment.util;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
@@ -81,6 +82,9 @@ public class EquipmentCache {
     public void removeEquipment(Equipment equipment) {
     public void removeEquipment(Equipment equipment) {
         if (equipment.getCid() != null) {
         if (equipment.getCid() != null) {
             if (allEquipment.containsKey(equipment.getCid())) {
             if (allEquipment.containsKey(equipment.getCid())) {
+                if(ObjectUtil.isNotEmpty(equipment.getCid())){
+                    equipmentManager.delete(equipment);
+                }
                 allEquipment.remove(equipment.getCid());
                 allEquipment.remove(equipment.getCid());
                 log.info("从缓存中删除设备：" + equipment.getCid() + "_" + equipment.getName());
                 log.info("从缓存中删除设备：" + equipment.getCid() + "_" + equipment.getName());
             }
             }