From 75a376746ef2ef0d19abc134c4fac69c4274a3ca Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 09 十月 2023 18:04:03 +0800
Subject: [PATCH] 设备台账修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersController.java | 12 +++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java | 2 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 3 +
4 files changed, 105 insertions(+), 7 deletions(-)
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 af7bacf..47949e0 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
@@ -523,7 +523,8 @@
queryWrapper.in("equipment_status",statusList);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
- }/**
+ }
+ /**
* 瀵煎叆
* @return
*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersController.java
index f227d49..7ecfdf8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersController.java
@@ -41,7 +41,7 @@
private IPrecisionParametersService precisionParametersService;
@Autowired
private IPrecisionParametersCategoryService precisionParametersTypeService;
-
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -74,7 +74,7 @@
}
return Result.OK(pageList);
}
-
+
/**
* 娣诲姞
*
@@ -89,7 +89,7 @@
precisionParametersService.save(momEamPrecisionParameters);
return Result.OK("娣诲姞鎴愬姛锛�");
}
-
+
/**
* 缂栬緫
*
@@ -104,7 +104,7 @@
precisionParametersService.updateById(momEamPrecisionParameters);
return Result.OK("缂栬緫鎴愬姛!");
}
-
+
/**
* 閫氳繃id鍒犻櫎
*
@@ -121,7 +121,7 @@
precisionParametersService.updateById(precisionParameters);
return Result.OK("鍒犻櫎鎴愬姛!");
}
-
+
/**
* 鎵归噺鍒犻櫎
*
@@ -141,7 +141,7 @@
}
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
}
-
+
/**
* 閫氳繃id鏌ヨ
*
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
index 180ee49..11444dc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java
@@ -4,10 +4,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -15,13 +20,22 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
//import org.jeecg.modules.base.service.IUnitService;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
+import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -216,5 +230,86 @@
.collect(Collectors.toList());
return Result.OK(nums);
}
+ /**
+ * 瀵煎叆
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ @Transactional(rollbackFor = Exception.class)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+ String exceptionInfo = "";
+ int exceptionNum = 0;
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();
+ ImportParams params = new ImportParams();
+ params.setNeedSave(true);
+ try {
+ InputStream fis = file.getInputStream();
+ Workbook workbook = new XSSFWorkbook(fis);
+ Sheet sheet = workbook.getSheetAt(0);
+ PrecisionParametersTemplate precisionParametersTemplate = new PrecisionParametersTemplate();
+ Row row1 = sheet.getRow(1);
+ Cell cell15 = row1.getCell(5);
+ if(ObjectUtils.isNotNull(cell15)&&cell15.getCellType()==CellType.NUMERIC){
+ String num = (int)cell15.getNumericCellValue()+"";
+ precisionParametersTemplate.setNum(num);
+ EquipmentPrecisionParameters equipmentPrecisionParameters = new EquipmentPrecisionParameters();
+ }
+
+ for (Row row : sheet) {
+ Cell cell1 = row.getCell(1);
+
+ if(row.getRowNum()>4){
+
+ }
+ for (Cell cell : row) {
+ String cellValue = "";
+ if (cell.getCellType() == CellType.STRING) {
+ cellValue = cell.getStringCellValue();
+ } else if (cell.getCellType() == CellType.NUMERIC) {
+ cellValue = String.valueOf(cell.getNumericCellValue());
+ }
+ // 鍦ㄨ繖閲屽彲浠ユ牴鎹偍鐨勯�昏緫澶勭悊鍜屾竻鐞嗘暟鎹�
+ System.out.println("Cell Value: " + cellValue);
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+ return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
+ }
+ // 妫�鏌ュ崟鍏冩牸鏄惁鍦ㄥ悎骞跺崟鍏冩牸鑼冨洿鍐�
+ private boolean isMergedCell(Sheet sheet, Cell cell) {
+ for (CellRangeAddress mergedRegion : sheet.getMergedRegions()) {
+ if (mergedRegion.isInRange(cell.getRowIndex(), cell.getColumnIndex())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // 鑾峰彇鍚堝苟鍗曞厓鏍肩殑鍊�
+ private String getMergedCellValue(Sheet sheet, Cell cell) {
+ for (CellRangeAddress mergedRegion : sheet.getMergedRegions()) {
+ if (mergedRegion.isInRange(cell.getRowIndex(), cell.getColumnIndex())) {
+ Row firstRow = sheet.getRow(mergedRegion.getFirstRow());
+ Cell firstCell = firstRow.getCell(mergedRegion.getFirstColumn());
+ if (firstCell != null) {
+ if (firstCell.getCellType() == CellType.STRING) {
+ return firstCell.getStringCellValue();
+ } else if (firstCell.getCellType() == CellType.NUMERIC) {
+ return String.valueOf(firstCell.getNumericCellValue());
+ }
+ }
+ }
+ }
+ return null;
+ }
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java
index 9951877..a62746b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionParametersTemplateDetail.java
@@ -113,6 +113,8 @@
private Double upper;
private Double lower;
+
+ private Double actualValue;
@TableField(exist = false)
private String precisionParametersUda1;
--
Gitblit v1.9.3