rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

指数采集接口修改-end

dev
zhangyongzhangyong 5 years ago
parent
c6daa8fff3
commit
d2c2a85705
14 changed files with 101 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java
  2. 9
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
  3. 2
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java
  4. 14
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.java
  5. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java
  6. 18
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
  7. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityGridMonthlyDao.java
  8. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexServiceAblityGridMonthlyDao.java
  9. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java
  10. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexPartyAblityOrgMonthlyEntity.java
  11. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexServiceAblityOrgMonthlyEntity.java
  12. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java
  13. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.3__update_col_data_type.sql
  14. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml

12
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java
View File

@ -55,15 +55,10 @@ public class GridGovrnAbilityFormDTO implements Serializable {
*/
private Integer projectTotal;
/**
* 网格自治项目数
*/
private Integer selfSolveProjectRatio;
/**
* 网格办结项目数
*/
private Integer resolveProjectTotal;
private Integer resolveProjectCount;
/**
* 网格吹哨部门准确率
@ -79,4 +74,9 @@ public class GridGovrnAbilityFormDTO implements Serializable {
* 网格议题转项目率
*/
private BigDecimal avgShiftProjectRatio;
/**
* 网格自治项目数 统计期网格自身内办结的项目数目
*/
private Integer selfSolveProjectCount;
}

9
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridPartyMemberDataFormDTO.java
View File

@ -86,4 +86,13 @@ public class GridPartyMemberDataFormDTO implements Serializable {
*/
private Integer issueToProjectCount;
/**
* 用户id
*/
private String userId;
/**
* 上级组织Id
*/
private String parentId;
}

2
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/OrgServiceAbilityFormDTO.java
View File

