From 789c773315d4e1aa1ce1c84b7fd64e929ffd6602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 15 Jan 2026 10:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=86?= =?UTF-8?q?=E6=9E=90=EF=BC=8C=E6=95=B4=E4=BD=93=E6=95=88=E8=83=BD=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SjProjectQualityController.java | 39 +++++++++ .../mapper/SjProjectQualityMapper.java | 36 ++++++++ .../service/SjProjectQualityService.java | 36 ++++++++ .../impl/SjProjectQualityServiceImpl.java | 87 +++++++++++++++++++ .../mapper/SjProjectQualityMapper.xml | 45 +++++++++- .../SjProjectQualityController.java | 65 ++++++++++++++ .../screen/mapper/SjProjectQualityMapper.java | 8 ++ .../service/SjProjectQualityService.java | 23 +++++ .../impl/SjProjectQualityServiceImpl.java | 51 +++++++++++ .../mapper/SjProjectQualityMapper.xml | 48 ++++++++++ 10 files changed, 437 insertions(+), 1 deletion(-) diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjProjectQualityController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjProjectQualityController.java index 6b275a0..3973fe6 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjProjectQualityController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjProjectQualityController.java @@ -8,6 +8,7 @@ import com.securitycontrol.common.log.annotation.Log; import com.securitycontrol.common.log.enums.OperationType; import com.securitycontrol.entity.background.dto.ParamDto; import com.securitycontrol.entity.background.vo.ProjectVo; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.entity.background.vo.SjProjectQualityVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -71,4 +72,42 @@ public class SjProjectQualityController extends BaseController { } + + @ApiOperation(value = "查询工程质量分析列表数据") + @GetMapping("newList") + @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.QUERY_BUSINESS, details = "查询工程质量分析数据", type = "业务日志") + public TableDataInfo getNewList(SjProjectMassVo dto) { + startPage(); + List list = new ArrayList<>(); + list = service.getNewList(dto); + return getDataTable(list); + } + + @ApiOperation(value = "新增工程质量分析数据") + @PostMapping("newAddData") + @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.ADD_BUSINESS, details = "新增数据", type = "业务日志") + public AjaxResult newAddData(@RequestBody SjProjectMassVo vo) { + return service.newAddData(vo); + } + + @ApiOperation(value = "数据详情") + @PostMapping(value="newGetDetails") + public AjaxResult getNewDetails(@RequestBody SjProjectMassVo dto){ + return service.getNewDetails(dto); + } + + @ApiOperation(value = "新增工程质量分析数据") + @PostMapping("newUpdateData") + @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.UPDATE_BUSINESS, details = "修改数据", type = "业务日志") + public AjaxResult newUpdateData(@RequestBody SjProjectMassVo vo) { + return service.newUpdateData(vo); + } + + @ApiOperation(value = "数据详情") + @PostMapping(value="newDelete") + @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.DELETE_BUSINESS, details = "删除数据", type = "业务日志") + public AjaxResult newDelete(@RequestBody SjProjectMassVo dto){ + return service.newDelete(dto); + } + } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjProjectQualityMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjProjectQualityMapper.java index 8901d10..199b740 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjProjectQualityMapper.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjProjectQualityMapper.java @@ -1,6 +1,7 @@ package com.securitycontrol.background.mapper; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.entity.background.vo.SjProjectQualityVo; import org.springframework.stereotype.Repository; @@ -45,4 +46,39 @@ public interface SjProjectQualityMapper { * @return */ Integer delete(SjProjectQualityVo vo); + + /** + * 查询质量数据集合 + * @param dto + * @return + */ + List getNewList(SjProjectMassVo dto); + + /** + * 新增数据 + * @param vo + * @return + */ + Integer newAddData(SjProjectMassVo vo); + + /** + * 获取详情 + * @param dto + * @return + */ + SjProjectMassVo getNewDetails(SjProjectMassVo dto); + + /** + * 修改数据 + * @param vo + * @return + */ + Integer newUpdateData(SjProjectMassVo vo); + + /** + * 删除 + * @param dto + * @return + */ + Integer newDelete(SjProjectMassVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjProjectQualityService.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjProjectQualityService.java index 36f12d5..744b41b 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjProjectQualityService.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjProjectQualityService.java @@ -3,6 +3,7 @@ package com.securitycontrol.background.service; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.background.dto.ParamDto; import com.securitycontrol.entity.background.vo.ProjectVo; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.entity.background.vo.SjProjectQualityVo; import java.util.List; @@ -42,4 +43,39 @@ public interface SjProjectQualityService { * @return */ AjaxResult delete(SjProjectQualityVo dto); + + /** + * 获取质量分析列表 + * @param dto + * @return + */ + List getNewList(SjProjectMassVo dto); + + /** + * 新增质量分析数据 + * @param vo + * @return + */ + AjaxResult newAddData(SjProjectMassVo vo); + + /** + * 获取质量分析详情 + * @param dto + * @return + */ + AjaxResult getNewDetails(SjProjectMassVo dto); + + /** + * 修改质量分析数据 + * @param vo + * @return + */ + AjaxResult newUpdateData(SjProjectMassVo vo); + + /** + * 删除质量分析数据 + * @param dto + * @return + */ + AjaxResult newDelete(SjProjectMassVo dto); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjProjectQualityServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjProjectQualityServiceImpl.java index 1c42f71..349c0d4 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjProjectQualityServiceImpl.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjProjectQualityServiceImpl.java @@ -5,6 +5,7 @@ import com.securitycontrol.background.service.SjProjectQualityService; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.background.dto.ParamDto; import com.securitycontrol.entity.background.vo.ProjectVo; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.entity.background.vo.SjProjectQualityVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -89,4 +90,90 @@ public class SjProjectQualityServiceImpl implements SjProjectQualityService { } return AjaxResult.error("删除失败,数据id不正确"); } + + /** + * 获取质量分析列表 + * @param dto + * @return + */ + @Override + public List getNewList(SjProjectMassVo dto) { + try{ + return mapper.getNewList(dto); + }catch (Exception e){ + log.error(e.getMessage(),e); + } + return Collections.emptyList(); + } + + /** + * 新增质量分析数据 + * @param vo + * @return + */ + @Override + public AjaxResult newAddData(SjProjectMassVo vo) { + try{ + Integer num= mapper.newAddData(vo); + if(num!=null && num>0){ + return AjaxResult.success("添加成功"); + } + }catch (Exception e){ + log.error(e.getMessage(),e); + } + return AjaxResult.error("新增失败,数据长度过长"); + } + + /** + * 获取质量分析详情 + * @param dto + * @return + */ + @Override + public AjaxResult getNewDetails(SjProjectMassVo dto) { + try{ + SjProjectMassVo data= mapper.getNewDetails(dto); + return AjaxResult.success(data); + }catch (Exception e){ + log.error(e.getMessage(),e); + } + return AjaxResult.success(dto); + } + + /** + * 修改质量分析数据 + * @param vo + * @return + */ + @Override + public AjaxResult newUpdateData(SjProjectMassVo vo) { + try{ + Integer num= mapper.newUpdateData(vo); + if(num!=null && num>0){ + return AjaxResult.success("添加成功"); + } + }catch (Exception e){ + log.error(e.getMessage(),e); + } + return AjaxResult.error("修改失败,数据长度过长"); + } + + /** + * 删除质量分析数据 + * @param dto + * @return + */ + @Override + public AjaxResult newDelete(SjProjectMassVo dto) { + try{ + Integer num= mapper.newDelete(dto); + if(num>0){ + return AjaxResult.success("删除成功"); + } + + }catch (Exception e){ + log.error(e.getMessage(),e); + } + return AjaxResult.error("删除失败,数据id不正确"); + } } diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectQualityMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectQualityMapper.xml index 8600e3c..8426421 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjProjectQualityMapper.xml @@ -14,6 +14,21 @@ #{commOneAccept},#{commAcceptRate} ) + + insert into sj_project_mass( + team_name,content_inspection,inspection_date, + inspection_results,inspection_url + )values (#{teamName},#{contentInspection},#{inspectionDate},#{inspectionResults},#{inspectionUrl}) + + + update sj_project_mass set team_name=#{teamName},content_inspection=#{contentInspection}, + inspection_date=#{inspectionDate},inspection_results=#{inspectionResults}, + inspection_url=#{inspectionUrl} + where id=#{id} + + + delete from sj_project_mass where id=#{id} + update sj_project_quality set pro_type=#{proType},pro_structure=#{proStructure},total_item=#{totalItem}, @@ -70,4 +85,32 @@ from sj_project_quality where id=#{id} - \ No newline at end of file + + + diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjProjectQualityController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjProjectQualityController.java index a042e78..483f515 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjProjectQualityController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjProjectQualityController.java @@ -2,15 +2,22 @@ package com.securitycontrol.screen.controller; import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.screen.domain.SjProjectQuality; import com.securitycontrol.screen.service.SjProjectQualityService; import com.securitycontrol.screen.service.impl.SjProjectQualityServiceImpl; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * 工程质量数据分析控制层 @@ -59,4 +66,62 @@ public class SjProjectQualityController extends BaseController { } } + /** + * 查询工程质量验收项-柱状图 + * + * @param o 传参 + * @return 查询工程质量验收项 + */ + @GetMapping("selectProMassEcharts") + public AjaxResult selectProMassEcharts(SjProjectQuality o) { + try { + return service.selectProMassEcharts(o); + } catch (Exception e) { + log.error(e.toString(),e); + return error("请求出错了"); + } + } + + /** + * 查询工程质量验收项-饼图 + * + * @param o 传参 + * @return 查询工程质量验收项 + */ + @GetMapping("selectProMassChart") + public AjaxResult selectProMassChart(SjProjectQuality o) { + try { + return service.selectProMassChart(o); + } catch (Exception e) { + log.error(e.toString(),e); + return error("请求出错了"); + } + } + + @ApiOperation(value = "查询工程质量分析列表数据") + @GetMapping("newList") + @Log(title = "数据分析", menu = "数据分析->工程质量分析", grade = OperationType.QUERY_BUSINESS, details = "查询工程质量分析数据", type = "业务日志") + public TableDataInfo getNewList(SjProjectMassVo dto) { + startPage(); + List list = new ArrayList<>(); + list = service.getNewList(dto); + return getDataTable(list); + } + + /** + * 查询工程质量验收项-预警 + * + * @param o 传参 + * @return 查询工程质量验收项 + */ + @GetMapping("selectProMassWarning") + public AjaxResult selectProMassWarning(SjProjectQuality o) { + try { + return service.selectProMassWarning(o); + } catch (Exception e) { + log.error(e.toString(),e); + return error("请求出错了"); + } + } + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/SjProjectQualityMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/SjProjectQualityMapper.java index 8d7eebf..46514b4 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/SjProjectQualityMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/SjProjectQualityMapper.java @@ -1,9 +1,11 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.screen.domain.SjProjectQuality; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; @Mapper public interface SjProjectQualityMapper { @@ -11,4 +13,10 @@ public interface SjProjectQualityMapper { SjProjectQuality selectProQualityData(SjProjectQuality o); List selectProQualityEcharts(SjProjectQuality o); + + List> selectProMassEcharts(SjProjectQuality o); + + List> selectProMassChart(SjProjectQuality o); + + List getNewList(SjProjectMassVo dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/SjProjectQualityService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/SjProjectQualityService.java index 5910948..27357a2 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/SjProjectQualityService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/SjProjectQualityService.java @@ -1,7 +1,11 @@ package com.securitycontrol.screen.service; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.screen.domain.SjProjectQuality; + +import java.util.List; + public interface SjProjectQualityService{ /** @@ -17,4 +21,23 @@ public interface SjProjectQualityService{ * @return */ AjaxResult selectProQualityEcharts(SjProjectQuality o); + + AjaxResult selectProMassEcharts(SjProjectQuality o); + + AjaxResult selectProMassChart(SjProjectQuality o); + + /** + * 质量分析列表 + * @param dto + * @return + */ + List getNewList(SjProjectMassVo dto); + + /** + * 查询工程质量验收项-预警 + * + * @param o 传参 + * @return 查询工程质量验收项 + */ + AjaxResult selectProMassWarning(SjProjectQuality o); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectQualityServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectQualityServiceImpl.java index 59a8db1..4433582 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectQualityServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/SjProjectQualityServiceImpl.java @@ -1,7 +1,9 @@ package com.securitycontrol.screen.service.impl; import com.securitycontrol.common.core.web.domain.AjaxResult; +import com.securitycontrol.entity.background.vo.SjProjectMassVo; import com.securitycontrol.screen.service.SjProjectQualityService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; @@ -10,10 +12,13 @@ import com.securitycontrol.screen.domain.SjProjectQuality; import com.securitycontrol.screen.mapper.SjProjectQualityMapper; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +@Slf4j @Service public class SjProjectQualityServiceImpl implements SjProjectQualityService { @@ -46,4 +51,50 @@ public class SjProjectQualityServiceImpl implements SjProjectQualityService { return AjaxResult.success("查询成功",groupedByProType); } + @Override + public AjaxResult selectProMassEcharts(SjProjectQuality o) { + List> res = mapper.selectProMassEcharts(o); + + return AjaxResult.success("查询成功",res); + } + + @Override + public AjaxResult selectProMassChart(SjProjectQuality o) { + List> res =mapper.selectProMassChart(o); + return AjaxResult.success("查询成功",res); + } + + /** + * 质量分析列表 + * @param dto + * @return + */ + @Override + public List getNewList(SjProjectMassVo dto) { + try{ + return mapper.getNewList(dto); + }catch (Exception e){ + log.error(e.getMessage(),e); + } + return Collections.emptyList(); + } + + /** + * 查询工程质量验收项-预警 + * + * @param o 传参 + * @return 查询工程质量验收项 + */ + @Override + public AjaxResult selectProMassWarning(SjProjectQuality o) { + List> res = mapper.selectProMassEcharts(o); + List> resNew = new ArrayList<>(); + for (Map map : res) { + if (Integer.parseInt(map.get("ratePercentage"))<80){ + resNew.add(map); + } + } + return AjaxResult.success("查询成功",resNew); + } + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectQualityMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectQualityMapper.xml index c4d6c0f..1f63986 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectQualityMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/SjProjectQualityMapper.xml @@ -58,4 +58,52 @@ pro_type, pro_structure + + + + +