--换表新增用户表数据

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwMeterExchangeRegisterServiceImpl.java

@@ -5,6 +5,7 @@ import com.rongwe.zhsw.system.domain.SwMeterExchangeRegisterDo;
 import com.rongwe.zhsw.system.domain.SwUserManagementDo;
 import com.rongwe.zhsw.system.domain.SwWaterMeterManagementDo;
 import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
+import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.zhsw.system.dao.SwMeterExchangeRegisterDao;
 import com.rongwei.zhsw.system.dao.SwWaterMeterManagementDao;
 import com.rongwei.zhsw.system.dao.SwWaterUsageEntryDao;
@@ -22,6 +23,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -48,6 +50,9 @@ public class SwMeterExchangeRegisterServiceImpl extends ServiceImpl<SwMeterExcha
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void changemeter(List<SwWaterUsageEntryDo> changemeterinfo, SwMeterExchangeRegisterDo registerDo) {
+        if (registerDo == null) {
+            throw new IllegalArgumentException("换表数据不能为空");
+        }
         //保存换表信息
         save(registerDo);
         //
@@ -77,6 +82,8 @@ public class SwMeterExchangeRegisterServiceImpl extends ServiceImpl<SwMeterExcha
         if (!StringUtils.isBlank(oldsmeterno)) {
             queryWrapper.eq("WATERMETERNO", oldsmeterno);
         }
+        queryWrapper.eq("deleted", "0");
+        queryWrapper.eq("meterstatus", "enable");
         queryWrapper.eq("accountuserno", accountuserno);
         SwWaterMeterManagementDo managementDo = swWaterMeterManagementDao.selectOne(queryWrapper);
         if (managementDo != null) {
@@ -85,10 +92,24 @@ public class SwMeterExchangeRegisterServiceImpl extends ServiceImpl<SwMeterExcha
             managementDo.setManufacturer(registerDo.getManufacturer());
             swWaterMeterManagementDao.updateById(managementDo);
         } else {
-            throw new IllegalArgumentException("未查询到水表信息");
-        }
-
+            SwWaterMeterManagementDo newManagementDo = new SwWaterMeterManagementDo();
 
+            newManagementDo.setId(SecurityUtil.getUUID());
+            newManagementDo.setWatermeterno(registerDo.getNewmeterno());
+            newManagementDo.setSpecificationmodel(registerDo.getNewmetermodel());
+            newManagementDo.setManufacturer(registerDo.getManufacturer());
+            newManagementDo.setDeleted("0");
+            newManagementDo.setMeterstatus("enable");
+            newManagementDo.setAccountuserno(accountuserno);
+            newManagementDo.setUserid(registerDo.getUserid());
+            newManagementDo.setUsername(registerDo.getUsername());
+            newManagementDo.setVolumeno(registerDo.getVolumeno());
+            newManagementDo.setStartdate(registerDo.getMeterchangedate());
+            newManagementDo.setManufacturedate(registerDo.getManufacturedate());
+            newManagementDo.setCommunityname(registerDo.getVillagename());
+            newManagementDo.setWaterusetype(registerDo.getWatertype());
+            swWaterMeterManagementDao.insert(newManagementDo);
+        }
     }
 
     private void updateUserMeterInfo(SwWaterUsageEntryDo entry) {