From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvWarnController.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWarnController.java b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
index 518fc41..9cd3b3a 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWarnController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.zy.asrs.entity.AgvWarn;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.param.AgvWarnBody;
@@ -12,11 +13,13 @@
import com.zy.asrs.service.AgvWarnService;
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.utils.AppAuthUtil;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@@ -40,6 +43,7 @@
*/
@Slf4j
@RestController
+@RequestMapping("/agv")
public class AgvWarnController extends BaseController {
@@ -57,25 +61,32 @@
@PostMapping("/service/rest/agvCallbackService/warnCallback")
@AppAuth(memo = "AGV鍛婅鍥炶皟")
public Object taskEventStaus(@RequestBody AgvWarnCallBackParam param, HttpServletRequest request) {
- log.info("AGV鍛婅鍥炶皟:{}", JSON.toJSONString(param));
- List<AgvWarnBody> data = param.getData();
+ //og.info("AGV鍛婅鍥炶皟:{}", JSON.toJSONString(param));
+ AppAuthUtil.auth("", param, request);
+ List<AgvWarnBody> agvWarnBodies = param.getData();
+ // List<AgvWarnBody> agvWarnBodies = JSONArray.parseArray(data, AgvWarnBody.class);
AgvWarn agvWarn = null;
List<AgvWarn> agvWarns = new ArrayList<>();
List<AgvWarn> updates = new ArrayList<>();
- for (AgvWarnBody body : data) {
- List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()).eq("warn_content", body.getWarnContent()));
+ for (AgvWarnBody body : agvWarnBodies) {
+ List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("warn_content", body.getWarnContent()));
if (Cools.isEmpty(agvWarnList)) {
agvWarn = new AgvWarn();
- agvWarn.setBeginTime(body.getBeginTime());
+ agvWarn.setBeginTime(body.getBeginDate());
agvWarn.setAppeTime(new Date());
agvWarn.setTimes(0);
+ agvWarn.setModiTime(DateUtils.convert(body.getBeginDate(), DateUtils.yyyyMMddHHmmss_F));
agvWarn.setRobotCode(body.getRobotCode());
agvWarn.setWarnContent(body.getWarnContent());
if (body.getTaskCode() != null) {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectById(body.getTaskCode());
- if (agvWrkMast != null) {
- agvWarn.setLocNo(agvWrkMast.getLocNo());
- agvWarn.setSourceLocNo(agvWrkMast.getSourceLocNo());
+ try {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectById(Math.abs(Integer.parseInt(body.getTaskCode())));
+ if (agvWrkMast != null) {
+ agvWarn.setLocNo(agvWrkMast.getLocNo());
+ agvWarn.setSourceLocNo(agvWrkMast.getSourceLocNo());
+ }
+ } catch (Exception e) {
+ log.info("浠诲姟涓嶅瓨鍦�");
}
}
agvWarns.add(agvWarn);
@@ -84,10 +95,14 @@
agvWarn.setWarnContent(agvWarn.getWarnContent().contains(body.getWarnContent()) ? body.getWarnContent() : agvWarn.getWarnContent() + "銆�" + body.getWarnContent());
agvWarn.setModiTime(new Date());
if (body.getTaskCode() != null) {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectById(body.getTaskCode());
- if (agvWrkMast != null) {
- agvWarn.setLocNo(agvWrkMast.getLocNo());
- agvWarn.setSourceLocNo(agvWrkMast.getSourceLocNo());
+ try {
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectById(body.getTaskCode());
+ if (agvWrkMast != null) {
+ agvWarn.setLocNo(agvWrkMast.getLocNo());
+ agvWarn.setSourceLocNo(agvWrkMast.getSourceLocNo());
+ }
+ } catch (Exception e) {
+ log.info("浠诲姟涓嶅瓨鍦�");
}
}
updates.add(agvWarn);
@@ -100,20 +115,20 @@
agvWarnService.updateBatchById(updates);
}
Map<String, Object> result = new HashMap<>();
- logPost(param, JSONObject.toJSONString(result), true);
+ logPost(JSONObject.toJSONString(param), JSONObject.toJSONString(result), true);
result.put("code", 0);
result.put("message", "鎴愬姛");
result.put("reqCode", param.getReqCode());
return result;
}
- private void logPost(AgvWarnCallBackParam param, String response, boolean success) {
+ private void logPost(String param, String response, boolean success) {
apiLogService.save(
"ESS浠诲姟鍥炶皟",
"/phyzwms/agv/task/event/status",
null,
null,
- JSONObject.toJSONString(param),
+ param,
response,
success
);
--
Gitblit v1.9.1