From 9a9697c55fa66821cf74165ac2ae820182dae94d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:53 +0800
Subject: [PATCH] 设备维修对应接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 51 +++++++++++----------------------------------------
1 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
index 02044ac..3d9b22b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
@@ -7,24 +7,15 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.TranslateDictTextUtils;
-import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.ReportRepairEnum;
+import org.jeecg.modules.eam.dto.EamReportRepairDto;
import org.jeecg.modules.eam.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
+import org.jeecg.modules.eam.request.EamReportRepairRequest;
import org.jeecg.modules.eam.service.IEamReportRepairService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
@@ -71,22 +62,22 @@
public Result<?> queryPageList(EamReportRepairQuery eamReportRepairQuery,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- Page<EamReportRepair> page = new Page<EamReportRepair>(pageNo, pageSize);
- IPage<EamReportRepair> pageList = eamReportRepairService.pageList(page, eamReportRepairQuery);
+ Page<EamReportRepairDto> page = new Page<EamReportRepairDto>(pageNo, pageSize);
+ IPage<EamReportRepairDto> pageList = eamReportRepairService.pageList(page, eamReportRepairQuery);
return Result.OK(pageList);
}
/**
* 娣诲姞
*
- * @param eamReportRepair
+ * @param eamReportRepairRequest
* @return
*/
@AutoLog(value = "鏁呴殰鎶ヤ慨-娣诲姞")
@ApiOperation(value = "鏁呴殰鎶ヤ慨-娣诲姞", notes = "鏁呴殰鎶ヤ慨-娣诲姞")
@PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
- EamReportRepair b = eamReportRepairService.add(eamReportRepair);
+ public Result<?> add(@RequestBody EamReportRepairRequest eamReportRepairRequest) {
+ EamReportRepair b = eamReportRepairService.add(eamReportRepairRequest);
if(b == null) {
return Result.error("娣诲姞澶辫触锛�");
}
@@ -96,33 +87,20 @@
/**
* 缂栬緫
*
- * @param eamReportRepair
+ * @param eamReportRepairDto
* @return
*/
@AutoLog(value = "鏁呴殰鎶ヤ慨-缂栬緫")
@ApiOperation(value = "鏁呴殰鎶ヤ慨-缂栬緫", notes = "鏁呴殰鎶ヤ慨-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
- boolean b = eamReportRepairService.edit(eamReportRepair);
+ public Result<?> edit(@RequestBody EamReportRepairDto eamReportRepairDto) {
+ boolean b = eamReportRepairService.edit(eamReportRepairDto);
if(!b) {
return Result.error("缂栬緫澶辫触锛�");
}
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) {
- eamReportRepairService.update(new LambdaUpdateWrapper<EamReportRepair>().set(EamReportRepair::getReportStatus, ReportRepairEnum.ABOLISH.name()).eq(EamReportRepair::getId, id).eq(EamReportRepair::getReportStatus, ReportRepairEnum.WAIT_REPAIR.name()));
- return Result.OK("浣滃簾鎴愬姛!");
- }
/**
* 鎵归噺浣滃簾
@@ -135,11 +113,6 @@
@DeleteMapping(value = "/abolishBatch")
public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
List<EamReportRepair> eamReportRepairs = eamReportRepairService.listByIds(Arrays.asList(ids.split(",")));
- eamReportRepairs.forEach(eamReportRepair -> {
- if(ReportRepairEnum.ABOLISH.name().equals(eamReportRepair.getReportStatus())) {
- eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name());
- }
- });
this.eamReportRepairService.updateBatchById(eamReportRepairs);
return Result.OK("鎵归噺浣滃簾鎴愬姛锛�");
}
@@ -163,9 +136,7 @@
JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
translateDictTextUtils.translateField("createBy", eamReportRepair.getCreateBy(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("breakdownFlag", eamReportRepair.getBreakdownFlag(), item, "breakdown_flag");
- translateDictTextUtils.translateField("faultType", eamReportRepair.getFaultType(), item, "fault_reason_category");
- translateDictTextUtils.translateField("reportStatus", eamReportRepair.getReportStatus(), item, "report_repair_status");
- translateDictTextUtils.translateField("equipmentId", eamReportRepair.getEquipmentId(), item, "eam_equipment,id,equipment_code");
+ translateDictTextUtils.translateField("equipmentId", eamReportRepair.getEquipmentId(), item, "eam_equipment,id,equipment_code");
return Result.OK(item);
} catch (Exception e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
--
Gitblit v1.9.3