From c354b62e324e63691418974d5f88b916e8a35f0a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 七月 2025 15:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 66 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 30 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 48d0bef..e8d2bc8 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
@@ -7,18 +7,13 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jeecg.common.api.vo.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.util.FileUtil;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
@@ -32,10 +27,10 @@
import org.jeecg.modules.eam.request.EamMaintenanceStandardRequest;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
+import org.jeecg.modules.eam.vo.EamMaintenanceStandardVo;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.util.PoiPublicUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -65,6 +60,28 @@
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
private IEamEquipmentService eamEquipmentService;
+
+ /**
+ * 娴佺▼鍚姩,淇濆瓨瀵瑰簲鐨勬暟鎹�
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯-娴佺▼鍚姩淇濆瓨瀵瑰簲鐨勬暟鎹�", notes = "淇濆吇鏍囧噯-娴佺▼鍚姩淇濆瓨瀵瑰簲鐨勬暟鎹�")
+ @GetMapping(value = "/saveEamMaintenanceStandardProcess")
+ public Result<?> saveEamMaintenanceStandardProcess(String id){
+ return eamMaintenanceStandardService.saveEamMaintenanceStandardProcess(id);
+ }
+
+ /**
+ * 娴佺▼瀹℃牳
+ * @param eamMaintenanceStandardVo
+ * @return
+ */
+ @ApiOperation(value = "淇濆吇鏍囧噯-娴佺▼瀹℃牳", notes = "淇濆吇鏍囧噯-娴佺▼瀹℃牳")
+ @PostMapping(value = "/audit")
+ public Result<?> auditEamMaintenanceStandard(@RequestBody EamMaintenanceStandardVo eamMaintenanceStandardVo){
+ return eamMaintenanceStandardService.auditEamMaintenanceStandard(eamMaintenanceStandardVo);
+ }
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -143,7 +160,7 @@
*/
@AutoLog(value = "淇濆吇鏍囧噯-鍗囩増")
@ApiOperation(value = "淇濆吇鏍囧噯-鍗囩増", notes = "淇濆吇鏍囧噯-鍗囩増")
- @RequestMapping(value = "/upgrade", method = {RequestMethod.PUT, RequestMethod.POST})
+ @PutMapping(value = "/upgrade")
public Result<?> upgrade(@RequestBody EamMaintenanceStandardRequest standardRequest) {
if (standardRequest == null) {
return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
@@ -256,6 +273,18 @@
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, EamMaintenanceStandard eamMaintenanceStandard) {
return super.exportXls(request, eamMaintenanceStandard, EamMaintenanceStandard.class, "淇濆吇鏍囧噯");
+ }
+
+ @PostMapping("/import")
+ public Result<?> importExcel(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();
+ eamMaintenanceStandardService.importPointInspectionExcel(file);
+ }
+ return Result.ok("瀵煎叆鎴愬姛");
}
/**
@@ -541,29 +570,6 @@
//鏂囦欢缂栫爜
Cell fileCode = row.getCell(13);
request.setFileCode(fileCode.getStringCellValue());
-
- Map<String, PictureData> pictures;
- if (isXSSFWorkbook) {
- pictures = PoiPublicUtil.getSheetPictrues07((XSSFSheet) book.getSheetAt(0), (XSSFWorkbook) book);
- } else {
- pictures = PoiPublicUtil.getSheetPictrues03((HSSFSheet) book.getSheetAt(0), (HSSFWorkbook) book);
- }
-
- if (CollectionUtil.isNotEmpty(pictures)) {
- //鍙細瀛樺湪涓�寮犲浘鐗�
- PictureData pictureData = pictures.get(pictures.keySet().iterator().next());
- byte[] data = pictureData.getData();
- String fileName = request.getEquipmentCode() + "[" + request.getFileCode() + "]" + "." + pictureData.suggestFileExtension();
- FileUploadResult fileUploadResult = FileUtil.uploadFile(data, fileName);
- if(fileUploadResult != null) {
- List<FileUploadResult> fileList = request.getFileList();
- if(fileList == null) {
- fileList = new ArrayList<FileUploadResult>();
- }
- fileList.add(fileUploadResult);
- request.setFileList(fileList);
- }
- }
} catch (Exception e) {
log.error("璇诲彇Excel淇℃伅澶辫触锛歿}", e.getMessage(), e);
}
--
Gitblit v1.9.3