@ -43,7 +43,7 @@ public class OrgServiceAbilityFormDTO implements Serializable {
/**
* allRegion：全区；community：社区；street：街道
*/
private Integer dataType;
private String dataType;
/**
* 社区/街道活动组织次数 爱心活动

14
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.java
View File

@ -36,12 +36,22 @@ public interface FactIndexGovrnAblityDeptMonthlyDao extends BaseDao<FactIndexGov
* 8、治理能力-部门相关指标
* 据CUSTOMER_ID、AGENCY_ID、DEPT_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
*
* @param formDTO
* @param customerId
* @param agencyId
* @param deptId
* @param yearId
* @param monthId
* @param quarterId
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
void deleteFactIndexGovrnAblityDeptMonthly(DeptGovrnAbilityFormDTO formDTO, @Param("customerId") String customerId);
void deleteFactIndexGovrnAblityDeptMonthly(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("deptId") String deptId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("quarterId") String quarterId);
/**
* 8、治理能力-部门相关指标

13
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java
View File

@ -38,12 +38,21 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
* 6、治理能力-网格相关指标
* 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
*
* @param formDTO
* @param customerId
* @param agencyId
* @param gridId
* @param yearId
* @param monthId
* @param quarterId
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
void deleteFactIndexGovrnAblityGridMonthly(GridGovrnAbilityFormDTO formDTO, @Param("customerId") String customerId);
void deleteFactIndexGovrnAblityGridMonthly(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("gridId") String gridId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("quarterId") String quarterId);
/**
* 6、治理能力-网格相关指标

18
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
View File

@ -38,12 +38,23 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
* 1、党建能力-党员相关指标上报(按照月份)
* 1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、USER_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
*
* @param formDTO
* @param customerId
* @param agencyId
* @param gridId
* @param userId
* @param yearId
* @param monthId
* @param quarterId
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
void deleteFactIndexPartyAblityCpcMonthly(GridPartyMemberDataFormDTO formDTO, @Param("customerId") String customerId);
void deleteFactIndexPartyAblityCpcMonthly(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("gridId") String gridId,
@Param("userId") String userId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("quarterId") String quarterId);
/**
* 1、党建能力-党员相关指标上报(按照月份)
@ -54,5 +65,6 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
void batchInsertFactIndexPartyAblityCpcMonthly(@Param("list") List<GridPartyMemberDataFormDTO> list, @Param("customerId")String customerId);
void batchInsertFactIndexPartyAblityCpcMonthly(@Param("list") List<GridPartyMemberDataFormDTO> list,
@Param("customerId")String customerId);
}

13
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityGridMonthlyDao.java
View File

@ -38,12 +38,21 @@ public interface FactIndexPartyAblityGridMonthlyDao extends BaseDao<FactIndexPar
* 2、党建能力-网格相关指标上报(按照月份)
* 1) 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
*
* @param formDTO
* @param customerId
* @param agencyId
* @param gridId
* @param yearId
* @param monthId
* @param quarterId
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
void deleteFactIndexPartyAblityGridMonthly(GridPartyAbilityFormDTO formDTO, @Param("customerId") String customerId);
void deleteFactIndexPartyAblityGridMonthly(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("gridId") String gridId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("quarterId") String quarterId);
/**
* 2、党建能力-网格相关指标上报(按照月份)

13
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexServiceAblityGridMonthlyDao.java
View File

@ -37,12 +37,21 @@ public interface FactIndexServiceAblityGridMonthlyDao extends BaseDao<FactIndexS
* 4、服务能力-网格相关指标
* 根据CUSTOMER_ID、AGENCY_ID、GRID_ID、YEAR_ID、MONTH_ID、QUARTER_ID进行查询，如果有数据，则先进行物理删除
*
* @param formDTO
* @param customerId
* @param agencyId
* @param gridId
* @param yearId
* @param monthId
* @param quarterId
* @Author zhangyong
* @Date 10:52 2020-08-20
**/
void deleteFactIndexServiceAblityGridMonthly(GridServiceAbilityFormDTO formDTO, @Param("customerId") String customerId);
void deleteFactIndexServiceAblityGridMonthly(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("gridId") String gridId,
@Param("yearId") String yearId,
@Param("monthId") String monthId,
@Param("quarterId") String quarterId);
/**
* 4、服务能力-网格相关指标

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexGovrnAblityOrgMonthlyEntity.java
View File

@ -27,7 +27,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* 治理能力-街道及社区相关数据
* 治理能力-街道及社区相关数据
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-20
@ -72,7 +72,7 @@ public class FactIndexGovrnAblityOrgMonthlyEntity extends BaseEpmetEntity {
/**
* 数据类型 allRegion：全区；street：街道；community：社区；grid：网格
*/
private Integer dataType;
private String dataType;
/**
* 被吹哨次数

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexPartyAblityOrgMonthlyEntity.java
View File

@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 党建能力-街道及社区相关事实表
* 党建能力-街道及社区相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-20
@ -76,6 +76,6 @@ public class FactIndexPartyAblityOrgMonthlyEntity extends BaseEpmetEntity {
/**
* 数据类型 allRegion：全区；community：社区；street：街道
*/
private Integer dataType;
private String dataType;
}

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexServiceAblityOrgMonthlyEntity.java
View File

@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 服务能力-组织（街道|社区|全区）相关事实表
* 服务能力-组织（街道|社区|全区）相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-20
@ -76,6 +76,6 @@ public class FactIndexServiceAblityOrgMonthlyEntity extends BaseEpmetEntity {
/**
* 数据类型 allRegion：全区；street：街道；community：社区；grid：网格
*/
private Integer dataType;
private String dataType;
}

20
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcollect/impl/FactIndexCollectServiceImpl.java
View File

@ -39,7 +39,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
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(formDTO.get(i), customerId);
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);
}
@ -50,7 +52,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
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(formDTO.get(i), customerId);
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);
}
@ -78,7 +82,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
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(formDTO.get(i), customerId);
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);
}
@ -106,7 +112,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
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(formDTO.get(i), customerId);
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);
}
@ -134,7 +142,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
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(formDTO.get(i), customerId);
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);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.3__update_col_data_type.sql
View File

@ -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：街道';

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
View File

@ -29,7 +29,7 @@
<delete id="deleteFactIndexGovrnAblityGridMonthly">
delete from fact_index_govrn_ablity_grid_monthly
where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId} AND USER_ID = #{userId}
where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId}
AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} AND QUARTER_ID = #{quarterId}
</delete>

Write Preview
Loading…
Cancel
Save