From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index b65ab9a..4623e8a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -1,7 +1,6 @@
package org.jeecg.modules.eam.controller;
import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -16,12 +15,13 @@
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.FileUtil;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
+import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
import org.jeecg.modules.eam.dto.MaintenanceStandardImport;
import org.jeecg.modules.eam.dto.WeekMaintenanceStandardImport;
import org.jeecg.modules.eam.entity.EamEquipment;
@@ -79,9 +79,9 @@
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamMaintenanceStandard> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandard, req.getParameterMap());
+// QueryWrapper<EamMaintenanceStandard> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandard, req.getParameterMap());
Page<EamMaintenanceStandard> page = new Page<EamMaintenanceStandard>(pageNo, pageSize);
- IPage<EamMaintenanceStandard> pageList = eamMaintenanceStandardService.page(page, queryWrapper);
+ IPage<EamMaintenanceStandard> pageList = eamMaintenanceStandardService.queryPageList(page, eamMaintenanceStandard);
return Result.OK(pageList);
}
@@ -134,6 +134,46 @@
}
/**
+ * 鍗囩増
+ *
+ * @param standardRequest
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-鍗囩増")
+ @ApiOperation(value = "淇濆吇鏍囧噯-鍗囩増", notes = "淇濆吇鏍囧噯-鍗囩増")
+ @RequestMapping(value = "/upgrade", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> upgrade(@RequestBody EamMaintenanceStandardRequest standardRequest) {
+ if (standardRequest == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
+ standardRequest.setStandardCode(codeSeq);
+ boolean b = eamMaintenanceStandardService.upgradeMaintenanceStandard(standardRequest);
+ if (!b) {
+ return Result.error("鍗囩増澶辫触锛�");
+ }
+ return Result.OK("鍗囩増鎴愬姛!");
+ }
+
+ /**
+ * 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
+ * @param keyword 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯")
+ @ApiOperation(value = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯", notes = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯")
+ @GetMapping(value = "/listByUser")
+ public Result<?> listByUser(@RequestParam(name = "keyword", required = false) String keyword,
+ @RequestParam(name = "maintenanceCategory", required = false) String maintenanceCategory) {
+ List<EamMaintenanceStandard> list = eamMaintenanceStandardService.queryListBykeywordAndCategory(keyword, maintenanceCategory);
+ return Result.OK(list);
+ }
+
+ /**
* 閫氳繃id鍒犻櫎
*
* @param id
@@ -143,8 +183,30 @@
@ApiOperation(value = "淇濆吇鏍囧噯-閫氳繃id鍒犻櫎", notes = "淇濆吇鏍囧噯-閫氳繃id鍒犻櫎")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
- eamMaintenanceStandardService.removeById(id);
+ EamMaintenanceStandard entity = eamMaintenanceStandardService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamMaintenanceStandardService.updateById(entity);
+ }
return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id浣滃簾
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "淇濆吇鏍囧噯-浣滃簾")
+ @ApiOperation(value = "淇濆吇鏍囧噯-浣滃簾", notes = "淇濆吇鏍囧噯-浣滃簾")
+ @DeleteMapping(value = "/abolish")
+ public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
+ EamMaintenanceStandard entity = eamMaintenanceStandardService.getById(id);
+ if (entity != null) {
+ entity.setStandardStatus(MaintenanceStandardStatusEnum.ABOLISH.name());
+ eamMaintenanceStandardService.updateById(entity);
+ }
+ return Result.OK("浣滃簾鎴愬姛!");
}
/**
@@ -157,7 +219,14 @@
@ApiOperation(value = "淇濆吇鏍囧噯-鎵归噺鍒犻櫎", notes = "淇濆吇鏍囧噯-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.eamMaintenanceStandardService.removeByIds(Arrays.asList(ids.split(",")));
+ List<String> list = Arrays.asList(ids.split(","));
+ list.forEach(id -> {
+ EamMaintenanceStandard entity = eamMaintenanceStandardService.getById(id);
+ if (entity != null) {
+ entity.setDelFlag(CommonConstant.DEL_FLAG_1);
+ eamMaintenanceStandardService.updateById(entity);
+ }
+ });
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
}
--
Gitblit v1.9.3