Browse Source

大屏接口修改

master
zhangyongzhangyong 5 years ago
parent
commit
0db0ff81e2
  1. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CpcBaseDataFormDTO.java
  2. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
  3. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerDeptFormDTO.java
  4. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerGridFormDTO.java
  5. 10
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/DifficultyDataFormDTO.java
  6. 10
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/EventDataFormDTO.java
  7. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/GovernRankDataFormDTO.java
  8. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java
  9. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataYearlyFormDTO.java
  10. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/OrgRankDataFormDTO.java
  11. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyBranchDataFormDTO.java
  12. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyLinkMassesDataFormDTO.java
  13. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
  14. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java
  15. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java
  16. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java
  17. 91
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
  18. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java
  19. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java
  20. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java
  21. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java
  22. 16
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java
  23. 14
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenEventDataDao.java
  24. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java
  25. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java
  26. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java
  27. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java
  28. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyBranchDataDao.java
  29. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java
  30. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java
  31. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserJoinDao.java
  32. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java
  33. 46
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
  34. 94
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
  35. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml
  36. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
  37. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerDeptDao.xml
  38. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
  39. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
  40. 10
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenEventDataDao.xml
  41. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
  42. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
  43. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
  44. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
  45. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
  46. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyLinkMassesDataDao.xml
  47. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml
  48. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
  49. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenUserTotalDataDao.xml

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

@ -14,11 +14,6 @@ public class CpcBaseDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/

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

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

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

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

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

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

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

@ -14,11 +14,6 @@ public class DifficultyDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
@ -88,4 +83,9 @@ public class DifficultyDataFormDTO implements Serializable {
* 事件状态描述
*/
private String eventStatusDesc;
/**
* 最近一次操作说明 eg: 转项目结案流转
*/
private String latestOperateDesc;
}

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

@ -17,11 +17,6 @@ public class EventDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/
@ -116,4 +111,9 @@ public class EventDataFormDTO implements Serializable {
* 事件状态key
*/
private String eventStatusCode;
/**
* 最近一次操作说明 eg: 转项目结案流转
*/
private String latestOperateDesc;
}

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

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

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

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

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

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

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

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

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

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

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

@ -14,11 +14,6 @@ public class PartyLinkMassesDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/

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

@ -14,11 +14,6 @@ public class PioneerDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/

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

@ -14,11 +14,6 @@ public class UserJoinFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/

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

@ -14,11 +14,6 @@ public class UserTotalDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/**
* 组织类别 agency组织部门department网格grid
*/

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java

