Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenRankFormDTO.java

@@ -25,4 +25,8 @@ public class AnScreenRankFormDTO implements Serializable {
 	private String agencyId;
 	@NotNull(message = "top值不能为空", groups = AnScreenRankFormDTO.AnScreenRankGroup.class)
 	private Integer topNum;
+	/**
+	 * 月份ID，默认上一个月
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmRankResultDTO.java

@@ -47,4 +47,8 @@ public class PmRankResultDTO implements Serializable {
 	 * 议题数
 	 */
 	private Integer issueTotal;
+	/**
+	 * 月份Id
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmRankDao.java

@@ -35,11 +35,12 @@ public interface ScreenAnGrassRootsPmRankDao {
 	 * 基层党员-党员排行榜单
 	 *
 	 * @param agencyId
+	 * @param monthId
 	 * @param topNum
 	 * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.PmRankResultDTO>
 	 * @author zhaoqifeng
 	 * @date 2020/10/9 15:43
 	 */
-	List<PmRankResultDTO> selectPmRank(@Param("agencyId") String agencyId, @Param("topNum") Integer topNum);
+	List<PmRankResultDTO> selectPmRank(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("topNum") Integer topNum);
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AnScreenServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.evaluationindex.screen.dto.form.AnScreenFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.AnScreenRankFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.AnScreenTrendFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +48,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 13:55
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public PmTotalResultDTO pmTotal(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsPmTotalMonthlyDao.selectPmTotal(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -60,6 +62,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 13:57
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public PmTotalTrendResultDTO pmTotalTrend(AnScreenTrendFormDTO formDTO) {
 		PmTotalTrendResultDTO resultDTO = new PmTotalTrendResultDTO();
 		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
@@ -86,8 +89,13 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 13:59
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<PmRankResultDTO> pmRank(AnScreenRankFormDTO formDTO) {
-		return screenAnGrassRootsPmRankDao.selectPmRank(formDTO.getAgencyId(), formDTO.getTopNum());
+		String monthId = formDTO.getMonthId();
+		if (StringUtils.isBlank(monthId)){
+			monthId = DateUtils.getBeforeNMonth(1);
+		}
+		return screenAnGrassRootsPmRankDao.selectPmRank(formDTO.getAgencyId(), monthId,formDTO.getTopNum());
 	}
 
 	/**
@@ -99,6 +107,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:01
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsOrgResultDTO grassRootsOrg(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsOrgMonthlyDao.selectGrassRootsOrg(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -112,6 +121,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:03
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsOrgTrendResultDTO grassRootsOrgTrend(AnScreenTrendFormDTO formDTO) {
 		GrassRootsOrgTrendResultDTO resultDTO = new GrassRootsOrgTrendResultDTO();
 		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
@@ -136,6 +146,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:06
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<GrassRootsOrgRankResultDTO> grassRootsOrgRank(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsOrgMonthlyDao.selectGrassRootsOrgRank(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -149,6 +160,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:10
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsGovernResultDTO grassRootsGovern(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsGovernMonthlyDao.selectGrassRootsGovern(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -162,6 +174,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:11
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public GrassRootsGovernTrendResultDTO grassRootsGovernTrend(AnScreenTrendFormDTO formDTO) {
 		GrassRootsGovernTrendResultDTO resultDTO = new GrassRootsGovernTrendResultDTO();
 		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
@@ -190,6 +203,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:13
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<GrassRootsGovernRankResultDTO> grassRootsGovernRank(AnScreenFormDTO formDTO) {
 		return screenAnGrassRootsGovernMonthlyDao.selectGrassRootsGovernRank(formDTO.getAgencyId(), formDTO.getMonthId());
 	}
@@ -203,6 +217,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	 * @date 2020/10/9 14:16
 	 */
 	@Override
+	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public List<ProjectProfileResultDTO> projectProfile(String customerId) {
 		return screenAnCommunityProjectProfileDao.selectProjectProfile(customerId);
 	}

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

@@ -142,14 +142,7 @@
     <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.group" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.issue" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.project" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.publicity" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.topic" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.user" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.voice" level="DEBUG"/>
-        <logger name="com.epmet.datareport.dao.evaluationindex.screen" level="DEBUG"/>
+        <logger name="com.epmet.datareport.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -162,13 +155,7 @@
     <springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.group" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.issue" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.project" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.publicity" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.topic" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.user" level="INFO"/>
-        <logger name="com.epmet.datareport.dao.voice" level="INFO"/>
+        <logger name="com.epmet.datareport.dao" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmRankDao.xml

@@ -4,16 +4,19 @@
 <mapper namespace="com.epmet.datareport.dao.evaluationindex.screenan.ScreenAnGrassRootsPmRankDao">
     <!--基层党员-党员排行榜单-->
     <select id="selectPmRank" resultType="com.epmet.evaluationindex.screen.dto.result.PmRankResultDTO">
-        SELECT USER_ID,
+        SELECT
+               USER_ID,
                USER_NAME,
                BRANCH_NAME,
                COMMUNITY_NAME,
                GROUP_MEMBER_TOTAL,
                TOPIC_TOTAL,
                PARTI_USER_TOTAL,
-               ISSUE_TOTAL
+               ISSUE_TOTAL,
+               MONTH_ID
         FROM screen_an_grass_roots_pm_rank
         WHERE DEL_FLAG = 0
+            AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
             AND ALL_PARENT_IDS LIKE concat('%', trim(#{agencyId}), '%')
         ORDER BY GROUP_MEMBER_TOTAL DESC
         LIMIT #{topNum}

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

@@ -14,6 +14,11 @@ import java.io.Serializable;
 public class AnGrassRootsPmRankFormDTO implements Serializable {
     private static final long serialVersionUID = 3642729389245262928L;
 
+    /**
+     *  月份Id
+     */
+    private String monthId;
+
     /**
      * 用户id
      */

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

@@ -47,7 +47,9 @@ public class AnScreenCollController {
      */
     @PostMapping("pmrank")
     public Result pmRank(@RequestHeader("CustomerId") String customerId, @RequestBody ScreenCollFormDTO<AnGrassRootsPmRankFormDTO> formDTO){
-        if(StringUtils.isBlank(customerId)) throw new ValidateException("客户Id不能为空");
+        if (StringUtils.isBlank(formDTO.getMonthId())){
+            throw new ValidateException("月份Id不能为空");
+        }
         screenCollService.pmRank(formDTO,customerId);
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenAnGrassRootsPmRankDao.java

@@ -37,20 +37,21 @@ public interface ScreenAnGrassRootsPmRankDao extends BaseDao<ScreenAnGrassRootsP
     /***
      * @Description 批量删除
      * @param customerId
+     * @param monthId
      * @return int
      * @author wangc
      * @date 2020.10.09 16:07
-    */
-    int deleteBatch(@Param("customerId") String customerId);
+     */
+    int deleteBatch(@Param("customerId") String customerId, @Param("monthId") String monthId);
 
     /**
-     * @Description 批量新增
      * @param list
      * @param customerId
      * @return int
+     * @Description 批量新增
      * @author wangc
      * @date 2020.10.09 16:10
-    */
-    int insertBatch(@Param("list") List<AnGrassRootsPmRankFormDTO> list,@Param("customerId") String customerId);
+     */
+    int insertBatch(@Param("list") List<AnGrassRootsPmRankFormDTO> list, @Param("customerId") String customerId);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenAnGrassRootsPmRankEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.screen;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 安宁-基层党员-排行榜单
  *
@@ -43,6 +40,11 @@ public class ScreenAnGrassRootsPmRankEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 *  月份Id
+	 */
+	private String monthId;
+
     /**
      * 用户id
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/AnScreenCollServiceImpl.java

@@ -85,9 +85,9 @@ public class AnScreenCollServiceImpl implements AnScreenCollService {
         List<AnGrassRootsPmRankFormDTO> dataList = formDTO.getDataList();
         if(CollectionUtils.isEmpty(dataList)) return ;
         if(formDTO.getIsFirst()){
-            int affectRows = pmRankDao.deleteBatch(customerId);
+            int affectRows = pmRankDao.deleteBatch(customerId,formDTO.getMonthId());
             while(affectRows >= NumConstant.ONE){
-                affectRows = pmRankDao.deleteBatch(customerId);
+                affectRows = pmRankDao.deleteBatch(customerId,formDTO.getMonthId());
             }
         }
         Lists.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED).forEach(list -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenAnGrassRootsPmRankDao.xml

@@ -9,6 +9,7 @@
         screen_an_grass_roots_pm_rank
         WHERE
         CUSTOMER_ID = #{customerId}
+        and MONTH_ID = #{monthId,jdbcType=VARCHAR}
         LIMIT 1000
     </delete>
 
@@ -17,6 +18,7 @@
         (
                 id,
                 customer_id,
+                month_id,
                 user_id,
                 user_name,
                 branch_id,
@@ -37,6 +39,7 @@
         (
                 (SELECT REPLACE(UUID(), '-', '') AS id),
                 #{customerId},
+                #{item.monthId},
                 #{item.userId},
                 #{item.userName},
                 #{item.branchId},