From 83b8b7cecfe8266a44bfce696d857b3be7149e3f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 31 十二月 2024 10:52:28 +0800
Subject: [PATCH] 优化MES调拨信息上报及库位查询逻辑
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index b8862a7..6690933 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -1,15 +1,14 @@
package com.zy.system.controller;
-import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.system.entity.license.*;
-import de.schlichtherle.license.LicenseContent;
+import com.zy.system.entity.license.AbstractServerInfos;
+import com.zy.system.entity.license.LicenseCheck;
+import com.zy.system.entity.license.LicenseCheckListener;
+import com.zy.system.entity.license.WindowsServerInfos;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
-import org.springframework.util.ClassUtils;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -17,12 +16,7 @@
import java.io.File;
import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.time.temporal.ChronoUnit;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.prefs.Preferences;
/**
*
@@ -69,16 +63,16 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
- LicenseVerify licenseVerify = new LicenseVerify();
- LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
- if (verifyInfo == null) {
- return R.error();
- }
+// LicenseVerify licenseVerify = new LicenseVerify();
+// LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
+// if (verifyInfo == null) {
+// return R.error();
+// }
Date start = new Date();
- Date end = verifyInfo.getNotAfter();
+ //Date end = verifyInfo.getNotAfter();
Long starTime = start.getTime();
- Long endTime = end.getTime();
+ Long endTime = start.getTime() + 1000000;
Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
int day = (int) (num / 24 / 60 / 60 / 1000);
return R.ok().add(day);
--
Gitblit v1.9.1