Browse Source

Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

dev_shibei_match
wangchao 5 years ago
parent
commit
86c2c6de09
  1. 24
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java
  2. 24
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java
  3. 6
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java
  4. 45
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java
  5. 45
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java
  6. 1
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
  7. 38
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java
  8. 14
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java
  9. 9
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java
  10. 24
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java
  11. 42
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java
  12. 17
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
  13. 17
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml
  14. 10
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
  15. 17
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
  16. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
  17. 26
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
  18. 61
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java
  19. 6
      epmet-module/data-statistical/data-statistical-server/pom.xml
  20. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
  21. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
  22. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
  23. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
  24. 62
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java
  25. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java
  26. 11
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java
  27. 86
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java
  28. 18
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
  29. 29
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
  30. 8
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
  31. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
  32. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
  33. 20
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
  34. 57
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml

24
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/ProjectFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.screen.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/19 1:25 下午
*/
@Data
public class ProjectFormDTO implements Serializable {
private static final long serialVersionUID = 7114390205886348751L;
public interface Project{}
/**
* 机关ID
*/
@NotBlank(message = "机关ID不能为空",groups = {Project.class})
private String agencyId;
}

24
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/form/TopProfileFormDTO.java

@ -0,0 +1,24 @@
package com.epmet.screen.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/19 1:43 下午
*/
@Data
public class TopProfileFormDTO implements Serializable {
private static final long serialVersionUID = -287352242311433250L;
public interface TopProfile{}
/**
* 机关ID
*/
@NotBlank(message = "机关ID不能为空",groups = {TopProfile.class})
private String agencyId;
}

6
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchResultDTO.java

@ -16,15 +16,15 @@ public class BranchResultDTO implements Serializable {
/**
* 网格ID
*/
private String gridId;
private String gridId = "";
/**
* 网格名称
*/
private String gridName;
private String gridName = "";
/**
* 党支部(网格)位置
*/
private String partyMark;
private String partyMark = "";
}

45
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ProjectResultDTO.java

@ -0,0 +1,45 @@
package com.epmet.screen.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/19 1:27 下午
*/
@Data
public class ProjectResultDTO implements Serializable {
private static final long serialVersionUID = 7130615407473171093L;
/**
* 项目标题
*/
private String projectTitle = "";
/**
* red, green,yellow
*/
private String color = "";
/**
* 项目id
*/
private String projectId = "";
/**
* 网格名称
*/
private String orgName = "";
/**
* 经度
*/
private Double longitude = 0.0;
/**
* 纬度
*/
private Double latitude = 0.0;
}

45
epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/TopProfileResultDTO.java

@ -0,0 +1,45 @@
package com.epmet.screen.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/19 1:46 下午
*/
@Data
public class TopProfileResultDTO implements Serializable {
private static final long serialVersionUID = -5081563117620857359L;
/**
* 用户总数
*/
private Integer userNum = 0;
/**
* 党员总数
*/
private Integer partyMemberNum = 0;
/**
* 党群总数
*/
private Integer groupNum = 0;
/**
* 话题总数
*/
private Integer topicNum = 0;
/**
* 议题总数
*/
private Integer issueNum = 0;
/**
* 项目总数
*/
private Integer projectNum = 0;
}

