sprint21 bug

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

@@ -107,7 +107,6 @@ public class InstallController {
     	dto.setNewMeterStart(newMeterStart);
     	dto.setInstallTime(LocalDateTime.now());
     	dto.setDateCreate(LocalDateTime.now());
-    	dto.setFileNo(fileNo);
     	dto.setOldMeterEnd(oldMeterEnd);
     	dto.setImageUrl(newImageUrl);
     	dto.setOldImageUrl(oldImageUrl);
@@ -175,7 +174,7 @@ public class InstallController {
     	dto.setUpdateBy(loginUser.getName());
     	dto.setNewMeterStart(newMeterStart);
     	//dto.setInstallTime(LocalDateTime.now());
-    	dto.setFileNo(fileNo);
+    	//dto.setFileNo(fileNo);
     	dto.setOldMeterEnd(oldMeterEnd);
     	dto.setImageUrl(newImageUrl);
     	dto.setOldImageUrl(oldImageUrl);

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

@@ -94,6 +94,7 @@ com.zcxk.redis.websocket.topic=sc_websocket_topic
 com.zcxk.kafka.accept_add_account.topic=sc_accept_add_account_topic
 com.zcxk.kafka.accept_meter_replace.topic=sc_accept_meter_replace_topic
 com.zcxk.kafka.valve.status.topic=sc_valve_status_billing
+com.zcxk.kafka.accept_valve_state.topic=sc_accept_valve_state_topic
 billing.valveStatus.receiving=billing_valveStatus_receiving
 
 # quartz

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

@@ -306,7 +306,7 @@
         d.loc_desc,
         sc.customer_name,
         sb.name as building_name,
-        IFNULL(sil.is_accepted,1) as is_accepted,
+        IF(sil.is_accepted = 0, 0, 1) as is_accepted,
         sdt1.equipment_type as new_equipment_type,
         sdt1.model as new_model,
         sdm1.name as new_manufacturer_name,