更新packing

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

+package com.tykj.dev.device.packing.controller;
+
+public class PackingController {
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/packingApp.java

+package com.tykj.dev.device.packing;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName userApp.java
+ * @Description TODO
+ * @createTime 2020年09月01日 14:32:00
+ */
+@SpringBootApplication(scanBasePackages={
+        "com.tykj.dev.*",
+}
+)
+public class packingApp {
+    public static void main(String[] args) {
+        SpringApplication.run(packingApp.class, args);
+    }
+}

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

+package com.tykj.dev.device.packing.repository;
+
+import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * @author dengdiyi
+ */
+public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer>, JpaSpecificationExecutor<PackingLibrary> {
+
+}

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

+package com.tykj.dev.device.packing.service;
+
+import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
+import com.tykj.dev.device.packing.subject.vo.PackingLibrarySelectVo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+public interface PackingLibraryService {
+
+    PackingLibrary addEntity(PackingLibrary packingLibraryEntity);
+
+    Page<PackingLibrary> getPage(PackingLibrarySelectVo packingLibrarySelectVo, Pageable pageable);
+
+    Page<PackingLibrary> getInvalidPage(PackingLibrarySelectVo packingLibrarySelectVo, Pageable pageable);
+
+    List<PackingLibrary> getList(PackingLibrarySelectVo packingLibrarySelectVo);
+
+    List<Integer> getTypeList();
+
+    List<String> getModelList();
+
+    List<PackingLibrary> selectAllPart(Integer id);
+
+    PackingLibrary update(PackingLibrary packingLibraryEntity);
+
+    PackingLibrary getOne(Integer id);
+
+    List<PackingLibrary> getPackingDetail(Integer id);
+
+    List<PackingLibrary> getInvalidDetail(Integer id);
+
+    void delete(Integer id);
+}

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

+package com.tykj.dev.device.packing.service.impl;
+
+import com.github.wenhao.jpa.PredicateBuilder;
+import com.github.wenhao.jpa.Specifications;
+import com.tykj.dev.device.packing.repository.PackingLibraryDao;
+import com.tykj.dev.device.packing.service.PackingLibraryService;
+import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
+import com.tykj.dev.device.packing.subject.vo.PackingLibrarySelectVo;
+import com.tykj.dev.misc.exception.ApiException;
+import com.tykj.dev.misc.utils.GetTreeUtils;
+import com.tykj.dev.misc.utils.ResultUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.Column;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author dengdiyi
+ */
+@Service
+public class PackingLibraryServiceImpl implements PackingLibraryService {
+
+    @Autowired
+    private PackingLibraryDao packingLibraryDao;
+
+    @Override
+    public PackingLibrary addEntity(PackingLibrary packingLibraryEntity) {
+        return packingLibraryDao.save(packingLibraryEntity);
+    }
+
+    @Override
+    public Page<PackingLibrary> getPage(PackingLibrarySelectVo packingLibrarySelectVo, Pageable pageable) {
+        return packingLibraryDao.findAll(getSelectSpecification5(packingLibrarySelectVo), pageable);
+    }
+
+    @Override
+    public Page<PackingLibrary> getInvalidPage(PackingLibrarySelectVo packingLibrarySelectVo, Pageable pageable) {
+        return packingLibraryDao.findAll(getSelectSpecification2(packingLibrarySelectVo), pageable);
+    }
+
+    @Override
+    public List<PackingLibrary> getList(PackingLibrarySelectVo packingLibrarySelectVo) {
+        List<PackingLibrary> packingLibraryEntities = packingLibraryDao.findAll(getSelectSpecification(packingLibrarySelectVo));
+        Map<Integer, PackingLibrary> nodeCollect =
+                packingLibraryEntities.stream().collect(Collectors.toMap(PackingLibrary::getId,packingLibraryEntity -> packingLibraryEntity));
+        List<PackingLibrary> packingLibraryEntityList= GetTreeUtils.parseTreeFromDown(
+                packingLibraryEntities,
+                PackingLibrary::getId,
+                packingLibraryEntity -> Optional.ofNullable(nodeCollect.get(packingLibraryEntity.getPartParentId())),
+                PackingLibrary::addChildNode
+        );
+
+        return packingLibraryEntityList;
+    }
+
+    @Override
+    public List<Integer> getTypeList() {
+        List<PackingLibrary> strings = packingLibraryDao.findAll();
+        Set<Integer> s = new HashSet<>();
+        for (PackingLibrary d:strings) {
+            s.add(d.getType());
+        }
+        return new ArrayList<>(s);
+    }
+
+    @Override
+    public List<String> getModelList() {
+        List<PackingLibrary> strings = packingLibraryDao.findAll();
+        Set<String> s = new HashSet<>();
+        for (PackingLibrary d:strings) {
+            s.add(d.getModel());
+        }
+        return new ArrayList<>(s);
+    }
+
+    @Override
+    public List<PackingLibrary> selectAllPart(Integer id) {
+        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        predicateBuilder.eq("isPart",1);
+        predicateBuilder.eq("partParentId",id);
+        return packingLibraryDao.findAll(predicateBuilder.build());
+    }
+
+    @Override
+    public PackingLibrary update(PackingLibrary packingLibraryEntity) {
+        return packingLibraryDao.save(packingLibraryEntity);
+    }
+
+    @Override
+    public PackingLibrary getOne(Integer id) {
+        Optional<PackingLibrary> byId = packingLibraryDao.findById(id);
+        if (!byId.isPresent()) {
+            throw new ApiException(ResultUtil.failed("id不存在"));
+        }
+        else {
+            return byId.get();
+        }
+    }
+
+    @Override
+    public List<PackingLibrary> getPackingDetail(Integer id) {
+        Optional<PackingLibrary> byId = packingLibraryDao.findById(id);
+        if (!byId.isPresent()) {
+            return null;
+        }
+        else {
+            List<PackingLibrary> libraryEntities = new ArrayList<>();
+            libraryEntities.add(byId.get());
+            List<PackingLibrary> p = packingLibraryDao.findAll(getSelectSpecification3(id));
+            libraryEntities.addAll(p);
+            return libraryEntities;
+        }
+    }
+
+    @Override
+    public List<PackingLibrary> getInvalidDetail(Integer id) {
+        Optional<PackingLibrary> byId = packingLibraryDao.findById(id);
+        if (!byId.isPresent()) {
+            return null;
+        }
+        else {
+            List<PackingLibrary> libraryEntities = new ArrayList<>();
+            libraryEntities.add(byId.get());
+            List<PackingLibrary> p = packingLibraryDao.findAll(getSelectSpecification4(id));
+            libraryEntities.addAll(p);
+            return libraryEntities;
+        }
+    }
+
+    @Override
+    public void delete(Integer id) {
+        packingLibraryDao.deleteById(id);
+    }
+
+    private Specification<PackingLibrary> getSelectSpecification(PackingLibrarySelectVo packingLibrarySelectVo) {
+        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        if (packingLibrarySelectVo != null) {
+            if (packingLibrarySelectVo.getContent() != null) {
+                Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;
+                Field[] declaredFields = packingLibraryEntityClass.getDeclaredFields();
+                PredicateBuilder<PackingLibrary> p = Specifications.or();
+                for (Field field : declaredFields) {
+                    if (field.getType().equals(String.class)&&field.getAnnotation(Column.class)!=null) {
+                        p.like(field.getName(), "%" + packingLibrarySelectVo.getContent() + "%");
+                    }
+                }
+                predicateBuilder.predicate(p.build());
+            }
+            if (packingLibrarySelectVo.getStartTime() != null) {
+                predicateBuilder.gt("createTime", packingLibrarySelectVo.getStartTime());
+            }
+            if (packingLibrarySelectVo.getEndTime() != null) {
+                predicateBuilder.lt("updateTime", packingLibrarySelectVo.getEndTime());
+            }
+            if (packingLibrarySelectVo.getModel()!=null){
+                predicateBuilder.eq("model",packingLibrarySelectVo.getModel());
+            }
+            if (packingLibrarySelectVo.getType()!=null){
+                predicateBuilder.eq("type",packingLibrarySelectVo.getType());
+            }
+            if(packingLibrarySelectVo.getSecretLevel()!=null){
+                predicateBuilder.eq("secretLevel",packingLibrarySelectVo.getSecretLevel());
+            }
+            if(packingLibrarySelectVo.getInvisibleRange()!=null){
+                predicateBuilder.eq("invisibleRange",packingLibrarySelectVo.getInvisibleRange());
+            }
+            if(packingLibrarySelectVo.getName()!=null){
+                predicateBuilder.eq("name",packingLibrarySelectVo.getName());
+            }
+        }
+        predicateBuilder.eq("packingStatus", 2);
+        return predicateBuilder.build();
+    }
+
+    private Specification<PackingLibrary> getSelectSpecification2(PackingLibrarySelectVo packingLibrarySelectVo) {
+        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        if (packingLibrarySelectVo != null) {
+            if (packingLibrarySelectVo.getContent() != null) {
+                Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;
+                Field[] declaredFields = packingLibraryEntityClass.getDeclaredFields();
+                PredicateBuilder<PackingLibrary> p = Specifications.or();
+                for (Field field : declaredFields) {
+                    if (field.getType().equals(String.class)&&field.getAnnotation(Column.class)!=null) {
+                        p.like(field.getName(), "%" + packingLibrarySelectVo.getContent() + "%");
+                    }
+                }
+                predicateBuilder.predicate(p.build());
+            }
+            if (packingLibrarySelectVo.getStartTime() != null) {
+                predicateBuilder.gt("createTime", packingLibrarySelectVo.getStartTime());
+            }
+            if (packingLibrarySelectVo.getEndTime() != null) {
+                predicateBuilder.lt("updateTime", packingLibrarySelectVo.getEndTime());
+            }
+            if (packingLibrarySelectVo.getModel()!=null){
+                predicateBuilder.eq("model",packingLibrarySelectVo.getModel());
+            }
+            if (packingLibrarySelectVo.getType()!=null){
+                predicateBuilder.eq("type",packingLibrarySelectVo.getType());
+            }
+            if(packingLibrarySelectVo.getSecretLevel()!=null){
+                predicateBuilder.eq("secretLevel",packingLibrarySelectVo.getSecretLevel());
+            }
+            if(packingLibrarySelectVo.getInvisibleRange()!=null){
+                predicateBuilder.eq("invisibleRange",packingLibrarySelectVo.getInvisibleRange());
+            }
+        }
+        predicateBuilder.eq("packingStatus", 3);
+        predicateBuilder.eq("isPart",0);
+        return predicateBuilder.build();
+    }
+
+    private Specification<PackingLibrary> getSelectSpecification3(Integer id) {
+        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        predicateBuilder.eq("packingStatus", 2);
+        predicateBuilder.eq("isPart", 1);
+        predicateBuilder.eq("partParentId", id);
+        return predicateBuilder.build();
+    }
+
+    private Specification<PackingLibrary> getSelectSpecification4(Integer id) {
+        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        predicateBuilder.eq("packingStatus", 3);
+        predicateBuilder.eq("isPart", 1);
+        predicateBuilder.eq("partParentId", id);
+        return predicateBuilder.build();
+    }
+
+    private Specification<PackingLibrary> getSelectSpecification5(PackingLibrarySelectVo packingLibrarySelectVo) {
+        PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
+        if (packingLibrarySelectVo != null) {
+            if (packingLibrarySelectVo.getContent() != null) {
+                Class<PackingLibrary> packingLibraryEntityClass = PackingLibrary.class;
+                Field[] declaredFields = packingLibraryEntityClass.getDeclaredFields();
+                PredicateBuilder<PackingLibrary> p = Specifications.or();
+                for (Field field : declaredFields) {
+                    if (field.getType().equals(String.class)&&field.getAnnotation(Column.class)!=null) {
+                        p.like(field.getName(), "%" + packingLibrarySelectVo.getContent() + "%");
+                    }
+                }
+                predicateBuilder.predicate(p.build());
+            }
+            if (packingLibrarySelectVo.getStartTime() != null) {
+                predicateBuilder.gt("createTime", packingLibrarySelectVo.getStartTime());
+            }
+            if (packingLibrarySelectVo.getEndTime() != null) {
+                predicateBuilder.lt("updateTime", packingLibrarySelectVo.getEndTime());
+            }
+            if (packingLibrarySelectVo.getModel()!=null){
+                predicateBuilder.eq("model",packingLibrarySelectVo.getModel());
+            }
+            if (packingLibrarySelectVo.getType()!=null){
+                predicateBuilder.eq("type",packingLibrarySelectVo.getType());
+            }
+            if(packingLibrarySelectVo.getSecretLevel()!=null){
+                predicateBuilder.eq("secretLevel",packingLibrarySelectVo.getSecretLevel());
+            }
+            if(packingLibrarySelectVo.getInvisibleRange()!=null){
+                predicateBuilder.eq("invisibleRange",packingLibrarySelectVo.getInvisibleRange());
+            }
+            if(packingLibrarySelectVo.getName()!=null){
+                predicateBuilder.eq("name",packingLibrarySelectVo.getName());
+            }
+        }
+        predicateBuilder.eq("packingStatus", 2);
+        predicateBuilder.eq("isPart",0);
+        return predicateBuilder.build();
+    }
+
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

+package com.tykj.dev.device.packing.subject.domin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * entity class for packing_library
+ * 列装库
+*/
+@Data
+@Entity
+@ApiModel("列装库")
+@EntityListeners(AuditingEntityListener.class)
+@SQLDelete(sql = "update packing_library set delete_tag = 1 where id = ?")
+@Where(clause = "delete_tag = 0")
+public class PackingLibrary {
+
+	/**
+	* 主键id
+	*/
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@ApiModelProperty(value = "主键id")
+	private Integer id;
+	/**
+	* 经办人省A岗id
+	*/
+	@ApiModelProperty(value = "经办人省A岗id")
+	private Integer userAId;
+	/**
+	* 审核人省B岗id
+	*/
+	@ApiModelProperty(value = "审核人省B岗id")
+	private Integer userBId;
+	/**
+	 * 是不是配件(0:不是，1:是)
+	 */
+	@ApiModelProperty(value = "是不是配件(0:不是，1:是)")
+	private Integer isPart;
+	/**
+	 * 配件对应装备列装id
+	 */
+	@ApiModelProperty(value = "配件对应装备列装id")
+	private Integer partParentId;
+	/**
+	* 列装状态(0:待审核,1:审核失败,2:审核成功待确认,3:已列装,4:已退装)
+	*/
+	@ApiModelProperty(value = "列装状态(0:待审核,1:审核失败,2:审核成功待确认,3:已列装,4:已退装)")
+	private Integer packingStatus;
+	/**
+	* 型号
+	*/
+	@ApiModelProperty(value = "型号")
+	private String model;
+	/**
+	 * 密级
+	 */
+	@ApiModelProperty(value = "密级")
+	private Integer secretLevel;
+	/**
+	* 名称
+	*/
+	@ApiModelProperty(value = "名称")
+	private String name;
+	/**
+	* 应用类型
+	*/
+	@ApiModelProperty(value = "应用类型")
+	private Integer applyType;
+	/**
+	* 配用范围
+	*/
+	@ApiModelProperty(value = "配用范围")
+	private Integer matchingRange;
+	/**
+	* 可见范围
+	*/
+	@ApiModelProperty(value = "可见范围")
+	private Integer invisibleRange;
+	/**
+	* 类型
+	*/
+	@ApiModelProperty(value = "类型")
+	private Integer type;
+	/**
+	* 列装性质
+	*/
+	@ApiModelProperty(value = "列装性质")
+	private Integer nature;
+	/**
+	* 列装状态
+	*/
+	@ApiModelProperty(value = "列装状态")
+	private Integer status;
+	/**
+	* 生产单位
+	*/
+	@ApiModelProperty(value = "生产单位")
+	private String prodUnit;
+	/**
+	* 创建单位
+	*/
+	@ApiModelProperty(value = "创建单位")
+	private String createUnit;
+	/**
+	* 价格
+	*/
+	@ApiModelProperty(value = "价格")
+	private String price;
+	/**
+	* 图片名称
+	*/
+	@ApiModelProperty(value = "图片名称")
+	private String imageName;
+	/**
+	* 图片url地址
+	*/
+	@ApiModelProperty(value = "图片url地址")
+	private String imageUrl;
+	/**
+	* 附件名称
+	*/
+	@ApiModelProperty(value = "附件名称")
+	private String fileName;
+	/**
+	* 附件url地址
+	*/
+	@ApiModelProperty(value = "附件url地址")
+	private String fileUrl;
+	/**
+	* 退装时间
+	*/
+	@ApiModelProperty(value = "退装时间")
+	private java.sql.Timestamp exitTime;
+	/**
+	* 创建用户id
+	*/
+	@CreatedBy
+	@ApiModelProperty(value = "创建用户id")
+	private Integer createUserId;
+	/**
+	* 创建时间
+	*/
+	@CreatedDate
+	@ApiModelProperty(name = "创建时间")
+	private Date createTime;
+	/**
+	* 更新用户id
+	*/
+	@LastModifiedBy
+	@ApiModelProperty(value = "更新用户id")
+	private Integer updateUserId;
+	/**
+	* 更新时间
+	*/
+	@LastModifiedDate
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	* 删除标记(0:未删除，1:已删除)
+	*/
+	@ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
+	private Integer deleteTag = 0;
+
+	@Transient
+	List<PackingLibrary> childs = new ArrayList<>();
+
+	/**
+	 * 装备和配件对应关系 相同的是一套设备
+	 */
+	@Transient
+	private Integer corresponding;
+
+	public void addChildNode(PackingLibrary packingLibraryEntity) {
+		childs.add(packingLibraryEntity);
+	}
+
+	@ApiModelProperty(value = "经办人省A岗")
+	@Transient
+	private String userA;
+
+	@ApiModelProperty(value = "审核人省B岗")
+	@Transient
+	private String userB;
+
+	@ApiModelProperty(value = "申请数量")
+	@Transient
+	private Integer applyNum;
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingEditVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Repository
+@Data
+@ApiModel("列装编辑类")
+public class PackingEditVo {
+
+    @ApiModelProperty(value = "列装库更新信息")
+    private PackingLibraryUpdateVo updateVoList;
+
+    @ApiModelProperty(value = "新增配件信息列表")
+    private List<PartSaveVo> partAddList;
+
+    @ApiModelProperty(value = "删除相关配件id")
+    private List<Integer> partIdDeleteList;
+
+    @ApiModelProperty(value = "列装装备id",example = "1")
+    private Integer packingId;
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingLibraryConfirmVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("列装审核类")
+public class PackingLibraryConfirmVo {
+    @ApiModelProperty(value = "对应任务ID",example = "1")
+    private Integer taskId;
+
+    @ApiModelProperty(value = "工作Id")
+    private Integer jobId;
+
+    @ApiModelProperty(name = "需要修改的状态",example = "0",value = "0为审核通过,1为驳回")
+    private Integer status;
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingLibrarySaveVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("列装存储类")
+@Repository
+public class PackingLibrarySaveVo {
+
+    @ApiModelProperty(value = "型号",example = "测试型号")
+    private String model;
+
+    @ApiModelProperty(value = "名称",example = "测试名称")
+    private String name;
+
+    @ApiModelProperty(value = "应用类型",example = "1")
+    private Integer applyType;
+
+    @ApiModelProperty(value = "配用范围",example = "1")
+    private Integer matchingRange;
+
+    @ApiModelProperty(value = "可见范围",example = "1")
+    private Integer invisibleRange;
+
+    @ApiModelProperty(value = "类型",example = "1")
+    private Integer type;
+
+    @ApiModelProperty(value = "密级(0:绝密,1:机密,2:秘密)",example = "1")
+    private Integer secretLevel;
+
+    @ApiModelProperty(value = "列装性质",example = "1")
+    private Integer nature;
+
+    @ApiModelProperty(value = "列装状态",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value = "生产单位",example = "测试型号")
+    private String prodUnit;
+
+    @ApiModelProperty(value = "创建单位",example = "测试创建单位")
+    private String createUnit;
+
+    @ApiModelProperty(value = "价格",example = "2.000.000")
+    private String price;
+
+    @ApiModelProperty(value = "照片名称",example = "没有先填一个空格")
+    private String imageName;
+
+    @ApiModelProperty(value = "照片路径",example = "没有先填一个空格")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "附件名称",example = "没有先填一个空格")
+    private String fileName;
+
+    @ApiModelProperty(value = "附件路径",example = "没有先填一个空格")
+    private String fileUrl;
+
+    @ApiModelProperty(value = "B岗用户ID",example = "2")
+    private Integer userBId;
+
+    @ApiModelProperty(value = "配件信息列表",example = "")
+    private List<PartSaveVo> partList;
+
+    public PackingLibrary toDo(){
+        PackingLibrary packingLibraryEntity = new PackingLibrary();
+        BeanUtils.copyProperties(this,packingLibraryEntity);
+        packingLibraryEntity.setPackingStatus(0);
+        packingLibraryEntity.setIsPart(0);
+        packingLibraryEntity.setUserBId(this.userBId);
+        return packingLibraryEntity;
+    }
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingLibrarySelectResultVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("列装结果返回类")
+public class PackingLibrarySelectResultVo {
+
+
+    private Integer NodeId;
+
+    private Integer ParentId;
+
+
+    @ApiModelProperty(value = "列装装备",example = "")
+    private PackingLibrary packingLibraryEntity;
+
+    @ApiModelProperty(value = "列装装备配件",example = "")
+    private List<PackingLibrary> list;
+
+    public void addChildNode(PackingLibrary packingLibraryEntity) {
+        list.add(packingLibraryEntity);
+    }
+
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingLibrarySelectVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import com.tykj.dev.misc.base.CustomPage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("列装查询类")
+public class PackingLibrarySelectVo extends CustomPage {
+
+    @ApiModelProperty(value = "模糊查询关键字",example = "测试")
+    public String content;
+
+    @ApiModelProperty(value = "名称",example = "名称")
+    public String name;
+
+    @ApiModelProperty(value = "开始时间",example = "2020-10-10 01:10:10")
+    public Date startTime;
+
+    @ApiModelProperty(value = "结束时间",example = "2020-10-10 01:10:10")
+    public Date endTime;
+
+    @ApiModelProperty(value = "类型",example = "1")
+    public Integer type;
+
+    @ApiModelProperty(value = "型号",example = "1234")
+    public String model;
+
+    @ApiModelProperty(value = "密级(0:绝密,1:机密,2:秘密)",example = "1")
+    private Integer secretLevel;
+
+    @ApiModelProperty(value = "应用领域",example = "1")
+    private Integer invisibleRange;
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PackingLibraryUpdateVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author dengdiyi
+ */
+@Repository
+@Data
+@ApiModel("列装更新类")
+public class PackingLibraryUpdateVo {
+
+    @ApiModelProperty(value = "列装库id",example = "1")
+    private int packingId;
+
+    @ApiModelProperty(value = "型号",example = "测试型号")
+    private String model;
+
+    @ApiModelProperty(value = "名称",example = "测试名称")
+    private String name;
+
+    @ApiModelProperty(value = "应用类型",example = "1")
+    private Integer applyType;
+
+    @ApiModelProperty(value = "密级",example = "1")
+    private Integer secretLevel;
+
+    @ApiModelProperty(value = "配用范围",example = "1")
+    private Integer matchingRange;
+
+    @ApiModelProperty(value = "可见范围",example = "1")
+    private Integer invisibleRange;
+
+    @ApiModelProperty(value = "类型",example = "1")
+    private Integer type;
+
+    @ApiModelProperty(value = "列装状态",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value = "列装性质",example = "1")
+    private Integer nature;
+
+    @ApiModelProperty(value = "生产单位",example = "测试型号")
+    private String prodUnit;
+
+    @ApiModelProperty(value = "创建单位",example = "测试创建单位")
+    private String createUnit;
+
+    @ApiModelProperty(value = "价格",example = "2.000.000")
+    private String price;
+
+    @ApiModelProperty(value = "照片名称",example = "没有先填一个空格")
+    private String imageName;
+
+    @ApiModelProperty(value = "照片路径",example = "没有先填一个空格")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "附件名称",example = "没有先填一个空格")
+    private String fileName;
+
+    @ApiModelProperty(value = "附件路径",example = "没有先填一个空格")
+    private String fileUrl;
+
+}

dev-device/device-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/PartSaveVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("配件存储类")
+public class PartSaveVo {
+
+    @ApiModelProperty(value = "型号",example = "测试型号")
+    private String model;
+
+    @ApiModelProperty(value = "名称",example = "测试名称")
+    private String name;
+
+    @ApiModelProperty(value = "类型",example = "1")
+    private Integer type;
+
+}