更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -102,6 +102,9 @@ public class AllotBillController {
     @Autowired
     private AreaService areaService;
 
+    @Autowired
+    private UserPublicService userService;
+
     @ApiOperation(value = "导入二维码获取配发装备", notes = "可以通过这个接口导入二维码获取配发装备")
     @PostMapping(value = "/load")
     public ResponseEntity loadDevice(@RequestBody RfidVo rfidVo) {
@@ -219,6 +222,16 @@ public class AllotBillController {
         messageService.add(messageBto);
         log.info("[配发模块]:" + allotBillEntity.getSendUnit() + "对" + allotBillEntity.getReceiveUnit() + "发起配发");
         myWebSocket.sendMessage1();
+        allotBill.setSenderUserA(userService.getOne(allotBill.getSendUseraId()).getName());
+        allotBill.setSenderUserB(allotBill.getAgent());
+        if (allotBill.getReceiveUseraId() != null) {
+            allotBill.setReceiveUserA(userService.getOne(allotBill.getReceiveUseraId()).getName());
+        }
+        if (allotBill.getReceiveUserbId() != null) {
+            allotBill.setReceiveUserB(userService.getOne(allotBill.getReceiveUserbId()).getName());
+        }
+        allotBill.setSendFileList(FilesUtil.stringFileToList(allotBill.getSendFiles()));
+        allotBill.setReplyFileList(FilesUtil.stringFileToList(allotBill.getReplyFiles()));
         return ResponseEntity.ok(new ResultObj(allotBill, "发起成功"));
     }
 

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillSelectController.java

@@ -63,7 +63,7 @@ public class AllotBillSelectController {
         //set账单用户名称并添加
         AllotBill allotBillEntity = allotBillService.getOne(id);
         allotBillEntity.setSenderUserA(userService.getOne(allotBillEntity.getSendUseraId()).getName());
-        allotBillEntity.setSenderUserB(userService.getOne(allotBillEntity.getSendUserbId()).getName());
+        allotBillEntity.setSenderUserB(allotBillEntity.getAgent());
         if (allotBillEntity.getReceiveUseraId() != null) {
             allotBillEntity.setReceiveUserA(userService.getOne(allotBillEntity.getReceiveUseraId()).getName());
         }

dev-retired/src/main/java/com/tykj/dev/device/retired/entity/vo/DeviceRetiredResultVo.java

@@ -32,9 +32,17 @@ public class DeviceRetiredResultVo {
     @ApiModelProperty(value = "类型", example = "1")
     private Integer type;
 
+    @ApiModelProperty(value = "经办人/主管领导", example = "密级")
+    private String secretLevelName;
+
+    @ApiModelProperty(value = "类型", example = "1")
+    private String typeName;
+
     @ApiModelProperty(value = "数量", example = "1")
     private Long count;
 
+    private Integer isPart;
+
     @ApiModelProperty(value = "数量", example = "1")
     private List<DeviceRetiredResultVo> childNodes = new ArrayList<>();
 }

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

@@ -45,6 +45,8 @@ public class DevRepelVo {
      */
     private Integer type;
 
+    private String typeName;
+
     /**
      * 清退时间
      */

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

@@ -33,4 +33,6 @@ public class ModelNameGroup {
      * 装备id集合
      */
     private List<Integer> ids;
+
+    private String typeName;
 }

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

@@ -103,10 +103,10 @@ public class RepelQueryServiceImpl implements RepelQueryService {
         deviceLibraries.forEach(
                 deviceLibrary -> {
                     List<Integer> ids=new ArrayList<>();
-                    String key=deviceLibrary.getModel()+deviceLibrary.getName();
+                    String key=deviceLibrary.getModel()+deviceLibrary.getType();
                     if (!modelNameGroupMap.containsKey(key)){
                         ids.add(deviceLibrary.getId());
-                        modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getType(),ids));
+                        modelNameGroupMap.put(key,new ModelNameGroup(deviceLibrary.getModel(),deviceLibrary.getType(),ids,deviceLibrary.setConfigName().getTypeName()));
                     }else {
                         ModelNameGroup modelNameGroup=modelNameGroupMap.get(key);
                         ids=modelNameGroupMap.get(key).getIds();
@@ -222,7 +222,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     }
 
     private DevRepelVo devRepelVo(DeviceLibrary deviceLibrary){
-        return new DevRepelVo(deviceLibrary.getId(),deviceLibrary.getName(),deviceLibrary.getModel(),deviceLibrary.getSeqNumber(),deviceLibrary.getType(),deviceLibrary.getUpdateTime());
+        return new DevRepelVo(deviceLibrary.getId(),deviceLibrary.getName(),deviceLibrary.getModel(),deviceLibrary.getSeqNumber(),deviceLibrary.getType(),deviceLibrary.setConfigName().getTypeName(),deviceLibrary.getUpdateTime());
 
     }
     private List<DeviceLibrary> findInvoleDevice(String involeDevice){

dev-statistical/src/main/java/com/tykj/dev/statistical/controller/StatisticalController.java

@@ -196,9 +196,11 @@ public class StatisticalController {
 //                deviceStatistics.setName(strings[1]);
                 if ("null".equals(strings[1])){
                     deviceStatistics.setType(null);
+                    deviceStatistics.setTypeName("-");
                 }
                 else {
                     deviceStatistics.setType(Integer.valueOf(strings[1]));
+                    deviceStatistics.setTypeName(map.get(s).get(0).setConfigName().getTypeName());
                 }
                 deviceStatistics.setNum(map.get(s).size());
                 deviceStatistics.setDeviceIds(map.get(s).stream().map(DeviceLibrary::getId).collect(Collectors.toList()));

dev-statistical/src/main/java/com/tykj/dev/statistical/vo/DeviceStatistics.java

@@ -27,4 +27,7 @@ public class DeviceStatistics {
 
     @ApiModelProperty(value = "装备Id列表")
     private List<Integer> deviceIds;
+
+    @ApiModelProperty(value = "装备类型", example = "100")
+    private String typeName;
 }