From cb2556fd6ce1a7240e7cb4d005384c28014df87c Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 31 三月 2025 16:32:43 +0800
Subject: [PATCH] art: 设备管理-保养标准-编辑功能
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 10 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java | 14 +
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java | 8 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java | 199 ++++++++------------------------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 6
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 11 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 79 ++++++++++++
8 files changed, 166 insertions(+), 163 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
index 6ede760..c1f658f 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamEquipmentService.java
@@ -44,5 +44,5 @@
* @param pageSize
* @return
*/
- List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize);
+ List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id);
}
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 1dea4cc..f77e769 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -166,7 +166,15 @@
}
@Override
- public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize) {
+ public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) {
+ if (StringUtils.isNotBlank(id)) {
+ EamEquipment eamEquipment = eamEquipmentMapper.selectById(id);
+ if (eamEquipment != null) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ resultList.add(new EquipmentSearchResult(eamEquipment));
+ return resultList;
+ }
+ }
IPage<EamEquipment> page = new Page<>(1, pageSize);
QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
//鐢ㄦ埛鏁版嵁鏉冮檺
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 52d5cb1..e5a735d 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
@@ -283,13 +283,15 @@
* 妫�绱㈣澶�
* @param keyword 鏌ヨ鍏抽敭璇� 璁惧缂栧彿锛岃澶囧悕绉版ā绯婂尮閰�
* @param pageSize 涓�娆¤繑鍥炲灏戣褰�
+ * @param id 璁惧涓婚敭
* @return
*/
@ApiOperation(value = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃", notes = "璁惧琛�-寮傛鍔犺浇璁惧鍒楄〃")
@GetMapping(value = "/asyncLoadEquipment")
public Result<?> asyncLoadEquipment(@RequestParam(name="keyword",required = false) String keyword,
- @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) {
- List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize);
+ @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize,
+ @RequestParam(name="id",required = false) String id) {
+ List<EquipmentSearchResult> resultList = eamEquipmentService.asyncLoadEquipment(keyword, pageSize, id);
return Result.ok(resultList);
}
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 ccbc930..c753d7e 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
@@ -113,7 +113,16 @@
@ApiOperation(value="淇濆吇鏍囧噯-缂栬緫", notes="淇濆吇鏍囧噯-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<?> edit(@RequestBody EamMaintenanceStandardRequest standardRequest) {
-// eamMaintenanceStandardService.updateById(eamMaintenanceStandard);
+ if(standardRequest == null){
+ return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
+ }
+ if(CollectionUtil.isEmpty(standardRequest.getTableDetailList())) {
+ return Result.error("淇濆吇椤逛笉鑳戒负绌猴紒");
+ }
+ boolean b = eamMaintenanceStandardService.editMaintenanceStandard(standardRequest);
+ if(!b) {
+ return Result.error("缂栬緫澶辫触锛�");
+ }
return Result.OK("缂栬緫鎴愬姛!");
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java
index 67f73fb..7f82d37 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardDetailController.java
@@ -1,167 +1,70 @@
package org.jeecg.modules.eam.controller;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
-import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
+import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
- /**
+import java.util.List;
+
+/**
* @Description: 淇濆吇鏍囧噯鏄庣粏
* @Author: jeecg-boot
- * @Date: 2025-03-26
+ * @Date: 2025-03-26
* @Version: V1.0
*/
@Slf4j
-@Api(tags="淇濆吇鏍囧噯鏄庣粏")
+@Api(tags = "淇濆吇鏍囧噯鏄庣粏")
@RestController
@RequestMapping("/eam/eamMaintenanceStandardDetail")
public class EamMaintenanceStandardDetailController extends JeecgController<EamMaintenanceStandardDetail, IEamMaintenanceStandardDetailService> {
- @Autowired
- private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param eamMaintenanceStandardDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="淇濆吇鏍囧噯鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="淇濆吇鏍囧噯鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<?> queryPageList(EamMaintenanceStandardDetail eamMaintenanceStandardDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<EamMaintenanceStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamMaintenanceStandardDetail, req.getParameterMap());
- Page<EamMaintenanceStandardDetail> page = new Page<EamMaintenanceStandardDetail>(pageNo, pageSize);
- IPage<EamMaintenanceStandardDetail> pageList = eamMaintenanceStandardDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param eamMaintenanceStandardDetail
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯鏄庣粏-娣诲姞")
- @ApiOperation(value="淇濆吇鏍囧噯鏄庣粏-娣诲姞", notes="淇濆吇鏍囧噯鏄庣粏-娣诲姞")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamMaintenanceStandardDetail eamMaintenanceStandardDetail) {
- eamMaintenanceStandardDetailService.save(eamMaintenanceStandardDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param eamMaintenanceStandardDetail
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯鏄庣粏-缂栬緫")
- @ApiOperation(value="淇濆吇鏍囧噯鏄庣粏-缂栬緫", notes="淇濆吇鏍囧噯鏄庣粏-缂栬緫")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<?> edit(@RequestBody EamMaintenanceStandardDetail eamMaintenanceStandardDetail) {
- eamMaintenanceStandardDetailService.updateById(eamMaintenanceStandardDetail);
- 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) {
- eamMaintenanceStandardDetailService.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.eamMaintenanceStandardDetailService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- @AutoLog(value = "淇濆吇鏍囧噯鏄庣粏-閫氳繃id鏌ヨ")
- @ApiOperation(value="淇濆吇鏍囧噯鏄庣粏-閫氳繃id鏌ヨ", notes="淇濆吇鏍囧噯鏄庣粏-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
- EamMaintenanceStandardDetail eamMaintenanceStandardDetail = eamMaintenanceStandardDetailService.getById(id);
- return Result.OK(eamMaintenanceStandardDetail);
- }
+ @Autowired
+ private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param eamMaintenanceStandardDetail
- */
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamMaintenanceStandardDetail eamMaintenanceStandardDetail) {
- return super.exportXls(request, eamMaintenanceStandardDetail, EamMaintenanceStandardDetail.class, "淇濆吇鏍囧噯鏄庣粏");
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param standardId
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes = "淇濆吇鏍囧噯鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(@RequestParam("standardId") String standardId,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardId);
+ Page<EamMaintenanceStandardDetail> page = new Page<>(pageNo, pageSize);
+ IPage<EamMaintenanceStandardDetail> pageList = eamMaintenanceStandardDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, EamMaintenanceStandardDetail.class);
- }
+ /**
+ * 涓�娆″姞杞�
+ *
+ * @param standardId
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "淇濆吇鏍囧噯鏄庣粏-涓嶅垎椤靛垪琛ㄦ煡璇�")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(@RequestParam("standardId") String standardId) {
+ LambdaQueryWrapper<EamMaintenanceStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandardDetail::getStandardId, standardId);
+ List<EamMaintenanceStandardDetail> list = eamMaintenanceStandardDetailService.list(queryWrapper);
+ return Result.OK(list);
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index cc529f9..61ba6ad 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
@@ -9,6 +9,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -68,16 +69,19 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date initialDate;
/**淇濆吇鍒嗙被*/
- @Excel(name = "淇濆吇鍒嗙被", width = 15)
+ @Excel(name = "淇濆吇鍒嗙被", width = 15, dicCode = "maintenance_category")
@ApiModelProperty(value = "淇濆吇鍒嗙被")
+ @Dict(dicCode = "maintenance_category")
private String maintenanceCategory;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
- @ApiModelProperty(value = "璁惧ID")
+ /**璁惧缂栧彿*/
+ @Excel(name = "璁惧缂栧彿", width = 15, dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ @Dict(dicCode = "eam_equipment, equipment_code, id")
private String equipmentId;
/**鏍囧噯鐘舵��*/
- @Excel(name = "鏍囧噯鐘舵��", width = 15)
+ @Excel(name = "鏍囧噯鐘舵��", width = 15, dicCode = "maintenance_standard_status")
@ApiModelProperty(value = "鏍囧噯鐘舵��")
+ @Dict(dicCode = "maintenance_standard_status")
private String standardStatus;
/**鏍囧噯鐗堟湰*/
@Excel(name = "鏍囧噯鐗堟湰", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
index 254986a..1f9831a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
@@ -23,4 +23,12 @@
* @param standardRequest
*/
boolean editMaintenanceStandard(EamMaintenanceStandardRequest standardRequest);
+
+ /**
+ * 閲嶅鎬ф牎楠�
+ * @param equipmentId 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index 5677a85..66f9c60 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -1,24 +1,28 @@
package org.jeecg.modules.eam.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
+import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper;
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardDetailService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: 淇濆吇鏍囧噯
@@ -50,8 +54,13 @@
entity.setStandardVersion(CommonConstant.OPERATE_TYPE_1);
//璁惧澶勭悊
entity.setEquipmentId(standardRequest.getEquipmentId());
+ //鍒犻櫎鏍囪
+ entity.setDelFlag(CommonConstant.DEL_FLAG_0);
//閲嶅鎬ф牎楠�
- //TODO
+ EamMaintenanceStandard exist = checkDuplicate(entity.getEquipmentId(), entity.getMaintenanceCategory());
+ if(exist != null){
+ throw new JeecgBootException("璁惧鏍囧噯宸插瓨鍦紝涓嶈兘閲嶅娣诲姞锛�");
+ }
//澶勭悊闄勪欢
if(CollectionUtil.isNotEmpty(standardRequest.getFileList())) {
FileUploadResult fileUploadResult = standardRequest.getFileList().get(0);
@@ -77,6 +86,66 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean editMaintenanceStandard(EamMaintenanceStandardRequest standardRequest) {
- return false;
+ EamMaintenanceStandard entity = eamMaintenanceStandardMapper.selectById(standardRequest.getId());
+ if(entity == null){
+ throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ entity.setStandardName(standardRequest.getStandardName());
+ entity.setMaintenancePeriod(standardRequest.getMaintenancePeriod());
+ entity.setFileCode(standardRequest.getFileCode());
+ //澶勭悊闄勪欢
+ if(CollectionUtil.isNotEmpty(standardRequest.getFileList())) {
+ FileUploadResult fileUploadResult = standardRequest.getFileList().get(0);
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ String referenceFile = mapper.writeValueAsString(fileUploadResult);
+ entity.setReferenceFile(referenceFile);
+ } catch (JsonProcessingException e) {
+ log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ }
+ }else {
+ entity.setReferenceFile(null);
+ }
+ eamMaintenanceStandardMapper.updateById(entity);
+ //澶勭悊璇︽儏
+ if(CollectionUtil.isNotEmpty(standardRequest.getTableDetailList())) {
+ List<EamMaintenanceStandardDetail> addList = new ArrayList<>();
+ List<EamMaintenanceStandardDetail> updateList = new ArrayList<>();
+ standardRequest.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setStandardId(entity.getId());
+ if(tableDetail.getId() == null){
+ addList.add(tableDetail);
+ }else {
+ updateList.add(tableDetail);
+ }
+ });
+ if(CollectionUtil.isNotEmpty(addList)){
+ eamMaintenanceStandardDetailService.saveBatch(addList);
+ }
+ if(CollectionUtil.isNotEmpty(updateList)){
+ eamMaintenanceStandardDetailService.updateBatchById(updateList);
+ }
+ }
+ if(CollectionUtil.isNotEmpty(standardRequest.getRemoveDetailList())) {
+ List<String> ids = standardRequest.getRemoveDetailList().stream().map(EamMaintenanceStandardDetail::getId).collect(Collectors.toList());
+ eamMaintenanceStandardDetailService.removeBatchByIds(ids);
+ }
+ return true;
+ }
+
+ @Override
+ public EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory) {
+ LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandard::getEquipmentId, equipmentId);
+ queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory);
+ queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.NORMAL.name());
+ queryWrapper.orderByDesc(EamMaintenanceStandard::getStandardVersion);
+
+ List<EamMaintenanceStandard> list = eamMaintenanceStandardMapper.selectList(queryWrapper);
+ if(CollectionUtil.isNotEmpty(list)) {
+ return null;
+ }
+ return list.get(0);
}
}
--
Gitblit v1.9.3