From f3ce4485cd37eb7c3bcf16fde86a7f149974c4b6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:51:50 +0800
Subject: [PATCH] #检查导出功能:  1.商品档案无异常  2.库存明细管理(异常)已修复  3.库存明细统计无异常  4.工作档查询维护无异常  5.工作档明细查询无异常  6.工作历史档查询无异常  7.工作明细历史档查询无异常  8.入库通知历史档无异常  9.库存移动流水记录(异常)已修复  10.机台工位绑定无异常  11.库存调整记录无异常  12.工作档维护日志(异常)已修复  13.操作日志无异常

---
 src/main/java/com/zy/system/controller/LicenseCreatorController.java |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 0aafb3b..ba27337 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -3,6 +3,7 @@
 import com.core.common.Cools;
 import com.core.common.R;
 import com.zy.system.entity.license.*;
+import com.zy.system.timer.LicenseTimer;
 import de.schlichtherle.license.LicenseContent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,7 +30,8 @@
 
     @Autowired
     private LicenseCheckListener licenseCheckListener;
-
+    @Autowired
+    private LicenseTimer licenseTimer;
     /**
      * 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
      * @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
@@ -61,19 +63,7 @@
      */
     @RequestMapping(value = "/getLicenseDays")
     public R getLicenseDays() {
-        LicenseVerify licenseVerify = new LicenseVerify();
-        LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
-        if (verifyInfo == null) {
-            return R.error();
-        }
-
-        Date start = new Date();
-        Date end = verifyInfo.getNotAfter();
-        Long starTime = start.getTime();
-        Long endTime = end.getTime();
-        Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
-        int day = (int) (num / 24 / 60 / 60 / 1000);
-        return R.ok().add(day);
+        return R.ok(licenseTimer.getLicenseDays());
     }
 
     @RequestMapping(value = "/updateLicense")
@@ -109,4 +99,11 @@
         return R.error("璁稿彲璇佹洿鏂板け璐�");
     }
 
+
+    @RequestMapping(value = "/activate")
+    public R activate() {
+        licenseTimer.timer();
+        return R.ok();
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1