增加镁光接口地址配置功能

src/main/java/com/neotel/smfcore/common/utils/Constants.java

@@ -211,4 +211,8 @@ public class Constants {
      * 是否启用Xray测试模式，所有的料盘获取入库库位时都去xray点料，true=启用
      * 是否启用Xray测试模式，所有的料盘获取入库库位时都去xray点料，true=启用
      */
      */
     public static final String CACHE_XRAY_TEST   ="CACHE_XRAY_TEST";
     public static final String CACHE_XRAY_TEST   ="CACHE_XRAY_TEST";
+    /**
+     * 镁光url地址：http://istio-ingressgateway-istio-system.apps.ose-dev45.micron.com/
+     */
+    public static final String CACHE_Micron_AppAddr   ="CACHE_Micron_AppAddr";
 }
 }

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

@@ -15,6 +15,7 @@ import com.neotel.smfcore.core.system.bean.OrderSetting;
 import com.neotel.smfcore.core.system.rest.bean.dto.SysSettingsDto;
 import com.neotel.smfcore.core.system.rest.bean.dto.SysSettingsDto;
 import com.neotel.smfcore.core.system.service.po.Settings;
 import com.neotel.smfcore.core.system.service.po.Settings;
 import com.neotel.smfcore.core.system.util.DbBackupService;
 import com.neotel.smfcore.core.system.util.DbBackupService;
