diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java new file mode 100644 index 000000000..b18f9d466 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemSurveyFormDTO.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 重点项目概况DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemSurveyFormDTO implements Serializable { + private static final long serialVersionUID = 6544783947444092507L; + /** + * 主键 + */ + private String id; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 部门ID列表 + */ + List gridIds; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java new file mode 100644 index 000000000..acf669b3e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemSurveyResultDTO.java @@ -0,0 +1,53 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 重点项目概况DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemSurveyResultDTO implements Serializable { +// t1.unsolvedCount, -- notCloseNum +// t2.dispatchCount, -- reportGridPlatformNum +// t2.solvingCount, -- solvingNum +// t2.solvedCount -- solvedNum + + /** + * 未解决项目数 + */ + private Integer unsolvedCount; + + /** + * 超时项目数 + */ + private Integer timeoutCount; + + /** + * 未超时项目数 + */ + private Integer noTimeoutCount; + + /** + * 区调度项目数 + */ + private Integer dispatchCount; + + /** + * 解决中项目数 + */ + private Integer solvingCount; + + /** + * 已解决项目数 + */ + private Integer solvedCount; + + /** + * 更新时间 + */ + private String updateTime; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java index 35485182e..72573efac 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java @@ -19,15 +19,14 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -84,5 +83,16 @@ public class ItemAnalysisController { return new Result>().ok(page); } - + /** + * @Description: 重点项目概况 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping("getItemSurvey") + public Result getItemSurvey(@RequestBody ItemSurveyFormDTO formDTO) { + ItemSurveyResultDTO data = itemAnalysisService.getItemSurvey(formDTO); + return new Result().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java index 209a41066..e5a55d815 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java @@ -18,8 +18,10 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -59,4 +61,13 @@ public interface ItemAnalysisDao extends BaseDao { * @Date 2020/2/11 13:14 **/ List selectListDifficultItemResultDTO(Map params); + + /** + * @Description: 重点项目概况 + * @Param: [formDTO] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + ItemSurveyResultDTO selectOneItemSurvey(ItemSurveyFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java index 94c17f074..5d2d00125 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java @@ -1,8 +1,10 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import java.util.Map; @@ -41,4 +43,13 @@ public interface ItemAnalysisService { * @Date 2020/2/11 13:13 **/ PageData listDifficultItemResultDTO(Map params); + + /** + * @Description: 重点项目概况 + * @Param: [formDTO] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + ItemSurveyResultDTO getItemSurvey(ItemSurveyFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java index 7418e6a89..4f6a9933c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java @@ -7,8 +7,10 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; @@ -87,4 +89,9 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl list = baseDao.selectListDifficultItemResultDTO(params); return new PageData<>(list, page.getTotal()); } + + @Override + public ItemSurveyResultDTO getItemSurvey(ItemSurveyFormDTO formDTO) { + return baseDao.selectOneItemSurvey(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml index c19595a2a..7828a73ab 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml @@ -191,4 +191,55 @@ AND reportFlag = #{reportFlag} + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java index ffef5f892..2d0908210 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java @@ -2,13 +2,21 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.service.AnalysisItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; + /** * 移动端接口-数据分析模块(项目) * @Author LPF @@ -33,4 +41,19 @@ public class ApiAnalysisItemController { public Result test(@LoginUser TokenDto tokenDto) { return analysisItemService.test(); } + + /** + * @Description: 重点项目概况 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping("getItemSurvey") + public Result getItemSurvey(@RequestBody ItemSurveyFormDTO formDto) { + //效验数据 + ValidatorUtils.validateEntity(formDto); + formDto.setGridIds(SecurityUser.getUser().getDeptIdList()); + return analysisItemService.getItemSurvey(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java index b64753468..3244de18a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.feign.fallback.AnalysisItemFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -27,6 +29,14 @@ public interface AnalysisItemFeignClient { @GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE) Result test(); - + /** + * @Description: 重点项目概况 + * @Param: [formDTO] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping(value = "analysis/item/getItemSurvey") + Result getItemSurvey(ItemSurveyFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java index 5273f87e5..1e3a8eeb2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.feign.AnalysisItemFeignClient; import org.springframework.stereotype.Component; @@ -19,4 +21,9 @@ public class AnalysisItemFeignClientFallback implements AnalysisItemFeignClient return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test"); } + @Override + public Result getItemSurvey(ItemSurveyFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemSurvey", formDto); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java index 456a0bcf6..adb7c02d0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java @@ -1,8 +1,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; - -import java.util.List; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; /** * 项目模块-数据分析移动端 @@ -19,6 +19,13 @@ public interface AnalysisItemService { * @Date: 2019/11/19 16:37 */ Result test(); - - + + /** + * @Description: 重点项目概况 + * @Param: [formDTO] + * @return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: zy + * @Date: 2020-02-11 + */ + Result getItemSurvey(ItemSurveyFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java index 2e97fbc7f..8805a31e2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java @@ -2,6 +2,8 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.feign.AnalysisItemFeignClient; import com.elink.esua.epdc.service.AnalysisItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,4 +26,9 @@ public class AnalysisItemServiceImpl implements AnalysisItemService { public Result test() { return analysisItemFeignClient.test(); } + + @Override + public Result getItemSurvey(ItemSurveyFormDTO formDTO) { + return analysisItemFeignClient.getItemSurvey(formDTO); + } }