定时关阀定时任务修改

smart-city-platform/src/main/java/com/bz/smart_city/quartz/job/ControlByDayJob.java

@@ -26,8 +26,8 @@ public class ControlByDayJob implements Job, Serializable {
         // 1,获取推送配置信息
         JobDetail jobDetail = context.getJobDetail();
         JobDataMap jobDataMap = jobDetail.getJobDataMap();
-        Integer siteId = jobDataMap.getInt("siteId");
-        Integer customerId = jobDataMap.getInt("customerId");
+        Integer siteId = Integer.valueOf(jobDataMap.get("siteId").toString());
+        Integer customerId = Integer.valueOf(jobDataMap.get("customerId").toString());
 
         // 2,调用推送方法
         log.info("invoke ControlByDayJob");

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayFeeServiceImp.java

@@ -1391,12 +1391,10 @@ public class PayFeeServiceImp implements PayFeeService {
 //        parmJson.put("customerNo",payValveStateInfo.getCustomerNo());
 //        String context=parmJson.toString();
         try {
-
             //调用阀门接口
             String url=payValveCommondUrl + "/api/platform/sendCommond";
             String params = String.format("?customerNo=%s&meterNo=%s&type=%s",payValveStateInfo.getCustomerNo(),payValveStateInfo.getMeterCode(),payValveStateInfo.getOperation());
             String result = HttpRequest.doPost(url + params ,"");
-
 //            String result= HttpClientUtils.doPostWithJson(payValveCommondUrl+"/api/platform/sendCommond",context);
             log.info("开关阀请求数据: {},开关阀请求结果: {}", url + params ,result);
             JSONObject jsonObject= JSON.parseObject(result);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayMessagesendrecordServiceImp.java

@@ -420,6 +420,9 @@ public class PayMessagesendrecordServiceImp implements PayMessagesendrecordServi
         if(corn == null){   //获取定时corn失败
             return;
         }
+        HashMap<String, Object> jobData = new HashMap<String, Object>();
+        jobData.put("siteId", payMessageTemplate.getSiteId());
+        jobData.put("customerId",payMessageTemplate.getCustomerId() );
         //保存模板后判断是不是自动发送短信
         if(payMessageTemplate.getSendType() == 0     //短信
                 && payMessageTemplate.getOperationType() == 1    //自动
@@ -443,25 +446,20 @@ public class PayMessagesendrecordServiceImp implements PayMessagesendrecordServi
 //        entity.setCronExpression("0 0/2 * * * ?");
 
             entity.setJobClassName(MessageSendJob.class.getName());
-
-            HashMap<String, Object> jobData = new HashMap<String, Object>();
-            jobData.put("siteId", payMessageTemplate.getSiteId());
-            jobData.put("customerId",payMessageTemplate.getCustomerId() );
 //            jobData.put("sendType", StringUtils.isNotBlank(payMessageTemplate.getDays())?1:2 );//1指定日期推送 2单日推送
             entity.setJobData(jobData);
-            entity2.setJobData(jobData);
             boolean exists = jobAndTriggerService.isExists(entity);
             if(!exists) {
                 jobAndTriggerService.deleteJob(entity);
             }
             jobAndTriggerService.save(entity);
-
         }else{
             //删除定时任务
             this.deleteQrtzTask(payMessageTemplate.getId());
             payMessageTemplate.setDays(null);
             entity2.setCronExpression(payMessageTemplate.Corn());
         }
+        entity2.setJobData(jobData);
         entity2.setJobGroup("自动关阀命令推送");
         entity2.setJobName("valveCommondSendJob"+payMessageTemplate.getId());
         entity2.setDescription("valveCommondSendJob"+payMessageTemplate.getId());