Browse Source
# Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPioneerDataEntity.javamaster
yinzuomei
5 years ago
48 changed files with 1783 additions and 61 deletions
@ -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/20 2:28 下午 |
|||
*/ |
|||
@Data |
|||
public class ContactMassLineChartFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5627978767044772204L; |
|||
|
|||
public interface ContactMassLineChart{} |
|||
|
|||
/** |
|||
* 机关ID |
|||
*/ |
|||
@NotBlank(message = "机关ID不能为空",groups = {ContactMassLineChart.class}) |
|||
private String agencyId; |
|||
} |
|||
@ -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/20 1:46 下午 |
|||
*/ |
|||
@Data |
|||
public class FineExampleFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -5402747414542735700L; |
|||
|
|||
public interface FineExample{} |
|||
|
|||
/** |
|||
* 机关ID |
|||
*/ |
|||
@NotBlank(message = "机关ID不能为空",groups = {FineExample.class}) |
|||
private String agencyId; |
|||
} |
|||
@ -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/20 3:12 下午 |
|||
*/ |
|||
@Data |
|||
public class VolunteerServiceFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 7916606646764729831L; |
|||
|
|||
public interface VolunteerService{} |
|||
|
|||
/** |
|||
* 机关ID |
|||
*/ |
|||
@NotBlank(message = "机关ID不能为空",groups = {VolunteerService.class}) |
|||
private String agencyId; |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.screen.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/8/20 2:45 下午 |
|||
*/ |
|||
@Data |
|||
public class ContactMassLineChartResult implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5668549816473850787L; |
|||
|
|||
/** |
|||
* 组织名称 |
|||
*/ |
|||
private String orgName; |
|||
|
|||
/** |
|||
* 党员建群数 |
|||
*/ |
|||
private Integer groupTotal; |
|||
|
|||
/** |
|||
* 群成员数 |
|||
*/ |
|||
private Integer userTotal; |
|||
} |
|||
@ -0,0 +1,31 @@ |
|||
package com.epmet.screen.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/8/20 2:31 下午 |
|||
*/ |
|||
@Data |
|||
public class ContactMassLineChartResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 192666933158635787L; |
|||
|
|||
/** |
|||
* 横坐标集合 |
|||
*/ |
|||
private List<String> xAxis; |
|||
|
|||
/** |
|||
* 党员建群数 |
|||
*/ |
|||
private List<Integer> groupData; |
|||
|
|||
/** |
|||
* 群成员数 |
|||
*/ |
|||
private List<Integer> groupMemberData; |
|||
} |
|||
@ -0,0 +1,81 @@ |
|||
package com.epmet.screen.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/8/20 1:48 下午 |
|||
*/ |
|||
@Data |
|||
public class FineExampleResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -2754696449087950719L; |
|||
|
|||
/** |
|||
* 党员参与议事 |
|||
*/ |
|||
private Integer issueTotal = 0; |
|||
|
|||
@JsonIgnore |
|||
private Double issueRatioA; |
|||
|
|||
/** |
|||
* 党员参与议事占比 |
|||
*/ |
|||
private String issueRatio = "0.00%"; |
|||
|
|||
/** |
|||
* 党员发布话题总数 |
|||
*/ |
|||
private Integer topicTotal = 0; |
|||
|
|||
@JsonIgnore |
|||
private Double topicRatioA; |
|||
|
|||
/** |
|||
* 党员发布话题占比 |
|||
*/ |
|||
private String topicRatio = "0.00%"; |
|||
|
|||
/** |
|||
* 议题转项目 |
|||
*/ |
|||
private Integer shiftProjectTotal = 0; |
|||
|
|||
@JsonIgnore |
|||
private Double shiftProjectRatioA; |
|||
|
|||
/** |
|||
* 议题转项目占比 |
|||
*/ |
|||
private String shiftProjectRatio = "0.00%"; |
|||
|
|||
/** |
|||
* 解决项目 |
|||
*/ |
|||
private Integer resolvedProjectTotal = 0; |
|||
|
|||
@JsonIgnore |
|||
private Double resolvedProjectRatioA; |
|||
|
|||
/** |
|||
* 解决项目占比 |
|||
*/ |
|||
private String resolvedProjectRatio = "0.00%"; |
|||
|
|||
/** |
|||
* 党员发布议题数 |
|||
*/ |
|||
private Integer publishIssueTotal = 0; |
|||
|
|||
@JsonIgnore |
|||
private Double publishIssueRatioA; |
|||
|
|||
/** |
|||
* 党员发布议题数占比 |
|||
*/ |
|||
private String publishIssueRatio = "0.00%"; |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.screen.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/8/20 3:16 下午 |
|||
*/ |
|||
@Data |
|||
public class VolunteerServiceResult implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 959536759114517195L; |
|||
|
|||
/** |
|||
* 月份ID |
|||
*/ |
|||
private String monthId; |
|||
|
|||
/** |
|||
* 组织次数 |
|||
*/ |
|||
private Integer organizeData; |
|||
|
|||
/** |
|||
* 参与次数 |
|||
*/ |
|||
private Integer joinData; |
|||
|
|||
/** |
|||
* 平均参与人次 |
|||
*/ |
|||
private Integer averageJoinUserData; |
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
package com.epmet.screen.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/8/20 3:14 下午 |
|||
*/ |
|||
@Data |
|||
public class VolunteerServiceResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -6227889392267793005L; |
|||
|
|||
/** |
|||
* x轴，返回近12个月，不包含当前月 |
|||
*/ |
|||
private List<String> xAxis; |
|||
|
|||
/** |
|||
* 组织次数 |
|||
*/ |
|||
private List<Integer> organizeData; |
|||
|
|||
/** |
|||
* 参与次数 |
|||
*/ |
|||
private List<Integer> joinData; |
|||
|
|||
/** |
|||
* 平均参与人次 |
|||
*/ |
|||
private List<Integer> averageJoinUserData; |
|||
} |
|||
@ -1,10 +1,152 @@ |
|||
package com.epmet.service.indexcollect.impl; |
|||
|
|||
import com.epmet.commons.tools.constant.NumConstant; |
|||
import com.epmet.dao.indexcoll.*; |
|||
import com.epmet.dto.indexcollect.form.*; |
|||
import com.epmet.service.indexcollect.FactIndexCollectService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Service; |
|||
import org.springframework.transaction.annotation.Transactional; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Auther: zhangyong |
|||
* @Date: 2020-08-20 10:05 |
|||
*/ |
|||
@Service |
|||
public class FactIndexCollectServiceImpl implements FactIndexCollectService { |
|||
|
|||
@Autowired |
|||
private FactIndexPartyAblityCpcMonthlyDao factIndexPartyAblityCpcMonthlyDao; |
|||
@Autowired |
|||
private FactIndexPartyAblityGridMonthlyDao factIndexPartyAblityGridMonthlyDao; |
|||
@Autowired |
|||
private FactIndexPartyAblityOrgMonthlyDao factIndexPartyAblityOrgMonthlyDao; |
|||
@Autowired |
|||
private FactIndexServiceAblityGridMonthlyDao factIndexServiceAblityGridMonthlyDao; |
|||
@Autowired |
|||
private FactIndexServiceAblityOrgMonthlyDao factIndexServiceAblityOrgMonthlyDao; |
|||
@Autowired |
|||
private FactIndexGovrnAblityGridMonthlyDao factIndexGovrnAblityGridMonthlyDao; |
|||
@Autowired |
|||
private FactIndexGovrnAblityOrgMonthlyDao factIndexGovrnAblityOrgMonthlyDao; |
|||
@Autowired |
|||
private FactIndexGovrnAblityDeptMonthlyDao factIndexGovrnAblityDeptMonthlyDao; |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertGridPartyMemberData(List<GridPartyMemberDataFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
factIndexPartyAblityCpcMonthlyDao.deleteFactIndexPartyAblityCpcMonthly(customerId, |
|||
formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getUserId(), |
|||
formDTO.get(i).getYearId(), formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId()); |
|||
} |
|||
factIndexPartyAblityCpcMonthlyDao.batchInsertFactIndexPartyAblityCpcMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertGridPartyAbility(List<GridPartyAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
factIndexPartyAblityGridMonthlyDao.deleteFactIndexPartyAblityGridMonthly(customerId, |
|||
formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getYearId(), |
|||
formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId()); |
|||
} |
|||
factIndexPartyAblityGridMonthlyDao.batchInsertFactIndexPartyAblityGridMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertOrgPartyAbility(List<OrgPartyAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
String[] agencyIds = new String[formDTO.size()]; |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
agencyIds[i] = formDTO.get(i).getAgencyId(); |
|||
} |
|||
factIndexPartyAblityOrgMonthlyDao.deleteFactIndexPartyAblityOrgMonthly(customerId, |
|||
formDTO.get(NumConstant.ZERO).getYearId(), |
|||
formDTO.get(NumConstant.ZERO).getMonthId(), |
|||
formDTO.get(NumConstant.ZERO).getQuarterId(), |
|||
agencyIds); |
|||
factIndexPartyAblityOrgMonthlyDao.batchInsertFactIndexPartyAblityOrgMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertGridServiceAbility(List<GridServiceAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
factIndexServiceAblityGridMonthlyDao.deleteFactIndexServiceAblityGridMonthly(customerId, |
|||
formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getYearId(), |
|||
formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId()); |
|||
} |
|||
factIndexServiceAblityGridMonthlyDao.batchInsertFactIndexServiceAblityGridMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertOrgServiceAbility(List<OrgServiceAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
String[] agencyIds = new String[formDTO.size()]; |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
agencyIds[i] = formDTO.get(i).getAgencyId(); |
|||
} |
|||
factIndexServiceAblityOrgMonthlyDao.deleteFactIndexServiceAblityOrgMonthly(customerId, |
|||
formDTO.get(NumConstant.ZERO).getYearId(), |
|||
formDTO.get(NumConstant.ZERO).getMonthId(), |
|||
formDTO.get(NumConstant.ZERO).getQuarterId(), |
|||
agencyIds); |
|||
factIndexServiceAblityOrgMonthlyDao.batchInsertFactIndexServiceAblityOrgMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertGridGovrnAbility(List<GridGovrnAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
factIndexGovrnAblityGridMonthlyDao.deleteFactIndexGovrnAblityGridMonthly(customerId, |
|||
formDTO.get(i).getAgencyId(), formDTO.get(i).getGridId(), formDTO.get(i).getYearId(), |
|||
formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId()); |
|||
} |
|||
factIndexGovrnAblityGridMonthlyDao.batchInsertFactIndexGovrnAblityGridMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertOrgGovrnAbility(List<OrgGovrnAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
String[] agencyIds = new String[formDTO.size()]; |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
agencyIds[i] = formDTO.get(i).getAgencyId(); |
|||
} |
|||
factIndexGovrnAblityOrgMonthlyDao.deleteFactIndexGovrnAblityOrgMonthly(customerId, |
|||
formDTO.get(NumConstant.ZERO).getYearId(), |
|||
formDTO.get(NumConstant.ZERO).getMonthId(), |
|||
formDTO.get(NumConstant.ZERO).getQuarterId(), |
|||
agencyIds); |
|||
factIndexGovrnAblityOrgMonthlyDao.batchInsertFactIndexGovrnAblityOrgMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
|
|||
@Override |
|||
@Transactional(rollbackFor = Exception.class) |
|||
public void insertDeptGovrnAbility(List<DeptGovrnAbilityFormDTO> formDTO, String customerId) { |
|||
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ |
|||
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ |
|||
factIndexGovrnAblityDeptMonthlyDao.deleteFactIndexGovrnAblityDeptMonthly(customerId, |
|||
formDTO.get(i).getAgencyId(), formDTO.get(i).getDeptId(), formDTO.get(i).getYearId(), |
|||
formDTO.get(i).getMonthId(), formDTO.get(i).getQuarterId()); |
|||
} |
|||
factIndexGovrnAblityDeptMonthlyDao.batchInsertFactIndexGovrnAblityDeptMonthly(formDTO, customerId); |
|||
} |
|||
} |
|||
} |
|||
|
|||
@ -0,0 +1,3 @@ |
|||
alter table fact_index_party_ablity_org_monthly MODIFY column DATA_TYPE VARCHAR(100) DEFAULT '' COMMENT '数据类型 allRegion：全区；community：社区；street：街道'; |
|||
alter table fact_index_service_ablity_org_monthly MODIFY column DATA_TYPE VARCHAR(100) DEFAULT '' COMMENT '数据类型 allRegion：全区；community：社区；street：街道'; |
|||
alter table fact_index_govrn_ablity_org_monthly MODIFY column DATA_TYPE VARCHAR(100) DEFAULT '' COMMENT '数据类型 allRegion：全区；community：社区；street：街道'; |
|||
Loading…
Reference in new issue