韩华接口配置改为通用配置

src/main/java/com/neotel/smfcore/custom/hanwha/controller/HanwhaApiInfoController.java → src/main/java/com/neotel/smfcore/core/equipment/rest/EquipApiController.java

-package com.neotel.smfcore.custom.hanwha.controller;
+package com.neotel.smfcore.core.equipment.rest;
 
-import com.neotel.smfcore.common.bean.ResultBean;
-import com.neotel.smfcore.custom.hanwha.util.HanwhaApiInfoUtil;
-import com.neotel.smfcore.custom.hanwha.util.bean.HanwhaApiInfo;
-import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import com.neotel.smfcore.common.bean.PageData;
+import com.neotel.smfcore.core.equipment.util.EquipApiUtil;
+import com.neotel.smfcore.core.equipment.util.bean.EquipApiInfo;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-
 @Slf4j
 @RestController
-@RequestMapping("/hanwhaApiInfo")
-public class HanwhaApiInfoController {
-
+@RequestMapping("/equipApiInfo")
+public class EquipApiController {
     @Autowired
-    private HanwhaApiInfoUtil hanwhaApiInfoUtil;
+    private EquipApiUtil equipApiUtil;
 
     @ApiOperation("获取列表")
-    @RequestMapping("/getApiInfoList")
-    public ResultBean getApiInfoList(){
-        List<HanwhaApiInfo> apiInfoList = hanwhaApiInfoUtil.getApiInfoList();
-        return ResultBean.newOkResult(apiInfoList);
+    @GetMapping("/getApiInfoList")
+    public PageData<EquipApiInfo> getApiInfoList() {
+        List<EquipApiInfo> apiInfoList = equipApiUtil.getApiInfoList();
+        return new PageData<EquipApiInfo>(apiInfoList, apiInfoList.size());
     }
 }

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

+package com.neotel.smfcore.core.equipment.rest;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.core.equipment.util.EquipConfigUtil;
+import com.neotel.smfcore.core.equipment.util.bean.EquipConfigInfo;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping("/equipConfig")
+public class EquipConfigController {
+
+
+
+        @Autowired
+        private EquipConfigUtil equipConfigUtil;
+
+        @ApiOperation("获取配置信息")
+        @GetMapping("/getConfig")
+        public ResultBean getCacheConfig(String equipType){
+            return ResultBean.newOkResult(equipConfigUtil.getConfigCache(equipType));
+        }
+
+        @ApiOperation("更改配置信息")
+        @PostMapping("/updateConfig")
+        public ResultBean updateConfig(@RequestBody EquipConfigInfo cacheConfig) {
+//            String host = cacheConfig.getHost();
+//            String apiPort = cacheConfig.getApiPort();
+//            String webPort = cacheConfig.getWebPort();
+//            log.info("收到修改ip和端口号,host为[{}],apiPort为[{}],webPort为[{}]",host,apiPort,webPort);
+//
+//            if (StringUtils.isEmpty(host)){
+//                return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"host"});
+//            }
+//            if (StringUtils.isEmpty(webPort)){
+//                return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"webPort"});
+//            }
+//            if (StringUtils.isEmpty(apiPort)){
+//                return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"apiPort"});
+//            }
+
+            if(ObjectUtil.isEmpty(cacheConfig.getEquipType())){
+                return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"equipType"});
+            }
+            equipConfigUtil.updateConfigCache(cacheConfig);
+
+            return ResultBean.newOkResult("");
+        }
+    }

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

@@ -82,6 +82,11 @@ public class EquipmentController {
                 }
             }
         }
+        if(equipment.isAPIEquip()){
+            equipment.setActivated(false);
+        }else{
+            equipment.setActivated(true);
+        }
         equipment = equipmentManager.save(equipment);
         equipmentCache.reloadEquipment(equipment,equipment.getCid());
         return new ResponseEntity<>(HttpStatus.CREATED);

src/main/java/com/neotel/smfcore/core/equipment/rest/dto/EquipmentDto.java

@@ -20,6 +20,8 @@ public class EquipmentDto {
 
     @ApiModelProperty("是否可用")
     private boolean available = true;
+    @ApiModelProperty("是否激活")
+    private boolean activated=true;
 
     private String id;
 }

src/main/java/com/neotel/smfcore/core/equipment/service/po/Equipment.java

