车辆报废，释放设备编号后在设备管理里添加一条设备替换记录

徐烜
1 parent 790463e4
Showing 3 changed files with 56 additions and 5 deletions
src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
src/main/java/com/bsth/service/schedule/impl/CarsServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
@@ -50,4 +50,7 @@ public interface CarConfigInfoRepository extends BaseRepository&lt;CarConfigInfo, L
     @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
     List<CarConfigInfo> findByXlId(Integer xlid);
+
+    @EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
+    List<CarConfigInfo> findByClId(Integer clid);
 }
 \ No newline at end of file
 package com.bsth.service.schedule.impl;
+import com.bsth.entity.CarDevice;
 import com.bsth.entity.Cars;
+import com.bsth.entity.schedule.CarConfigInfo;
+import com.bsth.repository.schedule.CarConfigInfoRepository;
+import com.bsth.service.schedule.CarDeviceService;
 import com.bsth.service.schedule.CarsService;
 import com.bsth.service.schedule.exception.ScheduleException;
 import com.bsth.service.schedule.utils.DataToolsFile;
@@ -12,7 +16,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import java.io.File;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 /**
@@ -24,6 +30,48 @@ public class CarsServiceImpl extends BServiceImpl&lt;Cars, Integer&gt; implements Cars
     @Qualifier(value = "cars_dataTool")
     private DataToolsService dataToolsService;
+    @Autowired
+    @Qualifier(value = "carDeviceServiceImpl_sc")
+    private CarDeviceService carDeviceService;
+
+    @Autowired
+    private CarConfigInfoRepository carConfigInfoRepository;
+
+    @Override
+    public Cars save(Cars cars) {
+        if (cars.getId() != null && cars.getScrapState()) { // 更新车辆信息，报废车辆
+            // 1、作废的车辆，修改报废号
+            String eCode = cars.getEquipmentCode();
+            cars.setEquipmentCode("BF-" + eCode);
+            cars.setScrapCode("BF-" + cars.getEquipmentCode());
+            // 2、添加一条相关的设备替换记录
+            // 查找在哪条线路上
+            List<CarConfigInfo> carConfigInfoList = carConfigInfoRepository.findByClId(cars.getId());
+            for (CarConfigInfo carConfigInfo : carConfigInfoList) {
+                CarDevice carDevice = new CarDevice();
+                carDevice.setGsName(cars.getCompany());
+                carDevice.setCompany(cars.getBusinessCode());
+                carDevice.setBrancheCompany(cars.getBrancheCompanyCode());
+                carDevice.setCl(cars.getId());
+                carDevice.setClZbh(cars.getInsideCode());
+                carDevice.setXl(carConfigInfo.getXl().getId());
+                carDevice.setXlName(carConfigInfo.getXl().getName());
+                carDevice.setXlBm(carConfigInfo.getXl().getLineCode());
+                carDevice.setOldDeviceNo(eCode);
+                carDevice.setNewDeviceNo("BF-" + eCode);
+                carDevice.setIsCancel(false);
+
+                carDevice.setCreateBy(cars.getCreateBy());
+                carDevice.setUpdateBy(cars.getUpdateBy());
+                carDevice.setCreateDate(new Date());
+                carDevice.setUpdateDate(new Date());
+                carDeviceService.save(carDevice);
+            }
+        }
+
+        return super.save(cars);
+    }
+
     @Override
     public void importData(File file, Map<String, Object> params) throws ScheduleException {
         dataToolsService.importData(file, params);
@@ -294,11 +294,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.submit = function() {
                 console.log(self.busInfoForSave);
-                // 报废的车辆，修改原来的车辆终端号
-                if (self.busInfoForSave.scrapState == true) {
-                    self.busInfoForSave.equipmentCode = "BF-" + self.busInfoForSave.equipmentCode;
-                    self.busInfoForSave.scrapCode = "BF-" + self.busInfoForSave.equipmentCode;
-                }
+                // // 报废的车辆，修改原来的车辆终端号
+                // if (self.busInfoForSave.scrapState == true) {
+                //     self.busInfoForSave.equipmentCode = "BF-" + self.busInfoForSave.equipmentCode;
+                //     self.busInfoForSave.scrapCode = "BF-" + self.busInfoForSave.equipmentCode;
+                // }
                 // 保存或者更新