[配发]加taskId

dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java

@@ -146,5 +146,16 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
     @Modifying
     @Query("update DeviceLibrary o set o.matchingRange = :matchingRange ,o.updateTime=current_timestamp where o.packingId = :packingId")
     int upDateMatchingRange(Integer matchingRange,Integer packingId);
+
+    @Transactional
+    @Modifying
+    @Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus where o.id = :id")
+    int batchUpdate(Integer lifeStatus,Integer id);
+
+    @Transactional
+    @Modifying
+    @Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus where o.id in :ids")
+    int batchUpdate2(Integer lifeStatus,List<Integer> ids);
+
 }
 

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java

@@ -181,4 +181,16 @@ public interface DeviceLibraryService {
      */
 
     List<DeviceLibrary> getAllDevByDevIds(List<Integer> ids);
+
+    /**
+     * @param lifeStatus 更新装备生命信息
+     */
+    void updateLifeStatus(Integer lifeStatus,Integer id);
+
+    /**
+     * @param lifeStatus 更新装备生命信息
+     */
+    void updateLifeStatus2(Integer lifeStatus,List<Integer> ids);
+
+    List<DeviceLibrary> findByIds(List<Integer> ids);
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -9,6 +9,7 @@ import com.tykj.dev.config.base.DeviceLifeStatus;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
 import com.tykj.dev.device.library.service.DeviceLibraryService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
+import com.tykj.dev.device.library.subject.domin.DeviceLog;
 import com.tykj.dev.device.library.subject.vo.DeviceLibrarySelectVo;
 import com.tykj.dev.device.library.subject.vo.DeviceStatisticsVo;
 import com.tykj.dev.device.user.subject.entity.Units;
@@ -570,6 +571,23 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         return allByIdIn;
     }
 
+    @Override
+    public void updateLifeStatus(Integer lifeStatus,Integer id) {
+        deviceLibraryDao.batchUpdate(lifeStatus,id);
+    }
+
+    @Override
+    public void updateLifeStatus2(Integer lifeStatus, List<Integer> ids) {
+         deviceLibraryDao.batchUpdate2(lifeStatus,ids);
+    }
+
+    @Override
+    public List<DeviceLibrary> findByIds(List<Integer> ids) {
+
+        return deviceLibraryDao.findAllByIdIn(ids);
+    }
+
+
     @Override
     public void isNotLoss(List<Integer> ids) {
         ids.forEach(integer -> {

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -24,6 +24,12 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
     List<PackingLibrary> findAllByIsRootAndPackingStatus(Integer isRoot,Integer packingStatus);
 
     List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(Integer partParentId,Integer matchingRange,Integer packingStatus,String name);
+    List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatusInAndName(Integer partParentId,Integer matchingRange,List<Integer> packingStatus,String name);
+
+    /**
+     * zsp
+     */
+    List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatusAndNameAndDeleteTag(Integer partParentId,Integer matchingRange,Integer packingStatus,String name,Integer del);
 
     List<PackingLibrary> findAllByDeleteTag(Integer deleteTag);
 

dev-packing/src/main/java/com/tykj/dev/device/packing/service/PackingLibraryService.java

@@ -160,6 +160,30 @@ public interface PackingLibraryService{
      */
     PackingLibrary findSamePacking(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
 
+    /**
+     * 列装状态2 和4
+     * @param parentId 父列装id
+     * @param matchingRange 配用范围
+     *
+     * 查询对应横向或纵向列装
+     */
+    PackingLibrary findSamePackingInPackingStatus(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
+
+    /**
+     *
+     * @param parentId 父列装id
+     * @param matchingRange 配用范围
+     * @param type
+     * @param style
+     * @param name
+     * @param secretLevel
+     * @param invisibleRange
+//     * @param del 删除标志
+     * @return
+     */
+//    PackingLibrary findSamePackingByDel(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange,Integer del,Integer status);
+
+
     List<PackingLibrary> findSamePacking1(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange);
     /**
      * @param packingLibraries 父子结构列装

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -607,6 +607,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
      */
     @Override
     public PackingLibrary findSamePacking(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange) {
+
         List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(parentId,matchingRange,2,name);
         if (packingLibraries.isEmpty()){
             return null;
@@ -616,6 +617,29 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         }
     }
 
+    @Override
+    public PackingLibrary findSamePackingInPackingStatus(Integer parentId, Integer matchingRange, Integer type, Integer style, String name, Integer secretLevel, Integer invisibleRange) {
+        List<Integer> list = new ArrayList<>(Arrays.asList(2, 4));
+
+        List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatusInAndName(parentId,matchingRange,list,name);
+        if (packingLibraries.isEmpty()){
+            return null;
+        }
+        else {
+            return packingLibraries.get(0);
+        }
+    }
+//
+//    @Override
+//    public PackingLibrary findSamePackingByDel(Integer parentId, Integer matchingRange, Integer type, Integer style, String name, Integer secretLevel, Integer invisibleRange, Integer del) {
+//        List<PackingLibrary> allByPartParentIdAndMatchingRangeAndPackingStatusAndNameAndDeleteTag = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatusAndNameAndDeleteTag(parentId, matchingRange, 4, name, 1);
+//        if (allByPartParentIdAndMatchingRangeAndPackingStatusAndNameAndDeleteTag.isEmpty()){
+//            return null;
+//        }else {
+//            return allByPartParentIdAndMatchingRangeAndPackingStatusAndNameAndDeleteTag.get(0);
+//        }
+//    }
+
     @Override
     public List<PackingLibrary> findSamePacking1(Integer parentId, Integer matchingRange, Integer type, Integer style, String name, Integer secretLevel, Integer invisibleRange) {
         List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(parentId,matchingRange,2,name);

dev-user/src/main/java/com/tykj/dev/device/user/read/repository/MessageDao.java

@@ -10,4 +10,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface MessageDao extends JpaRepository<Message,Integer>, JpaSpecificationExecutor<Message> {
+    Message findByTaskId(Integer taskId);
 }

dev-user/src/main/java/com/tykj/dev/device/user/read/service/MessageService.java

@@ -30,6 +30,8 @@ public interface MessageService {
 
     List<MessageBto> getBtoList();
 
+
+
     /**
      * @param messageId 阅知信息id
      * 阅读该信息
@@ -46,4 +48,6 @@ public interface MessageService {
      * 根据用户id查询阅知信息
      */
     boolean isNotExistMessage(Integer userId);
+
+    Message findByTaskId(Integer taskId);
 }

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -216,4 +216,9 @@ public class MessageServiceImpl implements MessageService {
                 .map(Message::parse2Bto)
                 .allMatch(messageBto -> messageBto.getInvolveUserIdList().contains(userId)&&messageBto.getCompleteUserIdList().contains(userId));
     }
+
+    @Override
+    public Message findByTaskId(Integer taskId) {
+        return messageDao.findByTaskId(taskId);
+    }
 }