From c14bb1422314b93d3fa99c69eab64e456f63cf6c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 11 Feb 2020 17:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=91=E9=9A=BE=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E6=9E=90=20=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/item/form/ItemAnalysisFormDTO.java | 60 +++++++++++++ .../item/result/ItemAnalysisResultDTO.java | 65 ++++++++++++++ .../controller/AppItemAnalysisController.java | 40 +++++++++ .../modules/item/dao/ItemAnalysisDao.java | 15 +++- .../item/service/ItemAnalysisService.java | 16 +++- .../service/impl/ItemAnalysisServiceImpl.java | 11 ++- .../resources/mapper/item/ItemAnalysisDao.xml | 85 +++++++++++++++++++ .../controller/ApiAnalysisItemController.java | 18 ++++ .../epdc/feign/AnalysisItemFeignClient.java | 14 +++ .../AnalysisItemFeignClientFallback.java | 9 ++ .../epdc/service/AnalysisItemService.java | 13 +++ .../service/impl/AnalysisItemServiceImpl.java | 9 ++ 12 files changed, 343 insertions(+), 12 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java new file mode 100644 index 000000000..2dc00a6d6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemAnalysisFormDTO.java @@ -0,0 +1,60 @@ +package com.elink.esua.epdc.dto.item.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 疑难项目分析DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemAnalysisFormDTO implements Serializable { + private static final long serialVersionUID = 6144783947444092507L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量，默认5页 + */ + @Min(value = 1, message = "每页条数必须大于0") + private Integer pageSize; + + /** + * 第一页查询发起时的时间 + */ + @NotBlank(message = "时间戳不能为空") + private String timestamp; + + /** + * 分析类型（1:耗时最长，2:设计部门最多，3:处理次数最多） + */ + @NotNull(message = "分析类型不能为空") + private Integer analysisType; + + /** + * 项目状态（1:结案或关闭，2:解决中） + */ + @NotNull(message = "项目状态不能为空") + private Integer itemState; + + /** + * 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年） + */ + @NotNull(message = "数据时间类型不能为空") + private Integer someMonthsType; + + /** + * 部门ID列表 + */ + List deptIdList; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java new file mode 100644 index 000000000..4db3b347e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAnalysisResultDTO.java @@ -0,0 +1,65 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 疑难项目分析DTO + * @Author zy + * @Date 2020/2/11 + */ +@Data +public class ItemAnalysisResultDTO implements Serializable { + + /** + * 主键 + */ + private String id; + + /** + * 项目内容 + */ + private String content; + + /** + * 创建时间 + */ + private String createdTime; + + /** + * 图片 + */ + private List images; + + /** + * 项目状态 0-处理中，5-已关闭，10-已结案 + */ + private Integer itemState; + + /** + * 分类名称 + */ + private String categoryName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 耗时（小时） + */ + private Integer spendTime; + + /** + * 部门数量 + */ + private Integer deptCount; + + /** + * 处理次数 + */ + private Integer handleCount; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java new file mode 100644 index 000000000..1f1cde52f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/AppItemAnalysisController.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.modules.item.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 手机端领导数据-项目 + * + * @author zy + * @since 2020-2-11 + */ +@RestController +@RequestMapping("appitem") +public class AppItemAnalysisController { + + @Autowired + private ItemAnalysisService itemAnalysisService; + + /** + * @Description: 疑难项目分析 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping("getItemAnalysis") + public Result> getItemAnalysis(@RequestBody ItemAnalysisFormDTO formDto) { + List data = itemAnalysisService.getItemAnalysis(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 e5a55d815..b3ec64512 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,11 +18,9 @@ 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.ItemAnalysisFormDTO; 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.dto.item.result.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -70,4 +68,13 @@ public interface ItemAnalysisDao extends BaseDao { * @Date: 2020-02-11 */ ItemSurveyResultDTO selectOneItemSurvey(ItemSurveyFormDTO formDTO); + + /** + * @Description: 疑难项目分析 + * @Param: [formDto] + * @return: java.util.List + * @Author: zy + * @Date: 2020-02-11 + */ + List selectOneItemAnalysis(ItemAnalysisFormDTO 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 5d2d00125..3cf250fe7 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,12 +1,11 @@ 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.ItemAnalysisFormDTO; 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.dto.item.result.*; +import java.util.List; import java.util.Map; /** @@ -52,4 +51,13 @@ public interface ItemAnalysisService { * @Date: 2020-02-11 */ ItemSurveyResultDTO getItemSurvey(ItemSurveyFormDTO formDTO); + + /** + * @Description: 疑难项目分析 + * @Param: [formDto] + * @return: java.util.List + * @Author: zy + * @Date: 2020-02-11 + */ + List getItemAnalysis(ItemAnalysisFormDTO 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 4f6a9933c..357b199a0 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,11 +7,9 @@ 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.ItemAnalysisFormDTO; 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.dto.item.result.*; import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; import org.slf4j.Logger; @@ -94,4 +92,9 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl getItemAnalysis(ItemAnalysisFormDTO formDto) { + return baseDao.selectOneItemAnalysis(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 7828a73ab..6b38cb161 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 @@ -242,4 +242,89 @@ ) t2; + + + + + + + + + + + + + + + + + + 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 2d0908210..13c0523f8 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 @@ -5,7 +5,9 @@ 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.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.service.AnalysisItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -56,4 +58,20 @@ public class ApiAnalysisItemController { formDto.setGridIds(SecurityUser.getUser().getDeptIdList()); return analysisItemService.getItemSurvey(formDto); } + + /** + * @Description: 疑难项目分析 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping("getItemAnalysis") + public Result> getItemAnalysis(@RequestBody ItemAnalysisFormDTO formDto) { + //效验数据 + ValidatorUtils.validateEntity(formDto); + formDto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); + Result> list = analysisItemService.getItemAnalysis(formDto); + return list; + } } 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 3244de18a..262cc78b8 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,13 +3,17 @@ 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.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; 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; import org.springframework.web.bind.annotation.GetMapping; +import java.util.List; + /** * 评价模块调用-移动app端 * @Author LPF @@ -39,4 +43,14 @@ public interface AnalysisItemFeignClient { @GetMapping(value = "analysis/item/getItemSurvey") Result getItemSurvey(ItemSurveyFormDTO formDto); + /** + * @Description: 疑难项目分析 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-02-11 + */ + @GetMapping(value = "analysis/appitem/getItemAnalysis") + Result> getItemAnalysis(ItemAnalysisFormDTO 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 1e3a8eeb2..7015eccbc 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,11 +3,15 @@ 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.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; import com.elink.esua.epdc.feign.AnalysisItemFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Author LPF * @Date 2019/11/18 16:39 @@ -26,4 +30,9 @@ public class AnalysisItemFeignClientFallback implements AnalysisItemFeignClient return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemSurvey", formDto); } + @Override + public Result> getItemAnalysis(ItemAnalysisFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getItemAnalysis", 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 adb7c02d0..47bdd41f7 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,9 +1,13 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; +import java.util.List; + /** * 项目模块-数据分析移动端 * @Author LPF @@ -28,4 +32,13 @@ public interface AnalysisItemService { * @Date: 2020-02-11 */ Result getItemSurvey(ItemSurveyFormDTO formDTO); + + /** + * @Description: 疑难项目分析 + * @Param: [formDto] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-02-11 + */ + Result> getItemAnalysis(ItemAnalysisFormDTO 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 8805a31e2..3cf48b246 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,13 +2,17 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; +import com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO; 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; import org.springframework.stereotype.Service; +import java.util.List; + /** * 项目模块-移动app端 * @Author LPF @@ -31,4 +35,9 @@ public class AnalysisItemServiceImpl implements AnalysisItemService { public Result getItemSurvey(ItemSurveyFormDTO formDTO) { return analysisItemFeignClient.getItemSurvey(formDTO); } + + @Override + public Result> getItemAnalysis(ItemAnalysisFormDTO formDto) { + return analysisItemFeignClient.getItemAnalysis(formDto); + } }