Browse Source

Merge remote-tracking branch 'origin/demo_' into demo_

hfxc226 2 years ago
parent
commit
9071b8fc59

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/vo/sb/SbInfoVO.java

@@ -52,7 +52,7 @@ public class SbInfoVO extends BaseVO implements Serializable {
      */
     private Integer standardNum;
     /**
-     * 是否子设备:0 父设备,1 子设备
+     * 是否子设备:2 父设备,1 子设备  3 独立设备
      */
     private Integer isChild;
     /**

+ 2 - 2
platform-rest/src/main/java/com/platform/rest/controller/sb/SbChangeRecordController.java

@@ -64,7 +64,7 @@ public class SbChangeRecordController {
    * @return R
    */
   @SysLog("新增设备更改记录表")
-  @PostMapping("batch")
+  @PostMapping("/batch")
   @PreAuthorize("@pms.hasPermission('sb-change-records-add')")
   public R saveBatch(@RequestBody BatchSbChange batchSbChange) {
     sbChangeRecordService.saveBatch(batchSbChange);
@@ -86,7 +86,7 @@ public class SbChangeRecordController {
   }
 
 
-                                                                                                        
+
   /**
    * 通过id删除一条记录
    *

+ 11 - 0
platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoController.java

@@ -226,6 +226,17 @@ public class SbInfoController {
         return new R<>();
     }
 
+    /**
+     * 获取分页
+     *
+     * @return R
+     */
+    @GetMapping("/fill/position/list")
+    public R<List<SbInfoVO>> queryList(SbInfoDTO sbInfoDTO) {
+        return new R<>(sbInfoService.getChildSbByIds(sbInfoDTO.getIds()));
+    }
+
+
     /**
      * 获取分页
      *

+ 7 - 0
platform-service/src/main/java/com/platform/service/sb/SbInfoService.java

@@ -320,4 +320,11 @@ public interface SbInfoService extends IBaseService<SbInfo, SbInfoDTO> {
     String updateImportUpdateForLongYan(MultipartFile file);
 
     void generateSbMeasureLog();
+
+    /**
+     * 获取所有子设备
+     * @param ids
+     * @return
+     */
+    List<SbInfoVO> getChildSbByIds(List<String> ids);
 }

+ 27 - 0
platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -786,6 +786,33 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         }
     }
 
+    @Override
+    public List<SbInfoVO> getChildSbByIds(List<String> ids) {
+        Map<String,String> maps = new HashMap<>();
+        ids.forEach(item -> maps.put(item,item));
+        SbInfoDTO queryDTO = new SbInfoDTO();
+        queryDTO.setIds(ids);
+        List<SbInfoVO> list = mapper.selectVOList(queryDTO);
+        List<SbInfoVO> resultList = ListUtils.newArrayList();
+        if(list != null && list.size() > 0){
+            list.forEach(item -> {
+                // 子设备且父设备在maps中不添加
+                if(item.getIsChild() == 1){
+                    if(StringUtils.isBlank(maps.get(item.getParentId()))){
+                        resultList.add(item);
+                    }
+                }else{
+                    // 获取子设备
+                    SbInfoDTO query = new SbInfoDTO();
+                    query.setParentId(item.getId());
+                    item.setChildren(mapper.selectVOList(query));
+                    resultList.add(item);
+                }
+            });
+        }
+        return resultList;
+    }
+
     /**
      * 更新和记录修改
      * @param sbInfos