diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java new file mode 100644 index 0000000..d7073f1 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java @@ -0,0 +1,17 @@ +package com.securitycontrol.entity.screen.vo; + +import lombok.Data; + +/** + * @Author:liang.chao + * @Date:2025/7/23 - 15:55 + */ +@Data +public class ProjectQualityVo { + private String projectName; + private String projectNumber; + private String projectAddress; + private String contractorName; + private String qualityLevel; + private String isContract; +} 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 b781b19..0f5d80b 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 @@ -10,6 +10,7 @@ import com.securitycontrol.entity.screen.dto.AccessMgeDto; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.AccessMgeVo; import com.securitycontrol.entity.screen.vo.DataAnalysisDetailVo; +import com.securitycontrol.entity.screen.vo.ProjectQualityVo; import com.securitycontrol.screen.service.DataAnalysisService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -54,6 +55,18 @@ public class DataAnalysisController extends BaseController { return getDataTableBadLayui(new ArrayList<>(),"请求出错了"); } } + @ApiOperation(value = "工程质量分析") + @GetMapping("getEngqualityAnalysis") + public TableDataInfo getEngqualityAnalysis(ScreenParamDto dto) { + try{ + startLayPage(); + List list = service.getEngqualityAnalysis(dto); + return getDataTableLayui(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBadLayui(new ArrayList<>(),"请求出错了"); + } + } @ApiOperation(value = "数据应用分析-环境检测") @GetMapping("getListByType2") 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 fccd883..b798fe5 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 @@ -2,6 +2,7 @@ package com.securitycontrol.screen.mapper; import com.securitycontrol.entity.screen.vo.DataAnalysisDetailVo; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.DataAnalysisVo; +import com.securitycontrol.entity.screen.vo.ProjectQualityVo; import org.springframework.stereotype.Repository; import java.util.List; @@ -32,4 +33,6 @@ public interface DataAnalysisMapper { * @date 2025/4/7 17:07 */ List getListByType(ScreenParamDto dto); + + List getEngqualityAnalysis(ScreenParamDto dto); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/DataAnalysisService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/DataAnalysisService.java index 04d3159..f3ebd7f 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/DataAnalysisService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/DataAnalysisService.java @@ -3,6 +3,7 @@ package com.securitycontrol.screen.service; import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.DataAnalysisDetailVo; +import com.securitycontrol.entity.screen.vo.ProjectQualityVo; import java.util.List; @@ -31,4 +32,6 @@ public interface DataAnalysisService { * @date 2025/4/7 17:05 */ List getListByType(ScreenParamDto dto); + + List getEngqualityAnalysis(ScreenParamDto dto); } 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 8ca01f1..8bca698 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 @@ -4,6 +4,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult; import com.securitycontrol.entity.screen.dto.ScreenParamDto; import com.securitycontrol.entity.screen.vo.DataAnalysisDetailVo; import com.securitycontrol.entity.screen.vo.DataAnalysisVo; +import com.securitycontrol.entity.screen.vo.ProjectQualityVo; import com.securitycontrol.screen.mapper.DataAnalysisMapper; import com.securitycontrol.screen.service.DataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -49,4 +50,15 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { } return list; } + + @Override + public List getEngqualityAnalysis(ScreenParamDto dto) { + List list = null; + try { + list = Optional.ofNullable(mapper.getEngqualityAnalysis(dto)).orElseGet(ArrayList::new); + } catch (Exception e) { + log.error(e.toString(),e); + } + return list; + } } 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 1390198..eb3a12d 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml @@ -33,4 +33,13 @@ yq_resaon AS yqResaon FROM tb_data_analysis_app WHERE data_type = #{type} + \ No newline at end of file