From 0c4e325b7744012fb117ddddfd11b0e9ba26b700 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 10:09:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 6 +++---
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 6 +++---
src/main/java/com/zy/common/web/AuthController.java | 10 +++++-----
src/main/webapp/views/deviceOperate/devpOperate.html | 26 +++++++++++++-------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++++
src/main/java/com/zy/core/MainProcess.java | 4 ++--
6 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index af46969..c0e75cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -380,6 +380,10 @@
}
}
+ public synchronized void DevpTaskAndPut() throws InterruptedException {
+
+ }
+
}
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 9199bb5..fff96c3 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -54,11 +54,11 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String mobile, String password){
//楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
-// LicenseVerify licenseVerify = new LicenseVerify();
-// boolean verify = licenseVerify.verify();
-// if (!verify) {//璁稿彲璇佸凡澶辨晥
-// return R.parse(CodeRes.SYSTEM_20001);
-// }
+ LicenseVerify licenseVerify = new LicenseVerify();
+ boolean verify = licenseVerify.verify();
+ if (!verify) {//璁稿彲璇佸凡澶辨晥
+ return R.parse(CodeRes.SYSTEM_20001);
+ }
if (mobile.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
res.put("username", mobile);
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index ab91620..dccc63f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -47,8 +47,8 @@
// mainService.RGVDemoShow0();
// mainService.RGVDemoShow1();
mainService.RGVDemoShow2();
- //鏈烘鑷傚厑璁稿彇璐с�佸厑璁告斁璐�
-// mainService.ExtTaskAndPut();
+ //浠诲姟鐢熸垚
+ mainService.DevpTaskAndPut();
} catch (Exception e) {
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index 3d21663..1552807 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -61,9 +61,9 @@
*/
@RequestMapping(value = "/getLicenseDays")
public R getLicenseDays() {
- if (true){
- return R.ok().add(0);
- }
+// if (true){
+// return R.ok().add(0);
+// }
LicenseVerify licenseVerify = new LicenseVerify();
LicenseContent verifyInfo = licenseVerify.getVerifyInfo();
if (verifyInfo == null) {
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 071ef11..126b337 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -79,12 +79,12 @@
LicenseVerify licenseVerify = new LicenseVerify();
//瀹夎璇佷功
-// LicenseContent install = licenseVerify.install(param);
+ LicenseContent install = licenseVerify.install(param);
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
-// return install != null;
- return true;
+ return install != null;
+// return true;
} catch (Exception e) {
return false;
}
diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index d8b1506..3e2b238 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -18,14 +18,14 @@
max-height="450" style="width: 100%">
<el-table-column property="devNo" label="绔欏彿">
</el-table-column>
- <el-table-column property="workNo" label="宸ヤ綔鍙�">
- </el-table-column>
- <el-table-column property="locType1" label="楂樹綆搴撲綅">
- </el-table-column>
- <el-table-column property="pakMk" label="鍏ュ簱鏍囪">
- </el-table-column>
- <el-table-column property="barcode" label="鏉＄爜">
- </el-table-column>
+<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column property="locType1" label="楂樹綆搴撲綅">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column property="pakMk" label="鍏ュ簱鏍囪">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column property="barcode" label="鏉＄爜">-->
+<!-- </el-table-column>-->
</el-table>
</div>
@@ -74,11 +74,11 @@
</div>
<div v-else>
<el-descriptions :title="currentTitle" direction="vertical" :column="2" border>
- <el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }}
- </el-descriptions-item>
- <el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo }}
- </el-descriptions-item>
+<!-- <el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="宸ヤ綔鍙�">-->
+<!-- {{ tableData[currentIndex].workNo }}-->
+<!-- </el-descriptions-item>-->
<el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵1">{{ tableData[currentIndex].autoing }}
</el-descriptions-item>
<el-descriptions-item label="杈撻�佺嚎 ==銆� 姘皵2">{{ tableData[currentIndex].loading }}
--
Gitblit v1.9.1