Merge branch 'dev_screen_data' into dev_temp

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

@@ -15,11 +15,6 @@ public class KcNewsTrendFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 阅读数量
-     */
-    private Integer readCount;
-
     /**
      * 参与数量
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -173,4 +173,11 @@ public interface DataStatisticalOpenFeignClient {
  @PostMapping("/data/stats/statstopic/execute")
  Result execTopicStatistical(@RequestParam(value = "date",required = false) String date);
 
+ /**
+  * 处理暂停的计算
+  * @return
+  */
+ @PostMapping("/data/stats/indexcalculate/process-pendding-cals")
+ Result processPenddingCalculate();
+
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -170,4 +170,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result execTopicStatistical(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical",date);
     }
+
+    @Override
+    public Result processPenddingCalculate() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "processPenddingCalculate");
+    }
 }

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

@@ -48,11 +48,6 @@ public class ScreenKcNewsTrendMonthlyEntity extends BaseEpmetEntity {
      */
 	private String monthId;
 
-    /**
-     * 阅读数量
-     */
-	private Integer readCount;
-
     /**
      * 参与数量
      */

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

@@ -7,7 +7,6 @@
         <result property="id" column="ID"/>
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="monthId" column="MONTH_ID"/>
-        <result property="readCount" column="READ_COUNT"/>
         <result property="partiCount" column="PARTI_COUNT"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
@@ -29,7 +28,6 @@
         ID,
         CUSTOMER_ID,
         MONTH_ID,
-        READ_COUNT,
         PARTI_COUNT,
         DEL_FLAG,
         REVISION,
@@ -43,7 +41,6 @@
             (SELECT REPLACE(UUID(), '-', '') AS id),
             #{customerId},
             #{monthId},
-            #{item.readCount},
             #{item.partiCount},
             0,
             0,

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/DataStatsProcessPenddingCalService.java

@@ -0,0 +1,9 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+
+public interface DataStatsProcessPenddingCalService {
+
+    Result processPenddingCal();
+
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/DataStatsProcessPenddingCalServiceImpl.java

@@ -0,0 +1,19 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.DataStatsProcessPenddingCalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DataStatsProcessPenddingCalServiceImpl implements DataStatsProcessPenddingCalService {
+
+    @Autowired
+    private DataStatisticalOpenFeignClient feignClient;
+
+    @Override
+    public Result processPenddingCal() {
+        return feignClient.processPenddingCalculate();
+    }
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DataStatsProcessPenddingCalTask.java

@@ -0,0 +1,26 @@
+package com.epmet.task;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.DataStatsProcessPenddingCalService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component("dataStatsProcessPenddingCalTask")
+public class DataStatsProcessPenddingCalTask implements ITask {
+
+	@Autowired
+	private DataStatsProcessPenddingCalService dataStatsProcessPenddingCalService;
+
+	@Override
+	public void run(String params) {
+		log.debug("DataStatsProcessPenddingCalTask定时任务正在执行，参数为：{}", params);
+		Result result = dataStatsProcessPenddingCalService.processPenddingCal();
+		if (result.success()){
+			log.debug("DataStatsProcessPenddingCalTask定时任务正在执行定时任务执行成功");
+		}else {
+			log.debug("DataStatsProcessPenddingCalTask定时任务正在执行定时任务执行失败:" + result.getMsg());
+		}
+	}
+}

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -230,9 +230,11 @@
             cs.del_flag = 0
             AND cs.enable_flag = 'enable'
             AND
-            <foreach collection="userIds" item="userId" separator="OR">
+            (
-                cs.user_id = #{userId}
+                <foreach collection="userIds" item="userId" separator="OR">
-            </foreach>
+                    cs.user_id = #{userId}
+                </foreach>
+            )
     </select>