diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ScreenParamDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ScreenParamDto.java index 740e193..e002c04 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ScreenParamDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/ScreenParamDto.java @@ -24,4 +24,6 @@ public class ScreenParamDto extends ScreenDto{ @ApiModelProperty("编码类型") private int typeCode; + private String type; + } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisVo.java index f5a44dc..6c1cd72 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DataAnalysisVo.java @@ -11,8 +11,11 @@ import lombok.Data; */ @Data public class DataAnalysisVo { + /**名称*/ - private String dataAnalysisName; + private String name; /**数量*/ private Integer num; + + private String typeName; } 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 014bd8d..5e659f9 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,7 +1,11 @@ package com.securitycontrol.screen.mapper; +import com.securitycontrol.entity.screen.dto.ScreenParamDto; +import com.securitycontrol.entity.screen.vo.DataAnalysisVo; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @className:DataAnalysisMapper * @author:cwchen @@ -11,4 +15,12 @@ import org.springframework.stereotype.Repository; */ @Repository(value = "DataAnalysisMapper") public interface DataAnalysisMapper { + /** + * 根据类型获取数据分析应用 + * @param dto + * @return List + * @author cwchen + * @date 2024/9/4 17:03 + */ + List getDataAnalysisByType(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 b120f13..685e5b2 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,12 +2,15 @@ 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.DataAnalysisVo; import com.securitycontrol.screen.mapper.DataAnalysisMapper; import com.securitycontrol.screen.service.DataAnalysisService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @className:DataAnalysisServiceImpl @@ -25,12 +28,12 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { @Override public AjaxResult getDataAnalysisByType(ScreenParamDto dto) { - + List list = new ArrayList<>(); try { - + list = mapper.getDataAnalysisByType(dto); } catch (Exception e) { log.error(e.toString(),e); } - return AjaxResult.success(); + return AjaxResult.success(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 4ff3c6d..9245441 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml @@ -2,4 +2,33 @@ + + \ No newline at end of file