[清退 退役 用户] 代码提交

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/DeviceDecommissioningBusinessService.java

@@ -12,6 +12,7 @@ import com.tykj.dev.device.decommissioning.entity.vo.StorageDeviceDevommissiong;
  * @createTime 2021年03月29日 16:37:00
  */
 public interface DeviceDecommissioningBusinessService {
+
     /**
      * 生成省中办退役的任务
      * @param userId 用户id

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java

 package com.tykj.dev.device.decommissioning.service.impl;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.tykj.dev.config.base.DeviceLifeStatus;
 import com.tykj.dev.device.decommissioning.entity.DeviceDecommissioningDetail;
 import com.tykj.dev.device.decommissioning.entity.vo.DecommissioningOrderOutData;
@@ -12,6 +14,7 @@ import com.tykj.dev.device.library.service.DeviceLogService;
 import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
 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.ScriptSaveVo;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
 import com.tykj.dev.device.user.read.service.MessageService;
@@ -22,9 +25,11 @@ import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserService;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringUtils;
 import com.tykj.dev.misc.utils.TaskDisposeUtil;
+import jdk.nashorn.internal.ir.IfNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -81,7 +86,17 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
         deviceDecommissioningDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+deviceDecommissioningDetail.getId());
         deviceDecommissioningDetail.setDeviceLibraryEntities(findInvoleDevice(deviceDecommissioningDetail.getDeviceIds()));
         deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
-        deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.RETIRED.id,decommissioningOrderOutData.getDevIds());
+        List<ScriptSaveVo> scriptSaveVos=decommissioningOrderOutData.getScriptSaveVos();
+
+        List<String> seqNumbers=new ArrayList<>();
+        scriptSaveVos.forEach(
+                scriptSaveVo -> {
+                    if (scriptSaveVo.getSeqNumber()!=null){
+                        seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                    }
+                }
+        );
+        deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.RETIRED.id,seqNumbers);
         TaskBto taskBto= sendOutSuperior(units.getUnitId(),deviceDecommissioningDetail.getId());
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起退役任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
         return deviceDecommissioningDetail;
@@ -110,7 +125,15 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
         }
         taskService.moveToEnd(taskBto);
         deviceDecommissioningDetail.setRepelStatus(2);
-        deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,StringUtils.stringToList(deviceDecommissioningDetail.getDeviceIds()));
+        List<String> seqNumbers=new ArrayList<>();
+        JacksonUtil.readValue(deviceDecommissioningDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
+                scriptSaveVo -> {
+                    if (scriptSaveVo.getSeqNumber()!=null){
+                        seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                    }
+                }
+        );
+        deviceLibraryDao.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,seqNumbers);
         deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"退役任务回执单据上传成功任务结束",gainThisUser(user.getUserId(),user.getUnitsId())));
     }
@@ -130,9 +153,6 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
 
     /**
      * 异步添加装备日志
-     * @param deviceLibraries
-     * @param remark
-     * @param userId
      */
     private void devLogAdd(List<DeviceLibrary> deviceLibraries, String remark, Integer userId){
         List<DeviceLog> logDtos=new ArrayList<>();

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

@@ -104,7 +104,7 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
 
     @Transactional
     @Modifying
-    @Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.ownUnit = :unitName where o.id in :idList")
+    @Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.ownUnit = :unitName ,o.locationUnit = :unitName where o.id in :idList")
     int upDateLeftStatusAndOwnUnitName(Integer lifeStatus,String unitName,@Param("idList") List<Integer> idList);
 
     List<DeviceLibrary> findAllByLifeStatus(Integer status);

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

@@ -434,7 +434,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
     public void isInStockOrWaitRetired(List<Integer> ids) {
         ids.forEach(integer -> {
             DeviceLibrary deviceLibrary = getOne(integer);
-            if (deviceLibrary.getLifeStatus()!=2&&deviceLibrary.getLifeStatus()!=15&& !deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.SEND_BACK.id)){
+            if (deviceLibrary.getLifeStatus()!=2 && deviceLibrary.getLifeStatus()!=15&& deviceLibrary.getLifeStatus()!=DeviceLifeStatus.SEND_BACK.id){
                 throw new ApiException(ResponseEntity.status(303).body("序列号"+deviceLibrary.getSeqNumber()+"的装备已被其他专管员操作"));
             }
         });

dev-loss/pom.xml

@@ -12,18 +12,22 @@
     <artifactId>dev-loss</artifactId>
 
     <dependencies>
+
         <dependency>
             <groupId>com.tykj</groupId>
             <artifactId>dev-library</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.tykj</groupId>
             <artifactId>dev-task</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.tykj</groupId>
             <artifactId>dev-packing</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>misc</artifactId>
@@ -33,6 +37,7 @@
             <groupId>com.tykj</groupId>
             <artifactId>dev-file</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.tykj.dev</groupId>
             <artifactId>config</artifactId>

dev-loss/src/main/java/com/tykj/dev/device/loss/entity/vo/DeviceLossVo.java

@@ -25,6 +25,7 @@ public class DeviceLossVo {
     @ApiModelProperty(value = "类型")
     private Integer type;
 
+    private String typeName;
     /**
      * 装备名称
      */

dev-loss/src/main/java/com/tykj/dev/device/loss/service/DeviceLossService.java

@@ -5,12 +5,24 @@ import com.tykj.dev.device.loss.entity.domain.DeviceLoss;
 import java.util.List;
 
 public interface DeviceLossService {
+    /**
+     * 丢失、找回表单信息保存
+     */
     DeviceLoss save(DeviceLoss deviceLoss);
 
+    /**
+     * 丢失、找回 根据单据id查询单据详情
+     */
     DeviceLoss findByDeviceLoss(Integer lossId);
 
+    /**
+     * 丢失、找回 查询所有的丢失、找回单据信息
+     */
     List<DeviceLoss> findByListLoss();
 
+    /**
+     * 丢失、找回 根据单位ID查询单据信息集合
+     */
     List<DeviceLoss> findByListLossUnitId(Integer unitId);
 
 

dev-loss/src/main/java/com/tykj/dev/device/loss/service/impl/LossBillSelectServiceImpl.java

@@ -44,6 +44,8 @@ public class LossBillSelectServiceImpl implements LossBillSelectService {
 
     private DeviceLossVo toDeviceLossVo(DeviceLibrary deviceLibrary){
         ModelMapper mapper = BeanHelper.getUserMapper();
-        return mapper.map(deviceLibrary, DeviceLossVo.class);
+        DeviceLossVo deviceLossVo=  mapper.map(deviceLibrary, DeviceLossVo.class);
+        deviceLossVo.setTypeName(deviceLibrary.setConfigName().getTypeName());
+        return deviceLossVo;
     }
 }

dev-loss/src/main/java/com/tykj/dev/device/loss/service/impl/LossBillServiceImpl.java

@@ -13,6 +13,7 @@ import com.tykj.dev.device.loss.service.LossBillService;
 import com.tykj.dev.device.loss.util.StringUtils;
 import com.tykj.dev.device.task.service.TaskService;
 import com.tykj.dev.device.task.subject.bto.TaskBto;
+import com.tykj.dev.device.user.read.service.MessageService;
 import com.tykj.dev.device.user.subject.entity.Area;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.Units;
@@ -61,6 +62,9 @@ public class LossBillServiceImpl implements LossBillService {
     @Autowired
     DeviceLogService deviceLogService;
 
+    @Autowired
+    MessageService messageService;
+
     @Override
     public void initiateLoss(DeviceLoss deviceLoss, SecurityUser securityUser) {
         deviceLibraryService.isInStockOrWaitRetired(deviceLoss.getDevIdsList());
@@ -90,12 +94,16 @@ public class LossBillServiceImpl implements LossBillService {
         Area area=areaService.findByid(units.getAreaId());
         TaskBto taskBto=taskService.get(lossAuditvo.getTaskId());
         DeviceLoss deviceLoss=deviceLossService.findByDeviceLoss(taskBto.getBillId());
+
         if (units.getLevel()==1){
+
             TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.LOSS1301);
             deviceLoss.setProvinceUnitName(units.getName());
             deviceLoss.setProvinceDes(lossAuditvo.getDes());
             taskService.moveToEnd(taskBto);
+
         }else {
+
             TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.LOSS1300);
             Units parentUnits=unitsService.findUnitAreaId(area.getFatherId());
             deviceLoss.setCityUnitName(units.getName());

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -60,16 +60,6 @@ public enum StatusEnum {
     /**
      * 清退任务
      */
-    //以下为stat状态
-//    SEND_BACK_1200(1200, "省市清退查看"),
-//    SEND_BACK_1201(1201, "统计数据等待办结"),
-//    SEND_BACK_1202(1202, "出库待审核"),
-//    SEND_BACK_1203(1203, "出库待校验"),
-//    SEND_BACK_1204(1204, "入库待审核"),
-//    SEND_BACK_1205(1205, "异常装备待描述"),
-//    SEND_BACK_1206(1206, "入库待校验"),
-//    SEND_BACK_1207(1207, "异常装备确认"),
-
     SEND_BACK_1200(1200, "省清退任务待各市提交"),
     SEND_BACK_1201(1201, "市清退任务待执行"),
     SEND_BACK_1202(1202, "省直属装备待清退"),
@@ -86,6 +76,7 @@ public enum StatusEnum {
     SEND_BACK_1213(1213,"省直属清退任务待上传单据"),
     SEND_BACK_1214(1214,"清退出库等待上传回执单"),
     SEND_BACK_1215(1215,"清退出库接收方单据待补充"),
+    SEND_BACK_1216(1216, "市本级装备待清退"),
 
 
 
@@ -131,12 +122,6 @@ public enum StatusEnum {
     TRAIN1010(1010, "待培训"),
 
     WORKHANDOVER1011(1011, "待上传签字单"),
-//
-//    TRAIN1011(1011,""),
-//
-//    TRAIN1012(1012,""),
-//
-//    TRAIN1013(1013,""),
 
     /**
      * 业务封存

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

 package com.tykj.dev.device.scrap.service.impl;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.tykj.dev.config.base.DeviceLifeStatus;
 import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.device.library.repository.DeviceLibraryDao;
@@ -7,6 +8,7 @@ import com.tykj.dev.device.library.service.DeviceLogService;
 import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
 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.ScriptSaveVo;
 import com.tykj.dev.device.scrap.service.ScrapBusinessService;
 import com.tykj.dev.device.scrap.service.ScrapService;
 import com.tykj.dev.device.scrap.subject.domin.Scrap;
@@ -22,6 +24,7 @@ import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.device.user.subject.service.UserService;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringUtils;
 import com.tykj.dev.misc.utils.TaskDisposeUtil;
@@ -43,6 +46,7 @@ import java.util.stream.Collectors;
  * @createTime 2021年03月31日 13:16:00
  */
 @Service
+@SuppressWarnings("ALL")
 public class ScrapBusinessServiceImpl implements ScrapBusinessService {
     @Autowired
     UserService userService;
@@ -79,13 +83,23 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         List<DeviceLibrary> deviceLibraries= findInvoleDevice(scrap.getDeviceIds());
         scrap.setDeviceLibraryEntities(findInvoleDevice(scrap.getDeviceIds()));
         scrapService.saveScrap(scrap);
-        deviceLibraryDao.upDateLeftStatus(DeviceLifeStatus.RETIRED.id,scrapOrderOutData.getDevIds());
+        List<ScriptSaveVo> scriptSaveVos=scrapOrderOutData.getScriptSaveVos();
+        List<String> seqNumbers=new ArrayList<>();
+        scriptSaveVos.forEach(
+                scriptSaveVo -> {
+                    if (scriptSaveVo.getSeqNumber()!=null){
+                        seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                    }
+                }
+        );
+        deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.RETIRED.id,seqNumbers);
         devLogAdd(deviceLibraries,"发起了报废任务",userId);
         TaskBto taskBto= sendOutSuperior(units.getUnitId(),scrap.getId(),userId);
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起退役任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
         return scrap;
     }
 
+
     @Override
     public void receiptSingle(Integer taskId, StorageScrap storageScrap) {
         User user=userService.findByUser(storageScrap.getUserId());
@@ -108,7 +122,16 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             scrap.setReceiveUserA(storageScrap.getUserAName());
         }
         taskService.moveToEnd(taskBto);
-        deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,scrap.getReceiveUnit(),0,StringUtils.stringToList(scrap.getDeviceIds()));
+
+        List<String> seqNumbers=new ArrayList<>();
+        JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
+                scriptSaveVo -> {
+                    if (scriptSaveVo.getSeqNumber()!=null){
+                        seqNumbers.addAll(DeviceSeqUtil.selectDeviceSeqs(scriptSaveVo.getSeqNumber()));
+                    }
+                }
+        );
+        deviceLibraryDao.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,scrap.getReceiveUnit(),0,seqNumbers);
         scrapService.saveScrap(scrap);
         devLogAdd(findInvoleDevice(scrap.getDeviceIds()),"上传了报废单据,装备状态-》已报废",storageScrap.getUserId());
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"退役任务回执单据上传成功任务结束",gainThisUser(user.getUserId(),user.getUnitsId())));

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepel.java

@@ -103,6 +103,18 @@ public class DeviceRepel extends BaseEntity {
      */
     private Integer unitId;
 
+    /**
+     * 装备序列号
+     */
+    @Column(name = "seq_numbers",columnDefinition = "TEXT")
+    private String seqNumbers;
+
+    /**
+     * type为123时使用
+     */
+    @Column(name = "equipment_involving_unit",columnDefinition = "TEXT")
+    private String equipmentInvolvingUnit;
+
     /**
      * 类型集合多个列装id
      * 页面类型

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/SupervisorVo.java

+package com.tykj.dev.device.sendback.entity.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName SupervisorVo.java
+ * @Description TODO
+ * @createTime 2021年04月07日 10:31:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SupervisorVo {
+    private String unitName;
+
+    private Integer unitid;
+
+}

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java

@@ -62,6 +62,10 @@ public interface RepelBusinessService {
      */
     DeviceRepelDetail sendBackOutCheck(Integer taskId, Integer userId, OrderOutData orderOutData);
 
+
+//    void SealOfAudit()
+
+
     /**
      * 上级清退装备入库
      */
@@ -73,6 +77,7 @@ public interface RepelBusinessService {
      */
     void oneselfRepel(Integer taskId,StorageDeviceRepel storageDeviceRepel,Integer userId);
 
+
     /**
      * 省直属任务等待上传 （需要根据主业务的type 给涉及的装备装备给不同的状态）
      */

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -19,6 +19,7 @@ import com.tykj.dev.device.user.subject.service.UnitsService;
 import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.DeviceLifeStatus;
 import com.tykj.dev.misc.base.StatusEnum;
+import com.tykj.dev.misc.utils.DeviceSeqUtil;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -77,7 +78,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public DeviceRepel findDeviceRepel(Integer taskId) {
         TaskBto taskBto= taskService.get(taskId);
-        if (taskBto.getBusinessType()==18){
+        if (taskBto.getBusinessType()== BusinessEnum.SEND_BACK_STATISTICAL.id){
             return deviceRepelService.findDeviceRepel(taskBto.getBillId());
         }
         DeviceRepelDetail deviceRepelDetail = repelDetailService.findDeviceRepelDetailNoDev(taskBto.getBillId());
@@ -89,26 +90,53 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         List<DeviceLibrary> deviceLibraries=new ArrayList<>();
         List<DeviceLibrary> deviceLibrariesAbnormal=new ArrayList<>();
         Units units= unitsService.findById(unitId);
-        deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding,units.getName()).stream()
+
+        DeviceRepelDetail deviceRepelDetail= repelDetailService.findDeviceRepelDetail(taskService.get(taskId).getBillId());
+        DeviceRepel deviceRepel=deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
+        if (deviceRepel.getType()==0) {
+            deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding, units.getName()).stream()
                     .filter(deviceLibrary -> deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_LIBRARY.id)
-                        ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPEL.id)
-                        ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.SEND_BACK.id)
-                        ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPAIRING.id)
-                        ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_TRANSIT.id)
-                        ||deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.USE.id))
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPEL.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.SEND_BACK.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPAIRING.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_TRANSIT.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.USE.id))
                     .map(DeviceLibrary::setConfigName).forEach(
                     deviceLibrary -> {
-                if (deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())){
-                    if (deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==15 ||deviceLibrary.getLifeStatus()==14||deviceLibrary.getLifeStatus()==6) {
+                        if (deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())) {
+                            if (deviceLibrary.getLifeStatus() == 2 || deviceLibrary.getLifeStatus() == 15 || deviceLibrary.getLifeStatus() == 14 || deviceLibrary.getLifeStatus() == 6) {
                                 deviceLibraries.add(deviceLibrary);
-                    }else {
+                            } else {
+                                deviceLibrariesAbnormal.add(deviceLibrary);
+                            }
+                        } else {
                             deviceLibrariesAbnormal.add(deviceLibrary);
                         }
+                    }
+            );
         }else {
+            deviceLibraryDao.findAllBySeqNumberIn(DeviceSeqUtil.selectDeviceSeqs(deviceRepel.getSeqNumbers())).stream()
+                    .filter(deviceLibrary -> deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_LIBRARY.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPEL.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.SEND_BACK.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.REPAIRING.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.IN_TRANSIT.id)
+                            || deviceLibrary.getLifeStatus().equals(DeviceLifeStatus.USE.id))
+                    .filter(deviceLibrary -> deviceLibrary.getOwnUnit().equals(units.getName()))
+                    .map(DeviceLibrary::setConfigName).forEach(
+                    deviceLibrary -> {
+                        if (deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())) {
+                            if (deviceLibrary.getLifeStatus() == 2 || deviceLibrary.getLifeStatus() == 15 || deviceLibrary.getLifeStatus() == 14 || deviceLibrary.getLifeStatus() == 6) {
+                                deviceLibraries.add(deviceLibrary);
+                            } else {
+                                deviceLibrariesAbnormal.add(deviceLibrary);
+                            }
+                        } else {
                             deviceLibrariesAbnormal.add(deviceLibrary);
                         }
                     }
             );
