调整安全检查不同周期定时任务

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -108,7 +108,15 @@ public class CoreSafecheckPlanController extends BaseController {
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             DateHelper dateHelper = new DateHelper(datetime);
-            Map<String, Date> map = DateHelper.getStartAndEnd(dateHelper, cycle);
+            Map<String, Date> map=null;
+            //如果无周期
+            if(cycle==6){
+                map = DateHelper.getStartAndEnd(dateHelper, null);
+                map.put("start", plan.getStartDate());
+                map.put("end", plan.getEndDate());
+            }else{
+                map = DateHelper.getStartAndEnd(dateHelper, cycle);
+            }
             jobBusiness.createTask(datetime, cycle, map.get("start"), map.get("end"));
             return AjaxResult.success();
         } catch (Exception e) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -260,10 +260,20 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             DateHelper dateHelper = new DateHelper(datetime);
+            int cycle = Math.toIntExact(coreSafecheckPlan.getPlanCycle());
 //        SCHEDULEDTASKSLOG.info("开始生成每周常规安全检查任务!");
             try {
-                Map<String, Date> map = DateHelper.getStartAndEnd(dateHelper, Math.toIntExact(coreSafecheckPlan.getPlanCycle()));
-                safetyCheckJobBusiness.createTask(datetime, Math.toIntExact(coreSafecheckPlan.getPlanCycle()), map.get("start"), map.get("end"));
+                Map<String, Date> map=null;
+                //如果无周期
+                if(cycle==6){
+                    map = DateHelper.getStartAndEnd(dateHelper, null);
+                    map.put("start", coreSafecheckPlan.getStartDate());
+                    map.put("end", coreSafecheckPlan.getEndDate());
+                }else{
+                    map = DateHelper.getStartAndEnd(dateHelper, cycle);
+                }
+
+                safetyCheckJobBusiness.createTask(datetime, cycle, map.get("start"), map.get("end"));
             } catch (Exception e) {
                 throw new RuntimeException("生成常规安全检查任务失败!");
             }