@@ -27,7 +27,21 @@ public class Equipment extends BasePo implements Serializable {
      */
     private boolean available = true;
 
+    /**
+     * 是否激活
+     */
+    private boolean activated=true;
+
     public boolean isNEOSCAN() {
         return EquipmentType.NEOSCAN.name().equals(type)||EquipmentType.NS200.name().equals(type);
     }
+
+
+    /**
+     * 是否是接口设备
+     * @return
+     */
+    public boolean isAPIEquip() {
+        return EquipmentType.HANWHA.name().equals(type)||EquipmentType.PANACIMNEOLINK.name().equals(type);
+    }
 }

src/main/java/com/neotel/smfcore/custom/hanwha/util/HanwhaApiInfoUtil.java → src/main/java/com/neotel/smfcore/core/equipment/util/EquipApiUtil.java

-package com.neotel.smfcore.custom.hanwha.util;
+package com.neotel.smfcore.core.equipment.util;
 
-import com.google.common.collect.Maps;
-import com.neotel.smfcore.custom.hanwha.util.bean.HanwhaApiInfo;
+import com.neotel.smfcore.core.equipment.util.bean.EquipApiInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class HanwhaApiInfoUtil {
+public class EquipApiUtil {
 
     //api接口信息,默认返回10条
-    public static List<HanwhaApiInfo> apiInfoList = new CopyOnWriteArrayList<>();
+    public static List<EquipApiInfo> apiInfoList = new CopyOnWriteArrayList<>();
 
 
     public void updateApiInfoList(String url, String requestParam, String resultReturn) {
-        HanwhaApiInfo info = new HanwhaApiInfo();
+        EquipApiInfo info = new EquipApiInfo();
         info.setCreateDate(new Date());
         info.setUrl(url);
         info.setRequestParam(requestParam);
@@ -29,10 +31,10 @@ public class HanwhaApiInfoUtil {
         }
     }
 
-    public List<HanwhaApiInfo> getApiInfoList(){
-        List<HanwhaApiInfo> resultList = new ArrayList<>();
-        if (apiInfoList != null && !apiInfoList.isEmpty()){
-            resultList = apiInfoList.stream().sorted(Comparator.comparing(HanwhaApiInfo::getCreateDate).reversed()).collect(Collectors.toList());
+    public List<EquipApiInfo> getApiInfoList() {
+        List<EquipApiInfo> resultList = new ArrayList<>();
+        if (apiInfoList != null && !apiInfoList.isEmpty()) {
+            resultList = apiInfoList.stream().sorted(Comparator.comparing(EquipApiInfo::getCreateDate).reversed()).collect(Collectors.toList());
         }
         return resultList;
     }

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

+package com.neotel.smfcore.core.equipment.util;
+
+import com.neotel.smfcore.common.utils.JsonUtil;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.equipment.enums.EquipmentType;
+import com.neotel.smfcore.core.equipment.util.bean.EquipConfigInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class EquipConfigUtil {
+
+    @Autowired
+    private DataCache dataCache;
+
+    private static final String Equip_Config_Cache = "Equip_Config_Cache";
+
+
+    public static String CacheStr(String equipType){
+        return Equip_Config_Cache+"_"+equipType;
+    }
+
+
+    public void updateConfigCache(EquipConfigInfo cacheConfig) {
+        String key=CacheStr(cacheConfig.getEquipType());
+        EquipConfigInfo configInfo = getConfigCache(cacheConfig.getEquipType());
+        configInfo.setEnableApi(cacheConfig.isEnableApi());
+        configInfo.setApiConfigMap(cacheConfig.getApiConfigMap());
+        dataCache.updateCache(key, configInfo);
+
+        log.info("updateConfigCache [" + key + "=" + JsonUtil.toJsonStr(configInfo) + "]");
+    }
+
+    public EquipConfigInfo getConfigCache(String equipType) {
+        String key=CacheStr(equipType);
+        EquipConfigInfo configInfo = dataCache.getCache(key);
+        if (configInfo == null) {
+            configInfo = new EquipConfigInfo();
+            configInfo.setEquipType(equipType);
+            configInfo.setEnableApi(false);
+            if(equipType.equals(EquipmentType.HANWHA.name())){
+                Map<String,Object> defMap=new HashMap<>();
+                defMap.put("host","");
+                defMap.put("webPort",1337);
+                defMap.put("apiPort",8082);
+                defMap.put("singleOrder",true);
+                configInfo.setApiConfigMap(defMap);
+            }
+        }
+        return configInfo;
+    }
+}

src/main/java/com/neotel/smfcore/custom/hanwha/util/bean/HanwhaApiInfo.java → src/main/java/com/neotel/smfcore/core/equipment/util/bean/EquipApiInfo.java

-package com.neotel.smfcore.custom.hanwha.util.bean;
+package com.neotel.smfcore.core.equipment.util.bean;
+
 
 import lombok.Data;
 
 import java.util.Date;
-
 @Data
-public class HanwhaApiInfo {
-
+public class EquipApiInfo {
     private String url;
 
     private String requestParam;
@@ -14,5 +13,4 @@ public class HanwhaApiInfo {
     private String resultReturn;
 
     private Date createDate;
-
 }

src/main/java/com/neotel/smfcore/core/equipment/util/bean/EquipConfigInfo.java

+package com.neotel.smfcore.core.equipment.util.bean;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+
+@Data
+@Slf4j
+public class EquipConfigInfo {
+
+    public String equipType = "";
+
+    /**
+     * 启用API连接 默认不启用
+     */
+    public boolean enableApi;
+
+    /**
+     * 配置列表
+     */
+    public Map<String, Object> apiConfigMap;
+
+
+    //韩华配置key: host ,webPort, apiPort,singleOrder
+    public  <T> T GetConfigValue(String key,Object defValue) {
+        try {
+            if (apiConfigMap != null) {
+                Object result = apiConfigMap.get(key);
+                if (result != null) {
+                    return (T) result;
+                }
+            }
+
+        } catch (Exception exception) {
+            log.error("GetConfigValue 出错： type=" + equipType + "，key=" + key + ", error =" + exception.toString());
+        }
+        if (defValue != null) {
+            return (T) defValue;
+        }
+        return null;
+    }
+
+}

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -60,11 +60,11 @@ public class LiteOrderCache {
     @Autowired
     private SmfApi smfApi;
 
-    //最大工单数
-    public   int  MaxOrderCount=1;
-    public boolean SingleOrderMode(){
-        return MaxOrderCount==1;
-    }
+//    //最大工单数
+//    public   int  MaxOrderCount=1;
+//    public boolean SingleOrderMode(){
+//        return MaxOrderCount==1;
+//    }
 
 
     /**

src/main/java/com/neotel/smfcore/custom/hanwha/controller/HanwhaConfigController.java

-package com.neotel.smfcore.custom.hanwha.controller;
-
-import com.neotel.smfcore.common.bean.ResultBean;
-import com.neotel.smfcore.common.utils.StringUtils;
-import com.neotel.smfcore.custom.hanwha.util.HanwhaCacheUtil;
-import com.neotel.smfcore.custom.hanwha.util.bean.HanwhaCacheConfig;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@RequestMapping("/hanwhaConfig")
-public class HanwhaConfigController {
-
-    @Autowired
-    private HanwhaCacheUtil hanwhaCacheUtil;
-
-    @ApiOperation("获取ip和端口号")
-    @RequestMapping("/getCacheConfig")
-    public ResultBean getCacheConfig(){
-        return ResultBean.newOkResult(hanwhaCacheUtil.getHostAndPortCache());
-    }
-
-    @ApiOperation("修改ip和端口号")
-    @RequestMapping("/updateCacheConfig")
-    public ResultBean updateCacheConfig(@RequestBody HanwhaCacheConfig cacheConfig) {
-        String host = cacheConfig.getHost();
-        String apiPort = cacheConfig.getApiPort();
-        String webPort = cacheConfig.getWebPort();
-        log.info("收到修改ip和端口号,host为[{}],apiPort为[{}],webPort为[{}]",host,apiPort,webPort);
-
-        if (StringUtils.isEmpty(host)){
-            return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"host"});
-        }
-        if (StringUtils.isEmpty(webPort)){
-            return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"webPort"});
-        }
-        if (StringUtils.isEmpty(apiPort)){
-            return ResultBean.newErrorResult(1,"smfcore.valueCanotNull", "{0}不能为空", new String[]{"apiPort"});
-        }
-        hanwhaCacheUtil.updateHostAndPort(cacheConfig);
-        return ResultBean.newOkResult("");
-    }
-}

src/main/java/com/neotel/smfcore/custom/hanwha/controller/HanwhaController.java

@@ -13,10 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -45,15 +42,16 @@ public class HanwhaController {
 
 
     @ApiOperation("更新最大工单数")
-    @GetMapping("/UpdateOrderMode")
+    @PostMapping("/UpdateOrderMode")
     @AnonymousAccess
     public ResultBean UpdateOrderMode(@RequestParam Integer maxOrderCount) {
 
-        if(ObjectUtil.isEmpty(maxOrderCount)){
-            return ResultBean.newErrorResult(-1,"Error","Error");
-        }
-        liteOrderCache.MaxOrderCount=maxOrderCount;
-        log.info("UpdateOrderMode 设置 liteOrderCache.MaxOrderCount="+liteOrderCache.MaxOrderCount);
-        return  ResultBean.newOkResult(maxOrderCount);
+//        if(ObjectUtil.isEmpty(maxOrderCount)){
+//            return ResultBean.newErrorResult(-1,"Error","Error");
+//        }
+//        liteOrderCache.MaxOrderCount=maxOrderCount;
+//        log.info("UpdateOrderMode 设置 liteOrderCache.MaxOrderCount="+liteOrderCache.MaxOrderCount);
+//        return  ResultBean.newOkResult(maxOrderCount);
+        return ResultBean.newOkResult("");
     }
 }

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSApis.java

@@ -5,8 +5,10 @@ import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.HttpHelper;
 import com.neotel.smfcore.common.utils.JsonUtil;
+import com.neotel.smfcore.core.equipment.util.EquipApiUtil;
 import com.neotel.smfcore.custom.hanwha.handler.bean.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -14,6 +16,8 @@ import java.util.*;
 @Service
 @Slf4j
 public class TMSApis  {
+    @Autowired
+    private EquipApiUtil equipApiUtil;
     /**
      * 3.16 RequestGetPartInfo
      * Request part information of given ReelCode to TMS (when the Rack needs it).
@@ -475,7 +479,9 @@ public class TMSApis  {
     private String PostJson(String url,Map<String,Object> sendData) throws ApiException {
 
         String responseStr = HttpHelper.postJson(url, sendData);
-        log.info("PostJson, url=["+url+"],send=["+JsonUtil.toJsonStr(sendData)+"],response=["+responseStr+"]");
+        String requestParam=JsonUtil.toJsonStr(sendData);
+        log.info("PostJson, url=["+url+"],send=["+requestParam+"],response=["+responseStr+"]");
+        equipApiUtil.updateApiInfoList(url,requestParam,responseStr);
         return responseStr;
     }
 

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSCommunicator.java

@@ -14,25 +14,21 @@ import java.util.concurrent.TimeUnit;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.exception.ApiException;
-import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.JsonUtil;
-import com.neotel.smfcore.core.api.SmfApi;
-import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
-import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.equipment.enums.EquipmentType;
+import com.neotel.smfcore.core.equipment.util.EquipConfigUtil;
+import com.neotel.smfcore.core.equipment.util.bean.EquipConfigInfo;
 import com.neotel.smfcore.core.order.LiteOrderCache;
-import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
-import com.neotel.smfcore.core.storage.bean.InventoryItem;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
-import com.neotel.smfcore.core.system.service.manager.IDataLogManager;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
@@ -55,28 +51,30 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
     public static String wsURL;
     public static String apiURL;
 
+
+    private static boolean enableApi=false;//是否启用api
     private static String host = "";
     private static int webPort = 8082;
     private static int apiPort = 1337 ;
-    private static String configWebPort = "";
-    private static String configApiPort = "";
+//    private static String configWebPort = "";
+//    private static String configApiPort = "";
     private static String clientType = "NEOTEL";
     private static String clientSubType = "Rack01";
 
-    @Value("${hanwha.host:}")
-    public void setHost(String host) {
-        TMSCommunicator.host = host;
-    }
-
-    @Value("${hanwha.webPort:}")
-    public void setWebPort(String configPort) {
-        TMSCommunicator.configWebPort = configPort;
-    }
-
-    @Value("${hanwha.apiPort:}")
-    public void setApiPort(String configPort) {
-        TMSCommunicator.configApiPort = configPort;
-    }
+//    @Value("${hanwha.host:}")
+//    public void setHost(String host) {
+//        TMSCommunicator.host = host;
+//    }
+//
+//    @Value("${hanwha.webPort:}")
+//    public void setWebPort(String configPort) {
+//        TMSCommunicator.configWebPort = configPort;
+//    }
+//
+//    @Value("${hanwha.apiPort:}")
+//    public void setApiPort(String configPort) {
+//        TMSCommunicator.configApiPort = configPort;
+//    }
     /**
      * API名称
      */
@@ -86,6 +84,9 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
     private DataCache dataCache;
 
     @Autowired
+    private EquipConfigUtil equipConfigUtil;
+
+    @Autowired
     private ILiteOrderManager liteOrderManager;
 
     @Autowired
@@ -100,34 +101,43 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
 //    @Autowired
 //    private IDataLogManager dataLogManager;
 
-    @Autowired
-    private IComponentManager componentManager;
+//    @Autowired
+//    private IComponentManager componentManager;
 
     @Autowired
     private TMSUtil tmsUtil;
 
-    private static int gRequestID = 1000;
-    public  static int GetRequestID()
-    {
-        return gRequestID++;
-    }
+//    private static int gRequestID = 1000;
+//    public  static int GetRequestID()
+//    {
+//        return gRequestID++;
+//    }
     private boolean needCheck=false;
     @PostConstruct
     public void init() {
-        host = dataCache.getConfigCache("hanwha.host", host);
-        String webPortStr = dataCache.getConfigCache("hanwha.webPort", configWebPort);
-        String apiPortStr = dataCache.getConfigCache("hanwha.apiPort", configApiPort);
+        EquipConfigInfo equipConfigInfo=equipConfigUtil.getConfigCache(EquipmentType.HANWHA.name());
+//        host = dataCache.getConfigCache("hanwha.host", host);
+//        String webPortStr = dataCache.getConfigCache("hanwha.webPort", configWebPort);
+//        String apiPortStr = dataCache.getConfigCache("hanwha.apiPort", configApiPort);
+
+        host=equipConfigInfo.GetConfigValue("host","");
+        webPort = equipConfigInfo.GetConfigValue("webPort",0);
+        apiPort = equipConfigInfo.GetConfigValue("apiPort",0);
+        enableApi=equipConfigInfo.isEnableApi();
         apiName = dataCache.getConfigCache("api.name",apiName);
 
         boolean enable=  apiName != null && apiName.equalsIgnoreCase("hanwha") ;
         if(!enable){
-            log.info("apiName:" + apiName+"，不需要连接");
+            log.info("apiName=" + apiName+"，不需要连接");
+        }else if(!enableApi){
+            log.info("enableApi=" + enableApi+"，不需要连接");
         }
-        else if (ObjectUtil.isEmpty(host) || ObjectUtil.isEmpty(webPortStr) || ObjectUtil.isEmpty((apiPortStr))) {
+        else if (ObjectUtil.isEmpty(host) || webPort==0 || apiPort==0) {
+//        else if (ObjectUtil.isEmpty(host) || ObjectUtil.isEmpty(webPortStr) || ObjectUtil.isEmpty((apiPortStr))) {
             log.info("配置不完整，不需要连接");
         } else {
-            webPort = Integer.parseInt(webPortStr);
-            apiPort = Integer.parseInt(apiPortStr);
+//            webPort = Integer.parseInt(webPortStr);
+//            apiPort = Integer.parseInt(apiPortStr);
             String apiName = dataCache.getConfigCache("api.name", "");
             if (apiName != null && apiName.equalsIgnoreCase("hanwha")) {
                 updateServerInfo(host, webPort, apiPort);
@@ -188,7 +198,7 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
         wsURL = String.format("ws://%s:%d/", serverHost, wport);
         apiURL = String.format("http://%s:%d/", serverHost, aport);
 
-        log.info("设置webSocketServer:[" + wsURL + "],httpServer:[" + apiURL + "]");
+        log.info("设置webSocketServer:[" + wsURL + "],httpServer:[" + apiURL + "],enableApi=["+enableApi+"]");
     }
 
     private void start() {
@@ -223,9 +233,13 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
     }
 
     public static boolean isEnable() {
-        if (ObjectUtil.isEmpty(host) || ObjectUtil.isEmpty(webPort) || ObjectUtil.isEmpty(apiPort)) {
+        if (ObjectUtil.isEmpty(host) || ObjectUtil.isEmpty(webPort) || ObjectUtil.isEmpty(apiPort)
+                || webPort == 0 || apiPort == 0) {
             return false;
         } else {
+            if (!enableApi) {
+                return false;
+            }
             return true;
         }
     }
@@ -237,8 +251,8 @@ public class TMSCommunicator  implements WsMsgReceivedListener {
         }
     }
     public boolean isConnected() {
-        if(isEnable()){
-            return true;
+        if(!isEnable()){
+            return false;
         }
         if (websocket != null &&(websocket.isConnecting()||websocket.isOpen()) ) {
             return true;

src/main/java/com/neotel/smfcore/custom/hanwha/handler/TMSUtil.java

@@ -7,6 +7,9 @@ import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.equipment.enums.EquipmentType;
+import com.neotel.smfcore.core.equipment.util.EquipConfigUtil;
+import com.neotel.smfcore.core.equipment.util.bean.EquipConfigInfo;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
@@ -57,6 +60,9 @@ public class TMSUtil {
     @Autowired
     private TMSApis tmsApis;
 
+    @Autowired
+    private EquipConfigUtil equipConfigUtil;
+
     public TMSReserve GetOrderInfo(LiteOrder liteOrder) {
 
         TMSReserve tmsReserve = new TMSReserve();
@@ -302,7 +308,14 @@ public class TMSUtil {
 
     public boolean HasExeOrder(){
 
-        if(liteOrderCache.SingleOrderMode()){
+        EquipConfigInfo config=equipConfigUtil.getConfigCache(EquipmentType.HANWHA.name());
+
+        Boolean singleOrderMode= true;
+        if(config!=null){
+            singleOrderMode= config.GetConfigValue("singleOrder",true );
+        }
+        if(singleOrderMode){
+//            if(liteOrderCache.SingleOrderMode()){
             Query query = new Query(Criteria.where("status").ne(LITEORDER_STATUS.CLOSED));
             List<LiteOrder> orderList = liteOrderManager.findByQuery(query);
             List<LiteOrder> nOder=new ArrayList<>();

src/main/java/com/neotel/smfcore/custom/hanwha/util/HanwhaCacheUtil.java

-package com.neotel.smfcore.custom.hanwha.util;
-
-import com.neotel.smfcore.core.device.util.DataCache;
-import com.neotel.smfcore.custom.hanwha.util.bean.HanwhaCacheConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Slf4j
-@Service
-public class HanwhaCacheUtil {
-
-    @Autowired
-    private DataCache dataCache;
-
-    public static final String Cache_Hanwha_HostAndPost = "Cache_Hanwha_HostAndPost";
-
-
-    public void updateHostAndPort(HanwhaCacheConfig cacheConfig) {
-        HanwhaCacheConfig hanwhaCacheConfig = dataCache.getCache(Cache_Hanwha_HostAndPost);
-        if (hanwhaCacheConfig == null) {
-            hanwhaCacheConfig = new HanwhaCacheConfig();
-        }
-        hanwhaCacheConfig.setHost(cacheConfig.getHost());
-        hanwhaCacheConfig.setWebPort(cacheConfig.getWebPort());
-        hanwhaCacheConfig.setApiPort(cacheConfig.getApiPort());
-        hanwhaCacheConfig.setSingleOrder(cacheConfig.isSingleOrder());
-        dataCache.updateCache(Cache_Hanwha_HostAndPost, hanwhaCacheConfig);
-    }
-
-    public HanwhaCacheConfig getHostAndPortCache(){
-        HanwhaCacheConfig hostAndPortCache = dataCache.getCache(Cache_Hanwha_HostAndPost);
-        if (hostAndPortCache == null) {
-            hostAndPortCache = new HanwhaCacheConfig();
-        }
-        return hostAndPortCache;
-    }
-
-}

src/main/java/com/neotel/smfcore/custom/hanwha/util/bean/HanwhaCacheConfig.java

-package com.neotel.smfcore.custom.hanwha.util.bean;
-
-import lombok.Data;
-
-@Data
-public class HanwhaCacheConfig {
-
-    private String host;
-
-    private String webPort;
-
-    private String apiPort;
-
-    private boolean singleOrder = false;
-
-}