From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasDevpController.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index cd89e40..4b3ef7e 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.param.BasDevpInitParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
@@ -23,6 +24,30 @@
@Autowired
private BasDevpService basDevpService;
+
+ @RequestMapping(value = "/basDevp/init/auth")
+ @ManagerAuth(memo = "response.station_init")
+ public R init(BasDevpInitParam param) {
+ List<BasDevp> list = new ArrayList<>();
+ for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (Cools.isEmpty(basDevp)){
+ BasDevp basDevp1 = new BasDevp();
+ basDevp1.setDevNo(devNo);
+ basDevp1.setInEnable("Y");
+ basDevp1.setOutEnable("Y");
+ basDevp1.setAutoing("Y");
+ basDevp1.setLoading("Y");
+ basDevp1.setCanining("Y");
+ basDevp1.setCanouting("Y");
+ basDevp1.setModiUser(getUserId());
+ basDevp1.setModiTime(new Date());
+ list.add(basDevp1);
+ }
+ }
+ basDevpService.insertBatch(list);
+ return R.ok("response.init_success");
+ }
@RequestMapping(value = "/basDevp/{id}/auth")
@ManagerAuth
@@ -58,43 +83,43 @@
}
@RequestMapping(value = "/basDevp/add/auth")
- @ManagerAuth(memo = "绔欑偣娣诲姞")
+ @ManagerAuth(memo = "response.station_add")
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();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth(memo = "绔欑偣淇敼")
+ @ManagerAuth(memo = "response.station_update")
public R update(BasDevp basDevp){
if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
- return R.error();
+ return R.error("response.param_error");
}
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
basDevpService.updateById(basDevp);
- return R.ok("淇敼瀹屾垚");
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth(memo = "绔欑偣鍒犻櫎")
+ @ManagerAuth(memo = "response.station_delete")
public R delete(@RequestParam String param){
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (BasDevp entity : list){
basDevpService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/basDevp/export/auth")
- @ManagerAuth(memo = "绔欑偣瀵煎嚭")
+ @ManagerAuth(memo = "response.station_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
@@ -125,9 +150,11 @@
public R query(@RequestBody JSONObject param) {
Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != basDevpService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(BasDevp.class, String.valueOf(param.get("key"))));
+ return r;
}
- return R.ok();
+ return R.ok("response.operation_success");
}
}
--
Gitblit v1.9.1