修改xxljob执行器id

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeasurementRecordMapper.xml

@@ -55,7 +55,9 @@
             <if test="status != null">
                 and approval_status = #{status}
             </if>
-
+            <if test="planId != null">
+                and plan_id = #{planId}
+            </if>
         </where>
     </select>
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/MeasurementSettlementMapper.xml

@@ -45,7 +45,7 @@
         ms.id,ms.settlement_time,ms.plan_name,ms.billing_cycle,
                company.ORG_NAME companyOrgName,depart.ORG_NAME deptOrgName,
                commuity.name communityName,task_id,ms.company_org_id
-        ,ms.dept_org_id,ms.community_id
+        ,ms.dept_org_id,ms.community_id,ms.total_water_meters
         from rmcp_measurement_settlement ms
         join rmcp_org company on ms.company_org_id=company.ID
         left join rmcp_org depart on ms.dept_org_id=depart.ID

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/logAdvice/LogAnnotation.java

@@ -13,4 +13,5 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 public @interface LogAnnotation {
 	String module() default "";
+	String params() default "";
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/MeasurementSettlementServiceImpl.java

@@ -94,9 +94,9 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         JSONObject jsonObject = JSON.parseObject(add);
         String taskId = jsonObject.getString("content");
         if(taskId!=null){
-            measurementSettlement.setTaskId(Long.parseLong(taskId));
             Integer id=measurementSettlement.getId();
             measurementSettlement=new MeasurementSettlement();
+            measurementSettlement.setTaskId(Long.parseLong(taskId));
             measurementSettlement.setId(id);
             measurementSettlementMapper.update(measurementSettlement);
 
@@ -116,8 +116,12 @@ public class MeasurementSettlementServiceImpl implements MeasurementSettlementSe
         measurementSettlement.setUpdateDate(new Date());
         measurementSettlementMapper.update(measurementSettlement);
         XxlJobInfo xxlJobInfo = setInfo(measurementSettlementDto);
-        xxlJobInfo.setId(measurementSettlementDto.getTaskId().intValue());
-        xxlJobUtil.update(xxlJobInfo);
+        Long taskId = measurementSettlementDto.getTaskId();
+        if(taskId!=null){
+            xxlJobInfo.setId(taskId.intValue());
+            xxlJobUtil.update(xxlJobInfo);
+        }
+
     }
     private XxlJobInfo setInfo(MeasurementSettlementDto measurementSettlementDto){
         XxlJobInfo xxlJobInfo=new XxlJobInfo();

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/util/XxlJobUtil.java

@@ -45,14 +45,17 @@ public class XxlJobUtil {
         // 查询对应groupId:
         jobInfo.setJobGroup(groupId);
         String json2 = JSON.toJSONString(jobInfo);
-        return doPost(adminAddresses + ADD_START_URL, json2);
+        String result=doPost(adminAddresses + ADD_START_URL, json2);
+        log.info("添加结算任务结果"+result);
+        return result;
     }
 
     public String update( XxlJobInfo jobInfo){
        jobInfo.setJobGroup(groupId);
-       String json = JSON.toJSONString(jobInfo);
-
-        return doPost(adminAddresses + UPDATE_URL, json);
+        String json = JSON.toJSONString(jobInfo);
+        String result= doPost(adminAddresses + UPDATE_URL, json);
+        log.info("修改结算任务结果"+result);
+        return result;
     }
 
     public String remove(int id){

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-dev.properties

@@ -104,7 +104,7 @@ ribbon.OkToRetryOnAllOperations=false
 ribbon.ReadTimeout=5000
 ribbon.ConnectTimeout=3000
 xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin
-xxl.job.group.id=8
+xxl.job.group.id=1
 
 
 

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -106,7 +106,7 @@ ribbon.OkToRetryOnAllOperations=false
 ribbon.ReadTimeout=5000
 ribbon.ConnectTimeout=3000
 xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin/
-xxl.job.group.id=8
+xxl.job.group.id=1