1
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@ -49,6 +49,7 @@ public class AgencyController {
* @author zxc
* @date 2020/8/18 2:33 下午
*/
@ExternalAppRequestAuth
@PostMapping("compartment")
public Result<CompartmentResultDTO> compartment(@RequestBody CompartmentFormDTO compartmentFormDTO){
ValidatorUtils.validateEntity(compartmentFormDTO, CompartmentFormDTO.Compartment.class);

38
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/DistributionController.java

@ -1,13 +1,10 @@
package com.epmet.datareport.controller.screen;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.form.UserFormDTO;
import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
import com.epmet.screen.dto.form.*;
import com.epmet.screen.dto.result.*;
import com.epmet.datareport.service.screen.DistributionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@ -36,6 +33,7 @@ public class DistributionController {
* @author zxc
* @date 2020/8/18 10:59 上午
*/
@ExternalAppRequestAuth
@PostMapping("branch")
public Result<List<BranchResultDTO>> branch(@RequestBody BranchFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, BranchFormDTO.Branch.class);
@ -48,6 +46,7 @@ public class DistributionController {
* @author zxc
* @date 2020/8/18 11:10 上午
*/
@ExternalAppRequestAuth
@PostMapping("user")
public Result<UserResultDTO> user(@RequestBody UserFormDTO userFormDTO){
ValidatorUtils.validateEntity(userFormDTO, UserFormDTO.User.class);
@ -60,10 +59,37 @@ public class DistributionController {
* @author zxc
* @date 2020/8/18 11:20 上午
*/
@ExternalAppRequestAuth
@PostMapping("parymember")
public Result<ParymemberResultDTO> parymember(@RequestBody ParymemberFormDTO parymemberFormDTO){
ValidatorUtils.validateEntity(parymemberFormDTO, ParymemberFormDTO.Parymember.class);
return new Result<ParymemberResultDTO>().ok(distributionService.parymember(parymemberFormDTO));
}
/**
* @Description 4事件
* @param projectFormDTO
* @author zxc
* @date 2020/8/19 1:29 下午
*/
// @ExternalAppRequestAuth
@PostMapping("project")
public Result<List<ProjectResultDTO>> project(@RequestBody ProjectFormDTO projectFormDTO){
ValidatorUtils.validateEntity(projectFormDTO, ProjectFormDTO.Project.class);
return new Result<List<ProjectResultDTO>>().ok(distributionService.project(projectFormDTO));
}
/**
* @Description 5top区概况
* @param topProfileFormDTO
* @author zxc
* @date 2020/8/19 1:52 下午
*/
// @ExternalAppRequestAuth
@PostMapping("topprofile")
public Result<TopProfileResultDTO> topProfile(@RequestBody TopProfileFormDTO topProfileFormDTO){
ValidatorUtils.validateEntity(topProfileFormDTO, TopProfileFormDTO.TopProfile.class);
return new Result<TopProfileResultDTO>().ok(distributionService.topProfile(topProfileFormDTO));
}
}

14
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenEventDataDao.java

@ -17,7 +17,11 @@
package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.ProjectResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 中央区-事件数据
@ -27,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ScreenEventDataDao{
/**
* @Description 查询事件
* @param parentId
* @author zxc
* @date 2020/8/19 2:09 下午
*/
List<ProjectResultDTO> selectEvent(@Param("parentId")String parentId);
}

9
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenUserTotalDataDao.java

@ -18,6 +18,7 @@
package com.epmet.datareport.dao.screen;
import com.epmet.screen.dto.result.PartymemberPercentResultDTO;
import com.epmet.screen.dto.result.TopProfileResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -39,4 +40,12 @@ public interface ScreenUserTotalDataDao {
**/
PartymemberPercentResultDTO selectAgencyPartymemberPercent(@Param("agencyId")String agencyId);
/**
* @Description 查询top区概况
* @param agencyId
* @author zxc
* @date 2020/8/19 2:13 下午
*/
TopProfileResultDTO selectTopProfile(@Param("agencyId")String agencyId);
}

24
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/DistributionService.java

@ -1,11 +1,7 @@
package com.epmet.datareport.service.screen;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.form.UserFormDTO;
import com.epmet.screen.dto.result.BranchResultDTO;
import com.epmet.screen.dto.result.ParymemberResultDTO;
import com.epmet.screen.dto.result.UserResultDTO;
import com.epmet.screen.dto.form.*;
import com.epmet.screen.dto.result.*;
import java.util.List;
@ -41,4 +37,20 @@ public interface DistributionService {
*/
ParymemberResultDTO parymember(ParymemberFormDTO parymemberFormDTO);
/**
* @Description 4事件
* @param projectFormDTO
* @author zxc
* @date 2020/8/19 1:29 下午
*/
List<ProjectResultDTO> project(ProjectFormDTO projectFormDTO);
/**
* @Description 5top区概况
* @param topProfileFormDTO
* @author zxc
* @date 2020/8/19 1:52 下午
*/
TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO);
}

42
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java

@ -1,10 +1,11 @@
package com.epmet.datareport.service.screen.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.datareport.dao.screen.ScreenCustomerAgencyDao;
import com.epmet.datareport.dao.screen.ScreenCustomerGridDao;
import com.epmet.screen.dto.form.BranchFormDTO;
import com.epmet.screen.dto.form.ParymemberFormDTO;
import com.epmet.screen.dto.form.UserFormDTO;
import com.epmet.datareport.dao.screen.ScreenEventDataDao;
import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao;
import com.epmet.screen.dto.form.*;
import com.epmet.screen.dto.result.*;
import com.epmet.screen.constant.*;
import com.epmet.datareport.service.screen.DistributionService;
@ -12,6 +13,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -27,6 +29,10 @@ public class DistributionServiceImpl implements DistributionService {
private ScreenCustomerGridDao screenCustomerGridDao;
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
@Autowired
private ScreenEventDataDao screenEventDataDao;
@Autowired
private ScreenUserTotalDataDao screenUserTotalDataDao;
/**
* @Description 1党支部
@ -87,4 +93,34 @@ public class DistributionServiceImpl implements DistributionService {
}
return parymemberResult;
}
/**
* @Description 4事件
* @param projectFormDTO
* @author zxc
* @date 2020/8/19 1:29 下午
*/
@Override
public List<ProjectResultDTO> project(ProjectFormDTO projectFormDTO) {
List<ProjectResultDTO> projectResultDTOS = screenEventDataDao.selectEvent(projectFormDTO.getAgencyId());
if (projectResultDTOS.size() == NumConstant.ZERO){
return new ArrayList<>();
}
return projectResultDTOS;
}
/**
* @Description 5top区概况
* @param topProfileFormDTO
* @author zxc
* @date 2020/8/19 1:52 下午
*/
@Override
public TopProfileResultDTO topProfile(TopProfileFormDTO topProfileFormDTO) {
TopProfileResultDTO topProfileResultDTO = screenUserTotalDataDao.selectTopProfile(topProfileFormDTO.getAgencyId());
if (null == topProfileResultDTO){
return new TopProfileResultDTO();
}
return topProfileResultDTO;
}
}

17
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@ -3,6 +3,19 @@
<mapper namespace="com.epmet.datareport.dao.screen.ScreenEventDataDao">
<!-- 查询事件 -->
<select id="selectEvent" resultType="com.epmet.screen.dto.result.ProjectResultDTO">
SELECT
event_title AS projectTitle,
event_level AS color,
event_id AS projectId,
org_name AS orgName,
longitude AS longitude,
latitude AS latitude
FROM
screen_event_data
WHERE
del_flag = '0'
AND parent_id = #{parentId}
</select>
</mapper>

17
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml

@ -16,4 +16,21 @@
AND ORG_ID = #{agencyId}
</select>
<!-- 查询top区概况 -->
<select id="selectTopProfile" resultType="com.epmet.screen.dto.result.TopProfileResultDTO">
SELECT
user_total AS userNum,
party_total AS partyMemberNum,
group_total AS groupNum,
topic_total AS topicNum,
issue_total AS issueNum,
project_total AS projectNum
FROM
screen_user_total_data
WHERE
del_flag = '0'
AND org_type = 'agency'
AND org_id = #{agencyId}
</select>
</mapper>

10
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java

@ -106,4 +106,14 @@ public class EventDataFormDTO implements Serializable {
* 图片列表
*/
private List<ImgDataListDTO> imgDataList;
/**
* 事件状态描述
*/
private String eventStatusDesc;
/**
* 事件状态key
*/
private String eventStatusCode;
}

17
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java

@ -5,7 +5,7 @@ import lombok.Data;
import java.io.Serializable;
/**
* 7基层党建-建设情况数据支部联建 入参
* 7基层党建-建设情况数据支部联建志愿 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@ -30,7 +30,7 @@ public class PartyBranchDataFormDTO implements Serializable {
private String monthId;
/**
* 数据类别 party:支部建设;union:联合建设
* 数据类别 party:支部建设;union:联合建设党员志愿服务voluntaryservice
*/
private String type;
@ -55,14 +55,14 @@ public class PartyBranchDataFormDTO implements Serializable {
private String orgName;
/**
* 分类名称
* 议分类名称
*/
private String issueCategoryName;
private String meetCategoryName;
/**
* 分类id
* 议分类id
*/
private String issueCategoryId;
private String meetCategoryId;
/**
* 组织次数
@ -73,4 +73,9 @@ public class PartyBranchDataFormDTO implements Serializable {
* 参加人数
*/
private Integer joinUserCount;
/**
* 平均参加人数
*/
private Integer averageJoinUserCount;
}

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java

@ -14,11 +14,6 @@ public class PartyUserRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 年Id yyyy
*/

26
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java

@ -3,7 +3,6 @@ package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 11基层治理-公众参与 入参
@ -41,32 +40,27 @@ public class UserJoinFormDTO implements Serializable {
private String orgName;
/**
* 总的参与次数
* 组织次数
*/
private Integer joinTotal;
private Integer organizeTotal;
/**
* 总的参与次数较上月增长率
* 参与次数
*/
private BigDecimal joinTotalUpRate;
/**
* 人均议题
*/
private Integer avgIssue;
private Integer joinTotal;
/**
* 人均议题较上月增长率
* 平均参与人数
*/
private BigDecimal avgIssueUpRate;
private Integer avgJoinUser;
/**
* 平均参与度
* 年Id yyyy
*/
private Integer avgJoin;
private String yearId;
/**
* 平均参与度较上月增长率
* 月份Id yyyyMM
*/
private BigDecimal avgJoinUpRate;
private String monthId;
}

61
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/VoluntaryActivityDataFormDTO.java

@ -1,61 +0,0 @@
package com.epmet.dto.screencoll.form;
import lombok.Data;
import java.io.Serializable;
/**
* 13党建引领-志愿活动服务数据 入参
* @Auther: zhangyong
* @Date: 2020-08-18 09:59
*/
@Data
public class VoluntaryActivityDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* yyyy
*/
private String yearId;
/**
* yyyyMM
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 组织活动次数
*/
private Integer activetyCount;
/**
* 活动参与人数
*/
private Integer joinUserCount;
}

6
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -68,6 +68,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-extapp-auth</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java

@ -1,5 +1,9 @@
package com.epmet.controller;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import com.epmet.service.screen.ScreenCollService;
@ -32,9 +36,11 @@ public class ScreenCollController {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("partyuserrankdata")
public Result partyUserRankData(@RequestBody List<PartyUserRankDataFormDTO> formDTO) {
return screenCollService.insertPartyUserRankData(formDTO);
public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyUserRankDataFormDTO> formDTO) {
screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -51,15 +57,15 @@ public class ScreenCollController {
}
/**
* 7基层党建-建设情况数据支部联建
* 7基层党建-建设情况数据支部联建志愿
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("partybranchdata")
public Result partyBranchData(@RequestBody List<PartyBranchDataFormDTO> formDTO) {
@PostMapping("meetdata")
public Result meetData(@RequestBody List<PartyBranchDataFormDTO> formDTO) {
return screenCollService.insertPartyBranchData(formDTO);
}
@ -182,19 +188,6 @@ public class ScreenCollController {
return screenCollService.insertCustomerAgency(formDTO);
}
/**
* 13党建引领-志愿活动服务数据
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@PostMapping("voluntaryactivitydata")
public Result voluntaryActivityData(@RequestBody List<VoluntaryActivityDataFormDTO> formDTO) {
return screenCollService.insertVoluntaryActivityData(formDTO);
}
/**
* 12中央区各类总数
*

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java

@ -34,7 +34,7 @@ import java.util.List;
@Mapper
public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataEntity> {
/**
* 7基层党建-建设情况数据支部联建
* 7基层党建-建设情况数据支部联建志愿
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
@ -50,7 +50,7 @@ public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataE
@Param("orgIds") String[] orgIds);
/**
* 7基层党建-建设情况数据支部联建
* 7基层党建-建设情况数据支部联建志愿
* 2) 在批量新增
*
* @param list

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java

@ -58,5 +58,5 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list);
void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list,@Param("customerId")String customerId);
}

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java

@ -36,15 +36,19 @@ public interface ScreenUserJoinDao extends BaseDao<ScreenUserJoinEntity> {
/**
* 11基层治理-公众参与
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteUserJoin(@Param("customerId") String customerId,
@Param("orgIds") String[] orgIds);
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 11基层治理-公众参与

62
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenVoluntaryActivityDataDao.java

@ -1,62 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dao.screen;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.screencoll.form.VoluntaryActivityDataFormDTO;
import com.epmet.entity.screen.ScreenVoluntaryActivityDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 党建引领-志愿活动服务数据
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-18
*/
@Mapper
public interface ScreenVoluntaryActivityDataDao extends BaseDao<ScreenVoluntaryActivityDataEntity> {
/**
* 13党建引领-志愿活动服务数据
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
*
* @param customerId
* @param yearId
* @param monthId
* @param orgIds 组织Id集合
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteVoluntaryActivityData(@Param("customerId") String customerId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("orgIds") String[] orgIds);
/**
* 13党建引领-志愿活动服务数据
* 2) 在批量新增
*
* @param list
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertVoluntaryActivityData(@Param("list") List<VoluntaryActivityDataFormDTO> list);
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenDifficultyDataEntity.java

@ -104,7 +104,7 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
private String eventCategoryName;
/**
* 事件状态编码
* 事件状态key
*/
private String eventStatusCode;

11
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenEventDataEntity.java

@ -95,7 +95,7 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
private String eventImgUrl;
/**
* 事件待处理级别 red:yellow
* 事件待处理级别 red:yellow绿色green
*/
private String eventLevel;
@ -124,4 +124,13 @@ public class ScreenEventDataEntity extends BaseEpmetEntity {
*/
private Date lastProcessDate;
/**
* 事件状态key
*/
private String eventStatusCode;
/**
* 事件状态描述
*/
private String eventStatusDesc;
}

86
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenVoluntaryActivityDataEntity.java

@ -1,86 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.entity.screen;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 党建引领-志愿活动服务数据
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-18
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("screen_voluntary_activity_data")
public class ScreenVoluntaryActivityDataEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户Id
*/
private String customerId;
/**
* 年Id
*/
private String yearId;
/**
* 月份Id
*/
private String monthId;
/**
* 组织类别 agency组织部门department网格grid
*/
private String orgType;
/**
* 组织Id 可以为网格机关id
*/
private String orgId;
/**
* 上级组织Id
*/
private String parentId;
/**
* 组织名称
*/
private String orgName;
/**
* 组织活动次数
*/
private Integer activetyCount;
/**
* 活动参与人数
*/
private Integer joinUserCount;
}

18
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java

@ -17,7 +17,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO);
void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId);
/**
* 8党建引领-党员联系群众数据
@ -32,7 +32,7 @@ public interface ScreenCollService {
Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO);
/**
* 7基层党建-建设情况数据支部联建
* 7基层党建-建设情况数据支部联建志愿
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
@ -151,18 +151,6 @@ public interface ScreenCollService {
**/
Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO);
/**
* 13党建引领-志愿活动服务数据
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertVoluntaryActivityData(List<VoluntaryActivityDataFormDTO> formDTO);
/**
* 12中央区各类总数
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
@ -177,7 +165,7 @@ public interface ScreenCollService {
/**
* 11基层治理-公众参与
* 1) 根据CUSTOMER_IDORG_ID进行查询如果有数据则先进行物理删除
* 1) 根据CUSTOMER_IDYEAR_IDMONTH_IDORG_ID进行查询如果有数据则先进行物理删除
* 2) 在新增
*
* @param formDTO

29
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java

@ -65,8 +65,6 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Autowired
private ScreenCustomerAgencyDao screenCustomerAgencyDao;
@Autowired
private ScreenVoluntaryActivityDataDao screenVoluntaryActivityDataDao;
@Autowired
private ScreenUserTotalDataDao screenUserTotalDataDao;
@Autowired
private ScreenUserJoinDao screenUserJoinDao;
@ -75,20 +73,19 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO) {
public void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenPartyUserRankDataDao.deletePartyUserRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO);
screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO,customerId);
}
return new Result();
}
@Override
@ -278,24 +275,6 @@ public class ScreenCollServiceImpl implements ScreenCollService {
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertVoluntaryActivityData(List<VoluntaryActivityDataFormDTO> formDTO) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId();
}
screenVoluntaryActivityDataDao.deleteVoluntaryActivityData(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenVoluntaryActivityDataDao.batchInsertVoluntaryActivityData(formDTO);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO) {
@ -321,6 +300,8 @@ public class ScreenCollServiceImpl implements ScreenCollService {
orgIds[i] = formDTO.get(i).getOrgId();
}
screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenUserJoinDao.batchInsertUserJoin(formDTO);

8
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml

@ -34,7 +34,9 @@
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
UPDATED_TIME,
EVENT_STATUS_CODE,
EVENT_STATUS_DESC
) values
<foreach collection="list" item="item" index="index" separator=",">
(
@ -61,7 +63,9 @@
'APP_USER',
now(),
'APP_USER',
now()
now(),
#{item.eventStatusCode},
#{item.eventStatusDesc}
)
</foreach>
</insert>

10
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml

@ -24,10 +24,11 @@
ORG_ID,
PARENT_ID,
ORG_NAME,
ISSUE_CATEGORY_ID,
ISSUE_CATEGORY_NAME,
MEET_CATEGORY_ID,
MEET_CATEGORY_NAME,
ORGANIZE_COUNT,
JOIN_USER_COUNT,
AVERAGE_JOIN_USER_COUNT,
DEL_FLAG,
REVISION,
CREATED_BY,
@ -46,10 +47,11 @@
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.issueCategoryId},
#{item.issueCategoryName},
#{item.meetCategoryId},
#{item.meetCategoryName},
#{item.organizeCount},
#{item.joinUserCount},
#{item.averageJoinUserCount},
0,
0,
'APP_USER',

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@ -12,7 +12,7 @@
</foreach>
</delete>
<insert id="batchInsertPartyUserRankData" parameterType="java.util.List">
<insert id="batchInsertPartyUserRankData" parameterType="map">
insert into screen_party_user_rank_data
(
ID,
@ -37,7 +37,7 @@
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},

20
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml

@ -5,7 +5,7 @@
<delete id="deleteUserJoin">
delete from screen_user_join
where CUSTOMER_ID = #{customerId}
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
@ -17,16 +17,15 @@
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
ORGANIZE_TOTAL,
JOIN_TOTAL,
JOIN_TOTAL_UP_RATE,
AVG_ISSUE,
AVG_ISSUE_UP_RATE,
AVG_JOIN,
AGVG_JOIN_UP_RATE,
AVG_JOIN_USER,
DEL_FLAG,
REVISION,
CREATED_BY,
@ -38,16 +37,15 @@
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.organizeTotal},
#{item.joinTotal},
#{item.joinTotalUpRate},
#{item.avgIssue},
#{item.avgIssueUpRate},
#{item.avgJoin},
#{item.avgJoinUpRate},
#{item.avgJoinUser},
0,
0,
'APP_USER',

57
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.screen.ScreenVoluntaryActivityDataDao">
<delete id="deleteVoluntaryActivityData">
delete from screen_voluntary_activity_data
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId}
AND ORG_ID IN
<foreach item="item" collection="orgIds" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<insert id="batchInsertVoluntaryActivityData" parameterType="java.util.List">
insert into screen_voluntary_activity_data
(
ID,
CUSTOMER_ID,
YEAR_ID,
MONTH_ID,
ORG_TYPE,
ORG_ID,
PARENT_ID,
ORG_NAME,
ACTIVETY_COUNT,
JOIN_USER_COUNT,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{item.yearId},
#{item.monthId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
#{item.orgName},
#{item.activetyCount},
#{item.joinUserCount},
0,
0,
'APP_USER',
now(),
'APP_USER',
now()
)
</foreach>
</insert>
</mapper>
Loading…
Cancel
Save