From 4788f8d86807296a3dce75b5dd428c0a8d5828db Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 17:12:39 +0800
Subject: [PATCH] 分类字典设置上级是否存在子节点修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 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 7a5d8e4..02044ac 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
@@ -4,13 +4,22 @@
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+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.entity.EamReportRepair;
import org.jeecg.modules.eam.request.EamReportRepairQuery;
@@ -21,6 +30,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -39,6 +50,12 @@
@Resource
private IEamReportRepairService eamReportRepairService;
+
+ @Resource
+ private ObjectMapper objectMapper;
+
+ @Resource
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -69,9 +86,10 @@
@ApiOperation(value = "鏁呴殰鎶ヤ慨-娣诲姞", notes = "鏁呴殰鎶ヤ慨-娣诲姞")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody EamReportRepair eamReportRepair) {
- eamReportRepair.setReportStatus(ReportRepairEnum.WAIT_REPAIR.name());
- eamReportRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
- eamReportRepairService.save(eamReportRepair);
+ EamReportRepair b = eamReportRepairService.add(eamReportRepair);
+ if(b == null) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -85,7 +103,10 @@
@ApiOperation(value = "鏁呴殰鎶ヤ慨-缂栬緫", notes = "鏁呴殰鎶ヤ慨-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) {
- eamReportRepairService.updateById(eamReportRepair);
+ boolean b = eamReportRepairService.edit(eamReportRepair);
+ if(!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -99,7 +120,7 @@
@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));
+ 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("浣滃簾鎴愬姛!");
}
@@ -114,38 +135,14 @@
@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 -> eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name()));
+ eamReportRepairs.forEach(eamReportRepair -> {
+ if(ReportRepairEnum.ABOLISH.name().equals(eamReportRepair.getReportStatus())) {
+ eamReportRepair.setReportStatus(ReportRepairEnum.ABOLISH.name());
+ }
+ });
this.eamReportRepairService.updateBatchById(eamReportRepairs);
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) {
-// eamReportRepairService.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.eamReportRepairService.removeByIds(Arrays.asList(ids.split(",")));
-// return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
-// }
/**
* 閫氳繃id鏌ヨ
@@ -158,7 +155,21 @@
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
EamReportRepair eamReportRepair = eamReportRepairService.getById(id);
- return Result.OK(eamReportRepair);
+ if (eamReportRepair == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹紒");
+ }
+ try {
+ String json = objectMapper.writeValueAsString(eamReportRepair);
+ 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");
+ return Result.OK(item);
+ } catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
--
Gitblit v1.9.3