From bef6c5cb4431e35008e55849ee7c0bd62acd4fbf Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 09 七月 2024 20:21:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 1a956d9..5af2626 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -1,21 +1,19 @@
package com.zy.asrs.controller;
-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.entity.BasJar;
-import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.vo.JarStateTableVo;
import com.zy.asrs.service.BasJarService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.common.model.enums.JarStatusType;
import com.zy.common.web.BaseController;
-import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -63,14 +61,14 @@
}
@RequestMapping(value = "/basJar/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板纭寲缃�")
public R add(BasJar basJar) {
basJarService.insert(basJar);
return R.ok();
}
@RequestMapping(value = "/basJar/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼纭寲缃�")
public R update(BasJar basJar){
if (Cools.isEmpty(basJar) || null==basJar.getJarNo()){
return R.error();
@@ -80,7 +78,7 @@
}
@RequestMapping(value = "/basJar/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎纭寲缃�")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
basJarService.deleteById(id);
@@ -89,7 +87,7 @@
}
@RequestMapping(value = "/basJar/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀵煎嚭纭寲缃愬熀纭�淇℃伅")
public R export(@RequestBody JSONObject param){
EntityWrapper<BasJar> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@@ -125,9 +123,11 @@
return R.ok();
}
+
+
@PostMapping("/table/jar/state")
// @ManagerAuth(memo = "JAR淇℃伅琛�")
- public R jarStateTable(){
+ public R rgvStateTable(){
List<JarStateTableVo> list = new ArrayList<>();
List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
for (BasJar basJar : jars) {
@@ -135,8 +135,17 @@
JarStateTableVo vo = new JarStateTableVo();
vo.setJarNo(basJar.getJarNo()); // RGV鍙�
list.add(vo);
+
+ vo.setJarMode(basJar.getJarMode$()); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarStatus()).desc); // 鐘舵��
+ vo.setJarNo(basJar.getJarNo()); // 宸ヤ綅1浠诲姟鍙�
+ vo.setRegion(basJar.getRegion());
+ vo.setJarCode(basJar.getJarCode());
+ vo.setJarErr(basJar.getJarErr$());
+
}
- return R.ok().add(jars);
+ return R.ok().add(list);
}
+
}
--
Gitblit v1.9.1