From ab41622d30946f83b34e5a5d881741237628f6f1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 14:26:39 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
index 131b34b..27bee63 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
@@ -10,8 +10,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkDetlLog;
import com.zy.asrs.entity.WrkDetlLog;
-import com.zy.asrs.service.WrkDetlLogService;
+import com.zy.asrs.service.AgvWrkDetlLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,12 +26,12 @@
public class AgvWrkDetlLogController extends BaseController {
@Autowired
- private WrkDetlLogService wrkDetlLogService;
+ private AgvWrkDetlLogService agvWrkDetlLogService;
@RequestMapping(value = "/agvWrkDetlLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
- return R.ok(wrkDetlLogService.selectById(String.valueOf(id)));
+ return R.ok(agvWrkDetlLogService.selectById(String.valueOf(id)));
}
/**
@@ -42,14 +43,14 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam Integer wrk_no,
@RequestParam String ioTime) {
- EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ EntityWrapper<AgvWrkDetlLog> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(wrk_no) && wrk_no != 0) {
wrapper.eq("wrk_no", wrk_no);
}
if (!Cools.isEmpty(ioTime)) {
wrapper.eq("io_time", DateUtils.convert(ioTime, DateUtils.yyyyMMddHHmmsssss_F));
}
- return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(agvWrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/agvWrkDetlLog/list/auth")
@@ -59,7 +60,7 @@
@RequestParam(required = false) String orderByField,
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
- EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ EntityWrapper<AgvWrkDetlLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
@@ -67,7 +68,7 @@
} else {
wrapper.orderBy("modi_time", false);
}
- return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(agvWrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
}
// 12.12鏂板锛屽伐浣滄槑缁嗗巻鍙叉。杩囨护鎵嬪姩鍙栨秷鐨勫伐浣滄槑缁�
@@ -81,15 +82,15 @@
@RequestParam Map<String, Object> param) {
try {
excludeTrash(param);
- EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ EntityWrapper<AgvWrkDetlLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
+ allLike(AgvWrkDetlLog.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
wrapper.orderBy("appe_time", false);
}
- return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ return R.ok(agvWrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
} catch (Exception e) {
return R.error("寮傚父" + e);
}
@@ -110,30 +111,30 @@
@RequestMapping(value = "/agvWrkDetlLog/add/auth")
@ManagerAuth
- public R add(WrkDetlLog wrkDetlLog) {
- wrkDetlLogService.insert(wrkDetlLog);
+ public R add(AgvWrkDetlLog wrkDetlLog) {
+ agvWrkDetlLogService.insert(wrkDetlLog);
return R.ok();
}
@RequestMapping(value = "/agvWrkDetlLog/update/auth")
@ManagerAuth
- public R update(WrkDetlLog wrkDetlLog) {
+ public R update(AgvWrkDetlLog wrkDetlLog) {
if (Cools.isEmpty(wrkDetlLog) || null == wrkDetlLog.getWrkNo()) {
return R.error();
}
- wrkDetlLogService.updateById(wrkDetlLog);
+ agvWrkDetlLogService.updateById(wrkDetlLog);
return R.ok();
}
@RequestMapping(value = "/agvWrkDetlLog/delete/auth")
@ManagerAuth
public R delete(@RequestParam String param) {
- List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
+ List<AgvWrkDetlLog> list = JSONArray.parseArray(param, AgvWrkDetlLog.class);
if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkDetlLog entity : list) {
- wrkDetlLogService.delete(new EntityWrapper<>(entity));
+ for (AgvWrkDetlLog entity : list) {
+ agvWrkDetlLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
}
@@ -141,22 +142,22 @@
@RequestMapping(value = "/agvWrkDetlLog/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param) {
- EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ EntityWrapper<AgvWrkDetlLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetlLog"));
convert(map, wrapper);
- List<WrkDetlLog> list = wrkDetlLogService.selectList(wrapper);
+ List<AgvWrkDetlLog> list = agvWrkDetlLogService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/agvWrkDetlLogQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ EntityWrapper<AgvWrkDetlLog> wrapper = new EntityWrapper<>();
wrapper.like("id", condition);
- Page<WrkDetlLog> page = wrkDetlLogService.selectPage(new Page<>(0, 10), wrapper);
+ Page<AgvWrkDetlLog> page = agvWrkDetlLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetlLog wrkDetlLog : page.getRecords()) {
+ for (AgvWrkDetlLog wrkDetlLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetlLog.getWrkNo());
map.put("value", wrkDetlLog.getWrkNo());
@@ -168,8 +169,8 @@
@RequestMapping(value = "/agvWrkDetlLog/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
- Wrapper<WrkDetlLog> wrapper = new EntityWrapper<WrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkDetlLogService.selectOne(wrapper)) {
+ Wrapper<AgvWrkDetlLog> wrapper = new EntityWrapper<AgvWrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != agvWrkDetlLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1