From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 三月 2025 16:10:29 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index c6a60b6..a12b7b1 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -1,25 +1,38 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.TaskWrkLog;
-import com.zy.asrs.service.TaskWrkLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.TaskWrkLogService;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+@Slf4j
@RestController
public class TaskWrkLogController extends BaseController {
+
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
+ @Autowired
+ private ApiLogService apiLogService;
@Autowired
private TaskWrkLogService taskWrkLogService;
@@ -32,23 +45,25 @@
@RequestMapping(value = "/taskWrkLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
wrapper.orderDesc(Collections.singleton("create_time"));
return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -65,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/taskWrkLog/update/auth")
- @ManagerAuth
- public R update(TaskWrkLog taskWrkLog){
- if (Cools.isEmpty(taskWrkLog)){
+ @RequestMapping(value = "/taskWrkLog/update/auth")
+ @ManagerAuth
+ public R update(TaskWrkLog taskWrkLog) {
+ if (Cools.isEmpty(taskWrkLog)) {
return R.error();
}
taskWrkLogService.updateById(taskWrkLog);
@@ -77,8 +92,8 @@
@RequestMapping(value = "/taskWrkLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskWrkLogService.deleteById(id);
}
return R.ok();
@@ -86,7 +101,7 @@
@RequestMapping(value = "/taskWrkLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("taskWrkLog"));
@@ -102,7 +117,7 @@
wrapper.like("id", condition);
Page<TaskWrkLog> page = taskWrkLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TaskWrkLog taskWrkLog : page.getRecords()){
+ for (TaskWrkLog taskWrkLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", taskWrkLog.getTaskNo());
map.put("value", taskWrkLog.getTaskNo());
@@ -115,10 +130,54 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TaskWrkLog> wrapper = new EntityWrapper<TaskWrkLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskWrkLogService.selectOne(wrapper)){
+ if (null != taskWrkLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TaskWrkLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
+ @RequestMapping(value = "/taskWrkLog/resubmitTheTask/auth")
+ @ManagerAuth(memo = "閲嶆柊涓婃姤浠诲姟瀹岀粨")
+ public R resubmitTheTask(@RequestParam String taskNo) {
+ TaskWrkLog taskWrk = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", taskNo));
+ if (!Cools.isEmpty(taskWrk)) {
+ HashMap<String, Object> headParam = new HashMap<>();
+ if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
+ headParam.put("Result", 1);
+ } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
+ headParam.put("Result", 2);
+ }
+ String response = "";
+ Boolean bool = false;
+ try {
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ log.info("閲嶆柊涓婃姤浠诲姟瀹岀粨={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(TaskExecCallback)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.get("ReturnStatus").equals(0)) {
+ bool = true;
+ }
+ } catch (Exception e) {
+ log.error("閲嶆柊涓婃姤浠诲姟瀹岀粨澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ } finally {
+ apiLogService.save("閲嶆柊涓婃姤浠诲姟瀹岀粨"
+ , wmsUrl + TaskExecCallback
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1