Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/AttendanceSummaryTaskImpl.java

@@ -31,9 +31,9 @@ public class AttendanceSummaryTaskImpl  implements ITaskExcuteService {
             if(StringUtils.isNotEmpty(verify)&&verify.equals("true")){
                 Thread.sleep(600*1000);
             }
-            cacheService.setnx(SUMMARY_TASK_KEY,"true",3600);
+            cacheService.set(SUMMARY_TASK_KEY,"true",600);
             attendanceStatService.doAttendanceSummary(null);
-            cacheService.setnx(SUMMARY_TASK_KEY,"false",60);
+            cacheService.set(SUMMARY_TASK_KEY,"false",60);
         }catch (Exception e){
 
         }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java

@@ -96,7 +96,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
             executorService.submit(new Runnable() {
                 @Override
                 public void run() {
-                    cacheService.setnx(SUMMARY_TASK_KEY,"true",3600);
+                    cacheService.set(SUMMARY_TASK_KEY,"true",600);
                     if(StringUtils.isNotEmpty(query.getSummaryTimeStart()) && StringUtils.isNotEmpty(query.getSummaryTimeEnd())){
                         List<String> dateList = getDatesBetween(query.getSummaryTimeStart(),query.getSummaryTimeEnd());
                         for(String day:dateList){
@@ -108,7 +108,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
                     }
                 }
             });
-            cacheService.setnx(SUMMARY_TASK_KEY,"false",60);
+            cacheService.set(SUMMARY_TASK_KEY,"false",60);
             model.put("message_info","开始执行考勤汇总,请稍后查看");
         } catch (Exception var9) {
             code = -1;