+        }
         int isNotSub = 1;
         if (units.getLevel()==2) {
             TaskBto taskBto = taskService.findFatherIdAndCustomInfo(taskId);

dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UserController.java

@@ -122,22 +122,12 @@ public class UserController {
     @GetMapping(value = "/findAll")
     @ApiOperation(value = "所有用户查询接口", notes = "成功返回用户对象集合")
     public ResponseEntity findAllUser(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
-//        log.info("当前登入对象：{}",securityUser.getCurrentUserInfo().getUsername());
         return ResponseEntity.ok(userService.findAll());
     }
 
-//    @GetMapping(value = "/findAll/{userId}")
-//    @ApiOperation(value = "根据用户id查询同级用户信息", notes = "成功返回用户对象集合")
-//    public ResponseEntity findAll(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer userId){
-////        log.info("当前登入对象：{}",securityUser.getCurrentUserInfo().getUsername());
-//        return ResponseEntity.ok(userService.findByUserId(userId));
-//    }
-
-
     @GetMapping(value = "/findAll/{unitsId}")
     @ApiOperation(value = "根据单位查询用户(下拉)", notes = "成功返回用户对象集合")
     public ResponseEntity findAll2(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer unitsId) {
-//        log.info("当前登入对象：{}",securityUser.getCurrentUserInfo().getUsername());
         return ResponseEntity.ok(userService.findByUniteId(unitsId));
     }
 
@@ -154,7 +144,6 @@ public class UserController {
         return ResponseEntity.ok(userService.findByUserId(userId));
     }
 
-
     @PostMapping(value = "/archives/update/password")
     @ApiOperation(value = "修改用户密码", notes = "返回修改结果")
     public ResponseEntity updatePassword(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody UserUpdatePw userUpdatePw) {
@@ -169,13 +158,6 @@ public class UserController {
         return ResponseEntity.ok("修改密码成功");
     }
 
-//    @GetMapping(value = "/get/train/{userId}")
-//    @ApiOperation(value = "根据用户id查询下级用户列表", notes = "成功返回UserTrainVo对象集合")
-//    public ResponseEntity getFind(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer userId) {
-//
-//        return ResponseEntity.ok(userService.findByIdUserTarinVo(userId));
-//    }
-
     @GetMapping(value = "/get/trainUnits/{userId}")
     @ApiOperation(value = "根据用户id查询下级单位列表", notes = "成功返回UnitsTrainVo对象集合")
     public ResponseEntity getFindTrainVo(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer userId) {
@@ -190,13 +172,6 @@ public class UserController {
         return ResponseEntity.ok(userService.findById(userId));
     }
 
-//    @PostMapping(value = "/update")
-//    @ApiOperation(value = "修改用户信息", notes = "成功返回UnitsTrainVo对象集合")
-//    public ResponseEntity getFindMemberThatVo(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody MemberThat memberThat){
-//        userService.update(memberThat.toUserVo());
-//        return ResponseEntity.ok(memberThat);
-//    }
-
     @GetMapping("/findAll/superiorList")
     @ApiOperation(value = "根据用户ID查询上级单位用户", notes = "List<UserSuperiorVo>")
     public ResponseEntity getFindMemberThatVo(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser) {
@@ -250,7 +225,6 @@ public class UserController {
     @PostMapping("/list/unitName")
     @ApiOperation(value = "根据单位名称查询单位用户")
     public ResponseEntity findUnitName(@RequestBody UnitNameVo unitNameVo){
-
         return ResponseEntity.ok(userService.findUnitNameListUser(unitNameVo));
     }