Merge remote-tracking branch 'origin/20210204' into 20210204

smart-city-platform/src/main/java/com/bz/smart_city/controller/PlatformApiController.java

@@ -43,8 +43,13 @@ public class PlatformApiController {
     public AjaxMessage sendCommond (
             @ApiParam(value = "客户id", required = true)  @RequestParam String customerNo,
             @RequestParam String meterNo,Integer type) {
-        platformAapiService.sendCommond(meterNo,type,customerNo);
-        return new AjaxMessage<>(ResultStatus.OK);
+        int result=platformAapiService.sendCommond(meterNo,type,customerNo);
+        if(result==0){
+            return new AjaxMessage<>(ResultStatus.OK);
+        }else{
+            return new AjaxMessage<>(ResultStatus.TASK_OPERATE_FAILED);
+        }
+
     }
     @GetMapping  ("/getWaterMeterNo")
     @ApiOperation(value = "获取电子号")

smart-city-platform/src/main/java/com/bz/smart_city/service/PlatformAapiService.java

@@ -6,7 +6,7 @@ import java.util.Map;
 public interface PlatformAapiService {
     void updateMeterNo(String meterNo, String meterCode, String customerNo);
 
-    void sendCommond(String meterNo, Integer type, String customerNo);
+    int sendCommond(String meterNo, Integer type, String customerNo);
 
     String getWaterMeterNo(String meterNo, String customerNo);
 

smart-city-platform/src/main/java/com/bz/smart_city/service/sync/PlatformAapiServiceImpl.java

@@ -43,9 +43,9 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
     }
 
     @Override
-    public void sendCommond(String meterNo, Integer type, String customerNo) {
-
+    public int sendCommond(String meterNo, Integer type, String customerNo) {
 
+            int result=-1;
             Device device = getDevice(meterNo, customerNo);
             if(device!=null){
                 deviceService.setValveV2(device.getId(),type+"");
@@ -57,11 +57,12 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
                 operatingValveRecord.setWaterFileNo(device.getMetercode());
                 operatingValveRecord.setWaterNo(device.getWaterMeterNo());
                 operatingValveRecord.setOperation(type);
+                result=0;
                 operatingValveRecordMapper.insert(operatingValveRecord);
 
             }
 
-
+            return  result;
 
     }
 

smart-city-platform/src/main/resources/mapper/ClearingRecordMapper.xml

@@ -227,7 +227,7 @@
 		sc_clearing_record cr
 		LEFT JOIN sc_clearing_plan cp ON ( cr.plan_id = cp.id ) 
 	WHERE
-		cr.`status` = 1
+		cr.`status` = 1 and cp.`status`=1
 	<if test="custId != null and custId != 0 ">
 		and cp.clearing_customer = #{custId}
 	</if>

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -1214,7 +1214,8 @@
         and sd.customer_id = #{customerId}
         and sil.is_installed=1
         <if test="createDate != null and createDate != ''"> and DATE_FORMAT(sd.date_create, '%Y%m%d' ) = #{createDate}</if>
-        and sil.metercode in <foreach collection="fileNo" item="item" open="(" separator="," close=")">#{item}</foreach>
+        and sil.metercode in
+            <foreach collection="fileNo" item="item" open="(" separator="," close=")">#{item}</foreach>
     </select>
     <update id="updateMeterNo">
         update sc_device set metercode=#{meterNo}

water_query_api/src/main/resources/mapper/WarningRuleMapper.xml

@@ -106,10 +106,12 @@
     select count(1) from sc_warning_rule where status = 1 and device_id = #{deviceId} and warning_type = #{warningType}
   </select>
     <select id="findByFileNo" resultType="com.zcxk.entity.Device">
-      select b.water_meter_file_no ,b.id from sc_customer a left join  sc_device b on a.id=b.customer_id
+      select b.water_meter_file_no ,b.id from sc_customer a
+      left join  sc_device b on a.id=b.customer_id
+      left join sc_install_list sil on(sil.device_id = b.id)
       where
       a.customer_no=#{customerNo}
-      and b.water_meter_file_no in
+      and sil.metercode in
       <foreach collection="fileNos" item="item" separator="," open="(" close=")">
         #{item}
       </foreach>