From 54f1d5ed531f609cb3fdbba47cd3a88c0a50d4e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 08 六月 2024 22:23:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index f55b15f..2d8aa66 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.*;
@@ -125,9 +123,11 @@
return R.ok();
}
+
+
@PostMapping("/table/jar/state")
-// @ManagerAuth(memo = "JAR淇℃伅琛�")
- public R jarStateTable(){
+ @ManagerAuth(memo = "RGV淇℃伅琛�")
+ 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() == 1?"鑱旀満":"鑴辨満" ); // 妯″紡鐘舵��
+ vo.setJarStatus(JarStatusType.get(basJar.getJarMode()).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