|
@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.bz.smart_city.commom.exception.ServiceException;
|
|
|
import com.bz.smart_city.commom.util.UserUtil;
|
|
|
import com.bz.smart_city.dao.*;
|
|
|
+import com.bz.smart_city.dao.assistant.InstallListMapper;
|
|
|
import com.bz.smart_city.dto.DeviceErrorDto;
|
|
|
import com.bz.smart_city.dto.WaterMeterMaintenanceLogDto;
|
|
|
import com.bz.smart_city.entity.*;
|
|
|
+import com.bz.smart_city.entity.assistant.InstallList;
|
|
|
import com.bz.smart_city.service.WorkOrderService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -43,6 +45,8 @@ public class WaterMeterMaintenanceLogServiceImpl implements WaterMeterMaintenanc
|
|
|
private DeviceMapper deviceMapper;
|
|
|
@Autowired
|
|
|
private WorkOrderService workOrderService;
|
|
|
+ @Resource
|
|
|
+ private InstallListMapper installListMapper;
|
|
|
|
|
|
@Override
|
|
|
public int insert(WaterMeterMaintenanceLog waterMeterMaintenanceLog) {
|
|
@@ -160,6 +164,15 @@ public class WaterMeterMaintenanceLogServiceImpl implements WaterMeterMaintenanc
|
|
|
|
|
|
//完成工单任务
|
|
|
workOrderService.handle(waterMeterMaintenanceLog.getTaskId(), "换表", null);
|
|
|
+
|
|
|
+ //更新安装列表中的初始读数和旧表读数
|
|
|
+ InstallList installList = new InstallList();
|
|
|
+ installList.setDeviceId(waterMeterMaintenanceLog.getDeviceId());
|
|
|
+ installList.setNewMeterStart(waterMeterMaintenanceLog.getNewBeginWsv());
|
|
|
+ installList.setOldMeterEnd(waterMeterMaintenanceLog.getOldEndWsv());
|
|
|
+ installList.setDateUpdate(LocalDateTime.now());
|
|
|
+ installListMapper.updateByDeviceId2(installList);
|
|
|
+
|
|
|
}
|
|
|
//4、更新设备信息
|
|
|
Device newDevice = new Device();
|