From 8d4540dcd0c3242474538cd8760723b9fe36c308 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:42:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9789baa..ee9f0b8 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,13 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
-import com.core.common.*;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +43,8 @@
@GetMapping("/order/delete/v1")
@AppAuth(memo = "璁㈠崟淇℃伅鍒犻櫎")
public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
- @RequestParam String orderNo,
- HttpServletRequest request) {
+ @RequestParam String orderNo,
+ HttpServletRequest request) {
auth(appkey, orderNo, request);
if (Cools.isEmpty(orderNo)) {
return R.parse(BaseRes.PARAM);
@@ -57,15 +58,15 @@
@PostMapping("/tagSync/v1")
@AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
public synchronized R tagSync(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) List<Map<String,String>> param,
- HttpServletRequest request) {
+ @RequestBody(required = false) List<Map<String, String>> param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
ArrayList<TagParam> params = new ArrayList<>();
- for (Map<String,String> map : param) {
- TagParam tagParam = new TagParam(map);
+ for (Map<String, String> map : param) {
+ TagParam tagParam = new TagParam(map);
params.add(tagParam);
}
@@ -85,26 +86,26 @@
return R.parse(BaseRes.PARAM);
}
try {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getSuperTaskNo()).eq("crn_no",7));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getSuperTaskNo()).eq("crn_no", 7));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鍥涘悜搴撲换鍔℃湭鎵惧埌");
}
- if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10|| wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
wrkMast.setWrkSts(4L);
- }else {
+ } else {
wrkMast.setWrkSts(14L);
}
- if (!wrkMastService.updateById(wrkMast)){
+ wrkMast.setModiTime(new Date());
+ if (!wrkMastService.updateById(wrkMast)) {
return R.error("鏇存柊澶辫触");
}
- }catch (Exception e) {
+ } catch (Exception e) {
throw new CoolException(e);
}
return R.ok();
}
-
@PostMapping("/locDetl/select/time/v1")
@@ -123,7 +124,7 @@
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -135,8 +136,8 @@
@PostMapping("/orderSync/default/v1")
@AppAuth(memo = "璁㈠崟淇℃伅鍚屾鎺ュ彛")
public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) GTOrderParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) GTOrderParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -144,7 +145,6 @@
return R.ok();
}
-
/****************************************************************************/
@@ -253,21 +253,19 @@
return R.ok().add(openService.queryStock());
}
- private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
- request.setAttribute("cache", obj);
- if (!auth) {
- return;
- }
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- if (!APP_KEY_LIST.contains(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (!auth) {
+ return;
}
-
-
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
/**
--
Gitblit v1.9.1