@ -3,8 +3,12 @@ package com.epmet;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync;
@EnableDiscoveryClient
@EnableFeignClients
@SpringBootApplication (exclude = {DataSourceAutoConfiguration.class})
@EnableAsync
public class DataStatsApplication {

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

@ -29,6 +29,7 @@ public class ScreenCollController {
/**
* 9党建引领|基层治理-居民党员积分排行榜
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
@ -44,105 +45,121 @@ public class ScreenCollController {
/**
* 8党建引领-党员联系群众数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("partylinkmassesdata")
public Result partyLinkMassesData(@RequestBody List<PartyLinkMassesDataFormDTO> formDTO) {
return screenCollService.insertPartyLinkMassesData(formDTO);
public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyLinkMassesDataFormDTO> formDTO) {
return screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 7基层党建-建设情况数据支部联建志愿
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("meetdata")
public Result meetData(@RequestBody List<PartyBranchDataFormDTO> formDTO) {
return screenCollService.insertPartyBranchData(formDTO);
public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyBranchDataFormDTO> formDTO) {
return screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 6党建引领-组织排行
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("orgrankdata")
public Result orgRankData(@RequestBody List<OrgRankDataFormDTO> formDTO) {
return screenCollService.insertOrgRankData(formDTO);
public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<OrgRankDataFormDTO> formDTO) {
return screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 5基层治理-治理能力数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("governrankdata")
public Result governRankData(@RequestBody List<GovernRankDataFormDTO> formDTO) {
return screenCollService.insertGovernRankData(formDTO);
public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<GovernRankDataFormDTO> formDTO) {
return screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 4事件数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("eventdata")
public Result eventData(@RequestBody List<EventDataFormDTO> formDTO) {
return screenCollService.insertEventData(formDTO);
public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<EventDataFormDTO> formDTO) {
return screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 3难点赌点
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("difficultydata")
public Result difficultyData(@RequestBody List<DifficultyDataFormDTO> formDTO) {
return screenCollService.insertDifficultyData(formDTO);
public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<DifficultyDataFormDTO> formDTO) {
return screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 2党员基本情况
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("cpcbasedata")
public Result cpcbaseData(@RequestBody List<CpcBaseDataFormDTO> formDTO) {
return screenCollService.insertCpcbaseData(formDTO);
public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CpcBaseDataFormDTO> formDTO) {
return screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 1指数_按月统计
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("indexdatamonthly")
public Result indexDataMonthly(@RequestBody List<IndexDataMonthlyFormDTO> formDTO) {
return screenCollService.insertIndexDataMonthly(formDTO);
public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<IndexDataMonthlyFormDTO> formDTO) {
return screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
}
// --
@ -150,91 +167,105 @@ public class ScreenCollController {
/**
* 17指数_按年统计
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("indexdatayearly")
public Result indexDataYearly(@RequestBody List<IndexDataYearlyFormDTO> formDTO) {
return screenCollService.insertIndexDataYearly(formDTO);
public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<IndexDataYearlyFormDTO> formDTO) {
return screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 16部门信息上传
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("customerdept")
public Result customerDept(@RequestBody List<CustomerDeptFormDTO> formDTO) {
return screenCollService.insertCustomerDept(formDTO);
public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerDeptFormDTO> formDTO) {
return screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 15网格信息上传
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("customergrid")
public Result customerGrid(@RequestBody List<CustomerGridFormDTO> formDTO) {
return screenCollService.insertCustomerGrid(formDTO);
public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerGridFormDTO> formDTO) {
return screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 14组织层级
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("customeragency")
public Result customerAgency(@RequestBody List<CustomerAgencyFormDTO> formDTO) {
return screenCollService.insertCustomerAgency(formDTO);
public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerAgencyFormDTO> formDTO) {
return screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 12中央区各类总数
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("usertotaldata")
public Result userTotalData(@RequestBody List<UserTotalDataFormDTO> formDTO) {
return screenCollService.insertUserTotalData(formDTO);
public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<UserTotalDataFormDTO> formDTO) {
return screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 11基层治理-公众参与
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("userjoin")
public Result userJoin(@RequestBody List<UserJoinFormDTO> formDTO) {
return screenCollService.insertUserJoin(formDTO);
public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<UserJoinFormDTO> formDTO) {
return screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
}
/**
* 10党建引领-先锋模范数据
*
* @param externalAppRequestParam
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
@ExternalAppRequestAuth
@PostMapping("pioneerdata")
public Result pioneerData(@RequestBody List<PioneerDataFormDTO> formDTO) {
return screenCollService.insertPioneerData(formDTO);
public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PioneerDataFormDTO> formDTO) {
return screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
}
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCpcBaseDataDao.java

@ -51,8 +51,9 @@ public interface ScreenCpcBaseDataDao extends BaseDao<ScreenCpcBaseDataEntity> {
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCpcBaseData(@Param("list") List<CpcBaseDataFormDTO> list);
void batchInsertCpcBaseData(@Param("list") List<CpcBaseDataFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerAgencyDao.java

@ -51,8 +51,9 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerAgency(@Param("list") List<CustomerAgencyFormDTO> list);
void batchInsertCustomerAgency(@Param("list") List<CustomerAgencyFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerDeptDao.java

@ -51,8 +51,9 @@ public interface ScreenCustomerDeptDao extends BaseDao<ScreenCustomerDeptEntity>
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerDept(@Param("list") List<CustomerDeptFormDTO> list);
void batchInsertCustomerDept(@Param("list") List<CustomerDeptFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenCustomerGridDao.java

@ -50,8 +50,9 @@ public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity>
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertCustomerGrid(@Param("list") List<CustomerGridFormDTO> list);
void batchInsertCustomerGrid(@Param("list") List<CustomerGridFormDTO> list, @Param("customerId")String customerId);
}

16
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenDifficultyDataDao.java

@ -36,23 +36,25 @@ public interface ScreenDifficultyDataDao extends BaseDao<ScreenDifficultyDataEnt
/**
* 3难点赌点
* 1) 根据CUSTOMER_IDEVENT_IDORG_ID进行查询如果有数据则先进行物理删除
* CUSTOMER_ID
* EVENT_ID
* ORG_ID
*
* @param list
* @param customerId
* @param eventId
* @param orgId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteDifficultyData(DifficultyDataFormDTO list);
void deleteDifficultyData(@Param("customerId")String customerId,
@Param("eventId")String eventId,
@Param("orgId")String orgId);
/**
* 3难点赌点
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertDifficultyData(@Param("list") List<DifficultyDataFormDTO> list);
void batchInsertDifficultyData(@Param("list") List<DifficultyDataFormDTO> list, @Param("customerId")String customerId);
}

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

@ -36,23 +36,25 @@ public interface ScreenEventDataDao extends BaseDao<ScreenEventDataEntity> {
/**
* 4事件数据
* 1) 根据CUSTOMER_IDEVENT_IDORG_ID进行查询如果有数据则先进行物理删除
* CUSTOMER_ID
* EVENT_ID
* ORG_ID
*
* @param list
* @param customerId
* @param eventId
* @param orgId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void deleteEventData(EventDataFormDTO list);
void deleteEventData(@Param("customerId")String customerId,
@Param("eventId")String eventId,
@Param("orgId")String orgId);
/**
* 4事件数据
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertEventData(@Param("list") List<EventDataFormDTO> list);
void batchInsertEventData(@Param("list") List<EventDataFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenGovernRankDataDao.java

@ -54,8 +54,9 @@ public interface ScreenGovernRankDataDao extends BaseDao<ScreenGovernRankDataEnt
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertGovernRankData(@Param("list") List<GovernRankDataFormDTO> list);
void batchInsertGovernRankData(@Param("list") List<GovernRankDataFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataMonthlyDao.java

@ -55,8 +55,9 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao<ScreenIndexDataMonthl
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertIndexDataMonthly(@Param("list") List<IndexDataMonthlyFormDTO> list);
void batchInsertIndexDataMonthly(@Param("list") List<IndexDataMonthlyFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenIndexDataYearlyDao.java

@ -53,8 +53,9 @@ public interface ScreenIndexDataYearlyDao extends BaseDao<ScreenIndexDataYearlyE
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertIndexDataYearly(@Param("list") List<IndexDataYearlyFormDTO> list);
void batchInsertIndexDataYearly(@Param("list") List<IndexDataYearlyFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenOrgRankDataDao.java

@ -54,8 +54,9 @@ public interface ScreenOrgRankDataDao extends BaseDao<ScreenOrgRankDataEntity> {
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertOrgRankData(@Param("list") List<OrgRankDataFormDTO> list);
void batchInsertOrgRankData(@Param("list") List<OrgRankDataFormDTO> list, @Param("customerId")String customerId);
}

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

@ -54,8 +54,9 @@ public interface ScreenPartyBranchDataDao extends BaseDao<ScreenPartyBranchDataE
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPartyBranchData(@Param("list") List<PartyBranchDataFormDTO> list);
void batchInsertPartyBranchData(@Param("list") List<PartyBranchDataFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyLinkMassesDataDao.java

@ -51,8 +51,9 @@ public interface ScreenPartyLinkMassesDataDao extends BaseDao<ScreenPartyLinkMas
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPartyLinkMassesData(@Param("list") List<PartyLinkMassesDataFormDTO> list);
void batchInsertPartyLinkMassesData(@Param("list") List<PartyLinkMassesDataFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPioneerDataDao.java

@ -51,8 +51,9 @@ public interface ScreenPioneerDataDao extends BaseDao<ScreenPioneerDataEntity> {
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertPioneerData(@Param("list") List<PioneerDataFormDTO> list);
void batchInsertPioneerData(@Param("list") List<PioneerDataFormDTO> list, @Param("customerId")String customerId);
}

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

@ -55,8 +55,9 @@ public interface ScreenUserJoinDao extends BaseDao<ScreenUserJoinEntity> {
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertUserJoin(@Param("list") List<UserJoinFormDTO> list);
void batchInsertUserJoin(@Param("list") List<UserJoinFormDTO> list, @Param("customerId")String customerId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenUserTotalDataDao.java

@ -51,8 +51,9 @@ public interface ScreenUserTotalDataDao extends BaseDao<ScreenUserTotalDataEntit
* 2) 在批量新增
*
* @param list
* @param customerId
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
void batchInsertUserTotalData(@Param("list") List<UserTotalDataFormDTO> list);
void batchInsertUserTotalData(@Param("list") List<UserTotalDataFormDTO> list, @Param("customerId")String customerId);
}

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

@ -13,6 +13,7 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
@ -25,11 +26,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO);
Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId);
/**
* 7基层党建-建设情况数据支部联建志愿
@ -37,11 +39,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO);
Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId);
/**
* 6党建引领-组织排行
@ -49,11 +52,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO);
Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId);
/**
* 5基层治理-治理能力数据
@ -61,11 +65,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO);
Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId);
/**
* 4事件数据
@ -73,11 +78,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertEventData(List<EventDataFormDTO> formDTO);
Result insertEventData(List<EventDataFormDTO> formDTO, String customerId);
/**
* 3难点赌点
@ -85,11 +91,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO);
Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId);
/**
* 2党员基本情况
@ -97,11 +104,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO);
Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId);
/**
* 1指数_按月统计
@ -109,11 +117,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO);
Result insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId);
/**
* 17指数_按年统计
@ -121,11 +130,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO);
Result insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId);
/**
* 16部门信息上传
@ -133,11 +143,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO);
Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId);
/**
* 15网格信息上传
@ -145,11 +156,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO);
Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId);
/**
* 14组织层级
@ -157,11 +169,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO);
Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId);
/**
* 12中央区各类总数
@ -169,11 +182,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO);
Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId);
/**
* 11基层治理-公众参与
@ -181,11 +195,12 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertUserJoin(List<UserJoinFormDTO> formDTO);
Result insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId);
/**
* 10党建引领-先锋模范数据
@ -193,9 +208,10 @@ public interface ScreenCollService {
* 2) 在新增
*
* @param formDTO
* @param customerId
* @return com.epmet.commons.tools.utils.Result
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPioneerData(List<PioneerDataFormDTO> formDTO);
Result insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId);
}

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

@ -91,81 +91,82 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO) {
public Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> 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();
}
screenPartyLinkMassesDataDao.deletePartyLinkMassesData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
screenPartyLinkMassesDataDao.deletePartyLinkMassesData(customerId, orgIds);
screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO);
screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO, customerId);
}
return new Result();
}
@Override
public Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO) {
@Transactional(rollbackFor = Exception.class)
public Result insertPartyBranchData(List<PartyBranchDataFormDTO> 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();
}
screenPartyBranchDataDao.deletePartyBranchData(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenPartyBranchDataDao.deletePartyBranchData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO);
screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO) {
public Result insertOrgRankData(List<OrgRankDataFormDTO> 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();
}
screenOrgRankDataDao.deleteOrgRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenOrgRankDataDao.deleteOrgRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenOrgRankDataDao.batchInsertOrgRankData(formDTO);
screenOrgRankDataDao.batchInsertOrgRankData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO) {
public Result insertGovernRankData(List<GovernRankDataFormDTO> 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();
}
screenGovernRankDataDao.deleteGovernRankData(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenGovernRankDataDao.deleteGovernRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenGovernRankDataDao.batchInsertGovernRankData(formDTO);
screenGovernRankDataDao.batchInsertGovernRankData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertEventData(List<EventDataFormDTO> formDTO) {
public Result insertEventData(List<EventDataFormDTO> formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
screenEventDataDao.deleteEventData(formDTO.get(i));
screenEventDataDao.deleteEventData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
}
screenEventDataDao.batchInsertEventData(formDTO);
screenEventDataDao.batchInsertEventData(formDTO, customerId);
for (int i = NumConstant.ZERO; i < formDTO.size(); i++) {
if (null != formDTO.get(i).getImgDataList() && formDTO.get(i).getImgDataList().size() > NumConstant.ZERO) {
@ -187,157 +188,156 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO) {
public Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
screenDifficultyDataDao.deleteDifficultyData(formDTO.get(i));
screenDifficultyDataDao.deleteDifficultyData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
}
screenDifficultyDataDao.batchInsertDifficultyData(formDTO);
screenDifficultyDataDao.batchInsertDifficultyData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO) {
public Result insertCpcbaseData(List<CpcBaseDataFormDTO> 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();
}
screenCpcBaseDataDao.deleteCpcBaseData(formDTO.get(NumConstant.ZERO).getCustomerId(), orgIds);
screenCpcBaseDataDao.deleteCpcBaseData(customerId, orgIds);
screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO);
screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO) {
public Result insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> 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();
}
screenIndexDataMonthlyDao.deleteIndexDataMonthly(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenIndexDataMonthlyDao.deleteIndexDataMonthly(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO);
screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO, customerId);
}
return new Result();
}
@Override
public Result insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO) {
@Transactional(rollbackFor = Exception.class)
public Result insertIndexDataYearly(List<IndexDataYearlyFormDTO> 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();
}
screenIndexDataYearlyDao.deleteIndexDataYearly(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenIndexDataYearlyDao.deleteIndexDataYearly(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
orgIds);
screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO);
screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO) {
public Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] deptIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
deptIds[i] = formDTO.get(i).getDeptId();
}
screenCustomerDeptDao.deleteCustomerDept(formDTO.get(NumConstant.ZERO).getCustomerId(), deptIds);
screenCustomerDeptDao.deleteCustomerDept(customerId, deptIds);
screenCustomerDeptDao.batchInsertCustomerDept(formDTO);
screenCustomerDeptDao.batchInsertCustomerDept(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO) {
public Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] gridIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
gridIds[i] = formDTO.get(i).getGridId();
}
screenCustomerGridDao.deleteCustomerGrid(formDTO.get(NumConstant.ZERO).getCustomerId(), gridIds);
screenCustomerGridDao.deleteCustomerGrid(customerId, gridIds);
screenCustomerGridDao.batchInsertCustomerGrid(formDTO);
screenCustomerGridDao.batchInsertCustomerGrid(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO) {
public Result insertCustomerAgency(List<CustomerAgencyFormDTO> 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();
}
screenCustomerAgencyDao.deleteCustomerAgency(formDTO.get(NumConstant.ZERO).getCustomerId(), agencyIds);
screenCustomerAgencyDao.deleteCustomerAgency(customerId, agencyIds);
screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO);
screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO) {
public Result insertUserTotalData(List<UserTotalDataFormDTO> 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();
}
screenUserTotalDataDao.deleteUserTotalData(formDTO.get(NumConstant.ZERO).getCustomerId(),
orgIds);
screenUserTotalDataDao.deleteUserTotalData(customerId, orgIds);
screenUserTotalDataDao.batchInsertUserTotalData(formDTO);
screenUserTotalDataDao.batchInsertUserTotalData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserJoin(List<UserJoinFormDTO> formDTO) {
public Result insertUserJoin(List<UserJoinFormDTO> 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();
}
screenUserJoinDao.deleteUserJoin(formDTO.get(NumConstant.ZERO).getCustomerId(),
screenUserJoinDao.deleteUserJoin(customerId,
formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds);
screenUserJoinDao.batchInsertUserJoin(formDTO);
screenUserJoinDao.batchInsertUserJoin(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPioneerData(List<PioneerDataFormDTO> formDTO) {
public Result insertPioneerData(List<PioneerDataFormDTO> 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();
}
screenPioneerDataDao.deletePioneerData(formDTO.get(NumConstant.ZERO).getCustomerId(),
orgIds);
screenPioneerDataDao.deletePioneerData(customerId, orgIds);
screenPioneerDataDao.batchInsertPioneerData(formDTO);
screenPioneerDataDao.batchInsertPioneerData(formDTO, customerId);
}
return new Result();
}

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

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

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

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

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

@ -12,7 +12,7 @@
</foreach>
</delete>
<insert id="batchInsertCustomerDept" parameterType="java.util.List">
<insert id="batchInsertCustomerDept" parameterType="map">
insert into screen_customer_dept
(
ID,
@ -33,7 +33,7 @@
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{customerId},
#{item.deptId},
#{item.deptName},
#{item.parentAgencyId},

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

@ -12,7 +12,7 @@
</foreach>
</delete>
<insert id="batchInsertCustomerGrid" parameterType="java.util.List">
<insert id="batchInsertCustomerGrid" parameterType="map">
insert into screen_customer_grid
(
ID,
@ -33,7 +33,7 @@
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{customerId},
#{item.gridId},
#{item.gridName},
#{item.parentAgencyId},

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

@ -8,7 +8,7 @@
where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
</delete>
<insert id="batchInsertDifficultyData" parameterType="java.util.List">
<insert id="batchInsertDifficultyData" parameterType="map">
insert into screen_difficulty_data
(
ID,
@ -32,12 +32,13 @@
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
UPDATED_TIME,
LATEST_OPERATE_DESC
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
@ -57,7 +58,8 @@
'APP_USER',
now(),
'APP_USER',
now()
now(),
#{latestOperateDesc}
)
</foreach>
</insert>

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

@ -8,7 +8,7 @@
where CUSTOMER_ID = #{customerId} AND EVENT_ID = #{eventId} AND ORG_ID = #{orgId}
</delete>
<insert id="batchInsertEventData" parameterType="java.util.List">
<insert id="batchInsertEventData" parameterType="map">
insert into screen_event_data
(
ID,
@ -36,12 +36,13 @@
UPDATED_BY,
UPDATED_TIME,
EVENT_STATUS_CODE,
EVENT_STATUS_DESC
EVENT_STATUS_DESC,
LATEST_OPERATE_DESC
) values
<foreach collection="list" item="item" index="index" separator=",">
(
(SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId},
#{customerId},
#{item.orgType},
#{item.orgId},
#{item.parentId},
@ -65,7 +66,8 @@
'APP_USER',
now(),
#{item.eventStatusCode},
#{item.eventStatusDesc}
#{item.eventStatusDesc},
#{latestOperateDesc}
)
</foreach>
</insert>

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

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

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

@ -12,7 +12,7 @@
</foreach>
</delete>
<insert id="batchInsertIndexDataMonthly" parameterType="java.util.List">
<insert id="batchInsertIndexDataMonthly" parameterType="map">
insert into screen_index_data_monthly
(
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},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save