Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -769,16 +769,20 @@ public class OrgUsrController extends BaseController {
 		queryWrapper.eq("type", "SpecialType").or().eq("type", "SpecialDepartment");
 		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 		List<String> objects = new ArrayList<>();
-		list.stream().forEach(e->objects.add(e.getName()));
+		list.stream().forEach(e->objects.add(e.getCode()));
 		//判断当前登录人权限是否处于特殊类型
 		if (objects.contains(authKey)){
 			//判断当前登录人部门是否处于特殊部门
 				if (objects.contains(personIdentity.getCompanyId())) {
+					//查询当前登录人所属单位/部门
+					OrgUsr orgUsr = orgUsrMapper.selectById(personIdentity.getCompanyId());
+
+					//查询当前登录人父级单位
 					LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-					wrapper.eq(OrgUsr::getParentId,personIdentity.getCompanyId());
+					wrapper.eq(OrgUsr::getSequenceNbr,orgUsr.getParentId());
 					wrapper.eq(BaseEntity::getIsDelete,false);
-					OrgUsr orgUsr = orgUsrMapper.selectOne(wrapper);
-					personIdentity.setBizOrgCode(orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : personIdentity.getBizOrgCode());
+					OrgUsr result = orgUsrMapper.selectOne(wrapper);
+					bizOrgCode = result.getBizOrgCode() != null? result.getBizOrgCode() : personIdentity.getBizOrgCode();
 				}
 		}
 		// 权限处理

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISourceSceneService.java

@@ -16,4 +16,5 @@ public interface ISourceSceneService extends IService<SourceScene> {
      * @Date 2020/12/19 15:25
      */
     List<SourceScene> findBySourceId(Long sourceId);
+    List<SourceScene> findByType(String type);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1295,18 +1295,38 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Override
     public List<EquiplistSpecificBySystemVO> getPointInFloor(Long floorId) {
         //0.查询画布信息，todo 建筑可标记点类型为装备、摄像头
-        List<SourceScene> sourceScenes = sourceSceneService.findBySourceId(floorId);
-        SourceScene sourceScene = sourceScenes.size() > 0 ? sourceScenes.get(0) : new SourceScene();
-        //0.1已标记装备点
-        String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
-        //0.2已标记视频点
-        String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+      //  List<SourceScene> sourceScenes = sourceSceneService.findBySourceId(floorId);
+        //查询所有画布
+        List<SourceScene> sourceScenes = sourceSceneService.findByType("building");
+
+
+//        SourceScene sourceScene = sourceScenes.size() > 0 ? sourceScenes.get(0) : new SourceScene();
+////        //0.1已标记装备点
+////        String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
+////        //0.2已标记视频点
+////        String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+
         //1.查询楼层下的所有装备list
         List<EquiplistSpecificBySystemVO> equipmentSpecifics = equipmentSpecificMapper.getListByWarehouseStructureId(floorId);
 
         equipmentSpecifics.forEach(e -> {
             //已经标记则为已绑定
-            e.setIsBound(equipPointInScene.contains(e.getId().toString()));
+
+
+
+            if(sourceScenes!=null&&sourceScenes.size()>0){
+                Boolean isBound=false;
+                for (SourceScene sourceScene : sourceScenes) {
+                    String equipPointInScene = sourceScene.getPointInScene() != null ? sourceScene.getPointInScene() : "";
+                    isBound= equipPointInScene.contains(e.getId().toString());
+                    if(isBound){
+                       break;
+                    }
+                }
+                e.setIsBound(isBound);
+            }
+
+
             e.setType("装备点");
         });
         List<EquiplistSpecificBySystemVO> bySystemVOS = new ArrayList<>(equipmentSpecifics);
@@ -1321,7 +1341,18 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
             vo.setEquipmentName(v.getName());
             vo.setType("视频点");
             //已经标记则为已绑定
-            vo.setIsBound(videoPointInScene.contains(v.getId().toString()));
+            if(sourceScenes!=null&&sourceScenes.size()>0){
+                Boolean isBound=false;
+                for (SourceScene sourceScene : sourceScenes) {
+                    String videoPointInScene = sourceScene.getVideoInScene() != null ? sourceScene.getVideoInScene() : "";
+                    isBound= videoPointInScene.contains(v.getId().toString());
+                    if(isBound){
+                        break;
+                    }
+                }
+                vo.setIsBound(isBound);
+            }
+
             bySystemVOS.add(vo);
         });
         return bySystemVOS;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SourceSceneServiceImpl.java

@@ -27,4 +27,10 @@ public class SourceSceneServiceImpl extends ServiceImpl<SourceSceneMapper, Sourc
         Optional.ofNullable(sourceId).orElseThrow(() -> new BadRequest("sourceId为空"));
         return this.list(new QueryWrapper<SourceScene>().lambda().eq(SourceScene::getSourceId,sourceId));
     }
+
+    @Override
+    public List<SourceScene> findByType(String type) {
+        Optional.ofNullable(type).orElseThrow(() -> new BadRequest("type为空"));
+        return this.list(new QueryWrapper<SourceScene>().lambda().eq(SourceScene::getSourceType,type));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -612,7 +612,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             page.setCurrent(i);
             page.setSize(size);
             LambdaQueryWrapper<CylinderInfo> wrapper = new LambdaQueryWrapper<>();
-            wrapper.orderByDesc(CylinderInfo::getSequenceNbr);
+            wrapper.select(CylinderInfo::getSequenceCode,CylinderInfo::getSequenceNbr).orderByDesc(CylinderInfo::getSequenceNbr);
             IPage<CylinderInfo> result = this.page(page, wrapper);
             for (CylinderInfo r : result.getRecords()) {
                 // 设置token