1.解析条码时,判断授权是否过期

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

@@ -201,4 +201,10 @@ public class Constants {
      */
     public static final String Cache_PanaCIMPort="Cache_PanaCIMPort";
 
+
+    /**
+     * 授权时间
+     */
+    public static final String Cache_AuthDate = "Cache_AuthDate";
+
 }

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

@@ -40,6 +40,8 @@ public class CodeResolve {
 
     private boolean useSizeConfirm = true;
 
+    private Date authDate = null;
+
     public void updateBarcodeRuleList(List<String> ruleList) {
         try {
 
@@ -66,6 +68,9 @@ public class CodeResolve {
         useSizeConfirm = confirm;
     }
 
+    public void updateAuthDate(Date date){
+        authDate = date;
+    }
 
     public CodeBean resolveSingleCode(String barcodeItemStr ){
         return resolveSingleCode(barcodeItemStr, COMPONENT_TYPE.COMPONENT);
@@ -74,6 +79,13 @@ public class CodeResolve {
      * 解析条码为单个 Barcode，自动保存到数据库
      */
     public CodeBean resolveSingleCode(String barcodeItemStr,int type){
+        //判断授权日期是否为空
+        if (authDate != null){
+            long time = authDate.getTime();
+            if (time < System.currentTimeMillis()){
+                throw new ValidateException("smfcore.error.barcode.authError","条码解析失败,请联系供应商处理");
+            }
+        }
 
         if(barcodeRuleList == null || barcodeRuleList.isEmpty()){
             CodeBean codeBean = BarcodeRule.splitCodeAndSize(barcodeItemStr);

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -196,6 +196,13 @@ public class DataCache {
         if (cacheKey.equals(Constants.CACHE_ExpiresDay)) {
             codeResolve.updateExpiresDay((Integer) value);
         }
+        if (cacheKey.equals(Constants.Cache_AuthDate)){
+            if (value == null) {
+                codeResolve.updateAuthDate(null);
+            }  else {
+                codeResolve.updateAuthDate((Date) value);
+            }
+        }
 
         log.info("updateCache [" + cacheKey + "]=[" + value + "]");
     }

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

@@ -298,4 +298,29 @@ public class SettingsController {
         log.info("获取版本号："+version);
         return "V"+version;
     }
+
+
+    @ApiOperation("修改授权日期")
+    @GetMapping("/updateAuthDate")
+    @AnonymousAccess
+    public ResultBean updateAuthDate(Long currentTime, int day) {
+        if (currentTime == null){
+            return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"currentTime"});
+        }
+        //log.info(System.currentTimeMillis()+"");
+        String dateStr = DateUtil.toDateString(currentTime, "yyyy-MM-dd");
+        String currentDateStr = DateUtil.toDateString(System.currentTimeMillis(), "yyyy-MM-dd");
+        if (!currentDateStr.equals(dateStr)) {
+            //smfcore.valueInvalid=[{0}]並非有效的參數
+            return ResultBean.newErrorResult(-1, "smfcore.valueInvalid", "[{0}]不是有效的参数", new String[]{"currentTime"});
+        }
+        //如果传入的时间小于0,则置为空,长时间有效
+        if (day < 0){
+            dataCache.updateCache(Constants.Cache_AuthDate,null);
+        } else {
+            Date newDate = DateUtil.addDays(new Date(), day);
+            dataCache.updateCache(Constants.Cache_AuthDate,newDate);
+        }
+        return ResultBean.newOkResult("");
+    }
 }

src/main/resources/messages.properties

@@ -2,6 +2,7 @@ smfcore.valueCanotNull={0}\u4E0D\u80FD\u4E3A\u7A7A
 smfcore.feleFormatError=\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF\uFF01, \u4EC5\u652F\u6301{0}\u683C\u5F0F
 smfcore.valueAlreadyExist={0}[{1}]\u5DF2\u5B58\u5728
 smfcore.valueNotExist={0}[{1}]\u4E0D\u5B58\u5728
+smfcore.valueInvalid=[{0}]\u4E0D\u662F\u6709\u6548\u7684\u53C2\u6570
 smfcore.fileToLong=\u6587\u4EF6\u8D85\u51FA\u89C4\u5B9A\u5927\u5C0F
 smfcore.fileError=\u6587\u4EF6\u89E3\u6790\u5931\u8D25
 smfcore.valueNotFind=\u672A\u627E\u5230{0}[{1}]
@@ -106,6 +107,7 @@ smfcore.error.barcode.wrongLength=\u6761\u7801[{0}]\u957F\u5EA6\u9519\u8BEF
 smfcore.error.barcode.noField=\u6761\u7801\u89E3\u6790\u5931\u8D25,\u672A\u627E\u5230{0}\u5B57\u6BB5
 smfcore.error.barcode.pnNotExist=x\u6863\u6848 {0} \u4E0D\u5B58\u5728
 smfcore.error.barcode.locked=\u5E93\u4F4D[{0}]\u5DF2\u88AB\u9501\u5B9A
+smfcore.error.barcode.authError=\u6761\u7801\u89E3\u6790\u5931\u8D25,\u8BF7\u8054\u7CFB\u4F9B\u5E94\u5546\u5904\u7406
 smfcore.manualOut.ok=\u624B\u52A8\u51FA\u5E93\u6210\u529F
 smfcore.manualOut.notFound=\u4ED3\u5E93\u4E2D\u672A\u627E\u5230\u6599\u76D8\u4FE1\u606F
 smfcore.order.lineCanotNull=\u7EBF\u522B\u4E0D\u80FD\u4E3A\u7A7A

src/main/resources/messages_en_US.properties

@@ -2,6 +2,7 @@ smfcore.valueCanotNull={0} is empty
 smfcore.feleFormatError=File format error! Only {0} format is supported
 smfcore.valueAlreadyExist={0}[{1}] exist
 smfcore.valueNotExist={0}[{1}]does not exist
+smfcore.valueInvalid=[{0}] is not a valid parameter
 smfcore.fileToLong=File exceeds specified size
 smfcore.fileError=File parsing failure
 smfcore.valueNotFind={0}[{1}] not found
@@ -108,6 +109,7 @@ smfcore.error.barcode.noField=Bar code parsing failed, {0} field not found
 smfcore.error.barcode.pnNotExist=Material file {0} does not exist
 smfcore.error.barcode.invalid=no valid barcode is found
 smfcore.error.barcode.locked=Library bit [{0}] is locked
+smfcore.error.barcode.authError=Barcode parsing failed, please contact the supplier for assistance
 smfcore.manualOut.ok=Manual exit successful
 smfcore.manualOut.notFound=No tray information found
 smfcore.order.lineCanotNull=Line cannot be empty

src/main/resources/messages_ja_JP.properties

@@ -2,6 +2,7 @@ smfcore.valueCanotNull={0}\u306F\u7A7A\u3067\u306F\u306A\u3044
 smfcore.feleFormatError=\u30D5\u30A1\u30A4\u30EB\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u30A8\u30E9\u30FC\u3067\u3059 {0}\u5F62\u5F0F\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059
 smfcore.valueAlreadyExist={0}[{1}] \u65E2\u306B\u5B58\u5728\u3059\u308B
 smfcore.valueNotExist={0}[{1}]\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
+smfcore.valueInvalid=[{0}]\u306F\u6709\u52B9\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 smfcore.fileToLong=\u30D5\u30A1\u30A4\u30EB\u8D85\u904E\u30B5\u30A4\u30BA
 smfcore.fileError=\u30D5\u30A1\u30A4\u30EB\u306E\u30D1\u30FC\u30B7\u30F3\u30B0\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 smfcore.valueNotFind=\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F{0}[{1}]
@@ -105,6 +106,7 @@ smfcore.error.barcode.noField=\u30D0\u30FC\u30B3\u30FC\u30C9\u306E\u89E3\u6790\u
 smfcore.error.barcode.pnNotExist=\u30D5\u30A1\u30A4\u30EB{0}\u304C\u5B58\u5728\u3057\u306A\u3044
 smfcore.error.barcode.invalid=\u306F\u6709\u52B9\u306A\u30D0\u30FC\u30B3\u30FC\u30C9\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 smfcore.error.barcode.locked=\u30E9\u30A4\u30D6\u30E9\u30EA\u30DD\u30B8\u30B7\u30E7\u30F3 [{0}] \u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B
+smfcore.error.barcode.authError=\u30D0\u30FC\u30B3\u30FC\u30C9\u306E\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u30B5\u30D7\u30E9\u30A4\u30E4\u30FC\u306B\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044
 smfcore.manualOut.ok=\u624B\u52D5\u7D42\u4E86\u6210\u529F
 smfcore.manualOut.notFound=\u5009\u5EAB\u3067\u30D1\u30EC\u30C3\u30C8\u60C5\u5831\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcore.order.lineCanotNull=\u30E9\u30A4\u30F3\u304C\u7A7A\u304F\u3053\u3068\u306F\u306A\u3044

src/main/resources/messages_zh_CN.properties

@@ -2,6 +2,7 @@ smfcore.valueCanotNull={0}\u4E0D\u80FD\u4E3A\u7A7A
 smfcore.feleFormatError=\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF\uFF01, \u4EC5\u652F\u6301{0}\u683C\u5F0F
 smfcore.valueAlreadyExist={0}[{1}]\u5DF2\u5B58\u5728
 smfcore.valueNotExist={0}[{1}]\u4E0D\u5B58\u5728
+smfcore.valueInvalid=[{0}]\u4E0D\u662F\u6709\u6548\u7684\u53C2\u6570
 smfcore.fileToLong=\u6587\u4EF6\u8D85\u51FA\u89C4\u5B9A\u5927\u5C0F
 smfcore.fileError=\u6587\u4EF6\u89E3\u6790\u5931\u8D25
 smfcore.valueNotFind=\u672A\u627E\u5230{0}[{1}]
@@ -106,6 +107,7 @@ smfcore.error.barcode.wrongLength=\u6761\u7801[{0}]\u957F\u5EA6\u9519\u8BEF
 smfcore.error.barcode.noField=\u6761\u7801\u89E3\u6790\u5931\u8D25,\u672A\u627E\u5230{0}\u5B57\u6BB5
 smfcore.error.barcode.pnNotExist=x\u6863\u6848 {0} \u4E0D\u5B58\u5728
 smfcore.error.barcode.locked=\u5E93\u4F4D[{0}]\u5DF2\u88AB\u9501\u5B9A
+smfcore.error.barcode.authError=\u6761\u7801\u89E3\u6790\u5931\u8D25,\u8BF7\u8054\u7CFB\u4F9B\u5E94\u5546\u5904\u7406
 smfcore.manualOut.ok=\u624B\u52A8\u51FA\u5E93\u6210\u529F
 smfcore.manualOut.notFound=\u4ED3\u5E93\u4E2D\u672A\u627E\u5230\u6599\u76D8\u4FE1\u606F
 smfcore.order.lineCanotNull=\u7EBF\u522B\u4E0D\u80FD\u4E3A\u7A7A

src/main/resources/messages_zh_TW.properties

@@ -2,6 +2,7 @@ smfcore.valueCanotNull={0}\u4E0D\u80FD\u7232\u7A7A
 smfcore.feleFormatError=\u6587\u4EF6\u683C\u5F0F\u932F\u8AA4\uFF01, \u50C5\u652F\u6301{0}\u683C\u5F0F
 smfcore.valueAlreadyExist={0}[{1}]\u5DF2\u5B58\u5728
 smfcore.valueNotExist={0}[{1}]\u4E0D\u5B58\u5728
+smfcore.valueInvalid=[{0}]\u4E26\u975E\u6709\u6548\u7684\u53C3\u6578
 smfcore.fileToLong=\u6587\u4EF6\u8D85\u51FA\u898F\u5B9A\u5927\u5C0F
 smfcore.fileError=\u6587\u4EF6\u89E3\u6790\u5931\u6557
 smfcore.valueNotFind=\u672A\u627E\u5230{0}[{1}]
@@ -106,6 +107,7 @@ smfcore.error.barcode.noField=\u689D\u78BC\u89E3\u6790\u5931\u6557\uFF0C\u672A\u
 smfcore.error.barcode.pnNotExist=\u6A94\u6848 {0} \u4E0D\u5B58\u5728
 smfcore.error.barcode.invalid=\u672A\u627E\u5230\u6709\u6548\u7684\u689D\u78BC
 smfcore.error.barcode.locked=\u5EAB\u4F4D[{0}]\u5DF2\u88AB\u9396\u5B9A
+smfcore.error.barcode.authError=\u689D\u78BC\u89E3\u6790\u5931\u6557\uFF0C\u8ACB\u806F\u7D61\u4F9B\u61C9\u5546\u8655\u7406
 smfcore.manualOut.ok=\u624B\u52D5\u51FA\u5EAB\u6210\u529F
 smfcore.manualOut.notFound=\u5009\u5EAB\u4E2D\u672A\u627E\u5230\u6599\u76E4\u4FE1\u606F
 smfcore.order.lineCanotNull=\u7DDA\u5225\u4E0D\u80FD\u70BA\u7A7A