From e3dee1c44cc6ab550af5df9447fa615dcabf64fb Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 7 Apr 2025 19:30:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E5=BA=94?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/vo/DataAnalysisDetailVo.java | 43 +++++++++++++++++++ .../controller/DataAnalysisController.java | 37 +++++++++++++++- .../screen/mapper/DataAnalysisMapper.java | 11 ++++- .../screen/service/DataAnalysisService.java | 12 ++++++ .../service/impl/DataAnalysisServiceImpl.java | 13 ++++++ .../resources/mapper/DataAnalysisMapper.xml | 23 ++++++++++ 6 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisDetailVo.java diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisDetailVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisDetailVo.java new file mode 100644 index 0000000..3d611f1 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisDetailVo.java @@ -0,0 +1,43 @@ +package com.securitycontrol.entity.screen.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * @className:DataAnalysisDetailVo + * @author:cwchen + * @date:2025-04-07-17:03 + * @version:1.0 + * @description:数据应用分析 + */ +@Data +public class DataAnalysisDetailVo { + + private Long id; + private String bidCode; + private String proName; + private String riskLevel; + private String qualityLevel; + private String xmManager; + private String concat; + private String teamLeader; + private String workTeam; + private String gcProcess; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planStartTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date planEndTime; + private int sgNum; + private int hisNum; + private String jcValue; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date jcTime; + private String jcName; + private String yqResaon; +} 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 59ff8f9..b781b19 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 @@ -1,7 +1,15 @@ package com.securitycontrol.screen.controller; +import com.securitycontrol.common.core.utils.aes.StringHelper; +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.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.screen.service.DataAnalysisService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -10,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @className:DataAnalysisController @@ -21,7 +31,7 @@ import javax.annotation.Resource; @RestController @RequestMapping("/largeScreen/dataAnalysis/") @Slf4j -public class DataAnalysisController { +public class DataAnalysisController extends BaseController { @Resource(name = "DataAnalysisService") private DataAnalysisService service; @@ -31,4 +41,29 @@ public class DataAnalysisController { public AjaxResult getDataAnalysisByType(ScreenParamDto dto){ return service.getDataAnalysisByType(dto); } + + @ApiOperation(value = "数据应用分析") + @GetMapping("getListByType") + public TableDataInfo getListByType(ScreenParamDto dto) { + try{ + startLayPage(); + List list = service.getListByType(dto); + return getDataTableLayui(list); + }catch (Exception e){ + log.error(e.toString(),e); + return getDataTableBadLayui(new ArrayList<>(),"请求出错了"); + } + } + + @ApiOperation(value = "数据应用分析-环境检测") + @GetMapping("getListByType2") + public AjaxResult getListByType2(ScreenParamDto dto) { + List list = null; + try{ + list = service.getListByType(dto); + }catch (Exception e){ + log.error(e.toString(),e); + } + return AjaxResult.success(list); + } } 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 5e659f9..fccd883 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 @@ -1,5 +1,5 @@ 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 org.springframework.stereotype.Repository; @@ -23,4 +23,13 @@ public interface DataAnalysisMapper { * @date 2024/9/4 17:03 */ List getDataAnalysisByType(ScreenParamDto dto); + + /** + * 根据类型获取数据分析应用 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/7 17:07 + */ + List getListByType(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 c17b95f..04d3159 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 @@ -2,6 +2,9 @@ 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 java.util.List; /** * @className:DataAnalysisService @@ -19,4 +22,13 @@ public interface DataAnalysisService { * @date 2024/9/4 17:03 */ AjaxResult getDataAnalysisByType(ScreenParamDto dto); + + /** + * 根据类型获取数据分析应用 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/7 17:05 + */ + List getListByType(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 685e5b2..8ca01f1 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 @@ -2,6 +2,7 @@ package com.securitycontrol.screen.service.impl; 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.screen.mapper.DataAnalysisMapper; import com.securitycontrol.screen.service.DataAnalysisService; @@ -11,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** * @className:DataAnalysisServiceImpl @@ -36,4 +38,15 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { } return AjaxResult.success(list); } + + @Override + public List getListByType(ScreenParamDto dto) { + List list = null; + try { + list = Optional.ofNullable(mapper.getListByType(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 67b5f8e..1390198 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml @@ -10,4 +10,27 @@ WHERE analysis_type = #{type} AND del_flag = 0 GROUP BY analysis_name + + \ No newline at end of file