首页-待办

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/runner/AppletDataRunner.java

@@ -26,6 +26,6 @@ public class AppletDataRunner implements ApplicationRunner {
      */
     @Override
     public void run(ApplicationArguments args) {
-        dataInitUtil.initAppletData();
+        //dataInitUtil.initAppletData();
     }
 }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/MaintenanceDataService.java

@@ -18,6 +18,7 @@ import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 /**
@@ -121,7 +122,7 @@ public class MaintenanceDataService {
      * @date 2020/2/5 4:53 下午
      */
     public RestResponse beyondStatistics(MaintenanceDataRequest maintenanceDataRequest) {
-        Map<String, Long> projectNameToBeyondNum = new HashMap<>();
+        Map<String, Long> projectNameToBeyondNum = getTestBeyondStatistics();
         //从redis中获取维保数据
         List<MaintenanceDataModel> maintenanceDataModelList = getMaintenanceDataListFromRedis(maintenanceDataRequest);
         if (maintenanceDataModelList != null && maintenanceDataModelList.size() > 0) {
@@ -148,6 +149,21 @@ public class MaintenanceDataService {
         return RestResponse.success(projectNameToBeyondNum, ApiConstants.RESULT_SUCCESS, "获取统计数据成功");
     }
 
+    /**
+     * @param
+     * @return
+     * @description 获取超期统计测试数据
+     * @date 2020/2/24 7:49 上午
+     */
+    private Map<String, Long> getTestBeyondStatistics() {
+        Map<String, Long> testMap = new HashMap<>();
+        Random random = new Random();
+        for(int i = 1; i <= 5; i++) {
+            testMap.put("测试项目" + i, (long)random.nextInt(10));
+        }
+        return testMap;
+    }
+
     /**
      * @param
      * @return

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/util/DataStatisticsUtil.java

@@ -45,7 +45,7 @@ public class DataStatisticsUtil {
             }));
         }
         //存放缓存时间为1天
-        redisTemplate.opsForValue().set(dataKey, mtCompanyIdToData, 1L, TimeUnit.DAYS);
+        redisTemplate.opsForValue().set(dataKey, mtCompanyIdToData, 3L, TimeUnit.DAYS);
     }
 
     /**

lift-system-service/src/main/resources/mapper/TodoDataMapper.xml

@@ -142,7 +142,6 @@
             count(1)
         from
             emergency_repair er
-        where
         <include refid="emergencyTodoQuerySql"></include>
     </select>
 
@@ -154,7 +153,6 @@
             count(1)
         from
             maintenance_plan mp
-        where
         <include refid="maintenanceTodoQuerySql"></include>
     </select>
 
@@ -166,8 +164,6 @@
             count(1)
         from
             capital_repair cr
-        where
-            cr.mt_company_id = #{mtCompanyId}
         <include refid="capitalTodoQuerySql"></include>
     </select>