优化批量新增

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/HardwareApiServiceImpl.java

@@ -53,6 +53,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
     @Autowired
     private IIsJobTicketUserService iIsJobTicketUserService;
 
+    /**
+     * 取出钥匙
+     * @param dto
+     * @return
+     */
     @Override
     public Boolean updateTakeOutKey(TakeOutKeyDTO dto) {
         Assert.notNull(dto.getTicketId(), "请告诉我关于哪个作业票!");
@@ -103,6 +108,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 归还钥匙
+     * @param dto
+     * @return
+     */
     @Override
     public Boolean updateReturnKey(ReturnKeyDTO dto) {
         Assert.notNull(dto.getTicketId(), "请告诉我关于哪个作业票!");
@@ -154,6 +164,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 取出挂锁时更新数据
+     * @param list
+     * @return
+     */
     @Override
     public Boolean updateTicketLockTake(List<TakeTicketLockDTO> list) {
         Assert.isFalse(list.isEmpty(), "请取出至少一把挂锁!");
@@ -232,6 +247,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 归还挂锁时更新数据
+     * @param dto
+     * @return
+     */
     @Override
     public Boolean updateTicketLockReturn(ReturnTicketLockDTO dto) {
         // Assert.notNull(dto.getTicketId(), "请告诉我关于哪个作业票!");
@@ -281,6 +301,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
     }
 
 
+    /**
+     * 批量更新作业票下隔离点的上锁状况
+     * @param list
+     * @return
+     */
     @Override
     public Boolean updateLockPointBatch(List<LockPointBatchDTO> list) {
         Assert.isFalse(list.isEmpty(), "没有接收到数据啊!");
@@ -344,6 +369,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 取出辅件时更新数据
+     * @param list
+     * @return
+     */
     @Override
     public Boolean updateLocksetTake(List<TakeLocksetDTO> list) {
         Assert.isFalse(list.isEmpty(), "请取出至少一个辅件!");
@@ -377,6 +407,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 辅件绑定隔离点(辅件和给隔离点上锁时)
+     * @param dto
+     * @return
+     */
     @Override
     public Boolean updateLocksetPoint(LocksetPointDTO dto) {
         Assert.notNull(dto.getTicketId(), "请告诉我关于哪个作业票!");
@@ -399,6 +434,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 辅件归还物资柜
+     * @param dto
+     * @return
+     */
     @Override
     public Boolean updateLocksetReturn(ReturnLocksetDTO dto) {
         Assert.notBlank(dto.getLocksetNfc(), "辅件nfc缺失!");
@@ -440,6 +480,11 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
+    /**
+     * 获取作业票和关联数据
+     * @param ticketId
+     * @return
+     */
     @Override
     public JobTicketVO selectTicketDetailById(Long ticketId) {
         Assert.notNull(ticketId, "作业票id不可为空!");

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -168,14 +168,16 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         isJobTicketMapper.insertIsJobTicket(jobTicket);
         // 3.新增作业票和隔离点的关联关系
         // TODO 批量新增
+        ArrayList<IsJobTicketPoints> isJobTicketPoints = new ArrayList<>();
         for (IsMachineryPoints point : points) {
             IsJobTicketPoints jobTicketPoints = new IsJobTicketPoints();
             jobTicketPoints.setTicketId(jobTicket.getTicketId());
             jobTicketPoints.setWorkstationId(sop.getWorkstationId());
             jobTicketPoints.setMachineryId(point.getMachineryId());
             jobTicketPoints.setPointId(point.getPointId());
-            iIsJobTicketPointsService.save(jobTicketPoints);
+            isJobTicketPoints.add(jobTicketPoints);
         }
+        iIsJobTicketPointsService.saveBatch(isJobTicketPoints);
         // 3.1新增作业票和钥匙的关联关系(两条数据，一条上锁，一条解锁)
         saveJobTicketKet(jobTicket.getTicketId());
         // 3.2新增作业票和挂锁的关联关// 3.3新增作业票和锁具的关联关系
@@ -220,14 +222,16 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         isJobTicketMapper.insertIsJobTicket(jobTicket);
         // 3.新增作业票和隔离点的关联关系
         // TODO 批量新增
+        ArrayList<IsJobTicketPoints> isJobTicketPoints = new ArrayList<>();
         for (IsMachineryPoints point : points) {
             IsJobTicketPoints jobTicketPoints = new IsJobTicketPoints();
             jobTicketPoints.setTicketId(jobTicket.getTicketId());
             jobTicketPoints.setWorkstationId(dto.getWorkstationId());
             jobTicketPoints.setMachineryId(point.getMachineryId());
             jobTicketPoints.setPointId(point.getPointId());
-            iIsJobTicketPointsService.save(jobTicketPoints);
+            isJobTicketPoints.add(jobTicketPoints);
         }
+        iIsJobTicketPointsService.saveBatch(isJobTicketPoints);
         // 3.1新增作业票和钥匙的关联关系(两条数据，一条上锁，一条解锁)
         saveJobTicketKet(jobTicket.getTicketId());
         // 3.2新增作业票和挂锁的关联关// 3.3新增作业票和锁具的关联关系
@@ -390,6 +394,7 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         // 无法检测隔离点属性是否变更，直接清理重新新增
         iIsJobTicketPointsService.remove(Wrappers.<IsJobTicketPoints>lambdaQuery().eq(IsJobTicketPoints::getTicketId, dto.getTicketId()));
         // TODO 批量新增
+        ArrayList<IsJobTicketPoints> isJobTicketPointsArrayList = new ArrayList<>();
         for (IsJobTicketPoints isJobTicketPoints : dto.getPointsList()) {
             IsJobTicketPoints jobTicketPoints = new IsJobTicketPoints();
             jobTicketPoints.setTicketId(jobTicket.getTicketId());
@@ -397,8 +402,9 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
             jobTicketPoints.setWorkareaId(dto.getWorkareaId());
             jobTicketPoints.setPointId(isJobTicketPoints.getPointId());
             jobTicketPoints.setPrePointId(isJobTicketPoints.getPrePointId());
-            iIsJobTicketPointsService.save(jobTicketPoints);
+            isJobTicketPointsArrayList.add(jobTicketPoints);
         }
+        iIsJobTicketPointsService.saveBatch(isJobTicketPointsArrayList);
         // 3.2新增作业票和挂锁的关联关// 3.3新增作业票和锁具的关联关系 ----先清除
         iIsJobTicketLockService.remove(Wrappers.<IsJobTicketLock>lambdaQuery().eq(IsJobTicketLock::getTicketId, dto.getTicketId()));
         iIsJobTicketLocksetService.remove(Wrappers.<IsJobTicketLockset>lambdaQuery().eq(IsJobTicketLockset::getJobTicketId, dto.getTicketId()));