diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java deleted file mode 100644 index a5d5e6bb9c..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexGovernAbilityGridMonthlyService.java +++ /dev/null @@ -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 lists); - - /** - * @Description 删除治理能力旧纪录 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/19 4:31 下午 - */ - void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId); - -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java deleted file mode 100644 index 198bcf57dc..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactIndexPartyAbilityGridMonthlyService.java +++ /dev/null @@ -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 lists); - - /** - * @Description 删除旧的党建能力记录 - * @param customerId - * @param monthId - * @author zxc - * @date 2020/9/19 10:45 上午 - */ - void deleteOldPartyAbility(String customerId,String monthId); -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java index 082fc28114..ee562f54d7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java @@ -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 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 result,String customerId,String monthId){ if (!CollectionUtils.isEmpty(result)){ - governAbilityGridMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId); - governAbilityGridMonthlyService.insertGovernAbilityRecord(result); + governAbilityOrgMonthlyService.deleteOldGovernAbilityRecord(customerId, monthId); + governAbilityOrgMonthlyService.insertGovernAbilityRecord(result); } } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java deleted file mode 100644 index 64096f1935..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexGovernAbilityGridMonthlyServiceImpl.java +++ /dev/null @@ -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 lists) { - governAbilityDao.insertGovernAbilityRecord(lists); - } - - @Override - public void deleteOldGovernAbilityRecord(String customerId, String monthId) { - governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId); - } -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java deleted file mode 100644 index 922e429ac9..0000000000 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactIndexPartyAbilityGridMonthlyServiceImpl.java +++ /dev/null @@ -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 lists) { - partyAbilityGridDao.insertPartyAbility(lists); - } - - @Override - public void deleteOldPartyAbility(String customerId, String monthId) { - partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId); - } -} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java index c2e3b3a179..ade3c57f5b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyService.java @@ -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 lists); + + /** + * @Description 删除治理能力旧纪录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 4:31 下午 + */ + void deleteOldGovernAbilityRecord(@Param("customerId")String customerId,@Param("monthId")String monthId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java index 0227a835f8..4dbf8a26a2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyService.java @@ -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 lists); + + /** + * @Description 删除旧的党建能力记录 + * @param customerId + * @param monthId + * @author zxc + * @date 2020/9/19 10:45 上午 + */ + void deleteOldPartyAbility(String customerId,String monthId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java index a1665b836c..954af7e1f8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexGovrnAblityOrgMonthlyServiceImpl.java @@ -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 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 lists) { + governAbilityDao.insertGovernAbilityRecord(lists); + } + + @Override + public void deleteOldGovernAbilityRecord(String customerId, String monthId) { + governAbilityDao.deleteOldGovernAbilityRecord(customerId, monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java index 7964b2788b..f2caafd528 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexPartyAblityOrgMonthlyServiceImpl.java @@ -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 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 lists) { + partyAbilityGridDao.insertPartyAbility(lists); + } + + @Override + public void deleteOldPartyAbility(String customerId, String monthId) { + partyAbilityGridDao.deleteOldPartyAbility(customerId, monthId); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index d6825a5eb1..2cf8eb9b10 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -8,7 +8,7 @@ WHERE CUSTOMER_ID = #{customerId} - DATE_ID = #{date} + AND DATE_ID = #{date} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index 99a6ac97a4..2c3abdd2ca 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -108,7 +108,7 @@ WHERE CUSTOMER_ID = #{customerId} - DATE_ID = #{date} + AND DATE_ID = #{date} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml index ef87296be2..37064faf46 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml @@ -82,7 +82,7 @@