From b46dc3bc339ed04f72b091c3880d20b9512b18c2 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 12 七月 2024 09:07:32 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OpenController.java | 123 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 108 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index a37f3c6..1ff367d 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,15 +1,21 @@ 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.BasCrnp; +import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.param.*; +import com.zy.asrs.service.BasCrnpService; +import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.OpenService; import com.zy.common.model.DetlDto; 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; @@ -32,8 +38,12 @@ @Autowired private OpenService openService; + @Autowired + private BasDevpService basDevpService; + @Autowired + private BasCrnpService basCrnpService; - /*@PostMapping("/order/matSync/default/v1") + @PostMapping("/order/matSync/default/v1") @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛") public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, @@ -44,7 +54,7 @@ } openService.syncMat(param); return R.ok(); - }*/ + } /** * 娣诲姞鍏ュ簱鍗� @@ -197,7 +207,7 @@ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭� */ @PostMapping("/labeller/mat/auth/v1") - @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") + @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀� public synchronized R labellerMat(@RequestHeader(required = false) String appkey, @RequestBody LabellerMatParam param, HttpServletRequest request) { @@ -209,25 +219,51 @@ * 璐存爣鏈鸿创鏍囧畬鎴� */ @PostMapping("/labeller/complete/auth/v1") - @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") + @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(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("/palletizing/complete/auth/v1") - @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�") - public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey, - @RequestBody PalletizingCompleteParam param, - HttpServletRequest request) { + @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.palletizingComplete(param); + openService.balconyComplete(param); return R.ok(param); } @@ -258,9 +294,66 @@ return R.ok(param); } - - - /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/ + /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/ + + /** + * 浜冲窞鐓滄槦浠诲姟涓嬪彂 // 灏忔枡绠辨姇鏂欏畬鎴愮粍鎵� + */ + @PostMapping("/small/containers/auth/v1") + @AppAuth(memo = "灏忔枡绠辨姇鏂欏畬鎴愮粍鎵�") + 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); + } + /*...........................浜冲窞鐓滄槦..............浠ヤ笂.............浜冲窞鐓滄槦...........................*/ } -- Gitblit v1.9.1