关联id修改成metercode

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

@@ -54,7 +54,7 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
                 operatingValveRecord.setCreateDate(new Date());
                 operatingValveRecord.setCustomerId(device.getCustomerId());
                 operatingValveRecord.setStatus(1);
-                operatingValveRecord.setWaterFileNo(device.getWaterMeterFileNo());
+                operatingValveRecord.setWaterFileNo(device.getMetercode());
                 operatingValveRecord.setWaterNo(device.getWaterMeterNo());
                 operatingValveRecord.setOperation(type);
                 operatingValveRecordMapper.insert(operatingValveRecord);

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

@@ -96,7 +96,7 @@ public class SyncDataServiceImpl implements SyncDataService {
         List<Long>deviceIds=new ArrayList<>();
         byFileNo.forEach(device -> {
             deviceIds.add(device.getId());
-            idMatchFileNo.put(device.getId(),device.getWaterMeterFileNo());
+            idMatchFileNo.put(device.getId(),device.getMetercode());
         });
 
         result.put("ids",deviceIds);

smart-city-platform/src/main/resources/application-dev.properties

@@ -65,8 +65,8 @@ jwt.tokenHead=Bearer
 
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
-spring.servlet.multipart.location=e:/test/files
-files.path=${file-path:e:/test/files}
+spring.servlet.multipart.location=D:/test
+files.path=${file-path:D:/test}
 
 #\u5FAE\u4FE1\u516C\u4F17\u53F7
 wechat.oa.appid=wx6b2ce547cd593413

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

@@ -1182,10 +1182,12 @@
         </if>
     </select>
     <select id="findByFileNo"  resultType="com.bz.smart_city.entity.Device">
-        select b.water_meter_file_no ,b.water_meter_no,b.id ,b.customer_id from sc_customer a left join  sc_device b on a.id=b.customer_id
+        select b.water_meter_file_no ,b.water_meter_no,b.id ,b.customer_id ,sil.metercode 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>

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

@@ -927,7 +927,7 @@
     and sd.customer_id = #{customerId}
     <if test="createDate != null and createDate != ''"> and DATE_FORMAT(sil.accept_time, '%Y%m%d' ) = #{createDate}</if>
     <if test="fileNo != null and fileNo.size() != 0">
-      and sd.water_meter_file_no 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>
     </if>
   </select>
 </mapper>

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

@@ -431,7 +431,7 @@
 
     <select id="replaceMete" resultType="com.bz.smart_city.dto.sync.ReplaceMeteDto">
         select
-        sd.water_meter_file_no as file_no,
+        sil.metercode as file_no,
         swmrl.new_water_no,
         swmrl.old_water_no,
         swmrl.new_begin_wsv,
@@ -441,6 +441,7 @@
         swmrl.date_create
         from sc_water_meter_replace_log swmrl
         inner join sc_device sd on(sd.id = swmrl.device_id)
+        left join sc_install_list sil on(sil.device_id = sd.id)
         where swmrl.status = 1 and sd.status = 1 and sd.customer_id = #{customerId}
         and DATE_FORMAT(swmrl.date_create, '%Y%m%d' ) = #{rePlaceDate}
     </select>