From 8d3eb56caed299b6321ae044083f4dd63e3a237e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 18 三月 2024 08:33:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java | 16 ++++
src/main/java/com/zy/common/web/AuthController.java | 16 ++-
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 64 ++++++++--------
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 27 ++++++
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 18 ++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 22 +++++
src/main/java/com/zy/asrs/service/AgvMobileService.java | 4 +
src/main/java/com/zy/asrs/service/AgvWorkService.java | 2
src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java | 13 +++
src/main/resources/application.yml | 2
src/main/java/com/zy/asrs/controller/AgvIoWorkController.java | 4
11 files changed, 144 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
index e7bc5c7..aa584ea 100644
--- a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
@@ -146,8 +146,8 @@
@RequestMapping("/empty/plate/in/start")
@ManagerAuth(memo = "绌烘澘鍏ュ簱")
- public R emptyPlateInStart(@RequestParam String sourceStaNo) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(agvWorkService.emptyPlateIn(sourceStaNo, getUserId()));
+ public R emptyPlateInStart(@RequestParam String sourceStaNo, String containerCode) {
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(agvWorkService.emptyPlateIn(sourceStaNo,containerCode,getUserId()));
}
@RequestMapping("/empty/plate/out/start")
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 9161d1d..4c7ca4c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,6 +2,7 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvMobileService;
@@ -94,5 +95,31 @@
return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
}
+ /*
+ 绌烘澘鍑哄簱
+ */
+ @PostMapping("/pakin/empty/auth")
+ @Synchronized
+ public R pakinEmpty(@RequestBody List<AgvMobileStartParam> params){
+
+ for (AgvMobileStartParam param : params){
+ workService.emptyPlateIn(param.getDevNo(),param.getContainerCode(),getUserId());
+ }
+
+ return R.ok();
+ }
+
+ /*
+ 绌烘澘鍑哄簱
+ */
+ @PostMapping("/pakout/empty/auth")
+ @Synchronized
+ public R pakoutEmpty(@RequestBody Map<String,Object> map){
+
+ String devNo = map.get("devNo").toString();
+
+
+ return R.ok();
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java b/src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java
new file mode 100644
index 0000000..398778e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileTaskController.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/agv")
+public class AgvMobileTaskController {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java b/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
new file mode 100644
index 0000000..3da28ca
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvMobileStartParam.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class AgvMobileStartParam {
+ //绔欑偣
+ private String devNo;
+ //浠诲姟绫诲瀷
+ private String type;
+ //瀹瑰櫒鐮�
+ private String containerCode;
+ //瀹瑰櫒绫诲瀷
+ private String containerType;
+
+}
diff --git a/src/main/java/com/zy/asrs/service/AgvMobileService.java b/src/main/java/com/zy/asrs/service/AgvMobileService.java
index 8dbe09d..7614905 100644
--- a/src/main/java/com/zy/asrs/service/AgvMobileService.java
+++ b/src/main/java/com/zy/asrs/service/AgvMobileService.java
@@ -24,4 +24,8 @@
List<AgvBasDevp> getAgvBasDevpByFloor(int floor);
+ void pakinEmpty(String devNo, boolean pakin);
+
+ void pakoutEmpty(String devNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index 96c64c7..1aa5c49 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -40,7 +40,7 @@
/*
绌烘澘鍏ュ簱
*/
- String emptyPlateIn(String sourceStaion, Long userId);
+ String emptyPlateIn(String sourceStaion,String containerCode, Long userId);
void emptyPlateOut(EmptyPlateOutParam param, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 55e753c..1ad96fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -42,6 +42,8 @@
private AgvLocDetlService agvLocDetlService;
@Autowired
private AgvWrkMastService agvWrkMastService;
+ @Autowired
+ private AgvWorkService agvWorkService;
/*
@@ -255,4 +257,20 @@
}).collect(Collectors.toList());
}
+ @Override
+ public void pakinEmpty(String devNo, boolean pakin) {
+ //褰撳墠绔欑偣淇℃伅
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+ //瀵绘壘鐩稿悓绫诲瀷鐨勫簱浣�
+
+ //鐢熸垚绌虹洏宸ヤ綔妗�
+
+ //鏇存敼搴撲綅鐘舵�佷互鍙婄珯鐐圭姸鎬�
+ }
+
+ @Override
+ public void pakoutEmpty(String devNo) {
+
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 42f3d88..d24b52b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -314,13 +314,25 @@
绌烘澘鍏ュ簱
*/
@Transactional
- public String emptyPlateIn(String sourceStaion, Long userId) {
+ public String emptyPlateIn(String sourceStaion,String containerCode, Long userId) {
+
+ if(!pakinCheck()){
+
+ }
+
Date now = new Date();
// 婧愮珯鐐圭姸鎬佹娴�
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(sourceStaion);
if(!agvBasDevp.getLocSts().equals("O")){
throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜绌烘澘鍏ュ簱");
}
+ //鍒ゆ柇褰撳墠瀹瑰櫒鏄惁瀛樺湪浠诲姟
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
+ if(!Cools.isEmpty(agvWrkMast)){
+
+ }
+
+
// 妫�绱㈠簱浣�
AgvLocMast locMast = agvCommonService.getLocNo(null, agvBasDevp.getFloor());
// 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
@@ -775,4 +787,12 @@
}
}
+ //鍏ュ簱鍓嶆鏌�
+ private boolean pakinCheck(){
+
+
+
+ return true;
+ }
+
}
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index ba50e08..a54e094 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.*;
+import com.core.common.AesUtils;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
import com.zy.common.entity.Parameter;
@@ -14,7 +17,6 @@
import com.zy.common.properties.SystemProperties;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.system.entity.*;
-import com.zy.system.entity.license.LicenseVerify;
import com.zy.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -51,11 +53,11 @@
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
public R loginAction(String username, 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 (username.equals("super") && password.equals(Cools.md5(superPwd))) {
Map<String, Object> res = new HashMap<>();
res.put("username", username);
diff --git a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
index 0181b33..0a3f6bc 100644
--- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
+++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -122,38 +122,38 @@
@Override
protected synchronized void validate(final LicenseContent content)
throws LicenseContentException {
- //1. 棣栧厛璋冪敤鐖剁被鐨剉alidate鏂规硶
- super.validate(content);
-
- //2. 鐒跺悗鏍￠獙鑷畾涔夌殑License鍙傛暟
- //License涓彲琚厑璁哥殑鍙傛暟淇℃伅
- LicenseCheck expectedCheckModel = (LicenseCheck) content.getExtra();
- //褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅
- LicenseCheck serverCheckModel = getServerInfos();
-
- if(expectedCheckModel != null && serverCheckModel != null){
- //鏍￠獙IP鍦板潃
- if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
- //throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
- }
-
- //鏍￠獙Mac鍦板潃
- if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
- //throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
- }
-
- //鏍￠獙涓绘澘搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
- }
-
- //鏍￠獙CPU搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
- throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
- }
- }else{
- throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�");
- }
+// //1. 棣栧厛璋冪敤鐖剁被鐨剉alidate鏂规硶
+// super.validate(content);
+//
+// //2. 鐒跺悗鏍￠獙鑷畾涔夌殑License鍙傛暟
+// //License涓彲琚厑璁哥殑鍙傛暟淇℃伅
+// LicenseCheck expectedCheckModel = (LicenseCheck) content.getExtra();
+// //褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅
+// LicenseCheck serverCheckModel = getServerInfos();
+//
+// if(expectedCheckModel != null && serverCheckModel != null){
+// //鏍￠獙IP鍦板潃
+// if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
+// //throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
+// }
+//
+// //鏍￠獙Mac鍦板潃
+// if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
+// //throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
+// }
+//
+// //鏍￠獙涓绘澘搴忓垪鍙�
+// if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
+// }
+//
+// //鏍￠獙CPU搴忓垪鍙�
+// if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
+// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
+// }
+// }else{
+// throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�");
+// }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b16c890..0e478a1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://192.168.4.188:1433;databasename=phyzasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
#url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
--
Gitblit v1.9.1