Merge branch '20200918' of http://114.135.61.188:53000/ZONIOT/water-iot into 20200918

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

@@ -33,12 +33,14 @@ public class DeviceValveCommondSync implements InitializingBean {
             while (true) {
                 try {
                     List<PayValveStateInfo> payValveStateInfos = payFeeMapper.getDeviceValveStateByRecord();
-                    List<BigInteger> devices = payValveStateInfos.stream().map( d ->{
-                                payFeeService.sendValveCommond(d);
-                                return d.getMeterId();
-                            }
-                    ).collect(Collectors.toList());
-                    payFeeMapper.deleteControlValveInfoByDevice(devices);
+                    if(payValveStateInfos.size() > 0){
+                        List<BigInteger> devices = payValveStateInfos.stream().map( d ->{
+                                    payFeeService.sendValveCommond(d);
+                                    return d.getMeterId();
+                                }
+                        ).collect(Collectors.toList());
+                        payFeeMapper.deleteControlValveInfoByDevice(devices);
+                    }
                 } catch (Exception e){
                     e.printStackTrace();
                 }

smart-city-platform/src/main/resources/mapper/pay/payFeeMapper.xml

@@ -70,7 +70,7 @@
             </if>
             <if test="list != null and  list.size() != 0">
                     and id in
-                <foreach collection="list" item="item" open="(" separator=" or " close=")">
+                <foreach collection="list" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -450,7 +450,7 @@
         select account_id
         from pay_amount_waterusedamount
         where   id in
-        <foreach collection="list" item="item" open="(" separator=" or " close=")">
+        <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
         )
@@ -476,7 +476,7 @@
     <delete id="deleteControlValveInfoByDevice">
         delete from pay_control_valve
         where   device_id in
-        <foreach collection="list" item="item" open="(" separator=" or " close=")">
+        <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
     </delete>