|
|
@@ -84,7 +84,7 @@ public class ControlDayServiceImpl implements ControlDayService, InitializingBea
|
|
|
jobAndTriggerService.deleteJob(entity);
|
|
|
|
|
|
if(1==1) {
|
|
|
- log.info(String.format("定时阀控处理:%s,客户ID%s",cron,customerId));
|
|
|
+ log.info(String.format("添加阀控处理任务:%s,客户ID%s",cron,customerId));
|
|
|
entity.setCronExpression(cron);
|
|
|
entity.setJobClassName(ControlByDayJob.class.getName());
|
|
|
|
|
|
@@ -165,7 +165,7 @@ public class ControlDayServiceImpl implements ControlDayService, InitializingBea
|
|
|
String[] deviceType = StringUtils.split(one.getValveRuleId(),",");
|
|
|
String[] deviceTypeName = StringUtils.split(one.getValveRuleName(),",");
|
|
|
//循环用户关联的所有阀控规则
|
|
|
- Integer ControlResult = null;
|
|
|
+ Integer ControlResult = -1;
|
|
|
if(deviceType != null ){
|
|
|
for (int i=0;i<deviceType.length;i++){
|
|
|
//result执行动作，0关阀 1开阀
|
oppadmin