From b804829cea50f7a679a8a10d41dcfa8312d3f0f2 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Jul 2025 17:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=B4=A8=E9=87=8F=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataAnalysisController.java | 39 +++++++++++++++---- .../screen/mapper/DataAnalysisMapper.java | 2 + .../service/impl/DataAnalysisServiceImpl.java | 5 --- .../resources/mapper/DataAnalysisMapper.xml | 26 +++++++------ 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java index c889142..e7fbd6f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/DataAnalysisController.java @@ -6,6 +6,7 @@ import com.securitycontrol.common.core.web.page.TableDataInfo; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.DataAnalysisDetailVo; import com.securitycontrol.entity.screen.vo.ProjectQualityVo; +import com.securitycontrol.screen.mapper.DataAnalysisMapper; import com.securitycontrol.screen.service.DataAnalysisService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -18,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.ByteArrayInputStream; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -38,6 +40,8 @@ public class DataAnalysisController extends BaseController { @Resource(name = "DataAnalysisService") private DataAnalysisService service; + @Resource(name = "DataAnalysisMapper") + private DataAnalysisMapper mapper; @ApiOperation("根据类型获取数据分析应用") @GetMapping("getDataAnalysisByType") public AjaxResult getDataAnalysisByType(ScreenParamDto dto) { @@ -131,33 +135,52 @@ public class DataAnalysisController extends BaseController { int allValues = 0; int passValues = 0; + StringBuilder noPassReason = new StringBuilder(); List> table2 = result.get("表格2"); + allValues = allValues + table2.size(); for (List row : table2) { for (String cell : row) { - allValues++; - if (cell.equals("合格")) + if (cell.equals("合格")) { passValues++; + } else if (cell.equals("不合格")) { + noPassReason.append(row.get(row.size() - 1)); + noPassReason.append(","); + } } } List> table3 = result.get("表格3"); + allValues = allValues + table3.size(); for (List row : table3) { for (String cell : row) { - allValues++; - if (cell.equals("合格")) + if (cell.equals("合格")) { passValues++; + } else if (cell.equals("不合格")) { + noPassReason.append(row.get(row.size() - 1)); + noPassReason.append(","); + } } + String lastValue = row.get(row.size() - 1); + noPassReason.append(lastValue); + noPassReason.append(","); } List> table4 = result.get("表格4"); + allValues = allValues + table4.size(); for (List row : table4) { for (String cell : row) { - allValues++; - if (cell.equals("合格")) + if (cell.equals("合格")) { passValues++; + } else if (cell.equals("不合格")) { + noPassReason.append(row.get(row.size() - 1)); + noPassReason.append(","); + } } } - System.out.println(allValues + " haha" + passValues); + vo.setCheckNum(new BigDecimal(allValues)); + vo.setPassNum(new BigDecimal(passValues)); + noPassReason.deleteCharAt(noPassReason.length() - 1); + vo.setUnqualifiedItems(noPassReason.toString()); + mapper.addProjectQuality(vo); } - } catch (Exception e) { throw new RuntimeException("处理Word文档时出错: " + e.getMessage(), e); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/DataAnalysisMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/DataAnalysisMapper.java index b798fe5..9acec54 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/DataAnalysisMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/DataAnalysisMapper.java @@ -35,4 +35,6 @@ public interface DataAnalysisMapper { List getListByType(ScreenParamDto dto); List getEngqualityAnalysis(ScreenParamDto dto); + + Integer addProjectQuality(ProjectQualityVo vo); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java index ab52933..076fbde 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/DataAnalysisServiceImpl.java @@ -59,11 +59,6 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { public List getEngqualityAnalysis(ScreenParamDto dto) { List list = null; try { - if (dto.getTypeCode() == 1) { - dto.setProjectName("安徽淮北凌云220kv变电站新建工程"); - } else if (dto.getTypeCode() == 2) { - dto.setProjectName("淮北红枫110kV变电站新建工程"); - } list = Optional.ofNullable(mapper.getEngqualityAnalysis(dto)).orElseGet(ArrayList::new); for (ProjectQualityVo projectQualityVo : list) { // 避免除不尽，设置精度为 4 位小数，四舍五入 diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml index be6fb04..8d039d3 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml @@ -1,6 +1,10 @@ + + INSERT INTO tb_project_quality(project_name, project_manager, team, start_time, check_num, pass_num,unqualified_items) + VALUES (#{projectName}, #{projectManager}, #{team}, #{startTime}, #{checkNum}, #{passNum}, #{unqualifiedItems}) + \ No newline at end of file