elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

dev_shibei_match
jianjun 5 years ago
parent
34811ab2d6 8531db86fb
commit
6e81419abe
12 changed files with 92 additions and 150 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. 33
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java
  2. 31
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java
  3. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java
  4. 37
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java
  5. 37
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java
  6. 21
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java
  7. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java
  8. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java
  9. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java
  10. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
  11. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
  12. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml

33
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java
View File

@ -1,33 +0,0 @@
package com.epmet.service.evaluationindex.extract;
import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 治理能力-网格相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-19
*/
public interface FactIndexGovernAbilityGridMonthlyService{
/**
* @Description 批量插入治理能力
* @param lists
* @author zxc
* @date 2020/9/19 4:28 下午
*/
void insertGovernAbilityRecord(@Param("lists") List<GovernAbilityGridMonthlyFormDTO> lists);
/**
* @Description 删除治理能力旧纪录
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 4:31 下午
*/
void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId);
}

31
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java
View File

@ -1,31 +0,0 @@
package com.epmet.service.evaluationindex.extract;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import java.util.List;
/**
* 党建能力-网格相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-19
*/
public interface FactIndexPartyAbilityGridMonthlyService{
/**
* @Description 网格党建能力插入
* @param lists
* @author zxc
* @date 2020/9/19 10:32 上午
*/
void insertPartyAbility(List<PartyAbilityGridMonthlyFormDTO> lists);
/**
* @Description 删除旧的党建能力记录
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 10:45 上午
*/
void deleteOldPartyAbility(String customerId,String monthId);
}

19
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java
View File

@ -17,6 +17,8 @@ import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.dto.extract.result.*;
import com.epmet.entity.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyEntity;
import com.epmet.service.evaluationindex.extract.*;
import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
import com.epmet.service.stats.FactArticlePublishedGridDailyService;
import com.epmet.service.stats.user.FactRegUserGridMonthlyService;
import lombok.extern.slf4j.Slf4j;
@ -44,10 +46,6 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
@Autowired
private IssueExtractService issueExtractService;
@Autowired
private FactIndexGovernAbilityGridMonthlyService governAbilityGridMonthlyService;
@Autowired
private FactIndexPartyAbilityGridMonthlyService partyAbilityGridMonthlyService;
@Autowired
private FactIndexGovrnAblityGridMonthlyDao governAbilityDao;
@Autowired
private FactOriginProjectMainDailyService projectMainService;
@ -63,7 +61,10 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
private GroupExtractService groupExtractService;
@Autowired
private FactOriginTopicLogDailyService topicLogService;
@Autowired
private FactIndexPartyAblityOrgMonthlyService partyAbilityOrgMonthlyService;
@Autowired
private FactIndexGovrnAblityOrgMonthlyService governAbilityOrgMonthlyService;
@Autowired
private FactIndexServiceAbilityGridMonthlyService factIndexServiceAbilityGridMonthlyService;
@Autowired
@ -497,8 +498,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
@Transactional(rollbackFor = Exception.class)
public void delAndInsertPartyAbility(List<PartyAbilityGridMonthlyFormDTO> result,String customerId,String monthId){
if (!CollectionUtils.isEmpty(result)){
partyAbilityGridMonthlyService.deleteOldPartyAbility(customerId, monthId);
partyAbilityGridMonthlyService.insertPartyAbility(result);
partyAbilityOrgMonthlyService.deleteOldPartyAbility(customerId, monthId);
partyAbilityOrgMonthlyService.insertPartyAbility(result);
}
}
@ -511,8 +512,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
@Transactional(rollbackFor = Exception.class)
public void delAndInsertGovernAbility(List<GovernAbilityGridMonthlyFormDTO> result,String customerId,String monthId){
if (!CollectionUtils.isEmpty(result)){
governAbilityGridMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId);
governAbilityGridMonthlyService.insertGovernAbilityRecord(result);
governAbilityOrgMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId);
governAbilityOrgMonthlyService.insertGovernAbilityRecord(result);
}
}
}

37
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java
View File

@ -1,37 +0,0 @@
package com.epmet.service.evaluationindex.extract.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
import com.epmet.service.evaluationindex.extract.FactIndexGovernAbilityGridMonthlyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 治理能力-网格相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-19
*/
@Service
@Slf4j
@DataSource(DataSourceConstant.EVALUATION_INDEX)
public class FactIndexGovernAbilityGridMonthlyServiceImpl implements FactIndexGovernAbilityGridMonthlyService {
@Autowired
private FactIndexGovrnAblityGridMonthlyDao governAbilityDao;
@Override
public void insertGovernAbilityRecord(List<GovernAbilityGridMonthlyFormDTO> lists) {
governAbilityDao.insertGovernAbilityRecord(lists);
}
@Override
public void deleteOldGovernAbilityRecord(String customerId, String monthId) {
governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId);
}
}

37
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java
View File

