Browse Source
# Conflicts: # esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java # esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java # esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java # esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java # esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xmldev
34 changed files with 975 additions and 18 deletions
@ -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<Long> deptIdList; |
|||
} |
|||
@ -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<Long> gridIds; |
|||
} |
|||
@ -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<String> images; |
|||
|
|||
/** |
|||
* 项目状态 0-处理中，5-已关闭，10-已结案 |
|||
*/ |
|||
private Integer itemState; |
|||
|
|||
/** |
|||
* 分类名称 |
|||
*/ |
|||
private String categoryName; |
|||
|
|||
/** |
|||
* 部门名称 |
|||
*/ |
|||
private String deptName; |
|||
|
|||
/** |
|||
* 耗时（小时） |
|||
*/ |
|||
private Integer spendTime; |
|||
|
|||
/** |
|||
* 部门数量 |
|||
*/ |
|||
private Integer deptCount; |
|||
|
|||
/** |
|||
* 处理次数 |
|||
*/ |
|||
private Integer handleCount; |
|||
} |
|||
@ -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; |
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
package com.elink.esua.epdc.dto.topic.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.Min; |
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 最新发布话题接口入参DTO |
|||
* @Author wgf |
|||
* @Date 2020/2/11 10:31 |
|||
*/ |
|||
@Data |
|||
public class NewHotTopicFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -1938141144074477454L; |
|||
|
|||
/** |
|||
* 页码，从1开始 |
|||
*/ |
|||
@Min(value = 1, message = "页码必须大于0") |
|||
private int pageIndex; |
|||
|
|||
/** |
|||
* 页容量，默认10页 |
|||
*/ |
|||
@Min(value = 1, message = "每页条数必须大于必须大于0") |
|||
private int pageSize = 10; |
|||
|
|||
/** |
|||
* 第一页查询发起时的时间 |
|||
*/ |
|||
@NotBlank(message = "时间戳不能为空") |
|||
private String timestamp; |
|||
|
|||
/** |
|||
* 数据时间类型（1:最近1个月，2:最近3个月，3:最近半年，4:最近一年）,默认1 |
|||
*/ |
|||
@NotBlank(message = "数据时间类型不能为空") |
|||
private int someMonthsType = 1; |
|||
} |
|||
@ -0,0 +1,43 @@ |
|||
package com.elink.esua.epdc.dto.topic.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Description 话题列表DTO |
|||
* @Author yinzuomei |
|||
* @Date 2020/2/10 11:31 |
|||
*/ |
|||
@Data |
|||
public class NewHotTopicResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -1938141144074477454L; |
|||
|
|||
/** |
|||
* 话题Id（TopicId） |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 内容 |
|||
*/ |
|||
private String content; |
|||
|
|||
/** |
|||
* 图片 |
|||
*/ |
|||
private List<String> images; |
|||
|
|||
/** |
|||
* 部门名称 |
|||
*/ |
|||
private String deptName; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private String createdTime; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,64 @@ |
|||
package com.elink.esua.epdc.dto.user.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* 用户数据排行 |
|||
* |
|||
* @author work@yujt.net.cn |
|||
* @date 2020/2/11 14:44 |
|||
*/ |
|||
@Data |
|||
public class UserDataRankResultDTO { |
|||
|
|||
/** |
|||
* 街道id |
|||
*/ |
|||
private String streetId; |
|||
/** |
|||
* 街道名称 |
|||
*/ |
|||
private String streetName; |
|||
/** |
|||
* 用户注册数 |
|||
*/ |
|||
private Integer userCount; |
|||
/** |
|||
* 男性数 |
|||
*/ |
|||
private Integer maleCount; |
|||
/** |
|||
* 女性数 |
|||
*/ |
|||
private Integer femaleCount; |
|||
/** |
|||
* 未知性别数 |
|||
*/ |
|||
private Integer unknownSexCount; |
|||
/** |
|||
* 居民数 |
|||
*/ |
|||
private Integer residentCount; |
|||
/** |
|||
* 党员数 |
|||
*/ |
|||
private Integer partymemberCount; |
|||
/** |
|||
* 老人数（年龄大于50） |
|||
*/ |
|||
private Integer oldCount; |
|||
/** |
|||
* 年轻人数（年龄不大于50） |
|||
*/ |
|||
private Integer youngCount; |
|||
/** |
|||
* 老人比例 |
|||
*/ |
|||
private BigDecimal oldPercent; |
|||
/** |
|||
* 年轻人比例 |
|||
*/ |
|||
private BigDecimal youngPercent; |
|||
} |
|||
@ -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<java.util.List<com.elink.esua.epdc.dto.item.result.ItemAnalysisResultDTO>> |
|||
* @Author: zy |
|||
* @Date: 2020-02-11 |
|||
*/ |
|||
@GetMapping("getItemAnalysis") |
|||
public Result<List<ItemAnalysisResultDTO>> getItemAnalysis(@RequestBody ItemAnalysisFormDTO formDto) { |
|||
List<ItemAnalysisResultDTO> data = itemAnalysisService.getItemAnalysis(formDto); |
|||
return new Result<List<ItemAnalysisResultDTO>>().ok(data); |
|||
} |
|||
} |
|||
Loading…
Reference in new issue