Merge branch 'dev' into dev_temp

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

@@ -22,4 +22,9 @@ public class AnScreenTrendFormDTO implements Serializable {
 	 */
 	@NotBlank(message = "机关Id不能为空", groups = AnScreenTrendFormDTO.AnScreenTrendGroup.class)
 	private String agencyId;
+
+	/**
+	 * 月份ID
+	 */
+	private String monthId;
 }

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

@@ -21,4 +21,9 @@ public class MonthBarchartFormDTO implements Serializable {
      */
     @NotBlank(message = "机关ID不能为空",groups = {MonthBarchart.class})
     private String agencyId;
+
+    /**
+     * 月份ID,如果此列有值，查询截止到当前monthId的近12个月数据
+     */
+    private String monthId;
 }

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

@@ -32,4 +32,6 @@ public class YearAverageIndexResultDTO implements Serializable {
      * 治理能力
      */
     private Double governAbility = 0.0;
+
+    private String yearId;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@@ -47,7 +47,7 @@ public interface ScreenIndexDataMonthlyDao{
      * @author zxc
      * @date 2020/8/20 9:02 上午
      */
-    List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId);
+    List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId,@Param("monthId") String monthId);
 
     /**
      * @param subAgencyIndexRankFormDTO

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

@@ -17,7 +17,6 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenan;
 
-import com.epmet.evaluationindex.screen.dto.form.AnScreenFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.PmTotalResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.PmTotalTrendDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -48,12 +47,12 @@ public interface ScreenAnGrassRootsPmTotalMonthlyDao {
 	 * 基层党员-指标月度趋势
 	 *
 	 * @param agencyId
-	 * @param yearId
+	 * @param monthId
 	 * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.PmTotalTrendDTO>
 	 * @author zhaoqifeng
 	 * @date 2020/10/9 15:12
 	 */
-	List<PmTotalTrendDTO> selectPmTotalTrend(@Param("agencyId") String agencyId, @Param("yearId") String yearId);
+	List<PmTotalTrendDTO> selectPmTotalTrend(@Param("agencyId") String agencyId, @Param("monthId") String monthId);
 
 
 }

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

@@ -65,8 +65,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	@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);
-		List<PmTotalTrendDTO> list = screenAnGrassRootsPmTotalMonthlyDao.selectPmTotalTrend(formDTO.getAgencyId(), yearId);
+		List<PmTotalTrendDTO> list = screenAnGrassRootsPmTotalMonthlyDao.selectPmTotalTrend(formDTO.getAgencyId(), formDTO.getMonthId());
 		List<String> xAxis = list.stream().map(item -> getMonth(item.getMonthId())).collect(Collectors.toList());
 		List<Integer> groupMemberTotalList = list.stream().map(PmTotalTrendDTO::getGroupMemberTotal).collect(Collectors.toList());
 		List<Integer> topicTotalList = list.stream().map(PmTotalTrendDTO::getTopicTotal).collect(Collectors.toList());

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

@@ -112,9 +112,13 @@ public class IndexServiceImpl implements IndexService {
         List<BigDecimal> partyDevWeightData = new ArrayList<>();
         List<BigDecimal> governAblityWeightData = new ArrayList<>();
         // 1. x轴
-        result.setXAxis(partyMemberLeadServiceImpl.getXPro());
+        if(StringUtils.isNotBlank(monthBarchartFormDTO.getMonthId())){
+            result.setXAxis(partyMemberLeadServiceImpl.getXproEndMonth(monthBarchartFormDTO.getMonthId()));
+        }else{
+            result.setXAxis(partyMemberLeadServiceImpl.getXPro());
+        }
         // 2. 查询近一年的指数值【包括本月】
-        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId());
+        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(),monthBarchartFormDTO.getMonthId());
         if (monthBarchartResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
                 serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO);
@@ -149,7 +153,12 @@ public class IndexServiceImpl implements IndexService {
         });
         List<MonthBarchartResult> collect = monthBarchartResults.stream().sorted(Comparator.comparing(MonthBarchartResult::getMonthId)).collect(Collectors.toList());
         //升序 当前月份在队尾
