From 5fb7dae61f9d6c38c37014cf27f28107c6f52e74 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 十一月 2025 16:18:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasDevpController.java | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 15e356c..086dabb 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -1,17 +1,19 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
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.domain.param.InitDevpStationParam;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.service.BasDevpService;
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.entity.BasDevp;
-import com.zy.asrs.service.BasDevpService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +28,7 @@
@RequestMapping(value = "/basDevp/{id}/auth")
@ManagerAuth
- public R get(@PathVariable("id") Long id) {
+ public R get(@PathVariable("id") String id) {
return R.ok(basDevpService.selectById(String.valueOf(id)));
}
@@ -36,10 +38,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- excludeTrash(param);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
convert(param, wrapper);
+ allLike(BasDevp.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -58,46 +62,36 @@
}
@RequestMapping(value = "/basDevp/add/auth")
- @ManagerAuth(memo = "绔欑偣娣诲姞")
+ @ManagerAuth
public R add(BasDevp basDevp) {
- basDevp.setModiUser(getUserId());
- basDevp.setModiTime(new Date());
- basDevp.setAppeUser(getUserId());
- basDevp.setAppeTime(new Date());
basDevpService.insert(basDevp);
return R.ok();
}
@RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth(memo = "绔欑偣淇敼")
+ @ManagerAuth
public R update(BasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
+ if (Cools.isEmpty(basDevp) || null==basDevp.getId()){
return R.error();
}
- basDevp.setModiUser(getUserId());
- basDevp.setModiTime(new Date());
basDevpService.updateById(basDevp);
- return R.ok("淇敼瀹屾垚");
+ return R.ok();
}
@RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
- List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (BasDevp entity : list){
- basDevpService.delete(new EntityWrapper<>(entity));
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Integer[] ids){
+ for (Integer id : ids){
+ basDevpService.deleteById(id);
}
return R.ok();
}
@RequestMapping(value = "/basDevp/export/auth")
- @ManagerAuth(memo = "绔欑偣瀵煎嚭")
+ @ManagerAuth
public R export(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
convert(map, wrapper);
List<BasDevp> list = basDevpService.selectList(wrapper);
@@ -108,13 +102,13 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
- wrapper.like("dev_no", condition);
+ wrapper.like("id", condition);
Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (BasDevp basDevp : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", basDevp.getDevNo());
- map.put("value", basDevp.getDevNo());
+ map.put("id", basDevp.getId());
+ map.put("value", basDevp.getId());
result.add(map);
}
return R.ok(result);
@@ -130,4 +124,37 @@
return R.ok();
}
+ @PostMapping(value = "/basDevp/initStation/auth")
+ @ManagerAuth
+ public R initStation(@RequestBody InitDevpStationParam param) {
+ if(Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("devp_no", param.getDevpNo()));
+ if(Cools.isEmpty(basDevp)){
+ return R.error("璁惧涓嶅瓨鍦�");
+ }
+
+ if(Cools.isEmpty(param.getStationNo())){
+ return R.error("璇烽�夋嫨瑕佸垵濮嬪寲鐨勭珯鐐圭紪鍙�");
+ }
+
+ if(Cools.isEmpty(param.getInitLength())){
+ return R.error("璇疯緭鍏ュ垵濮嬪寲闀垮害");
+ }
+
+ List<HashMap<String, Object>> list = new ArrayList<>();
+ for (int i = param.getStationNo(); i < param.getStationNo() + param.getInitLength(); i++) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("devpNo", param.getDevpNo());
+ map.put("stationId", i);
+ list.add(map);
+ }
+
+ basDevp.setStationList(JSON.toJSONString(list));
+ basDevpService.updateById(basDevp);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1