@ -1,37 +0,0 @@
package com.epmet.service.evaluationindex.extract.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.service.evaluationindex.extract.FactIndexPartyAbilityGridMonthlyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 党建能力-网格相关事实表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-09-19
*/
@Service
@Slf4j
@DataSource(DataSourceConstant.EVALUATION_INDEX)
public class FactIndexPartyAbilityGridMonthlyServiceImpl implements FactIndexPartyAbilityGridMonthlyService {
@Autowired
private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao;
@Override
public void insertPartyAbility(List<PartyAbilityGridMonthlyFormDTO> lists) {
partyAbilityGridDao.insertPartyAbility(lists);
}
@Override
public void deleteOldPartyAbility(String customerId, String monthId) {
partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId);
}
}

21
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java
View File

@ -1,7 +1,11 @@
package com.epmet.service.evaluationindex.indexcoll;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author zhaoqifeng
@ -19,4 +23,21 @@ public interface FactIndexGovrnAblityOrgMonthlyService extends BaseService<FactI
* @return void
*/
void deleteByCustomer(String customerId, String monthId, String type);
/**
* @Description 批量插入治理能力
* @param lists
* @author zxc
* @date 2020/9/19 4:28 下午
*/
void insertGovernAbilityRecord(@Param("lists") List<GovernAbilityGridMonthlyFormDTO> lists);
/**
* @Description 删除治理能力旧纪录
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 4:31 下午
*/
void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId);
}

20
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java
View File

@ -1,8 +1,11 @@
package com.epmet.service.evaluationindex.indexcoll;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
@ -19,4 +22,21 @@ public interface FactIndexPartyAblityOrgMonthlyService extends BaseService<FactI
* @return void
*/
void deleteByCustomer(String customerId, String monthId, String type);
/**
* @Description 网格党建能力插入
* @param lists
* @author zxc
* @date 2020/9/19 10:32 上午
*/
void insertPartyAbility(List<PartyAbilityGridMonthlyFormDTO> lists);
/**
* @Description 删除旧的党建能力记录
* @param customerId
* @param monthId
* @author zxc
* @date 2020/9/19 10:45 上午
*/
void deleteOldPartyAbility(String customerId,String monthId);
}

19
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java
View File

@ -3,11 +3,16 @@ package com.epmet.service.evaluationindex.indexcoll.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyDao;
import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
import com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity;
import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
@ -16,8 +21,22 @@ import org.springframework.stereotype.Service;
@Service
@DataSource(DataSourceConstant.EVALUATION_INDEX)
public class FactIndexGovrnAblityOrgMonthlyServiceImpl extends BaseServiceImpl<FactIndexGovrnAblityOrgMonthlyDao, FactIndexGovrnAblityOrgMonthlyEntity> implements FactIndexGovrnAblityOrgMonthlyService {
@Autowired
private FactIndexGovrnAblityGridMonthlyDao governAbilityDao;
@Override
public void deleteByCustomer(String customerId, String monthId, String type) {
baseDao.deleteByCustomer(customerId, monthId, type);
}
@Override
public void insertGovernAbilityRecord(List<GovernAbilityGridMonthlyFormDTO> lists) {
governAbilityDao.insertGovernAbilityRecord(lists);
}
@Override
public void deleteOldGovernAbilityRecord(String customerId, String monthId) {
governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId);
}
}

19
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java
View File

@ -3,11 +3,16 @@ package com.epmet.service.evaluationindex.indexcoll.impl;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityGridMonthlyDao;
import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyEntity;
import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
@ -16,8 +21,22 @@ import org.springframework.stereotype.Service;
@Service
@DataSource(DataSourceConstant.EVALUATION_INDEX)
public class FactIndexPartyAblityOrgMonthlyServiceImpl extends BaseServiceImpl<FactIndexPartyAblityOrgMonthlyDao, FactIndexPartyAblityOrgMonthlyEntity> implements FactIndexPartyAblityOrgMonthlyService {
@Autowired
private FactIndexPartyAblityGridMonthlyDao partyAbilityGridDao;
@Override
public void deleteByCustomer(String customerId, String monthId, String type) {
baseDao.deleteByCustomer(customerId, monthId, type);
}
@Override
public void insertPartyAbility(List<PartyAbilityGridMonthlyFormDTO> lists) {
partyAbilityGridDao.insertPartyAbility(lists);
}
@Override
public void deleteOldPartyAbility(String customerId, String monthId) {
partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId);
}
}

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
View File

@ -8,7 +8,7 @@
WHERE
CUSTOMER_ID = #{customerId}
<if test='null != date and "" != date'>
DATE_ID = #{date}
AND DATE_ID = #{date}
</if>
</delete>

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
View File

@ -108,7 +108,7 @@
WHERE
CUSTOMER_ID = #{customerId}
<if test='null != date and "" != date'>
DATE_ID = #{date}
AND DATE_ID = #{date}
</if>
</delete>

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
View File

@ -82,7 +82,7 @@
<!-- 查询网格 党员/群众 人均提出话题数 -->
<select id="selectCreateTopicCount" resultType="com.epmet.dto.extract.result.CreateTopicCountResultDTO">
SELECT
ROUND(( COUNT( ID ) / COUNT( DISTINCT ( CREATE_TOPIC_USER_ID ))), 0 ) AS createTopic,
ROUND(( COUNT( ID ) / COUNT( DISTINCT ( CREATE_TOPIC_USER_ID ))), 0 ) AS createTopicCount,
GRID_ID
FROM
fact_origin_topic_main_daily

Write Preview
Loading…
Cancel
Save