From c2dbde3d4826946e7a40fff6efeb08547e4ab75a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 25 三月 2025 14:22:37 +0800
Subject: [PATCH] art: 设备台账-分页查询修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index fdb9c2a..c49ecfe 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -8,10 +8,15 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -19,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
/**
* @Description: 璁惧鍙拌处
@@ -34,25 +40,26 @@
@Autowired
private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private IMdcEquipmentService mdcEquipmentService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
* @param eamEquipment
* @param pageNo
* @param pageSize
- * @param req
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
+// @AutoLog(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鍙拌处-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamEquipment eamEquipment,
+ public Result<?> queryPageList(EamEquipmentQuery eamEquipment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
- Page<EamEquipment> page = new Page<EamEquipment>(pageNo, pageSize);
- IPage<EamEquipment> pageList = eamEquipmentService.page(page, queryWrapper);
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+// QueryWrapper<EamEquipment> queryWrapper = QueryGenerator.initQueryWrapper(eamEquipment, req.getParameterMap());
+ IPage<EamEquipment> page = new Page<>(pageNo, pageSize);
+ IPage<EamEquipment> pageList = eamEquipmentService.queryPageList(page, eamEquipment);
return Result.OK(pageList);
}
@@ -62,13 +69,22 @@
* @param eamEquipment
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-娣诲姞")
+// @AutoLog(value = "璁惧鍙拌处-娣诲姞")
@ApiOperation(value = "璁惧鍙拌处-娣诲姞", notes = "璁惧鍙拌处-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamEquipment eamEquipment) {
- boolean b = eamEquipmentService.saveEquipment(eamEquipment);
- if (!b) {
- Result.OK("娣诲姞澶辫触锛�");
+ EamEquipment entity = eamEquipmentService.saveEquipment(eamEquipment);
+ if (entity == null) {
+ return Result.OK("娣诲姞澶辫触锛�");
+ }
+ //璋冪敤mdcEquipment鎻掑叆MDC璁惧
+ if(CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
+ //鎻掑叆MDC璁惧
+ MdcEquipment mdcEquipment = new MdcEquipment();
+ mdcEquipment.setEquipmentId(entity.getEquipmentCode());
+ mdcEquipment.setEquipmentType(entity.getDeviceType());
+ mdcEquipment.setEquipmentName(entity.getEquipmentName());
+ mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
}
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -79,7 +95,6 @@
* @param eamEquipment
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-缂栬緫")
@ApiOperation(value = "璁惧鍙拌处-缂栬緫", notes = "璁惧鍙拌处-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamEquipment eamEquipment) {
@@ -93,7 +108,6 @@
* @param id
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-閫氳繃id鍒犻櫎")
@ApiOperation(value = "璁惧鍙拌处-閫氳繃id鍒犻櫎", notes = "璁惧鍙拌处-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
@@ -107,7 +121,6 @@
* @param ids
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-鎵归噺鍒犻櫎")
@ApiOperation(value = "璁惧鍙拌处-鎵归噺鍒犻櫎", notes = "璁惧鍙拌处-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@@ -121,7 +134,6 @@
* @param id
* @return
*/
- @AutoLog(value = "璁惧鍙拌处-閫氳繃id鏌ヨ")
@ApiOperation(value = "璁惧鍙拌处-閫氳繃id鏌ヨ", notes = "璁惧鍙拌处-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
@@ -152,4 +164,18 @@
return super.importExcel(request, response, EamEquipment.class);
}
+ @ApiOperation(value = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�", notes = "璁惧琛�-閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�")
+ @GetMapping(value = "/loadTreeListByProductionIds")
+ public Result<List<EamEquipmentTree>> loadTreeListByProductionIds(@RequestParam(name = "ids", required = true) String ids) {
+ Result<List<EamEquipmentTree>> result = new Result<>();
+ try {
+ List<EamEquipmentTree> mdcEquipmentTreeList = eamEquipmentService.loadTreeListByProductionIds(ids);
+ result.setSuccess(true);
+ result.setResult(mdcEquipmentTreeList);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.3