From 9c7e5bc10f242b71f3d94e2c700cb7de79feda17 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 25 二月 2025 08:45:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 320 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 277 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 19883d4..797ae7d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,19 +1,27 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.service.OpenService;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasJar;
+import com.zy.asrs.entity.RgvOneSign;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.LocDetlMesVo;
+import com.zy.asrs.entity.vo.JarStateTableVo;
+import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -33,35 +41,39 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private BasJarService basJarService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
-
-
- /****************************************************************************/
- /********************************* 鎵撳寘涓婄嚎 **********************************/
- /****************************************************************************/
-
-
- @PostMapping("/order/pakin/new/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestParam(required = false) String barcode) {
- auth(appkey, barcode);
- if (Cools.isEmpty(barcode)) {
+ @PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.packageUp(barcode);
+ openService.syncMat(param);
return R.ok();
}
-
-
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ /*@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -76,27 +88,36 @@
}
openService.pakinOrderCreate(param);
return R.ok();
- }
+ }*/
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
+ /*@PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
- }
+ }*/
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
+ /*@PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
}
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
@@ -109,31 +130,33 @@
}
openService.pakoutOrderCreate(param);
return R.ok();
- }
+ }*/
/**
* 鍑哄簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakout/complete/default/v1")
+ /*@PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakoutOrderComplete(param));
- }
+ }*/
/**
* 搴撳瓨缁熻
*/
- @RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
+ /*@RequestMapping("/stock/default/v1")
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
return R.ok().add(openService.queryStock());
- }
+ }*/
-
- private void auth(String appkey, Object obj) {
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -145,7 +168,7 @@
}
}
- public static void main(String[] args) {
+ /*public static void main(String[] args) {
// 1
System.out.println("======================================");
OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -182,6 +205,217 @@
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
+ }*/
+
+
+
+ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+
+ /**
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ */
+ @PostMapping("/labeller/mat/auth/v1")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
+ public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
}
+ /**
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ */
+ @PostMapping("/labeller/complete/auth/v1")
+ @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
+ public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.labellerComplete(param);
+ return R.ok();
+ }
+
+// /**
+// * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+// */
+// @PostMapping("/palletizing/complete/auth/v1")
+// @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+// public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+// @RequestBody PalletizingCompleteTwoFloorParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.PalletizingCompleteTwoFloorParam(param);
+// return R.ok(param);
+// }
+
+ /**
+ * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @PostMapping("/palletizing/complete/auth/v2")
+ @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�")
+ public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.palletizingCompleteS(param);
+ return R.ok();
+ }
+
+ /**
+ * 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
+ */
+ @PostMapping("/balcony/complete/auth/v1")
+ @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀�
+ public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.balconyComplete(param);
+ return R.ok(param);
+ }
+
+
+ /**
+ * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+ */
+ @PostMapping("/single/unstacking/complete/auth/v1")
+ @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡")
+ public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody SingleUnstackingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.singleUnstackingComplete(param);
+ return R.ok(param);
+ }
+
+ /**
+ * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+ */
+ @PostMapping("/single/mount/unstacking/complete/auth/v1")
+ @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡")
+ public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody SingleMountUnstackingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.singleMountUnstackingComplete(param);
+ return R.ok(param);
+ }
+
+ /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
+ /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
+
+ /**
+ * 浜冲窞鐓滄槦浠诲姟涓嬪彂 // 灏忔枡绠辨姇鏂欏畬鎴愮粍鎵�
+ */
+ @PostMapping("/small/containers/auth/v1")
+ @AppAuth(memo = "MES浠诲姟涓嬪彂")
+ public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
+ @RequestBody SmallCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.smallContainers(param);
+ return R.ok().add("鎴愬姛");
+ }
+//
+// /**
+// * 浜冲窞鐓滄槦浠诲姟涓嬪彂
+// */
+// @PostMapping("/small/containers/auth/v1")
+// @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
+// public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
+// @RequestBody LabellerCompleteParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.labellerComplete(param);
+// return R.ok();
+// }
+//
+// /**
+// * 浜冲窞鐓滄槦浠诲姟涓嬪彂
+// */
+// @PostMapping("/small/containers/auth/v1")
+// @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
+// public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
+// @RequestBody LabellerCompleteParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// openService.labellerComplete(param);
+// return R.ok();
+// }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/deviceStatus")
+ @AppAuth(memo = "璁惧鐘舵�佹煡璇㈡帴鍙�")
+ @Transactional
+ public R deviceStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<Object> list = new ArrayList<>();
+ for (BasDevp basDevp:basDevps){
+ list.add(basDevp);
+ }
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ list.add(basCrnp);
+ }
+ return R.ok(list);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/jarStatus")
+ @AppAuth(memo = "纭寲缃愮姸鎬佹煡璇㈡帴鍙�")
+ @Transactional
+ public R jarStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "纭寲缃愮姸鎬佹煡璇㈡帴鍙�", request);
+ List<JarStateTableVo> list = new ArrayList<>();
+ List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
+ for (BasJar basJar : jars) {
+ // 琛ㄦ牸琛�
+ JarStateTableVo vo = new JarStateTableVo();
+ vo.setJarNo(basJar.getJarNo()); // JAR鍙�
+ list.add(vo);
+
+ vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc); // 鐘舵��
+ vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
+ vo.setRegion(basJar.getRegion());
+ vo.setJarCode(basJar.getJarCode());
+ vo.setJarErr(basJar.getJarErr$());
+ vo.setJarMastTableVoList(openService.getJatIdList(vo.getJarNo()));
+ }
+ return R.ok().add(list);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/mesLocStatus")
+ @AppAuth(memo = "搴撳瓨淇℃伅鏌ヨ鎺ュ彛")
+ @Transactional
+ public R mesLocStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "搴撳瓨淇℃伅鏌ヨ鎺ュ彛", request);
+ List<LocDetlMesVo> list = locDetlService.selectLocDetlMesAll();
+ return R.ok().add(list);
+ }
+
+ @PostMapping("/overturn/empty")
+ @AppAuth(memo = "缈昏浆鍚庡厑璁稿洖搴撴帴鍙�")
+ @Transactional
+ public R mesOverturnEmpty(@RequestHeader String appkey,
+ @RequestParam Integer devNo,
+ HttpServletRequest request) {
+ auth(appkey, "绔欑偣鍙�"+devNo, request);
+ RgvOneSign sign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","sign"+devNo));
+ if (Cools.isEmpty(sign)) {
+ return R.error().add("缈昏浆绔欎俊鎭湁璇�");
+ }
+ sign.setRgvOneSign(1);
+ rgvOneSignService.updateById(sign);
+ return R.ok();
+ }
+ /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/
+
}
--
Gitblit v1.9.1