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/EamMaintenanceStandardController.java | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 161 insertions(+), 2 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 7084d5b..48d0bef 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
@@ -23,6 +23,8 @@
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.SecondMaintenanceStandardImport;
+import org.jeecg.modules.eam.dto.ThirdMaintenanceStandardImport;
import org.jeecg.modules.eam.dto.WeekMaintenanceStandardImport;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
@@ -131,6 +133,48 @@
return Result.error("缂栬緫澶辫触锛�");
}
return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 鍗囩増
+ *
+ * @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 = "equipmentId", required = false) String equipmentId,
+ @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize,
+ @RequestParam(name = "maintenanceCategory", required = false) String maintenanceCategory) {
+ List<EamMaintenanceStandard> list = eamMaintenanceStandardService.queryListByKeywordAndCategory(keyword, equipmentId, pageSize, maintenanceCategory);
+ return Result.OK(list);
}
/**
@@ -331,6 +375,122 @@
}
/**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/secondMaintenanceImportExcel", method = RequestMethod.POST)
+ public Result<?> secondMaintenanceImportExcel(HttpServletRequest request, HttpServletResponse response) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
+ MultipartFile file = entity.getValue();
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setSheetNum(1);
+ params.setNeedSave(true);
+ EamMaintenanceStandardRequest standardRequest = new EamMaintenanceStandardRequest();
+ try {
+ //璇诲彇璁惧缂栧彿锛屽浘鐗囩瓑
+ readWeekExcel(file, standardRequest);
+ EamEquipment equipment = eamEquipmentService.selectByEquipmentCode(standardRequest.getEquipmentCode());
+ if(equipment == null) {
+ log.error("璁惧涓嶅瓨鍦細{}", standardRequest.getEquipmentCode());
+ continue;
+ }
+ standardRequest.setStandardName(standardRequest.getEquipmentName() + "浜屼繚鏍囧噯");
+ standardRequest.setMaintenanceCategory(MaintenanceCategoryEnum.SECOND_MAINTENANCE.name());
+ standardRequest.setEquipmentId(equipment.getId());
+ //璇诲彇淇濆吇鏄庣粏鍐呭
+ List<SecondMaintenanceStandardImport> list = ExcelImportUtil.importExcel(file.getInputStream(), SecondMaintenanceStandardImport.class, params);
+ //鏄庣粏椤�
+ List<EamMaintenanceStandardDetail> tableList = list.stream().map(EamMaintenanceStandardDetail::new).collect(Collectors.toList());
+ standardRequest.setTableDetailList(tableList);
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
+ standardRequest.setStandardCode(codeSeq);
+ boolean b = eamMaintenanceStandardService.addMaintenanceStandard(standardRequest);
+ if (!b) {
+ log.error("淇濆瓨澶辫触锛� {}", standardRequest.getEquipmentCode());
+ }
+ } catch (Exception e) {
+ //update-begin-author:taoyan date:20211124 for: 瀵煎叆鏁版嵁閲嶅澧炲姞鎻愮ず
+ String msg = e.getMessage();
+ log.error("鏂囦欢 {} 澶勭悊寮傚父锛� {}", file.getOriginalFilename(), msg, e);
+ //update-end-author:taoyan date:20211124 for: 瀵煎叆鏁版嵁閲嶅澧炲姞鎻愮ず
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ }
+ return Result.ok("鏂囦欢瀵煎叆瀹屾垚锛�");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/thirdMaintenanceImportExcel", method = RequestMethod.POST)
+ public Result<?> thirdMaintenanceImportExcel(HttpServletRequest request, HttpServletResponse response) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ // 鑾峰彇涓婁紶鏂囦欢瀵硅薄
+ MultipartFile file = entity.getValue();
+ ImportParams params = new ImportParams();
+ params.setTitleRows(2);
+ params.setHeadRows(1);
+ params.setSheetNum(1);
+ params.setNeedSave(true);
+ EamMaintenanceStandardRequest standardRequest = new EamMaintenanceStandardRequest();
+ try {
+ //璇诲彇璁惧缂栧彿锛屽浘鐗囩瓑
+ readWeekExcel(file, standardRequest);
+ EamEquipment equipment = eamEquipmentService.selectByEquipmentCode(standardRequest.getEquipmentCode());
+ if(equipment == null) {
+ log.error("璁惧涓嶅瓨鍦細{}", standardRequest.getEquipmentCode());
+ continue;
+ }
+ standardRequest.setStandardName(standardRequest.getEquipmentName() + "涓変繚鏍囧噯");
+ standardRequest.setMaintenanceCategory(MaintenanceCategoryEnum.THIRD_MAINTENANCE.name());
+ standardRequest.setEquipmentId(equipment.getId());
+ //璇诲彇淇濆吇鏄庣粏鍐呭
+ List<ThirdMaintenanceStandardImport> list = ExcelImportUtil.importExcel(file.getInputStream(), ThirdMaintenanceStandardImport.class, params);
+ //鏄庣粏椤�
+ List<EamMaintenanceStandardDetail> tableList = list.stream().map(EamMaintenanceStandardDetail::new).collect(Collectors.toList());
+ standardRequest.setTableDetailList(tableList);
+ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.MAINTENANCE_STANDARD_CODE_RULE);
+ standardRequest.setStandardCode(codeSeq);
+ boolean b = eamMaintenanceStandardService.addMaintenanceStandard(standardRequest);
+ if (!b) {
+ log.error("淇濆瓨澶辫触锛� {}", standardRequest.getEquipmentCode());
+ }
+ } catch (Exception e) {
+ //update-begin-author:taoyan date:20211124 for: 瀵煎叆鏁版嵁閲嶅澧炲姞鎻愮ず
+ String msg = e.getMessage();
+ log.error("鏂囦欢 {} 澶勭悊寮傚父锛� {}", file.getOriginalFilename(), msg, e);
+ //update-end-author:taoyan date:20211124 for: 瀵煎叆鏁版嵁閲嶅澧炲姞鎻愮ず
+ } finally {
+ try {
+ file.getInputStream().close();
+ } catch (IOException e) {
+ log.error(e.getMessage(), e);
+ }
+ }
+ }
+ return Result.ok("鏂囦欢瀵煎叆瀹屾垚锛�");
+ }
+
+ /**
* 璇诲彇Excel 绗竴琛岋紝 绗簩琛岀殑淇℃伅锛屽寘鎷浘鐗囦俊鎭�
* @param file
* @param request
@@ -454,8 +614,7 @@
if (CellType.NUMERIC.equals(period.getCellType())) {
request.setMaintenancePeriod((int) period.getNumericCellValue());
} else {
- //榛樿鐐规鍛ㄦ湡 1
- request.setMaintenancePeriod(1);
+ request.setMaintenancePeriod(null);
}
//鏂囦欢缂栫爜
Cell fileCode = row.getCell(8);
--
Gitblit v1.9.3