-        List<String> _ymList = dateUtils.getXpro().keySet().stream().collect(Collectors.toList());
+        List<String> _ymList = new ArrayList<>();
+        if(StringUtils.isNotBlank(monthBarchartFormDTO.getMonthId())){
+            _ymList=dateUtils.getXproEndMonth(monthBarchartFormDTO.getMonthId()).keySet().stream().collect(Collectors.toList());
+        }else{
+            _ymList=dateUtils.getXpro().keySet().stream().collect(Collectors.toList());
+        }
         //针对集合collect的游标
         int cursor = NumConstant.ZERO;
         //针对X轴，数据集合不全则进行数据填充

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

@@ -15,6 +15,7 @@ import com.epmet.evaluationindex.screen.dto.form.FineExampleFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.VolunteerServiceFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +31,7 @@ import java.util.*;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:22
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
@@ -194,6 +196,18 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         return xAxis;
     }
 
+    public List<String> getXproEndMonth(String monthId) {
+        List<String> xAxis = new ArrayList<>();
+        for (int i = NumConstant.ELEVEN; i >= NumConstant.ZERO; i--) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(com.epmet.commons.tools.utils.DateUtils.stringToDate(monthId.concat("01"), com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMMDD));
+            c.add(Calendar.MONTH, -i);
+            Date date = c.getTime();
+            String month = com.epmet.commons.tools.utils.DateUtils.format(date, com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMM);
+            xAxis.add(month.substring(4, 6).concat(ScreenConstant.MONTH));
+        }
+        return xAxis;
+    }
 
     /**
      * @Description 4、先进排行榜单-先进支部排行

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java

@@ -75,6 +75,22 @@ public class DateUtils {
         return result;
     }
 
+    public  Map<String,String> getXproEndMonth(String monthId){
+        Map<String,String> xAxis = new HashMap<>();
+        for(int i=NumConstant.ZERO;i <= NumConstant.ELEVEN; i++){
+            Calendar c = Calendar.getInstance();
+            c.setTime(com.epmet.commons.tools.utils.DateUtils.stringToDate(monthId.concat("01"), com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMMDD));
+            c.add(Calendar.MONTH, - i);
+            Date date = c.getTime();
+            String month= com.epmet.commons.tools.utils.DateUtils.format(date, com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMM);
+            xAxis.put(month,month.substring(4,6).concat("月"));
+        }
+        Map<String, String> result = Maps.newLinkedHashMap();
+        xAxis.entrySet().stream().sorted(Map.Entry.comparingByKey())
+                .forEachOrdered((e -> result.put(e.getKey(),e.getValue())));
+        return result;
+    }
+
     /**
      * @Description 得到上个月的monthId
      * @param

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

@@ -42,6 +42,9 @@
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
+            <if test="monthId != null and monthId.trim() != ''">
+                AND MONTH_ID &lt;= #{monthId}
+            </if>
             ORDER BY MONTH_ID DESC
             LIMIT 12
     </select>
@@ -190,7 +193,11 @@
 
     <select id="selectRankList" resultType="com.epmet.evaluationindex.screen.dto.result.IndexAdvanceBranchRankResultDTO">
         SELECT
-            dm.org_name AS "name",
+            CONCAT(
+                (select agency_name from screen_customer_agency where agency_id = rd.parent_id),
+                '-',
+                dm.org_name
+            )AS "name",
             dm.index_total AS "totalScore",
             rd.party_total AS "partyMemberNum",
             rd.issue_total AS "issueNum",

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

@@ -8,13 +8,15 @@
         SELECT
             service_ablity AS serviceAbility,
             party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility
+            govern_ablity AS governAbility,
+            year_id as yearId
         FROM
             screen_index_data_yearly
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
-            AND year_id = DATE_FORMAT(NOW(),'%Y')
+            order by year_id desc
+		    limit 1
     </select>
 
     <!-- 下级部门指数排行 安宁 - 年 -->

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

@@ -14,15 +14,21 @@
           AND MONTH_ID = #{monthId}
     </select>
     <select id="selectPmTotalTrend" resultType="com.epmet.evaluationindex.screen.dto.result.PmTotalTrendDTO">
-        SELECT MONTH_ID,
-               GROUP_MEMBER_TOTAL,
-               TOPIC_TOTAL,
-               TOPIC_PARTI_USER_TOTAL,
-               ISSUE_TOTAL
-        FROM screen_an_grass_roots_pm_total_monthly
-        WHERE DEL_FLAG = '0'
-          AND ORG_ID = #{agencyId}
-          AND YEAR_ID = #{yearId}
-        ORDER BY MONTH_ID
+        SELECT
+            MONTH_ID,
+            GROUP_MEMBER_TOTAL,
+            TOPIC_TOTAL,
+            TOPIC_PARTI_USER_TOTAL,
+            ISSUE_TOTAL
+        FROM
+        screen_an_grass_roots_pm_total_monthly
+        WHERE
+        DEL_FLAG = '0'
+        AND ORG_ID = #{agencyId}
+        <if test="monthId != null and monthId.trim() != ''">
+            AND MONTH_ID &lt;= #{monthId}
+        </if>
+        ORDER BY MONTH_ID ASC
+        LIMIT 12
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -94,7 +94,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     private void extractGridUserJoin(ExtractScreenFormDTO formDTO) {
         List<DimGridEntity> orgList = dimGridService.getGridListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
-            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,客户Id:{}", formDTO.getCustomerId());
+            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,customerId:{}", formDTO.getCustomerId());
             return;
         }
         //构建组织数据
@@ -103,12 +103,12 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         //获取议题月份增量
         List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取议题增量为空,客户Id:{}", formDTO.getCustomerId());
+            log.error("抽取【公众参与-人均议题】，获取议题增量为空,customerId:{}", formDTO.getCustomerId());
             return;
         }
         List<GridUserCountResultDTO> userCountList = factRegUserGridMonthlyService.selectGridUserCount(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(userCountList)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,客户Id:{}", formDTO.getCustomerId());
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,customerId:{}", formDTO.getCustomerId());
             return;
         }
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
@@ -143,7 +143,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             //获取每个网格的应表决人数
             List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
             if (CollectionUtils.isEmpty(memberCountList)) {
-                log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,客户Id:{}", formDTO.getCustomerId());
+                log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,customerId:{}", formDTO.getCustomerId());
                 return;
             }
             gridMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
@@ -184,7 +184,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     private void extractAgencyUserJoin(ExtractScreenFormDTO formDTO) {
         List<DimAgencyEntity> orgList = dimAgencyService.getAgencyListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
-            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,客户Id:{}", formDTO.getCustomerId());
+            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,customerId:{}", formDTO.getCustomerId());
             return;
         }
         //构建组织数据
@@ -196,7 +196,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
         Set<String> agencyIdSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,客户Id:{}", formDTO.getCustomerId());
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,customerId:{}", formDTO.getCustomerId());
             issueTotal.forEach(issue -> {
                 String agencyId = issue.getAgencyId();
                 agencyIdSet.add(agencyId);
@@ -219,7 +219,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                     //获取每个网格的应表决人数
                     List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
                     if (CollectionUtils.isEmpty(memberCountList)) {
-                        log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,客户Id:{}", formDTO.getCustomerId());
+                        log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,customerId:{}", formDTO.getCustomerId());
                         return;
                     }
                     orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -10,7 +10,6 @@ package com.epmet.controller;
 
 import com.epmet.cloud.CloudStorageConfig;
 import com.epmet.cloud.OssFactory;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -42,7 +41,6 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -132,7 +130,7 @@ public class OssController {
 	@DeleteMapping
 	@ApiOperation(value = "删除")
 //	@LogOperation("删除")
-	public Result delete(@RequestBody Long[] ids){
+	public Result delete(@RequestBody String[] ids){
 		ossService.deleteBatchIds(Arrays.asList(ids));
 
 		return new Result();

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -37,7 +37,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 	@Override
 	public PageData<OssEntity> page(Map<String, Object> params) {
 		IPage<OssEntity> page = baseDao.selectPage(
-			getPage(params, Constant.CREATE_DATE, false),
+			getPage(params, Constant.CREATED_TIME, false),
 			new QueryWrapper<>()
 		);
 		return getPageData(page, OssEntity.class);