+import com.neotel.smfcore.custom.micron1053.api.MicronConfig;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.bean.FileProperties;
 import com.neotel.smfcore.security.bean.FileProperties;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -49,6 +50,8 @@ public class SettingsController {
 
 
     @Autowired
     @Autowired
     private DbBackupService dbBackupService;
     private DbBackupService dbBackupService;
+    @Autowired
+    private  MicronConfig micronConfig;
 
 
     /**
     /**
      * 当前版本
      * 当前版本
@@ -97,6 +100,7 @@ public class SettingsController {
             xrayTest=false;
             xrayTest=false;
             dataCache.updateCache(Constants.CACHE_XRAY_TEST,xrayTest);
             dataCache.updateCache(Constants.CACHE_XRAY_TEST,xrayTest);
         }
         }
+        String micronAppAddr=dataCache.getCache(Constants.CACHE_Micron_AppAddr);
         SysSettingsDto dto = new SysSettingsDto();
         SysSettingsDto dto = new SysSettingsDto();
         dto.setStartJob(startJob);
         dto.setStartJob(startJob);
         dto.setStopOut(stopOut);
         dto.setStopOut(stopOut);
@@ -110,6 +114,7 @@ public class SettingsController {
         dto.setExpiredateVerify(expiredateVerify);
         dto.setExpiredateVerify(expiredateVerify);
         dto.setInputCheck(inputCheck);
         dto.setInputCheck(inputCheck);
         dto.setXRayTest(xrayTest);
         dto.setXRayTest(xrayTest);
+        dto.setMicronAppAddr(micronAppAddr);
         return dto;
         return dto;
     }
     }
 
 
@@ -129,11 +134,14 @@ public class SettingsController {
         dataCache.updateCache(Constants.CACHE_EXPIREDATE_VERIFY, sysSettingsDto.isExpiredateVerify());
         dataCache.updateCache(Constants.CACHE_EXPIREDATE_VERIFY, sysSettingsDto.isExpiredateVerify());
         dataCache.updateCache(Constants.CACHE_INPUT_CHECK,sysSettingsDto.isInputCheck());
         dataCache.updateCache(Constants.CACHE_INPUT_CHECK,sysSettingsDto.isInputCheck());
         dataCache.updateCache(Constants.CACHE_XRAY_TEST,sysSettingsDto.isXRayTest());
         dataCache.updateCache(Constants.CACHE_XRAY_TEST,sysSettingsDto.isXRayTest());
+        dataCache.updateCache(Constants.CACHE_Micron_AppAddr,sysSettingsDto.getMicronAppAddr());
+
         log.info("更改系统设置：stopout=" + sysSettingsDto.isStopOut() + ",stopjob=" + sysSettingsDto.isStartJob() + ",sluggishDay=" + sysSettingsDto.getSluggishDay()
         log.info("更改系统设置：stopout=" + sysSettingsDto.isStopOut() + ",stopjob=" + sysSettingsDto.isStartJob() + ",sluggishDay=" + sysSettingsDto.getSluggishDay()
                 + ",expiresDay=" + sysSettingsDto.getExpiresDay() + ",capacityWarn=" + sysSettingsDto.getCapacityWarn() + ",backUpMonth=" + sysSettingsDto.getBackUpMonth() +
                 + ",expiresDay=" + sysSettingsDto.getExpiresDay() + ",capacityWarn=" + sysSettingsDto.getCapacityWarn() + ",backUpMonth=" + sysSettingsDto.getBackUpMonth() +
                 " ,sameBarcodeSettings=" + sysSettingsDto.getSameBarcodeSettings()+", apiTest="+sysSettingsDto.isApiTest()+",xrayBypass="+sysSettingsDto.isXrayBypass()+
                 " ,sameBarcodeSettings=" + sysSettingsDto.getSameBarcodeSettings()+", apiTest="+sysSettingsDto.isApiTest()+",xrayBypass="+sysSettingsDto.isXrayBypass()+
-                ",expiredateVerify=" + sysSettingsDto.isExpiredateVerify()+",inputCheck="+sysSettingsDto.isInputCheck()+",isXRayTest="+sysSettingsDto.isXRayTest());
-
+                ",expiredateVerify=" + sysSettingsDto.isExpiredateVerify()+",inputCheck="+sysSettingsDto.isInputCheck()+",isXRayTest="+sysSettingsDto.isXRayTest()
+                +",CACHE_Micron_AppAddr="+sysSettingsDto.getMicronAppAddr());
+        micronConfig.UpdateAddr(sysSettingsDto.getMicronAppAddr());
         String msg = MessageUtils.getText("smfcore.saveOk", servletRequest.getLocale(), "保存成功");
         String msg = MessageUtils.getText("smfcore.saveOk", servletRequest.getLocale(), "保存成功");
         return ResultBean.newOkResult(msg);
         return ResultBean.newOkResult(msg);
 
 

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/SysSettingsDto.java

@@ -33,6 +33,8 @@ public class SysSettingsDto implements Serializable {
     @ApiModelProperty("开启api测试")
     @ApiModelProperty("开启api测试")
     private boolean apiTest = false;
     private boolean apiTest = false;
 
 
+    @ApiModelProperty("镁光API地址")
+    private String micronAppAddr = "";
 
 
     @ApiModelProperty("忽略XRay")
     @ApiModelProperty("忽略XRay")
     private boolean xrayBypass=false;
     private boolean xrayBypass=false;

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronConfig.java

 package com.neotel.smfcore.custom.micron1053.api;
 package com.neotel.smfcore.custom.micron1053.api;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -283,7 +284,26 @@ public class MicronConfig {
 //        action_GetMaterialLot = dataCache.GetConfigCache("siemens.action.GetMaterialLot", "siemens.action.GetMaterialLot", action_GetMaterialLot);
 //        action_GetMaterialLot = dataCache.GetConfigCache("siemens.action.GetMaterialLot", "siemens.action.GetMaterialLot", action_GetMaterialLot);
 //        action_ProcessMaterialLot = dataCache.GetConfigCache("siemens.action.ProcessMaterialLot", "siemens.action.ProcessMaterialLot", action_ProcessMaterialLot);
 //        action_ProcessMaterialLot = dataCache.GetConfigCache("siemens.action.ProcessMaterialLot", "siemens.action.ProcessMaterialLot", action_ProcessMaterialLot);
 
 
+        String dbAddr=dataCache.getCache(Constants.CACHE_Micron_AppAddr);
+        if(ObjectUtil.isNotEmpty(dbAddr)){
+            //数据库地址不为空，使用数据库地址
+            log.info("CACHE_Micron_AppAddr 数据库配置不为空，使用数据库配置：[" + dbAddr+"] 替换配置文件配置：["+micronAddr+"]" );
+            micronAddr=dbAddr;
+        }else{
+            log.info("CACHE_Micron_AppAddr 数据库配置为空， 修改数据库配置=["+micronAddr+"]" );
+            dataCache.updateCache(Constants.CACHE_Micron_AppAddr,micronAddr);
+        }
 
 
         log.info("Micron sesrver addr：" + micronAddr );
         log.info("Micron sesrver addr：" + micronAddr );
     }
     }
+
+    public void UpdateAddr(String newAddr){
+        if(newAddr.equals(micronAddr)){
+            return;
+        }
+        log.info("手动更改：CACHE_Micron_AppAddr =[" + newAddr+"] 替换原来配置：["+micronAddr+"]" );
+        micronAddr=newAddr;
+
+    }
+
 }
 }