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

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

@@ -39,5 +39,9 @@ public interface ScreenProjectGridDailyDao{
      * @author yinzuomei
      * @description 下级网格的效率（解决率）列表
      **/
-    List<EfficiencyAnalysisResultDTO> queryGridEfficiencyAnalysis(@Param("customerId") String customerId, @Param("areaCode") String areaCode);
+    List<EfficiencyAnalysisResultDTO> queryGridEfficiencyAnalysis(@Param("customerId") String customerId,
+                                                                  @Param("areaCode") String areaCode,
+                                                                  @Param("dateId")String dateId);
+
+    String selectLastDateId(String customerId);
 }

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

@@ -17,7 +17,10 @@
 
 package com.epmet.datareport.service.evaluationindex.screen.impl;
 
+import com.alibaba.druid.util.StringUtils;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectGridDailyDao;
 import com.epmet.datareport.service.evaluationindex.screen.ScreenProjectGridDailyService;
@@ -48,6 +51,12 @@ public class ScreenProjectGridDailyServiceImpl  implements ScreenProjectGridDail
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     @Override
     public List<EfficiencyAnalysisResultDTO> efficiencyAnalysis(String customerId, String areaCode) {
-        return screenProjectGridDailyDao.queryGridEfficiencyAnalysis(customerId,areaCode);
+        //先查询最后一次统计的dateId
+        String dateId=screenProjectGridDailyDao.selectLastDateId(customerId);
+        if(StringUtils.isEmpty(dateId)){
+            //如果为空,默认查询前一天
+            dateId= DateUtils.getBeforeNDay(NumConstant.ONE);
+        }
+        return screenProjectGridDailyDao.queryGridEfficiencyAnalysis(customerId,areaCode,dateId);
     }
 }

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

@@ -19,14 +19,19 @@
         WHERE
             m.DEL_FLAG = '0'
             AND a.AREA_CODE LIKE concat( #{areaCode}, '%')
-            AND M.DATE_ID=(
+            AND M.DATE_ID=#{dateId}
-                select t1.DATE_ID from  screen_project_grid_daily t1
-                where t1.DEL_FLAG='0'
-                and t1.CUSTOMER_ID=#{customerId}
-                order by t1.DATE_ID desc
-                limit 1
-            )
     </select>
 
-
+    <select id="selectLastDateId" resultType="java.lang.String">
+        SELECT
+            t1.DATE_ID
+        FROM
+            screen_project_grid_daily t1
+        WHERE
+            t1.DEL_FLAG = '0'
+            AND t1.CUSTOMER_ID = #{customerId}
+        ORDER BY
+            t1.DATE_ID DESC
+            LIMIT 1
+    </select>
 </mapper>

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

@@ -50,6 +50,6 @@
                 and t1.CUSTOMER_ID=#{customerId}
                 order by t1.DATE_ID desc
                 limit 1
-            )
+            )and m.customerId=#{customerId}
     </select>
 </mapper>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@@ -201,7 +201,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
     @Override
     public void projectSendMsg(List<ProjectSendMsgFormDTO> formDTOList) {
         if (CollectionUtils.isEmpty(formDTOList)){
-            logger.error(SysSmsConstant.IS_NULL_PARAM_LIST);
+            logger.warn(SysSmsConstant.IS_NULL_PARAM_LIST);
             return;
         }
         Map<String, List<ProjectSendMsgFormDTO>> groupByCustomer = formDTOList.stream().collect(Collectors.groupingBy(ProjectSendMsgFormDTO::getCustomerId));
@@ -213,7 +213,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
         }
         List<CrmParameterResultDTO> parameterResult = listResult.getData();
         if (CollectionUtils.isEmpty(parameterResult)){
-            logger.error(SysSmsConstant.PARAMETER_INFO_IS_ZERO);
+            logger.warn(SysSmsConstant.PARAMETER_INFO_IS_ZERO);
             return;
         }
         groupByCustomer.forEach((customerId,v) -> {
@@ -230,11 +230,11 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
                     if (customerId.equals(p.getCustomerId())){
                         // 判断参数开关是否打开，false：未打开
                         if (p.getSwitchStatus() == false){
-                            logger.error(String.format(SysSmsConstant.NOT_ON_SWITCH,customerId,p.getParameterKey()));
+                            logger.warn(String.format(SysSmsConstant.NOT_ON_SWITCH,customerId,p.getParameterKey()));
                         }else {
                             // 判断余额状态 false：余额不足
                             if (p.getBalanceStatus() == false){
-                                logger.error(String.format(SysSmsConstant.NOT_ENOUGH_BALANCE,customerId,p.getParameterValue()));
+                                logger.warn(String.format(SysSmsConstant.NOT_ENOUGH_BALANCE,customerId,p.getParameterValue()));
                             }else {
                                 v.forEach(dto->{
                                     SysSmsDTO sysSmsDTO = new SysSmsDTO();
@@ -249,7 +249,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
                 });
             });
         }catch (RenException e){
-            logger.error(e.getInternalMsg());
+            logger.warn(e.getInternalMsg());
         }
         Map<Boolean, List<CrmParameterResultDTO>> groupBySwitch = parameterResult.stream().collect(Collectors.groupingBy(CrmParameterResultDTO::getSwitchStatus));
         List<CrmParameterResultDTO> crmParameterTrue = groupBySwitch.get(true);
@@ -274,7 +274,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
             //短信服务
             AbstractSmsService service = SmsFactory.build();
             if (service == null) {
-                logger.error("发送短信异常,ErrorCode:%s,异常AbstractSmsService is null", ModuleErrorCode.SMS_CONFIG);
+                logger.warn("发送短信异常,ErrorCode:%s,异常AbstractSmsService is null", ModuleErrorCode.SMS_CONFIG);
             }
             //发送短信
             if (StringUtils.isNotBlank(sysSmsDTO.getAliyunTemplateCode())) {
@@ -283,7 +283,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
                 service.sendSms(sysSmsDTO.getMobile(), map);
             }
         } catch (Exception e) {
-            logger.error(String.format("项目提醒发送短信失败,失败手机号:%s,ErrorCode:%s", sysSmsDTO.getMobile(), e.getMessage()));
+            logger.warn(String.format("项目提醒发送短信失败,失败手机号:%s,ErrorCode:%s", sysSmsDTO.getMobile(), e.getMessage()));
         }
     }