增加有效期配置

src/main/java/com/neotel/smfcore/custom/micron1053/Micron1053Menu.java

@@ -65,6 +65,7 @@ public class Micron1053Menu {
         MenuInit.addMenu(menuLabel,null,166, "Diagnosis","diagnosis", "system/diagnosis/index","diagnosis");
         MenuInit.addMenu(menuLabel,null,166, "Diagnosis","diagnosis", "system/diagnosis/index","diagnosis");
         //Help
         //Help
         MenuInit.addMenu(menuLabel,null,167, "Help","helps", "help/helps/index","help");
         MenuInit.addMenu(menuLabel,null,167, "Help","helps", "help/helps/index","help");
+        MenuInit.addMenu(menuLabel,null,168, "expirationSetting","expirationSetting", "system/expirationSetting/index","expireSetting");
         //报表：出入库、库存
         //报表：出入库、库存
         Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report","inOutData",null);
         Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report","inOutData",null);
         MenuInit.addMenu(menuLabel,pMenuReport,201, "料盘日志","trayLog", "report/trayLog/index","trayLog");
         MenuInit.addMenu(menuLabel,pMenuReport,201, "料盘日志","trayLog", "report/trayLog/index","trayLog");

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronGroupController.java

+package com.neotel.smfcore.custom.micron1053.controller;
+
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@Api(tags = "1053：group")
+@RequestMapping("/rest/micron/group")
+public class MicronGroupController {
+
+    public static final String ExpirationDateConfig = "micron_expiration_config";
+
+    @Autowired
+    private DataCache dataCache;
+
+    @ApiOperation("增加过期设置")
+    @RequestMapping("/addExpirationDateConfig")
+    @AnonymousAccess
+    public ResultBean addExpirationDateConfig(String key, int value) {
+        Map<String, Integer> configMap = dataCache.getCache(ExpirationDateConfig);
+        if (configMap == null) {
+            configMap = new HashMap<>();
+            configMap.put(key, value);
+        } else {
+            if (configMap.get(key) != null) {
+                return ResultBean.newErrorResult(-1, "smfcore.expiration.ameExists", "过期配置[{0}]已存在", new String[]{key});
+            }
+            configMap.put(key, value);
+        }
+        dataCache.updateCache(ExpirationDateConfig, configMap);
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("删除过期设置")
+    @RequestMapping("/deleteExpirationDateConfig")
+    @AnonymousAccess
+    public ResultBean deleteExpirationDateConfig(String key) {
+        Map<String, Integer> configMap = dataCache.getCache(ExpirationDateConfig);
+        if (configMap == null) {
+            configMap = new HashMap<>();
+        }
+        configMap.remove(key);
+        dataCache.updateCache(ExpirationDateConfig, configMap);
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("修改过期设置")
+    @RequestMapping("/updateExpirationDateConfig")
+    @AnonymousAccess
+    public ResultBean updateExpirationDateConfig(String key, int value) {
+        Map<String, Integer> configMap = dataCache.getCache(ExpirationDateConfig);
+        if (configMap == null) {
+            configMap = new HashMap<>();
+        }
+        Integer config = configMap.get(key);
+        if (config == null) {
+            return ResultBean.newErrorResult(-1, "smfcore.expiration.notExist", "过期配置[{0}]不存在 ", new String[]{key});
+        }
+        configMap.put(key, value);
+        dataCache.updateCache(ExpirationDateConfig, configMap);
+        return ResultBean.newOkResult("");
+    }
+
+
+    @ApiOperation("获取过期设置")
+    @RequestMapping("/getExpirationDateConfig")
+    @AnonymousAccess
+    public ResultBean getExpirationDateConfig(String key) {
+        Map<String, Integer> configMap = dataCache.getCache(ExpirationDateConfig);
+        if (configMap == null) {
+            configMap = new HashMap<>();
+        } else {
+            if (StringUtils.isNotBlank(key)) {
+                HashMap<String, Integer> resultMap = new HashMap<>();
+                if (configMap.get(key) != null) {
+                    resultMap.put(key, configMap.get(key));
+                }
+                return ResultBean.newOkResult(resultMap);
+            }
+        }
+        return ResultBean.newOkResult(configMap);
+    }
+}

src/main/resources/messages.properties

@@ -347,6 +347,8 @@ smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1}
 smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
 smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
 smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
 smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
+smfcore.expiration.ameExists=\u8FC7\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
+smfcore.expiration.notExist=\u8FC7\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F

src/main/resources/messages_en_US.properties

@@ -347,3 +347,5 @@ smfcore.emptyOut.fail=Task [{0}] empty processing failure:{1}
 smfcore.storage.error.posNameExist=Bin number already exists in other bins\uFF1A{0}
 smfcore.storage.error.posNameExist=Bin number already exists in other bins\uFF1A{0}
 smfcore.device.formatError= Format error
 smfcore.device.formatError= Format error
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
+smfcore.expiration.ameExists=expiration date config[{0}]already exists
+smfcore.expiration.notExist=expiration date config[{0}]does not exist
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -344,3 +344,5 @@ smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1}
 smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
 smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
 smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
 smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
+smfcore.expiration.ameExists=\u8FC7\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
+smfcore.expiration.notExist=\u8FC7\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -344,3 +344,5 @@ smfcore.emptyOut.fail=\u4EFB\u52A1[{0}]\u7A7A\u51FA\u5904\u7406\u5931\u8D25:{1}
 smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
 smfcore.storage.error.posNameExist=\u5E93\u4F4D\u53F7\u5DF2\u5728\u5176\u4ED6\u6599\u4ED3\u5B58\u5728\uFF1A{0}
 smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
 smfcore.device.formatError= \u683C\u5F0F\u9519\u8BEF
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
+smfcore.expiration.ameExists=\u8FC7\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
+smfcore.expiration.notExist=\u8FC7\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -345,3 +345,5 @@ smfcore.emptyOut.fail=\u4EFB\u52D9[{0}]\u7A7A\u51FA\u8655\u7406\u5931\u6557:{1}
 smfcore.storage.error.posNameExist=\u5EAB\u4F4D\u865F\u5DF2\u5728\u5176\u4ED6\u6599\u5009\u5B58\u5728\uFF1A{0}
 smfcore.storage.error.posNameExist=\u5EAB\u4F4D\u865F\u5DF2\u5728\u5176\u4ED6\u6599\u5009\u5B58\u5728\uFF1A{0}
 smfcore.device.formatError= \u683C\u5F0F\u932F\u8AA4
 smfcore.device.formatError= \u683C\u5F0F\u932F\u8AA4
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.m.emptyOut=No Reel Pickup From Mycronics
+smfcore.expiration.ameExists=\u904E\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
+smfcore.expiration.notExist=\u904E\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
\ No newline at end of file