From 4dda0622ef6e588284dbdb7a155f58b622615e94 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 13:33:58 +0800
Subject: [PATCH] art: 设备管理-三保，接口添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java | 200 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 144 insertions(+), 56 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
index 2406e16..790cd00 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceOrderController.java
@@ -1,6 +1,6 @@
package org.jeecg.modules.eam.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
@@ -9,16 +9,23 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
+import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
+import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
- /**
+/**
* @Description: 璁惧涓夌骇淇濆吇
* @Author: jeecg-boot
* @Date: 2025-04-29
@@ -27,89 +34,84 @@
@Slf4j
@Api(tags="璁惧涓夌骇淇濆吇")
@RestController
-@RequestMapping("/eam/eamThirdMaintenanceOrder")
+@RequestMapping("/eam/thirdMaintenanceOrder")
public class EamThirdMaintenanceOrderController extends JeecgController<EamThirdMaintenanceOrder, IEamThirdMaintenanceOrderService> {
@Autowired
private IEamThirdMaintenanceOrderService eamThirdMaintenanceOrderService;
-
+ @Autowired
+ private ISysBusinessCodeRuleService businessCodeRuleService;
+
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
- * @param eamThirdMaintenanceOrder
+ * @param query
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧涓夌骇淇濆吇-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<?> queryPageList(EamThirdMaintenanceOrder eamThirdMaintenanceOrder,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ public Result<?> queryPageList(EamThirdMaintenanceQuery query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceOrder, req.getParameterMap());
Page<EamThirdMaintenanceOrder> page = new Page<EamThirdMaintenanceOrder>(pageNo, pageSize);
- IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.page(page, queryWrapper);
+ IPage<EamThirdMaintenanceOrder> pageList = eamThirdMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
- * @param eamThirdMaintenanceOrder
+ * @param request
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-娣诲姞")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-娣诲姞", notes="璁惧涓夌骇淇濆吇-娣诲姞")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-娣诲姞", notes = "璁惧涓夌骇淇濆吇-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamThirdMaintenanceOrder eamThirdMaintenanceOrder) {
- eamThirdMaintenanceOrderService.save(eamThirdMaintenanceOrder);
+ public Result<?> add(@RequestBody EamThirdMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CODE_RULE);
+ request.setOrderNum(codeSeq);
+ request.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
+ boolean b = eamThirdMaintenanceOrderService.addMaintenance(request);
+ if (!b) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
- * @param eamThirdMaintenanceOrder
+ * @param request
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-缂栬緫")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-缂栬緫", notes="璁惧涓夌骇淇濆吇-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamThirdMaintenanceOrder eamThirdMaintenanceOrder) {
- eamThirdMaintenanceOrderService.updateById(eamThirdMaintenanceOrder);
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-缂栬緫", notes = "璁惧涓夌骇淇濆吇-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamThirdMaintenanceRequest request) {
+ if (request == null) {
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if (CollectionUtil.isEmpty(request.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ boolean b = eamThirdMaintenanceOrderService.editMaintenance(request);
+ if (!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇-閫氳繃id鍒犻櫎")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-閫氳繃id鍒犻櫎", notes="璁惧涓夌骇淇濆吇-閫氳繃id鍒犻櫎")
- @DeleteMapping(value = "/delete")
- public Result<?> delete(@RequestParam(name="id",required=true) String id) {
- eamThirdMaintenanceOrderService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "璁惧涓夌骇淇濆吇-鎵归噺鍒犻櫎")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-鎵归噺鍒犻櫎", notes="璁惧涓夌骇淇濆吇-鎵归噺鍒犻櫎")
- @DeleteMapping(value = "/deleteBatch")
- public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.eamThirdMaintenanceOrderService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
+
/**
* 閫氳繃id鏌ヨ
*
@@ -117,10 +119,96 @@
* @return
*/
@AutoLog(value = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ", notes="璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ", notes = "璁惧涓夌骇淇濆吇-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamThirdMaintenanceOrder eamThirdMaintenanceOrder = eamThirdMaintenanceOrderService.getById(id);
- return Result.OK(eamThirdMaintenanceOrder);
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamThirdMaintenanceOrder order = eamThirdMaintenanceOrderService.getById(id);
+ return Result.OK(order);
+ }
+
+ /**
+ * 閫氳繃id浣滃簾
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-浣滃簾")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-浣滃簾", notes = "璁惧涓夌骇淇濆吇-浣滃簾")
+ @DeleteMapping(value = "/abolish")
+ public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.getById(id);
+ if (entity == null) {
+ return Result.error("瑕佷綔搴熺殑鏁版嵁涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ return Result.error("璇ョ姸鎬佺殑鏁版嵁涓嶅厑璁歌繘琛屼綔搴燂紒");
+ }
+ entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+ eamThirdMaintenanceOrderService.updateById(entity);
+ return Result.OK("浣滃簾鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id棰嗗彇
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧涓夌骇淇濆吇-棰嗗彇")
+ @ApiOperation(value = "璁惧涓夌骇淇濆吇-棰嗗彇", notes = "璁惧涓夌骇淇濆吇-棰嗗彇")
+ @GetMapping(value = "/collect")
+ public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamThirdMaintenanceOrderService.collect(id);
+ if (!b) {
+ Result.OK("棰嗗彇澶辫触!");
+ }
+ return Result.OK("棰嗗彇鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺浣滃簾
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾", notes = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @DeleteMapping(value = "/abolishBatch")
+ public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.getById(id);
+ if (entity != null && ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ entity.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+ eamThirdMaintenanceOrderService.updateById(entity);
+ i.getAndIncrement();
+ }
+ });
+ return Result.OK("鎵归噺浣滃簾鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
+ }
+
+ /**
+ * 閫氳繃id鎵归噺棰嗗彇
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-鎵归噺棰嗗彇")
+ @DeleteMapping(value = "/collectBatch")
+ public Result<?> collectBatch(@RequestParam(name = "ids", required = true) String ids) {
+ List<String> list = Arrays.asList(ids.split(","));
+ AtomicInteger i = new AtomicInteger();
+ list.forEach(id -> {
+ EamThirdMaintenanceOrder entity = eamThirdMaintenanceOrderService.getById(id);
+ if (entity != null && ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ boolean b = eamThirdMaintenanceOrderService.collect(id);
+ if (b) {
+ i.getAndIncrement();
+ }
+ }
+ });
+ return Result.OK("鎵归噺棰嗗彇鎴愬姛 " + i.get() + " 鏉″伐鍗曪紒");
}
}
--
Gitblit v1.9.3