Browse Source

返参调整

master
yinzuomei 5 years ago
parent
commit
c084ca825e
  1. 45
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
  2. 37
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
  3. 45
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java

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

@ -54,7 +54,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("partylinkmassesdata")
public Result partyLinkMassesData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyLinkMassesDataFormDTO> formDTO) {
return screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertPartyLinkMassesData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -69,7 +70,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("meetdata")
public Result meetData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PartyBranchDataFormDTO> formDTO) {
return screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertPartyBranchData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -84,7 +86,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("orgrankdata")
public Result orgRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<OrgRankDataFormDTO> formDTO) {
return screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertOrgRankData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -99,7 +102,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("governrankdata")
public Result governRankData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<GovernRankDataFormDTO> formDTO) {
return screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertGovernRankData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -114,7 +118,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("eventdata")
public Result eventData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<EventDataFormDTO> formDTO) {
return screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertEventData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -129,7 +134,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("difficultydata")
public Result difficultyData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<DifficultyDataFormDTO> formDTO) {
return screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertDifficultyData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -144,7 +150,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("cpcbasedata")
public Result cpcbaseData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CpcBaseDataFormDTO> formDTO) {
return screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertCpcbaseData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -159,7 +166,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("indexdatamonthly")
public Result indexDataMonthly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<IndexDataMonthlyFormDTO> formDTO) {
return screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertIndexDataMonthly(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
// --
@ -176,7 +184,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("indexdatayearly")
public Result indexDataYearly(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<IndexDataYearlyFormDTO> formDTO) {
return screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertIndexDataYearly(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -191,7 +200,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("customerdept")
public Result customerDept(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerDeptFormDTO> formDTO) {
return screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertCustomerDept(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -206,7 +216,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("customergrid")
public Result customerGrid(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerGridFormDTO> formDTO) {
return screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertCustomerGrid(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -221,7 +232,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("customeragency")
public Result customerAgency(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<CustomerAgencyFormDTO> formDTO) {
return screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertCustomerAgency(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -236,7 +248,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("usertotaldata")
public Result userTotalData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<UserTotalDataFormDTO> formDTO) {
return screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertUserTotalData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -251,7 +264,8 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("userjoin")
public Result userJoin(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<UserJoinFormDTO> formDTO) {
return screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertUserJoin(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
/**
@ -266,6 +280,7 @@ public class ScreenCollController {
@ExternalAppRequestAuth
@PostMapping("pioneerdata")
public Result pioneerData(ExternalAppRequestParam externalAppRequestParam, @RequestBody List<PioneerDataFormDTO> formDTO) {
return screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
screenCollService.insertPioneerData(formDTO, externalAppRequestParam.getCustomerId());
return new Result();
}
}

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

@ -4,7 +4,12 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*;
import java.util.List;
/**
* 大屏数据采集api
*
* @author yinzuomei@elink-cn.com
* @date 2020/8/18 10:25
*/
public interface ScreenCollService {
/**
@ -31,7 +36,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId);
void insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId);
/**
* 7基层党建-建设情况数据支部联建志愿
@ -44,7 +49,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId);
void insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId);
/**
* 6党建引领-组织排行
@ -57,7 +62,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId);
void insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId);
/**
* 5基层治理-治理能力数据
@ -70,7 +75,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId);
void insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId);
/**
* 4事件数据
@ -83,7 +88,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertEventData(List<EventDataFormDTO> formDTO, String customerId);
void insertEventData(List<EventDataFormDTO> formDTO, String customerId);
/**
* 3难点赌点
@ -96,7 +101,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId);
void insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId);
/**
* 2党员基本情况
@ -109,7 +114,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId);
void insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId);
/**
* 1指数_按月统计
@ -122,7 +127,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId);
void insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId);
/**
* 17指数_按年统计
@ -135,7 +140,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId);
void insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId);
/**
* 16部门信息上传
@ -148,7 +153,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId);
void insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId);
/**
* 15网格信息上传
@ -161,7 +166,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId);
void insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId);
/**
* 14组织层级
@ -174,7 +179,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId);
void insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId);
/**
* 12中央区各类总数
@ -187,7 +192,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId);
void insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId);
/**
* 11基层治理-公众参与
@ -200,7 +205,7 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId);
void insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId);
/**
* 10党建引领-先锋模范数据
@ -213,5 +218,5 @@ public interface ScreenCollService {
* @Author zhangyong
* @Date 10:52 2020-08-18
**/
Result insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId);
void insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId);
}

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

@ -91,7 +91,7 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPartyLinkMassesData(List<PartyLinkMassesDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -101,12 +101,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenPartyLinkMassesDataDao.batchInsertPartyLinkMassesData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPartyBranchData(List<PartyBranchDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -119,12 +118,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenPartyBranchDataDao.batchInsertPartyBranchData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertOrgRankData(List<OrgRankDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -137,12 +135,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenOrgRankDataDao.batchInsertOrgRankData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertGovernRankData(List<GovernRankDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -155,12 +152,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenGovernRankDataDao.batchInsertGovernRankData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertEventData(List<EventDataFormDTO> formDTO, String customerId) {
public void insertEventData(List<EventDataFormDTO> formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
screenEventDataDao.deleteEventData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
@ -183,12 +179,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
}
}
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId) {
public void insertDifficultyData(List<DifficultyDataFormDTO> formDTO, String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
screenDifficultyDataDao.deleteDifficultyData(customerId, formDTO.get(i).getEventId(), formDTO.get(i).getOrgId());
@ -196,12 +191,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenDifficultyDataDao.batchInsertDifficultyData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCpcbaseData(List<CpcBaseDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -211,12 +205,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenCpcBaseDataDao.batchInsertCpcBaseData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertIndexDataMonthly(List<IndexDataMonthlyFormDTO> formDTO, String customerId) {
public void 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++){
@ -229,12 +222,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenIndexDataMonthlyDao.batchInsertIndexDataMonthly(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertIndexDataYearly(List<IndexDataYearlyFormDTO> formDTO, String customerId) {
public void 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++){
@ -246,12 +238,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenIndexDataYearlyDao.batchInsertIndexDataYearly(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerDept(List<CustomerDeptFormDTO> formDTO, String customerId) {
public void 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++){
@ -261,12 +252,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenCustomerDeptDao.batchInsertCustomerDept(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerGrid(List<CustomerGridFormDTO> formDTO, String customerId) {
public void 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++){
@ -276,12 +266,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenCustomerGridDao.batchInsertCustomerGrid(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertCustomerAgency(List<CustomerAgencyFormDTO> formDTO, String customerId) {
public void 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++){
@ -291,12 +280,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenCustomerAgencyDao.batchInsertCustomerAgency(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserTotalData(List<UserTotalDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -306,12 +294,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenUserTotalDataDao.batchInsertUserTotalData(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertUserJoin(List<UserJoinFormDTO> formDTO, String customerId) {
public void 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++){
@ -324,12 +311,11 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenUserJoinDao.batchInsertUserJoin(formDTO, customerId);
}
return new Result();
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result insertPioneerData(List<PioneerDataFormDTO> formDTO, String customerId) {
public void 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++){
@ -339,6 +325,5 @@ public class ScreenCollServiceImpl implements ScreenCollService {
screenPioneerDataDao.batchInsertPioneerData(formDTO, customerId);
}
return new Result();
}
}

Loading…
Cancel
Save