故障统计定时任务和导入优化

als-modules/agile-assurance/src/main/java/org/eco/als/controller/FaultStatisticsController.java

@@ -114,10 +114,9 @@ public class FaultStatisticsController extends BaseController {
      */
     @Log(title = "故障统计", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public CommonResult<Void> importData(MultipartFile file, boolean updateSupport) throws Exception {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        ExcelResult<FaultStatisticsImportVo> result = ExcelUtil.importExcel(file.getInputStream(), FaultStatisticsImportVo.class, new FaultStatisticsImportListener(updateSupport, loginUser));
-        return CommonResult.success(result.getAnalysis().getLogInfo());
+    public CommonResult<List<FaultStatisticsImportVo>> importData(MultipartFile file, boolean updateSupport) throws Exception {
+        List<FaultStatisticsImportVo> result = ExcelUtil.importExcel(file.getInputStream(), FaultStatisticsImportVo.class);
+        return CommonResult.success(result);
     }
 
     /**

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultStatisticsServiceImpl.java

@@ -140,7 +140,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
     @Transactional
     @Override
     public void getExtraStatistics() {
-        int count = faultStatisticsMapper.deleteByCondition(FAULT_STATISTICS.CREATE_TIME.lt(DateUtil.date()).and(FAULT_STATISTICS.REMARKS.notIn("import")));
+        int count = faultStatisticsMapper.deleteByCondition(FAULT_STATISTICS.CREATE_TIME.lt(DateUtil.date()).and(FAULT_STATISTICS.REMARKS.isNull()));
         log.info("删除数据条数：{}", count);
         String pageNo = "1";
         JSONArray rows = getStatisticsData(pageNo);

als-modules/agile-assurance/src/main/java/org/eco/als/task/FaultTask.java

@@ -22,7 +22,7 @@ public class FaultTask {
     @Resource
     private IFaultStatisticsService faultStatisticsService;
 
-    @Scheduled(cron = "0 */1 * * * *")
+    @Scheduled(cron = "0 */30 * * * *")
     public void faultStatisticsTask() {
         log.info("获取ZK故障信息定时任务=========开始");
         faultStatisticsService.getExtraStatistics();