Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp

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

@@ -267,7 +267,7 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         Map<String,String> Xaxis = dateUtils.getXpro();
         List<UserJoinMonthlyResultDTO> monthlyData = screenUserJoinDao.selectUserJoinDataMonthly(param.getAgencyId(),Xaxis.keySet().iterator().next());
         PublicPartiChartResultDTO result = new PublicPartiChartResultDTO();
-        result.setXAxis(Xaxis.values().stream().collect(Collectors.toList()));
+        result.setXAxis(new ArrayList<>(Xaxis.values()));
         List<Integer> defaultData = new LinkedList<>();
         for(int i = NumConstant.ZERO ; i < NumConstant.TWELVE ; i++){
             defaultData.add(NumConstant.ZERO);
@@ -282,17 +282,17 @@ public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
         result.setJoinUserNumList(new ArrayList<>());
         result.setAverageJoinNumList(new ArrayList<>());
         Map<String,List<UserJoinMonthlyResultDTO>> dataMap = monthlyData.stream().collect(Collectors.groupingBy(UserJoinMonthlyResultDTO :: getMonthId));
-        Xaxis.keySet().stream().forEach(monthId -> {
+        Xaxis.keySet().forEach(monthId -> {
             List<UserJoinMonthlyResultDTO> data = dataMap.get(monthId);
-            if(null == data || data.isEmpty()){
+            if (null == data || data.isEmpty()) {
                 result.getOrganizeNumList().add(NumConstant.ZERO);
                 result.getJoinUserNumList().add(NumConstant.ZERO);
                 result.getAverageJoinNumList().add(NumConstant.ZERO);
-            }else{
+            } else {
                 Integer o = NumConstant.ZERO;
                 Integer j = NumConstant.ZERO;
                 Integer a = NumConstant.ZERO;
-                for(UserJoinMonthlyResultDTO unit : data){
+                for (UserJoinMonthlyResultDTO unit : data) {
                     o = null == unit.getOrganizeNum() ? NumConstant.ZERO : o + unit.getOrganizeNum();
                     j = null == unit.getJoinUserNum() ? NumConstant.ZERO : o + unit.getJoinUserNum();
                     a = null == unit.getAverageJoinNum() ? NumConstant.ZERO : o + unit.getAverageJoinNum();

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

@@ -5,57 +5,56 @@
 
     <!-- 查询用户参与数据 -->
     <select id="selectUserJoinData" resultType="com.epmet.evaluationindex.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO">
-        SELECT
-            JOIN_TOTAL AS total,
-            ROUND( AVG_JOIN, 1 ) AS averageJoin,
-            JOIN_TOTAL_UP_RATE AS monthIncr,
-            JOIN_TOTAL_UP_FLAG AS monthTrend,
-            ROUND(AVG_ISSUE, 1) AS averageIssue,
-            AVG_ISSUE_UP_RATE AS issueCompareLatestMonth,
+  		SELECT
+            IFNULL(JOIN_TOTAL,0) AS total,
+            IFNULL(ROUND( AVG_JOIN, 1 ),0) AS averageJoin,
+            IFNULL(JOIN_TOTAL_UP_RATE,0) AS monthIncr,
+            IFNULL(JOIN_TOTAL_UP_FLAG,0) AS monthTrend,
+            IFNULL(ROUND(AVG_ISSUE, 1),0) AS averageIssue,
+            IFNULL(AVG_ISSUE_UP_RATE,0) AS issueCompareLatestMonth,
             AVG_ISSUE_UP_FLAG AS issueCompareLatestTrend,
-            AGVG_JOIN_UP_RATE AS joinCompareLatestMonth,
+            IFNULL(AGVG_JOIN_UP_RATE,0) AS joinCompareLatestMonth,
             AGVG_JOIN_UP_FLAG AS joinCompareLatestTrend
         FROM
             screen_user_join
         WHERE
             DEL_FLAG = '0'
-
-            AND ORG_ID = #{agencyId}
             AND MONTH_ID = #{monthId}
+            AND ORG_ID = #{agencyId}
     </select>
 
     <!-- 根据地区码查询用户参与数据 -->
     <select id="selectUserJoinDataByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.UserJoinIndicatorGrowthRateResultDTO">
         SELECT
-            avg( scj.JOIN_TOTAL ) AS total,
-            ROUND( avg( scj.AVG_JOIN ), 1 ) AS averageJoin,
-            avg( scj.JOIN_TOTAL_UP_RATE ) AS monthIncr,
-            (case when avg( scj.JOIN_TOTAL_UP_RATE ) &gt;0 then 'incr'
-            when avg( scj.JOIN_TOTAL_UP_RATE ) &lt; 0 then 'decr'
-            else 'eq'
-            end )as monthTrend,
-            ROUND( avg( scj.AVG_ISSUE ), 1 ) AS averageIssue,
-            avg( scj.AVG_ISSUE_UP_RATE ) AS issueCompareLatestMonth,
-            (
-            case when avg( scj.AVG_ISSUE_UP_RATE )&gt; 0 then 'incr'
-            when avg( scj.AVG_ISSUE_UP_RATE ) &lt; 0 then 'decr'
-            else 'eq'
-            end
-            )as issueCompareLatestTrend,
-            avg( scj.AGVG_JOIN_UP_RATE ) AS joinCompareLatestMonth,
-            (
-            case when avg( scj.AGVG_JOIN_UP_RATE ) &gt; 0 then 'incr'
-            when avg( scj.AGVG_JOIN_UP_RATE ) &lt; 0 then 'decr'
-            else 'eq'
-            end
-            )as joinCompareLatestTrend
+        IFNULL(avg( scj.JOIN_TOTAL ),0) AS total,
+        IFNULL(ROUND( avg( scj.AVG_JOIN ), 1 ),0) AS averageJoin,
+        IFNULL(avg( scj.JOIN_TOTAL_UP_RATE ),0) AS monthIncr,
+        (case when IFNULL(avg( scj.JOIN_TOTAL_UP_RATE ),0) &gt;0 then 'incr'
+        when IFNULL(avg( scj.JOIN_TOTAL_UP_RATE ),0) &lt; 0 then 'decr'
+        else 'eq'
+        end )as monthTrend,
+        ROUND( IFNULL(avg( scj.AVG_ISSUE ),0), 1 ) AS averageIssue,
+        IFNULL(avg( scj.AVG_ISSUE_UP_RATE ),0) AS issueCompareLatestMonth,
+        (
+        case when IFNULL(avg( scj.AVG_ISSUE_UP_RATE ),0) &gt; 0 then 'incr'
+        when IFNULL(avg( scj.AVG_ISSUE_UP_RATE ),0) &lt; 0 then 'decr'
+        else 'eq'
+        end
+        )as issueCompareLatestTrend,
+        IFNULL(avg( scj.AGVG_JOIN_UP_RATE) ,0) AS joinCompareLatestMonth,
+        (
+        case when IFNULL(avg( scj.AGVG_JOIN_UP_RATE ),0) &gt; 0 then 'incr'
+        when IFNULL(avg( scj.AGVG_JOIN_UP_RATE ),0) &lt; 0 then 'decr'
+        else 'eq'
+        end
+        )as joinCompareLatestTrend
         FROM
         screen_user_join scj
         LEFT JOIN screen_customer_agency agency ON scj.org_id = agency.agency_id
         WHERE
-            scj.DEL_FLAG = '0'
-            AND scj.MONTH_ID = #{monthId}
-            AND agency.PARENT_AREA_CODE =#{areaCode}
+        scj.DEL_FLAG = '0'
+        AND scj.MONTH_ID = #{monthId}
+        AND agency.PARENT_AREA_CODE =#{areaCode}
     </select>
 
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java

@@ -160,7 +160,7 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
                     long endTs = System.currentTimeMillis();
                     logger.info("异步创建群二维码成功，执行时长:{}", endTs - startTs);
                 } catch (Exception e) {
-                    logger.error("异步创建群二维码失败，错误信息:{}", ExceptionUtils.getErrorStackTrace(e));
+                    logger.error("异步创建群二维码失败，错误信息:{},堆栈信息:{}", e.getMessage(), ExceptionUtils.getErrorStackTrace(e));
                 }
             });
             return "";