Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/OrgMenuDto.java

+package com.yeejoin.amos.boot.biz.common.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+/**
+ * @author fengwang
+ * @date 2021-06-19.
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="OrgMenuVo", description="树菜单")
+public class OrgMenuDto {
+    private Long key;
+    private Long value;
+    private String title;
+    private String name;
+    private Long parentId;
+    private Boolean leaf = true;
+    private Boolean isLeaf = true;
+    private List<OrgMenuDto> children;
+    private String bizOrgType;
+    private String bizOrgCode;
+    
+    public Boolean getLeaf() {
+    	return ObjectUtils.isEmpty(children);
+    }
+    
+    public Boolean getIsLeaf() {
+    	return ObjectUtils.isEmpty(children);
+    }
+    
+    public Long getValue() {
+    	return key;
+    }
+    
+    public String getName() {
+    	return title;
+    }
+    
+    public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf, String bizOrgCode) {
+        super();
+        this.key = key;
+        this.title = title;
+        this.parentId = parentId;
+        this.bizOrgType = bizOrgType;
+        this.leaf = leaf;
+        this.bizOrgCode = bizOrgCode;
+    }
+    public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType, boolean leaf) {
+        super();
+        this.key = key;
+        this.title = title;
+        this.parentId = parentId;
+        this.bizOrgType = bizOrgType;
+        this.leaf = leaf;
+    }
+
+    public OrgMenuDto(Long key, String title, Long parentId, String bizOrgType) {
+        this.key = key;
+        this.title = title;
+        this.parentId = parentId;
+        this.bizOrgType = bizOrgType;
+    }
+
+	public OrgMenuDto() {
+		// TODO Auto-generated constructor stub
+	}
+
+    public OrgMenuDto(Long key, Long value, String title, String name, List<OrgMenuDto> children) {
+        this.key = key;
+        this.value = value;
+        this.title = title;
+        this.name = name;
+        this.children = children;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireStationDto.java

@@ -122,4 +122,12 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "战备车辆数量")
     private Integer carNum;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireStation.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -87,4 +88,10 @@ public class FireStation extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/ExcelUtil.java

@@ -45,7 +45,7 @@ public class ExcelUtil {
 	 * @param model     导出的头
 	 * @param flag      true模板填充下拉 false 不填充
 	 */
-	public static void createTemplate(HttpServletResponse response, String fileName, String sheetName,
+	public static void    createTemplate(HttpServletResponse response, String fileName, String sheetName,
 			List<? extends Object> data, Class<?> model, DataSources dataDictionaryMapper, boolean flag) {
 
 		HorizontalCellStyleStrategy horizontalCellStyleStrategy = setMyCellStyle();

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -28,6 +28,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.bizCompanyId!=null'> and a.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and a.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "<if test='par.address!=null'> and a.address like  CONCAT('',#{par.address},'%') </if>"
+			+ "<if test='par.bizOrgCode != null'> and a.biz_org_code like  CONCAT(#{par.bizOrgCode},'%') </if>"
 			+" order by a.rec_date desc limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
 	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
@@ -37,6 +38,7 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
 			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "<if test='par.address!=null'> and cb_fire_station.address like  CONCAT('',#{par.address},'%') </if>"
+			+ "<if test='par.bizOrgCode != null'> and biz_org_code  like  CONCAT(#{par.bizOrgCode},'%')  </if>"
 			+ "</script>")	
 	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -766,6 +766,10 @@ LEFT JOIN (
                     AND ( usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
                 </otherwise>
             </choose>
+            <if test="bizOrgCode!='' and bizOrgCode!=null">
+                AND usr.biz_org_code like CONCAT('%',#{bizOrgCode},'%')
+            </if>
+            and usr.is_delete = false
         </where>
     </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/OrgUsrDto.java

+package com.yeejoin.equipmanage.common.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 机构/部门/人员表
+ *
+ * @author tb
+ * @date 2021-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "OrgUsrDto", description = "机构/部门/人员表")
+public class OrgUsrDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentId;
+
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Area.java

@@ -57,4 +57,10 @@ public class Area extends BaseEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long creatorId;
 
+    @ApiModelProperty("机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Car.java

@@ -104,6 +104,24 @@ public class Car extends BaseEntity {
 	@ApiModelProperty(value = "队伍名称(冗余字段来源于平台)")
 	private String teamName;
 
+
+
+	//新加
+
+	@ApiModelProperty(value = "机构/部门名称")
+	@TableField("biz_org_name")
+	private String bizOrgName;
+
+	@ApiModelProperty(value = "机构编码")
+	@TableField("biz_org_code")
+	private String bizOrgCode;
+
+
+
+
+
+
+
 	@ApiModelProperty(value = "图片")
 	@TableField(exist = false)
 	private List<UploadFile> img;

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java

@@ -106,6 +106,18 @@ public class EquipmentSpecific extends BaseEntity {
     @TableField(exist = false)
     private StockDetail stockDetail;
 
+
+    //新加
+
+    @ApiModelProperty(value = "机构/部门名称")
+    @TableField("biz_org_name")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    @TableField("biz_org_code")
+    private String bizOrgCode;
+
+
     /**
      * 所属部门
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/FireFightingSystemEntity.java

@@ -122,4 +122,10 @@ public class FireFightingSystemEntity {
 
     @ApiModelProperty("系统类型编码")
     private String systemTypeCode;
+
+    @ApiModelProperty("机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/EquipTypeAmountPageDTO.java

@@ -49,4 +49,9 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
     
     @ApiModelProperty(value = "所在位置名称")
     private String warehouseStructureName;
+
+    @ApiModelProperty(value = "单位部门名陈")
+    private String bizOrgName;
+    @ApiModelProperty(value = "单位部门org")
+    private String bizOrgCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipTypeImgAmountVO.java

@@ -47,4 +47,10 @@ public class EquipTypeImgAmountVO {
     private String eqtype;
     @ApiModelProperty(value = "库存明细id")
     private Long stockDetailId;
+
+    @ApiModelProperty(value = "单位部门名陈")
+    private String bizOrgName;
+    @ApiModelProperty(value = "单位部门org")
+    private String bizOrgCode;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/AreaResquest.java

@@ -19,5 +19,7 @@ public class AreaResquest {
     private Long creatorId;
     private String userId;
     private Long riskPointId;
+    private String bizOrgCode;
+    private String bizOrgName;
     private List<SourceFile> sourceFiles;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentManageVo.java

@@ -117,4 +117,8 @@ public class EquipmentManageVo  implements Serializable {
     private Integer equipCount;
 
     private Long instanceId;
+
+    private String bizOrgCode;
+
+    private String bizOrgName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemTreeVo.java

+package com.yeejoin.equipmanage.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+@Data
+@ApiModel("部门公司消防系统树")
+public class FireFightingSystemTreeVo {
+
+    @ApiModelProperty("id主键")
+    private String id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("类型")
+    private String type;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty("父级id")
+    private String parentId;
+
+    @ApiModelProperty("children")
+    private List<FireFightingSystemTreeVo> children;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemTypeTreeVo.java

+package com.yeejoin.equipmanage.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+@Data
+@ApiModel("部门公司消防系统树")
+public class FireFightingSystemTypeTreeVo {
+    @ApiModelProperty("id主键")
+    private String id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("类型")
+    private String type;
+
+    @ApiModelProperty("父级id")
+    private String parentId;
+
+    @ApiModelProperty("数量")
+    private String total;
+
+    @ApiModelProperty("children")
+    private List<FireFightingSystemTypeTreeVo> children;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/FireFightingSystemVo.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.vo;
 
 import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -165,4 +166,14 @@ public class FireFightingSystemVo implements Serializable {
      */
     private String status;
 
+    /**
+     * 机构编码
+     */
+    private String bizOrgCode;
+
+    /**
+     * 机构名称
+     */
+    private String bizOrgName;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/UnitAreaTreeVo.java

+package com.yeejoin.equipmanage.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+@Data
+@ApiModel("单位区域树")
+public class UnitAreaTreeVo {
+
+    @ApiModelProperty("id主键")
+    private Long id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty(value = "区域编码")
+    private String code;
+
+    @ApiModelProperty("区域类型")
+    private String type;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgName;
+
+    @ApiModelProperty("父级id")
+    private Long parentId;
+
+    @ApiModelProperty("children")
+    private List<UnitAreaTreeVo> children;
+
+
+}

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
+import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,12 +39,15 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "微型消防站Api")
-@RequestMapping(value = "/common/fire-station")
+    @RequestMapping(value = "/common/fire-station")
 public class FireStationController extends BaseController {
 
     @Autowired
     FireStationServiceImpl fireStationServiceImpl;
 
+    @Autowired
+    OrgUsrServiceImpl iOrgUsrService;
+
     /**
      * 新增微型消防站
      *
@@ -70,7 +77,7 @@ public class FireStationController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr删除
+     *  根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
      * @return
@@ -107,11 +114,11 @@ public class FireStationController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "微型消防站分页查询", notes = "微型消防站分页查询")
     public ResponseModel<Page<FireStationDto>> queryForPage(@RequestParam(value = "current") int current,
-                                                            @RequestParam(value = "size") int size) {
+                                                            @RequestParam(value = "size") int size,String bizOrgCode) {
         Page<FireStationDto> page = new Page<FireStationDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page));
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationPage(page,bizOrgCode));
     }
 
     /**
@@ -142,8 +149,8 @@ public class FireStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "微型消防站列表全部数据查询", notes = "微型消防站列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<FireStationDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList(false,null,null));
+    public ResponseModel<List<FireStationDto>> selectForList(String bizOrgCode) {
+        return ResponseHelper.buildResponse(fireStationServiceImpl.queryForFireStationList(false,null,null,bizOrgCode));
     }
 
     /**
@@ -159,4 +166,20 @@ public class FireStationController extends BaseController {
         List<MenuFrom> menus = fireStationServiceImpl.getCompanyTeamTree();
         return ResponseHelper.buildResponse(menus);
     }
+
+    /**
+     * 微型消防站单位部门树
+     *
+     * @param
+     * @return
+     */
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/tree/companyTreeByUserAndType")
+    @ApiOperation(httpMethod = "GET", value = "微型消防站单位部门树", notes = "微型消防站单位部门树")
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false) String type) {
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams,type));
+    }
 }

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

@@ -599,6 +599,7 @@ public class OrgUsrController extends BaseController {
 
     /**
      * 根据机构类型和登陆人bizOrgCode获取列表不分页
+     *
      * @param orgTypes 机构类型（逗号分割）
      * @return list不分页
      */
@@ -606,11 +607,40 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
     @GetMapping(value = "/amos/getListByBizOrgTypesCode")
-    public ResponseModel<List<OrgUsr>> getListByBizOrgTypeCode(@RequestParam(required = false) String orgTypes){
+    public ResponseModel<List<OrgUsr>> getListByBizOrgTypeCode(@RequestParam(required = false) String orgTypes) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+        String bizOrgCode = personIdentity.getBizOrgCode();
+        return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode));
+    }
+
+
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
+    @GetMapping(value = "/{authKey}/listWithAuth")
+    public ResponseModel<List<OrgUsr>> getListWithAuth(
+            @RequestParam(required = false) String orgTypes,
+            @PathVariable String authKey) {
         ReginParams reginParams = getSelectedOrgInfo();
         ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
         String bizOrgCode = personIdentity.getBizOrgCode();
+        // TODO 伪代码 tianbo 上下文类 set authKey
         return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode));
     }
 
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{authKey}/treeWithAuth", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据权限查询公司部门树", notes = "根据权限查询公司部门树")
+    public ResponseModel<List<OrgMenuDto>> getCompanyTreeWithAuth(
+            @RequestParam(required = false) String orgType,
+            @PathVariable String authKey) {
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        // TODO 伪代码 tianbo 上下文类 set authKey
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType);
+        return ResponseHelper.buildResponse(menus);
+    }
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

@@ -48,15 +48,15 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     /**
      * 分页查询
      */
-    public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page) {
-        return this.queryForPage(page, null, false);
+    public Page<FireStationDto> queryForFireStationPage(Page<FireStationDto> page,String bizOrgCode) {
+        return this.queryForPage(page, null, false,bizOrgCode);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name) {
-        return this.queryForList("", false, isDelete,bizCompanyId,name);
+    public List<FireStationDto> queryForFireStationList(@Condition(Operator.eq) Boolean isDelete,@Condition(Operator.eq) Long bizCompanyId,@Condition(Operator.like) String name,@Condition(Operator.eq) String bizOrgCode) {
+        return this.queryForList("", false, isDelete,bizCompanyId,name,bizOrgCode);
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml

@@ -18,11 +18,6 @@
             <version>${amos-biz-boot.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.amosframework.boot</groupId>
-            <artifactId>amos-boot-module-common-biz</artifactId>
-            <version>${amos-biz-boot.version}</version>
-        </dependency>
-        <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>visual-feign-morphic</artifactId>
             <version>1.6.3-SNAPSHOT</version>

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/AreaController.java

 package com.yeejoin.equipmanage.controller;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
-import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.service.IAreaService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 区域
@@ -41,14 +35,42 @@ public class AreaController extends AbstractBaseController {
 	@Autowired
 	IAreaService iAreaService;
 
+//	/**
+//	 * 获取区域树
+//	 */
+//	@TycloudOperation(ApiLevel = UserType.AGENCY)
+//	@ApiOperation("区域树")
+//	@GetMapping(value = "/tree")
+//	public List<AreaTreeVo> getAreaTree() {
+//		return iAreaService.getAreaTreeVo();
+//	}
+
 	/**
-	 * 获取区域树
+	 * 获取公司部门区域树
+	 * @return list
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation("区域树")
+	@ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位区域树", notes = "根据登陆人获取单位区域树")
 	@GetMapping(value = "/tree")
-	public List<AreaTreeVo> getAreaTree() {
-		return iAreaService.getAreaTreeVo();
+	public List<UnitAreaTreeVo> getSystemTree(){
+		return iAreaService.getAreaTreeListVo();
+	}
+
+	/**
+	 * 获取公司部门树
+	 * @return list
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "根据登陆人获取公司树", notes = "根据登陆人获取公司树")
+	@GetMapping(value = "/companyTreeByUserAndType")
+	public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type,
+													 @RequestParam(required = false) String bizOrgCode){
+		// 获取登陆人角色
+		ReginParams reginParams = getSelectedOrgInfo();
+		if (StringUtil.isNotEmpty(bizOrgCode)) {
+			reginParams.getPersonIdentity().setBizOrgCode(bizOrgCode);
+		}
+		return iAreaService.companyDeptTree();
 	}
 
 	/**
@@ -57,11 +79,11 @@ public class AreaController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation("区域树")
 	@GetMapping(value = "/treeById")
-	public List<AreaTreeVo> getAreaTreeById(@RequestParam Long id) {
+	public List<UnitAreaTreeVo> getAreaTreeById(@RequestParam Long id, @RequestParam String bizOrgCode) {
 		if (id == null) {
 			id = -1L;
 		}
-		return iAreaService.getAreaTreeVoById(id);
+		return iAreaService.getAreaTreeVoById(id, bizOrgCode);
 	}
 
 	/**
@@ -84,6 +106,7 @@ public class AreaController extends AbstractBaseController {
 		return iAreaService.areaList(page, area);
 	}
 
+
 	/**
 	 * 保存数据
 	 */

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

 package com.yeejoin.equipmanage.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.http.MediaType;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.equipmanage.common.entity.EquProperty;
-import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.StockDetail;
-import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
 import com.yeejoin.equipmanage.common.enums.ExcelEnums;
 import com.yeejoin.equipmanage.common.utils.ExcelUtils;
@@ -51,18 +17,29 @@ import com.yeejoin.equipmanage.fegin.JcsFeign;
 import com.yeejoin.equipmanage.mapper.EquipmentDetailMapper;
 import com.yeejoin.equipmanage.mapper.ManufacturerInfoMapper;
 import com.yeejoin.equipmanage.mapper.StockDetailMapper;
-import com.yeejoin.equipmanage.service.IEquipmentDetailService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IExcelService;
-import com.yeejoin.equipmanage.service.IStockService;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.IWarehouseStructureService;
+import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.ExcelUtil;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.MediaType;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @author wujiang
@@ -84,15 +61,12 @@ public class EquipmentDetailController extends AbstractBaseController {
     IStockService iStockService;
     @Autowired
     private ManufacturerInfoMapper manufacturerInfoMapper;
-
     @Autowired
     private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
 
     @Autowired
     IEquipmentSpecificSerivce equipmentSpecificSerivce;
 
-    @Autowired
-    private IEquipmentDetailService equipmentDetailService;
 
     @Autowired
     private IExcelService excelService;
@@ -102,7 +76,7 @@ public class EquipmentDetailController extends AbstractBaseController {
 
     @Autowired
     private IWarehouseStructureService warehouseStructureService;
-    
+
     @Autowired
     private ISyncDataService syncDataService;
 
@@ -142,16 +116,16 @@ public class EquipmentDetailController extends AbstractBaseController {
 //            throw new BadRequest("设备物联编码重复");
 //        }
         String sysCode = vo.getCode();
-        if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
+        if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())) {
             int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
-            if (code != 0 ) {
+            if (code != 0) {
                 throw new BadRequest("设备编码填写重复，请重新输入！");
             }
         }
         String iot = vo.getIotCode();
-        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
+        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())) {
             int iot_code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", iot.trim()));
-            if (iot_code != 0 ) {
+            if (iot_code != 0) {
                 throw new BadRequest("物联编码填写重复，请重新输入！");
             }
         }
@@ -198,14 +172,14 @@ public class EquipmentDetailController extends AbstractBaseController {
         equipmentSpecific.setFullqrCode("01#" + equipmentSpecific.getQrCode());
         EquipmentDetail equipmentDetail = iEquipmentDetailService.getOneById(equipmentSpecific.getEquipmentDetailId());
         StockDetail stockDetail = null;
-        if(stockDetailId != null){
+        if (stockDetailId != null) {
             //解决灭火药剂，有多个货位状态问题
             stockDetail = stockDetailMapper.selectById(stockDetailId);
             equipmentSpecific.setStockDetail(stockDetail);
-        }else {
+        } else {
             //消防装备默认分支
-            List<StockDetail> stockDetails = stockDetailMapper.selectList(new LambdaQueryWrapper<StockDetail>().eq(StockDetail::getEquipmentSpecificId,id));
-            if(!stockDetails.isEmpty()){
+            List<StockDetail> stockDetails = stockDetailMapper.selectList(new LambdaQueryWrapper<StockDetail>().eq(StockDetail::getEquipmentSpecificId, id));
+            if (!stockDetails.isEmpty()) {
                 stockDetail = stockDetails.get(0);
                 equipmentSpecific.setStockDetail(stockDetail);
             }
@@ -230,16 +204,16 @@ public class EquipmentDetailController extends AbstractBaseController {
     public EquipmentDate updateByIdEquipmentDetail(HttpServletRequest request, @RequestBody EquipmentDate equipmentDate) {
         EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
         String sysCode = vo.getCode();
-        if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
-            int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()).ne("id",vo.getId()));
-            if (code > 0){
+        if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())) {
+            int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", vo.getCode()).ne("id", vo.getId()));
+            if (code > 0) {
                 throw new BadRequest("设备编码重复");
             }
         }
         String iot = vo.getIotCode();
-        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())){
-            int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id",vo.getId()));
-            if (iotCode > 0){
+        if (StringUtils.isNotEmpty(iot) && StringUtils.isNotEmpty(iot.trim())) {
+            int iotCode = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("iot_code", vo.getIotCode()).ne("id", vo.getId()));
+            if (iotCode > 0) {
                 throw new BadRequest("设备物联编码重复");
             }
         }
@@ -256,7 +230,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         if (!ObjectUtils.isEmpty(bean)) {
             equipmentSpecific.setEquipmentCode(bean.getCode());
         }
-        Long warehouseStructureId = ObjectUtils.isEmpty(equipmentSpecific.getStockDetail())?null:equipmentSpecific.getStockDetail().getWarehouseStructureId();
+        Long warehouseStructureId = ObjectUtils.isEmpty(equipmentSpecific.getStockDetail()) ? null : equipmentSpecific.getStockDetail().getWarehouseStructureId();
         if (warehouseStructureId != null) {
             WarehouseStructure warehouseStructure = warehouseStructureService.getById(warehouseStructureId);
             if (!ObjectUtils.isEmpty(warehouseStructure)) {
@@ -487,8 +461,9 @@ public class EquipmentDetailController extends AbstractBaseController {
 
     /**
      * 下载模板
-     * @Since 2021-3-10
+     *
      * @return
+     * @Since 2021-3-10
      */
     @GetMapping(value = "/downTemplate")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -502,8 +477,8 @@ public class EquipmentDetailController extends AbstractBaseController {
             // 判读机场服务是否在线
             ExcelEnums excelEnums;
             ResponseModel<String[]> result = jcsFeign.getEquipmentInfo(getAppKey(), getProduct(), getToken(), null, "getCompany");
-            if(200 == result.getStatus()) {
-                 excelEnums=  ExcelEnums.getByKey(ExcelEnums.XFZB.getType());
+            if (200 == result.getStatus()) {
+                excelEnums = ExcelEnums.getByKey(ExcelEnums.XFZB.getType());
                 ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
                 String url = excelDto.getClassUrl();
                 Class<?> clz = Class.forName(url);
@@ -512,7 +487,7 @@ public class EquipmentDetailController extends AbstractBaseController {
             }
 
         } catch (Exception e) {
-            ExcelEnums excelEnums =  ExcelEnums.getByKey(ExcelEnums.XFZBSINGLE.getType());
+            ExcelEnums excelEnums = ExcelEnums.getByKey(ExcelEnums.XFZBSINGLE.getType());
             ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
             String url = excelDto.getClassUrl();
             Class<?> clz = Class.forName(url);
@@ -523,13 +498,14 @@ public class EquipmentDetailController extends AbstractBaseController {
 
     /**
      * 单个设备信息导入
-     * @Since 2021-3-10
+     *
      * @return
+     * @Since 2021-3-10
      */
     @PostMapping(value = "/uploadListByTemplate")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "单个设备信息导入", notes = "单个设备信息导入")
-    public ResponseModel<Object> uploadListByTemplate(MultipartFile file, @RequestParam(value = "type")  String type)  throws Exception {
+    public ResponseModel<Object> uploadListByTemplate(MultipartFile file, @RequestParam(value = "type") String type) throws Exception {
 //        try {
 //            InputStream inputStream = null;
 //            Workbook workbook = null;
@@ -545,13 +521,13 @@ public class EquipmentDetailController extends AbstractBaseController {
 //            throw new BadRequest("请使用指定模板进行上传");
 //        }
 
-       // List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloadS = ExcelUtils.importExcel(file, 1, 1, EquipmentDetailDownloadTemplateVO.class);
+        // List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloadS = ExcelUtils.importExcel(file, 1, 1, EquipmentDetailDownloadTemplateVO.class);
 
-        ExcelEnums excelEnums=  ExcelEnums.getByKey(type);
+        ExcelEnums excelEnums = ExcelEnums.getByKey(type);
         ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
 
-        excelService.commonUpload(file, excelDto,getSelectedOrgInfo(), getUserInfo());
-       // return iStockService.uploadListByTemplate(equipmentDetailDownloadS, getSelectedOrgInfo(), getUserInfo());
+        excelService.commonUpload(file, excelDto, getSelectedOrgInfo(), getUserInfo());
+        // return iStockService.uploadListByTemplate(equipmentDetailDownloadS, getSelectedOrgInfo(), getUserInfo());
         return ResponseHelper.buildResponse(null);
     }
 
@@ -592,4 +568,17 @@ public class EquipmentDetailController extends AbstractBaseController {
 //        return ;
 //    }
 
+    /**
+     * 消防装备单位部门树
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/companyTreeByUserAndType")
+    @ApiOperation(httpMethod = "GET", value = "消防装备单位部门树", notes = "消防装备单位部门树")
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() {
+        return ResponseHelper.buildResponse(iEquipmentDetailService.companyDeptTree());
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentManageController.java

@@ -51,10 +51,12 @@ public class EquipmentManageController extends AbstractBaseController{
             @RequestParam(value = "equipmentCode",required = false) String equipmentCode,
             @RequestParam(value = "construction",required = false) String construction,
             @RequestParam(value = "maintenance",required = false) String maintenance,
+            @RequestParam(value = "maintenance",required = false) String bizOrgCode,
+            @RequestParam(value = "maintenance",required = false) String formGroupId,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int pageSize
     ) {
-        return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,current,pageSize);
+        return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize);
     }
 
     @GetMapping(value = "/getUtils")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

 package com.yeejoin.equipmanage.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
-import com.yeejoin.equipmanage.common.entity.EquProperty;
-import com.yeejoin.equipmanage.common.entity.Equipment;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.ManufacturerInfo;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
-import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
+import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
-import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
-import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
-import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
+import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.IBuilldService;
-import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IManufacturerInfoService;
-import com.yeejoin.equipmanage.service.IUploadFileService;
-
+import com.yeejoin.equipmanage.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author zjw
@@ -329,10 +293,12 @@ public class FireFightingSystemController extends AbstractBaseController {
             @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
             @RequestParam(value = "construction", required = false) String construction,
             @RequestParam(value = "maintenance", required = false) String maintenance,
+            @RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
+            @RequestParam(value = "formGroupId", required = false) String formGroupId,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int pageSize
     ) {
-        return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, current, pageSize);
+        return fireFightingSystemService.queryEquipmenInfoAndCount(equipmentName, equipmentCode, construction, maintenance, bizOrgCode, formGroupId, current, pageSize);
     }
 
     /**
@@ -459,7 +425,7 @@ public class FireFightingSystemController extends AbstractBaseController {
         Map<String, String> map1 = new HashMap<>();
         if (fireFightingSystem != null) {
             list1.add(new AlarmDataVO("责任人", fireFightingSystem.getChargePersonName(), false));
-            FireFightingSystemVo fireFightingSystemVo = fireFightingSystemMapper.getFightingSysInfo(fireFightingSystem.getCode(),fireFightingSystem.getId());
+            FireFightingSystemVo fireFightingSystemVo = fireFightingSystemMapper.getFightingSysInfo(fireFightingSystem.getCode(), fireFightingSystem.getId());
             map1.put("value", "异常".equals(fireFightingSystemVo.getStatus()) ? "false" : "true");
         } else {
             list1.add(new AlarmDataVO("责任人", ":", false));
@@ -542,4 +508,42 @@ public class FireFightingSystemController extends AbstractBaseController {
         return fireFightingSystemService.getSystemCategory();
     }
 
+    /**
+     * 获取公司部门系统树
+     *
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据登陆人获取公司部门系统树", notes = "根据登陆人获取公司部门系统树")
+    @GetMapping(value = "/companySystemTreeByUser")
+    public List<FireFightingSystemTreeVo> getSystemTree() {
+        ReginParams reginParams = getSelectedOrgInfo();
+        ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
+        String bizOrgCode = personIdentity.getBizOrgCode();
+        return fireFightingSystemService.getSystemTreeByOrgCode(bizOrgCode);
+    }
+
+    /**
+     * 获取人员部门树
+     *
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据登陆人获取公司部门树", notes = "根据登陆人获取公司部门树")
+    @GetMapping(value = "/companyTreeByUserAndType")
+    public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type) {
+        return fireFightingSystemService.companyTreeByUserAndType(type);
+    }
+
+    /**
+     * 获取系统分类树
+     *
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取系统分类树", notes = "获取系统分类树")
+    @GetMapping(value = "/systemTypeTree")
+    public List<FireFightingSystemTypeTreeVo> systemTypeTree() {
+        return fireFightingSystemService.systemTypeTree();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/VideoController.java

@@ -3,7 +3,7 @@ package com.yeejoin.equipmanage.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
@@ -47,8 +47,6 @@ public class VideoController extends AbstractBaseController {
     @Autowired
     private IExcelService excelService;
 
-    @Autowired
-    private IOrgUsrService orgUsrService;
 
     /**
      * 新增
@@ -276,11 +274,10 @@ public class VideoController extends AbstractBaseController {
         return flvUrl;
     }
 
-//    @PersonIdentify
-//    @TycloudOperation(ApiLevel = UserType.AGENCY)
-//    @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
-//    @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
-//    public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type) {
-//        return orgUsrService.companyTreeByUserAndType(getUserInfo(), type);
-//    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
+    public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam String type) {
+        return videoService.companyTreeByUserAndType(type);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WarehouseStructureController.java

@@ -5,8 +5,10 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.entity.Warehouse;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.service.IFormInstanceService;
 import com.yeejoin.equipmanage.service.IWarehouseService;
 import org.apache.commons.lang3.StringUtils;
@@ -34,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
 @RestController
 @Api(tags = "货架结构Api")
 @RequestMapping(value = "/warehouse-structure", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-public class WarehouseStructureController {
+public class WarehouseStructureController extends AbstractBaseController {
 
 	@Autowired
 	IWarehouseStructureService iWarehouseStructureService;
@@ -195,7 +197,9 @@ public class WarehouseStructureController {
 	@RequestMapping(value = "/getValueByColumn", method = RequestMethod.GET)
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "根据source_id查询区域树", notes = "根据id查询")
-	public List<AreaTreeVo> getValueByColumn(@RequestParam Long sourceId) {
-		return iFormInstanceService.getValueByColumn(sourceId);
+	public List<UnitAreaTreeVo> getValueByColumn(@RequestParam Long sourceId) {
+		// 获取登陆人角色
+		String orgcode = getOrgCode();
+		return iFormInstanceService.getValueByColumn(sourceId, orgcode);
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/FeignConfiguration.java

@@ -11,14 +11,21 @@ import org.springframework.context.annotation.Bean;
 
 public class FeignConfiguration {
 
-	   @Autowired
-		private ObjectFactory<HttpMessageConverters> messageConverters;
-		@Bean
-		public Encoder feignFormEncoder() {
-			return new SpringFormEncoder(new SpringEncoder(messageConverters));
-		}
-		 @Bean
-		    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-		        return new FeignBasicAuthRequestInterceptor();
-		    }
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+    @Bean
+    public FeignBasicAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new FeignBasicAuthRequestInterceptor();
+    }
+
+	@Bean
+	public FeignErrorDecoder errorDecoder(){
+		return new FeignErrorDecoder();
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/FeignErrorDecoder.java

+package com.yeejoin.equipmanage.fegin;
+
+import com.alibaba.fastjson.JSONObject;
+import feign.Response;
+import feign.Util;
+import feign.codec.ErrorDecoder;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+
+/**
+ * @author DELL
+ */
+@Slf4j
+public class FeignErrorDecoder implements ErrorDecoder {
+
+    @Override
+    public Exception decode(String methodKey, Response response) {
+        String msg = null;
+        try {
+            msg = Util.toString(response.body().asReader(Util.UTF_8));
+            JSONObject object = JSONObject.parseObject(msg);
+            throw new RuntimeException(object.get("devMessage").toString());
+        } catch (IOException e) {
+            log.error("feign 调用失败" + e.getMessage());
+        }
+        throw new RuntimeException(methodKey + "远程调用失败");
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

 package com.yeejoin.equipmanage.fegin;
 
-import java.util.List;
-import java.util.Map;
-
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.equipmanage.common.dto.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
-import com.yeejoin.equipmanage.common.dto.MenuFromDto;
-import com.yeejoin.equipmanage.common.dto.UserDto;
-import com.yeejoin.equipmanage.common.dto.WaterResourceDto;
-import com.yeejoin.equipmanage.common.dto.WaterResourceTypeDto;
+import java.util.List;
+import java.util.Map;
+
 
 /**
- * @ProjectName: EquipManageRoot
- * @Package: com.yeejoin.equipmanage.fegin
- * @ClassName: JcsFeign
- * @Author: Jianqiang Gao
- * @Description: JcsFeign
- * @Date: 2021/7/20 10:39
- * @Version: 1.0
+ * @author DELL
  */
-@FeignClient(name = "${jcs.fegin.name}", configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${jcs.fegin.name}", path = "jcs", configuration = {FeignConfiguration.class})
 public interface JcsFeign {
 
-    @RequestMapping(value = "/jcs/water-resource/select_list", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/water-resource/select_list", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<List<WaterResourceDto>> selectList(
-    		@RequestHeader("appKey") String appKey,
+            @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
-            @RequestParam(value = "name", required = false) String name, 
+            @RequestParam(value = "name", required = false) String name,
             @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr,
-            @RequestParam(value = "belongFightingSystemId", required = false) Long belongFightingSystemId, 
+            @RequestParam(value = "belongFightingSystemId", required = false) Long belongFightingSystemId,
             @RequestParam(value = "belongBuildingId", required = false) Long belongBuildingId,
-            @RequestParam(value = "belongBuilding", required = false) String belongBuilding, 
+            @RequestParam(value = "belongBuilding", required = false) String belongBuilding,
             @RequestParam(value = "resourceType", required = false) String resourceType);
 
-    @RequestMapping(value = "/jcs/water-resource/page", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/water-resource/page", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<Page<WaterResourceDto>> queryForPage(
-    		@RequestHeader("appKey") String appKey,
+            @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size,
             @RequestParam(value = "name") String name,
             @RequestParam(value = "belongBuildingId") List<Long> belongBuildingId,
-            @RequestParam(value = "belongFightingSystemId")  Long belongFightingSystemId,
-            @RequestParam(value = "sequenceNbr")  Long sequenceNbr,
-            @RequestParam(value = "classifyId")  String classifyId
+            @RequestParam(value = "belongFightingSystemId") Long belongFightingSystemId,
+            @RequestParam(value = "sequenceNbr") Long sequenceNbr,
+            @RequestParam(value = "classifyId") String classifyId
     );
 
-    @RequestMapping(value = "/jcs/equip/fireSystem_waterResource/list", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/equip/fireSystem_waterResource/list", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<List<MenuFromDto>> getFireSystemWaterResourceList(
-    		@RequestHeader("appKey") String appKey,
+            @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token
     );
 
-    @RequestMapping(value = "/jcs/water-resource/resource_type_list", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/water-resource/resource_type_list", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<List<WaterResourceTypeDto>> selectResourceTypeList(
-    		@RequestHeader("appKey") String appKey,
+            @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token
     );
 
-    @RequestMapping(value = "/jcs/common/maintenance-company/companyList", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/common/maintenance-company/companyList", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<List<Map<String, Object>>> selectCompanyList(
-    		@RequestHeader("appKey") String appKey,
+            @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token
     );
 
-    @RequestMapping(value = "/jcs/org-usr/{userId}/userInfo", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/org-usr/{userId}/userInfo", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<List<UserDto>> getUserInfo(
             @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
-            @PathVariable(value = "userId")  String userId);
+            @PathVariable(value = "userId") String userId);
 
-    @RequestMapping(value = "/jcs/excel/exportForEquipment", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/excel/exportForEquipment", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<String[]> getEquipmentInfo(
             @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
             @RequestParam(value = "type", required = false) String type,
             @RequestParam(value = "method", required = false) String method);
-    
+
     /**
-     * 
      * <pre>
      * 根据值班区域ID查询当前值班人
      * </pre>
@@ -102,27 +89,48 @@ public interface JcsFeign {
      * @param dutyAreaId
      * @return
      */
-    @RequestMapping(value = "/jcs/common/duty-person/findByDutyAreaId/{dutyAreaId}", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/common/duty-person/findByDutyAreaId/{dutyAreaId}", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<Object> findByDutyAreaId(@PathVariable(value = "dutyAreaId") Long dutyAreaId);
 
     /**
      * 获取机场单位
      */
-    @RequestMapping(value = "/jcs/org-usr/getUnit/{id}", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/org-usr/getUnit/{id}", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<JSONObject> getUnitById(
             @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
-            @PathVariable(value = "id")  String id);
+            @PathVariable(value = "id") String id);
 
     /**
      * 获取机场人员
+     *
      * @return
      */
-    @RequestMapping(value = "/jcs/org-person/getPersonByUserId/{userId}", method = RequestMethod.GET, consumes = "application/json")
+    @RequestMapping(value = "/org-person/getPersonByUserId/{userId}", method = RequestMethod.GET, consumes = "application/json")
     ResponseModel<JSONObject> getPersonByUserId(
             @RequestHeader("appKey") String appKey,
             @RequestHeader("product") String product,
             @RequestHeader("token") String token,
-            @PathVariable(value = "userId")  String userId);
+            @PathVariable(value = "userId") String userId);
+
+    /**
+     * 查询有权限的公司部门部门树
+     *
+     * @param authKey 权限key
+     * @param orgType 树类型null,公司部门树，COMPANY: 公司树 DEPARTMENT部门树
+     * @return ResponseModel<OrgUsrDto>
+     */
+    @GetMapping(value = "/org-usr/{authKey}/treeWithAuth")
+    FeignClientResult<List<OrgMenuDto>> getCompanyDeptTreeWithAuth(@PathVariable String authKey, @RequestParam(required = false) String orgType);
+
+    /**
+     * 查询有权限的公司部门列表
+     *
+     * @param authKey          权限key
+     * @param orgTypes(多个逗号分隔) 为空默认查询公司和部门，COMPANY: 公司树 DEPARTMENT部门树
+     * @return ResponseModel<OrgUsrDto>
+     */
+    @GetMapping(value = "/org-usr/{authKey}/listWithAuth")
+    FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuth(@PathVariable String authKey, @RequestParam(required = false) String orgTypes);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/VideoFeignClient.java

+package com.yeejoin.equipmanage.fegin;
+
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/10/20
+ */
+@FeignClient(name = "${video.fegin.name:video}", path = "video", configuration = {MultipartSupportConfig.class})
+public interface VideoFeignClient {
+    @RequestMapping(value = "/video-original/url/video/{indexCode}", method = RequestMethod.GET)
+    ResponseModel<String> videoUrlByIndexCode(@PathVariable("indexCode") String indexCode);
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/remote/FeignBasicAuthRequestInterceptor.java

@@ -12,7 +12,8 @@ import feign.RequestInterceptor;
 import feign.RequestTemplate;
 
 public class FeignBasicAuthRequestInterceptor implements RequestInterceptor {
-    public FeignBasicAuthRequestInterceptor() {
+    public
+    FeignBasicAuthRequestInterceptor() {
 
     }
 
@@ -32,6 +33,7 @@ public class FeignBasicAuthRequestInterceptor implements RequestInterceptor {
             template.header("token", authToken);
             template.header("appKey", request.getHeader("appKey"));
             template.header("product", request.getHeader("product"));
+            template.header("clientType", "feignClient");
         }
     }
 }

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

@@ -26,7 +26,7 @@ public interface EquipmentManageService extends IService<EquipmentManageEntity>
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int spage, int pageSize);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId , int spage, int pageSize);
 
     /**
      * 获取下拉菜单数据

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

@@ -3,10 +3,11 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
-import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
 import java.util.List;
 import java.util.Map;
@@ -22,9 +23,10 @@ public interface IAreaService extends IService<Area> {
      * 获取区域树
      * @return
      */
-    List<AreaTreeVo> getAreaTreeVo();
+//    List<AreaTreeVo> getAreaTreeVo();
+
+    List<UnitAreaTreeVo> getAreaTreeVoById(long id, String bizOrgCode);
 
-    List<AreaTreeVo> getAreaTreeVoById(long id);
     /**
      * 根据条件分页
      * @param page
@@ -33,6 +35,19 @@ public interface IAreaService extends IService<Area> {
      */
     IPage<AreaResquest> areaList(Page page, Area area);
 
+    /**
+     * 根据bizOrgCode获取单位区域树
+     * @return list
+     */
+    List<UnitAreaTreeVo> getAreaTreeListVo();
+
+
+    /**
+     * 根据登录人公司树
+     * @return List<OrgMenuDto>
+     */
+    List<OrgMenuDto> companyDeptTree();
+
     Object saveArea(AreaResquest areaResquest);
 
     Object updateArea(AreaResquest areaResquest);

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.entity.EquProperty;
 import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
 
@@ -33,4 +34,6 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
 	String getPref(String id);
 
 	String checkDelete( List<Long> ids);
+
+	List<OrgMenuDto> companyDeptTree();
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
 import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
@@ -16,6 +17,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 根据系统id查询设备列表
+     *
      * @param systemId
      * @return
      */
@@ -23,6 +25,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 获取系列列表
+     *
      * @param equimentName
      * @param equimentCode
      * @param construction
@@ -31,11 +34,13 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int current, int pageSize);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize);
 
     FireFightingSystemEntity getOneById(Long id);
+
     /**
      * 根据系统id查询分组设备数量
+     *
      * @param systemId
      * @return
      */
@@ -43,20 +48,23 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 保存
+     *
      * @param vo
      * @return
      */
-    String save (FireFightingSystemVo vo);
+    String save(FireFightingSystemVo vo);
 
     /**
      * 修改
+     *
      * @param vo
      * @return
      */
-    String update (FireFightingSystemVo vo);
+    String update(FireFightingSystemVo vo);
 
     /**
      * 创建画布
+     *
      * @param model 模型
      * @return RiskSourceScene
      */
@@ -64,6 +72,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 更新画布
+     *
      * @param resourceDTO 参数
      */
     ResourceDTO updateMorphic(ResourceDTO resourceDTO);
@@ -71,36 +80,41 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 获得点位区域树
+     *
      * @param orgCode
      * @return
      */
-    List<PointTreeVo> getPointTree(String systemId,String orgCode);
+    List<PointTreeVo> getPointTree(String systemId, String orgCode);
 
 
     /**
      * 装备点性能指标接口
+     *
      * @return
      */
     List<SpeIndexVo> getSpeIndex(Long id);
+
     /**
      * 列表查询
+     *
      * @return List<FireFightingSystemEntity>
      */
     List<FireFightingSystemEntity> getList();
 
     /**
      * 获取详情
+     *
      * @param id
      * @return
      */
     List<AlarmDataVO> getSystemById(Long id);
 
-    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page,Long sourceId,Long systemId,Integer confirmType,String createDate,String type);
-
+    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType, String createDate, String type);
 
 
     /**
      * 删除装备系统
+     *
      * @param id
      * @return
      */
@@ -108,6 +122,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 删除画布
+     *
      * @param id
      * @return
      */
@@ -117,12 +132,14 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 获取消防系统在装备分类的定义
+     *
      * @return List<EquipmentManageVo>
      */
     List<EquipmentManageVo> getSystemCategory();
 
     /**
      * 根据具体条件，获取消防系统详情
+     *
      * @param fireFightingSystemVo
      * @return
      */
@@ -130,6 +147,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 通过codes的数组，获取消防系统集合
+     *
      * @param idsArr
      * @return
      */
@@ -139,19 +157,41 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
 
     /**
      * 按照code查询详情
+     *
      * @param systemCode 系统编号
      * @return FireFightingSystemEntity
      */
     FireFightingSystemEntity getDetailByCode(String systemCode);
-    
+
     /**
      * 集成页面系统数据
+     *
      * @param systemCode 系统code
-     * @param isUpdate 自动
-     * @return  Map<String,Object>
+     * @param isUpdate   自动
+     * @return Map<String, Object>
+     */
+    Map<String, Object> integrationPageSysData(String systemCode, Boolean isUpdate);
+
+    /**
+     * 根据bizOrgCode获取消防系统树
+     *
+     * @param bizOrgCode 登陆人的机构编码
+     * @return list
      */
-    Map<String,Object> integrationPageSysData(String systemCode, Boolean isUpdate);
-    
+    List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode);
 
-    
+    /**
+     * 根据登录人及类型获取公司部门树
+     *
+     * @param type 默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
+     * @return
+     */
+    List<OrgMenuDto> companyTreeByUserAndType(String type);
+
+    /**
+     * 获取消防系统类型树
+     *
+     * @return
+     */
+    List<FireFightingSystemTypeTreeVo> systemTypeTree();
 }

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

@@ -6,6 +6,7 @@ import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -150,6 +151,6 @@ public interface IFormInstanceService extends IService<FormInstance> {
      */
     void unbindRegionRelation(Long instanceId);
 
-    List<AreaTreeVo> getValueByColumn(Long instanceId);
+    List<UnitAreaTreeVo> getValueByColumn(Long instanceId, String bizOrgcode);
 
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
@@ -76,4 +77,6 @@ public interface IVideoService extends IService<Video> {
      * @return
      */
     String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code);
+
+    List<OrgMenuDto> companyTreeByUserAndType(String type);
 }

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

@@ -5,23 +5,27 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.dto.AreaDto;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.Area;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.SourceFile;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.utils.TreeNodeUtil;
 import com.yeejoin.equipmanage.common.vo.AreaResquest;
-import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.context.SpringContextHolder;
 import com.yeejoin.equipmanage.event.SynAreaRiskEvent;
 import com.yeejoin.equipmanage.mapper.AreaMapper;
 import com.yeejoin.equipmanage.operation.AreaSynRiskOperator;
 import com.yeejoin.equipmanage.service.IAreaService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.IEqSourceFileService;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,6 +36,7 @@ import org.springframework.util.CollectionUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 区域 服务实现类
@@ -56,33 +61,40 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     @Value("${systemctl.dict.area-type}")
     private String areaType;
 
-    @Override
-    public List<AreaTreeVo> getAreaTreeVo() {
-        List<AreaTreeVo> areaTreeList = new ArrayList<>();
-        // 查询平台区域数据字典
-        FeignClientResult<List<DictionarieValueModel>> dictValues = Systemctl.dictionarieClient.dictValues(areaType);
-        if (dictValues != null) {
-            List<DictionarieValueModel> values = dictValues.getResult();
-            // 根据区域类型查询子节点
-            if (values != null && values.size() > 0) {
-                for (DictionarieValueModel dictionarieValueModel : values) {
-                    AreaTreeVo areaTreeVo = new AreaTreeVo();
-                    long parentId = Long.parseLong(dictionarieValueModel.getDictDataKey());
-                    areaTreeVo.setId(parentId);
-                    areaTreeVo.setName(dictionarieValueModel.getDictDataValue());
-                    areaTreeVo.setChildren(getChildren(parentId));
-                    areaTreeList.add(areaTreeVo);
-                }
-            }
-        }
-        return areaTreeList;
-    }
+    @Autowired
+    JCSRemoteService jcsRemoteService;
+
+    @Value("${auth-key-area:area_info}")
+    private String authKey;
+
+
+//    @Override
+//    public List<UnitAreaTreeVo> getAreaTreeVo() {
+//        List<UnitAreaTreeVo> areaTreeList = new ArrayList<>();
+//        // 查询平台区域数据字典
+//        FeignClientResult<List<DictionarieValueModel>> dictValues = Systemctl.dictionarieClient.dictValues(areaType);
+//        if (dictValues != null) {
+//            List<DictionarieValueModel> values = dictValues.getResult();
+//            // 根据区域类型查询子节点
+//            if (values != null && values.size() > 0) {
+//                for (DictionarieValueModel dictionarieValueModel : values) {
+//                    UnitAreaTreeVo areaTreeVo = new UnitAreaTreeVo();
+//                    long parentId = Long.parseLong(dictionarieValueModel.getDictDataKey());
+//                    areaTreeVo.setId(parentId);
+//                    areaTreeVo.setName(dictionarieValueModel.getDictDataValue());
+//                    areaTreeVo.setChildren(getChildren(parentId));
+//                    areaTreeList.add(areaTreeVo);
+//                }
+//            }
+//        }
+//        return areaTreeList;
+//    }
 
     @Override
-    public List<AreaTreeVo> getAreaTreeVoById(long id) {
-        List<AreaTreeVo> listTree = new ArrayList<>();
+    public List<UnitAreaTreeVo> getAreaTreeVoById(long id, String bizOrgCode) {
+        List<UnitAreaTreeVo> listTree = new ArrayList<>();
         if (id == -1) {
-            listTree = getAreaTreeVo();
+            listTree = getAreaTreeListVo();
         } else {
             listTree = getChildrenz(id);
         }
@@ -95,18 +107,18 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
      * @param parentId
      * @return
      */
-    public List<AreaTreeVo> getChildrenz(Long parentId) {
-        List<AreaTreeVo> areaTreeVos = new ArrayList<>();
+    public List<UnitAreaTreeVo> getChildrenz(Long parentId) {
+        List<UnitAreaTreeVo> areaTreeVos = new ArrayList<>();
         LambdaQueryWrapper<Area> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Area::getIsDelete, false);
         queryWrapper.eq(Area::getId, parentId);
         List<Area> areas = this.baseMapper.selectList(queryWrapper);
         if (areas != null && areas.size() > 0) {
             for (Area area : areas) {
-                AreaTreeVo areaTreeVo = new AreaTreeVo();
+                UnitAreaTreeVo areaTreeVo = new UnitAreaTreeVo();
                 areaTreeVo.setId(area.getId());
                 areaTreeVo.setName(area.getName());
-                areaTreeVo.setCode(area.getOrgCode());
+                areaTreeVo.setBizOrgCode(area.getOrgCode());
                 areaTreeVo.setParentId(parentId);
                 // 查询子节点赋值
                 areaTreeVo.setChildren(getChildren(area.getId()));
@@ -116,24 +128,35 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
         return areaTreeVos;
     }
 
+    private List<UnitAreaTreeVo> getAreaChildren(UnitAreaTreeVo root, List<UnitAreaTreeVo> all) {
+        return all.stream().filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId())
+                || (StringUtil.isNotEmpty(d.getBizOrgCode())
+                && d.getBizOrgCode().equals(root.getBizOrgCode())
+                && !"area".equals(root.getType())
+                && !d.getId().equals(root.getId()))
+        )
+                .peek(m -> m.setChildren(getAreaChildren(m, all)))
+                .collect(Collectors.toList());
+    }
+
     /**
      * 根据父节点查询子节点赋值
      *
      * @param parentId
      * @return
      */
-    public List<AreaTreeVo> getChildren(Long parentId) {
-        List<AreaTreeVo> areaTreeVos = new ArrayList<>();
+    public List<UnitAreaTreeVo> getChildren(Long parentId) {
+        List<UnitAreaTreeVo> areaTreeVos = new ArrayList<>();
         LambdaQueryWrapper<Area> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Area::getParentId, parentId);
         queryWrapper.eq(Area::getIsDelete, false);
         List<Area> areas = this.baseMapper.selectList(queryWrapper);
         if (areas != null && areas.size() > 0) {
             for (Area area : areas) {
-                AreaTreeVo areaTreeVo = new AreaTreeVo();
+                UnitAreaTreeVo areaTreeVo = new UnitAreaTreeVo();
                 areaTreeVo.setId(area.getId());
                 areaTreeVo.setName(area.getName());
-                areaTreeVo.setCode(area.getOrgCode());
+                areaTreeVo.setBizOrgCode(area.getOrgCode());
                 areaTreeVo.setParentId(parentId);
                 // 查询子节点赋值
                 areaTreeVo.setChildren(getChildren(area.getId()));
@@ -146,16 +169,21 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     /**
      * 分页
      *
-     * @param page
-     * @param area
+     * @param
+     * @param
      * @return
      */
     @Override
     public IPage areaList(Page page, Area area) {
         long id = area.getParentId();
         LambdaQueryWrapper<Area> queryWrapper = new LambdaQueryWrapper<>();
-        // 查询传入节点下的区域父id
-        Set<Long> parentIdSet = getChildrenId(id);
+        List<UnitAreaTreeVo> list = new ArrayList<>();
+        list = treeMenuList(getAreaTreeListVo(), id);
+        List<Long> parentIdSet = list.stream().map(vo -> vo.getId()).collect(Collectors.toList());
+        parentIdSet.add(id);
+        if (StringUtil.isNotEmpty(area.getBizOrgCode())) {
+            queryWrapper.like(Area::getBizOrgCode, area.getBizOrgCode());
+        }
         queryWrapper.eq(Area::getIsDelete, false);
         if (parentIdSet.size() > 0) {
             queryWrapper.in(Area::getParentId, parentIdSet);
@@ -191,6 +219,71 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     }
 
     /**
+     * 获取某个父节点下面的所有子节点
+     * @param list
+     * @param pid
+     * @return
+     */
+    public static List<UnitAreaTreeVo> treeMenuList (List<UnitAreaTreeVo> list, Long pid) {
+        List<UnitAreaTreeVo> voList = new ArrayList<>();
+        for (UnitAreaTreeVo vo : list) {
+            //遍历出父id等于参数的id，add进子节点集合
+            if (Long.valueOf(vo.getParentId()) == pid) {
+                //递归遍历下一级
+                treeMenuList(list, Long.valueOf(vo.getId()));
+                voList.add(vo);
+            }
+        }
+        return voList;
+    }
+
+    @Override
+    public List<UnitAreaTreeVo> getAreaTreeListVo() {
+        // 获取公司部门list
+        List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
+        List<UnitAreaTreeVo> areaTreeList = orgCompanyLists.stream()
+                .map(key -> {
+                    UnitAreaTreeVo vo = new UnitAreaTreeVo();
+                    vo.setId((key.getSequenceNbr()));
+                    vo.setName(key.getBizOrgName());
+                    vo.setType(key.getBizOrgType());
+                    vo.setBizOrgCode(key.getBizOrgCode());
+                    vo.setBizOrgName(key.getBizOrgName());
+                    vo.setParentId(StringUtil.isNotEmpty(key.getParentId()) ? Long.valueOf(key.getParentId()) : null);
+                    return vo;
+                }).collect(Collectors.toList());
+
+        // 根据bizOrgCode获取区域list
+        List<String> bizOrgCodes = areaTreeList.stream().map(UnitAreaTreeVo::getBizOrgCode).collect(Collectors.toList());
+        LambdaQueryWrapper<Area> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Area::getIsDelete, false);
+        wrapper.in(Area::getBizOrgCode, bizOrgCodes);
+        List<Area> areaEntityList = this.baseMapper.selectList(wrapper);
+        List<UnitAreaTreeVo> systemList = areaEntityList.stream()
+                .map(key -> {
+                    UnitAreaTreeVo vo = new UnitAreaTreeVo();
+                    vo.setId(key.getId());
+                    vo.setName(key.getName());
+                    vo.setType("area");
+                    vo.setBizOrgCode(key.getBizOrgCode());
+                    vo.setBizOrgName(key.getBizOrgName());
+                    vo.setParentId(key.getParentId());
+                    return vo;
+                }).collect(Collectors.toList());
+
+        areaTreeList.addAll(systemList);
+        return areaTreeList.stream()
+                .filter(d -> !"area".equals(d.getType()))
+                .peek((m) -> m.setChildren(getAreaChildren(m, areaTreeList)))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<OrgMenuDto> companyDeptTree() {
+        return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, "COMPANY");
+    }
+
+    /**
      * 根据父节点查询所有子节点parentId
      *
      * @param parentId
@@ -211,6 +304,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
         return idSet;
     }
 
+
     @Override
     @Transactional
     public Object saveArea(AreaResquest areaResquest) {

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.enums.BillContentEnum;
 import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
@@ -64,9 +65,15 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
     @Autowired
     private IEquipmentSpecificIndexSerivce equipmentSpecificIndexSerivce;
 
+    @Autowired
+    JCSRemoteService jcsRemoteService;
+
     @Value("${fileserver_domain}")
     private String fileServer;
 
+    @Value("${auth-key-fire-equip:fire_equip_info}")
+    private String authKey;
+
     @Autowired
     private ISystemDicService iSystemDicService;
 
@@ -81,7 +88,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
 
     private List<UploadFile> fillFileList(List<UploadFile> list, Long id, String type) {
         if (list == null) {
-            return new ArrayList<UploadFile>();
+            return new ArrayList<>();
         }
         list.forEach(item -> {
             if (item.getUrl().contains(fileServer)) {
@@ -175,7 +182,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
                 specificIndex.setValue(p.getValue());
                 return specificIndex;
             }).collect(Collectors.toList());
-            if(!equipmentSpecificIndexs.isEmpty()){
+            if (!equipmentSpecificIndexs.isEmpty()) {
                 equipmentSpecificIndexSerivce.updateIndexValueBatchByUniqueKey(equipmentSpecificId, equipmentSpecificIndexs);
             }
         }
@@ -272,4 +279,9 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
         }
         return res;
     }
+
+    @Override
+    public List<OrgMenuDto> companyDeptTree() {
+        return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, null);
+    }
 }

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

@@ -62,7 +62,8 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
     private String fireSystemId;
 
     @Override
-    public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int current, int pageSize) {
+    public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance,
+                                                         String bizOrgCode, String formGroupId, int current, int pageSize) {
         HttpServletRequest request = null;
         Map map = new HashMap<String, Object>();
         map.put("equimentName", equimentName);
@@ -71,6 +72,8 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
         map.put("maintenance", maintenance);
         map.put("spage", current);
         map.put("pageSize", pageSize);
+        map.put("bizOrgCode", bizOrgCode);
+        map.put("formGroupId", formGroupId);
         List<EquipmentManageVo> dataList = equipmentManageMapper.queryEquipmenInfo(map);
         Long count = equipmentManageMapper.queryEquipmenCount(map);
         map.clear();

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
@@ -44,43 +19,36 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireFightingSystem;
-import com.yeejoin.equipmanage.common.entity.DynamicFormGroup;
-import com.yeejoin.equipmanage.common.entity.DynamicFormInstance;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.SourceScene;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.EquipTypeAmountPageDTO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipTypeImgAmountVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentAlarmBySystemIdOrSourceIdVO;
-import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
+import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
 import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
 import com.yeejoin.equipmanage.common.enums.SystemTypeEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
-import com.yeejoin.equipmanage.common.vo.EquipmentManageVo;
-import com.yeejoin.equipmanage.common.vo.FileUploadVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystem3dVo;
-import com.yeejoin.equipmanage.common.vo.FireFightingSystemVo;
-import com.yeejoin.equipmanage.common.vo.SpeIndexVo;
-import com.yeejoin.equipmanage.mapper.BuildingMapper;
-import com.yeejoin.equipmanage.mapper.EquipmentManageMapper;
-import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
-import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
-import com.yeejoin.equipmanage.mapper.SourceSceneMapper;
+import com.yeejoin.equipmanage.common.vo.*;
+import com.yeejoin.equipmanage.mapper.*;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
-import com.yeejoin.equipmanage.service.EquipmentManageService;
-import com.yeejoin.equipmanage.service.IEqDynamicFormGroupService;
-import com.yeejoin.equipmanage.service.IEqDynamicFormInstanceService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IFireFightingSystemService;
-import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
-import com.yeejoin.equipmanage.service.ISourceSceneService;
-import com.yeejoin.equipmanage.service.ISyncDataService;
-import com.yeejoin.equipmanage.service.MqttSendGateway;
+import com.yeejoin.equipmanage.service.*;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -142,9 +110,15 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     @Autowired
     MqttSendGateway mqttSendGateway;
 
+    @Autowired
+    private JCSRemoteService jcsRemoteService;
+
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
 
+    @Value("${auth-key-fire-system:fire_system_info}")
+    private String authKey;
+
     @Override
     public List<EquipCountBySystemVO> getEquipCountBySystemId(Long systemId) {
         return this.baseMapper.getEquipCountBySystemId(systemId);
@@ -157,8 +131,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     @Override
-    public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, int current, int pageSize) {
-        Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode, construction, maintenance, current, pageSize);
+    public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize) {
+        Map<String, Object> map = equipmentManageService.queryEquipmenInfoAndCount(equimentName, equimentCode, construction, maintenance, bizOrgCode, formGroupId, current, pageSize);
         List<EquipmentManageVo> dataList = (List<EquipmentManageVo>) map.get("dataList");
         StringBuilder stb = new StringBuilder();
         dataList.forEach(y -> {
@@ -793,7 +767,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             data = saveIntegrationPageSysData(systemCode);
         } else {
             if (redisUtils.hasKey(systemCode)) {
-                data = JSONObject.parseObject(redisUtils.get(systemCode).toString(),Map.class);
+                data = JSONObject.parseObject(redisUtils.get(systemCode).toString(), Map.class);
             } else {
                 data = saveIntegrationPageSysData(systemCode);
             }
@@ -841,5 +815,84 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
     }
 
+    @Override
+    public List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode) {
+        // 获取公司部门list
+        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth("COMPANY,DEPARTMENT", bizOrgCode);
+        List<FireFightingSystemTreeVo> fireFightingSystemTreeList = orgUsrLists.stream()
+                .map(key -> {
+                    FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
+                    vo.setId(String.valueOf(key.getSequenceNbr()));
+                    vo.setName(key.getBizOrgName());
+                    vo.setType(key.getBizOrgType());
+                    vo.setBizOrgCode(key.getBizOrgCode());
+                    vo.setParentId(key.getParentId());
+                    return vo;
+                }).collect(Collectors.toList());
+
+        // 根据bizOrgCode获取系统list
+        List<String> bizOrgCodes = fireFightingSystemTreeList.stream().map(FireFightingSystemTreeVo::getBizOrgCode).collect(Collectors.toList());
+        LambdaQueryWrapper<FireFightingSystemEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(FireFightingSystemEntity::getBizOrgCode, bizOrgCodes);
+        List<FireFightingSystemEntity> fireFightingSystemEntityList = this.baseMapper.selectList(wrapper);
+        List<FireFightingSystemTreeVo> systemList = fireFightingSystemEntityList.stream()
+                .map(key -> {
+                    FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
+                    vo.setId(String.valueOf(key.getId()));
+                    vo.setName(key.getName());
+                    vo.setType("system");
+                    vo.setBizOrgCode(key.getBizOrgCode());
+                    return vo;
+                }).collect(Collectors.toList());
+
+        // 组装公司部门树
+        fireFightingSystemTreeList.addAll(systemList);
+        return fireFightingSystemTreeList.stream()
+                .filter(d -> !"system".equals(d.getType()))
+                .peek((m) -> m.setChildren(getChildren(m, fireFightingSystemTreeList)))
+                .collect(Collectors.toList());
+    }
+
+    private List<FireFightingSystemTreeVo> getChildren(FireFightingSystemTreeVo root, List<FireFightingSystemTreeVo> all) {
+        return all.stream().filter(d -> StringUtil.isNotEmpty(d.getParentId()) && d.getParentId().equals(root.getId())
+                || (StringUtil.isNotEmpty(d.getBizOrgCode())
+                && d.getBizOrgCode().equals(root.getBizOrgCode())
+                && !"system".equals(root.getType())
+                && !d.getId().equals(root.getId()))
+        )
+                .peek(m -> m.setChildren(getChildren(m, all)))
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<OrgMenuDto> companyTreeByUserAndType(String type) {
+        return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, type);
+    }
+
+    @Override
+    public List<FireFightingSystemTypeTreeVo> systemTypeTree() {
+        // 获取所有系统list
+        LambdaQueryWrapper<DynamicFormGroup> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DynamicFormGroup::getGroupType, "fireSystem");
+        wrapper.eq(DynamicFormGroup::getParentId, 0);
+        List<DynamicFormGroup> list = iEqDynamicFormGroupService.list(wrapper);
+        List<FireFightingSystemTypeTreeVo> childrenList = list.stream().map(item -> {
+            FireFightingSystemTypeTreeVo vo = new FireFightingSystemTypeTreeVo();
+            vo.setName(item.getGroupName());
+            vo.setTotal("0");
+            vo.setType(item.getGroupType());
+            vo.setId(String.valueOf(item.getId()));
+            return vo;
+        }).collect(Collectors.toList());
+
+        // 自定义根节点返回树
+        FireFightingSystemTypeTreeVo parentNode = new FireFightingSystemTypeTreeVo();
+        parentNode.setType("all");
+        parentNode.setName("全部分类");
+        parentNode.setId("-1");
+        parentNode.setParentId("-1");
+        parentNode.setChildren(childrenList);
+        return Collections.singletonList(parentNode);
+    }
 
 }

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

@@ -18,6 +18,7 @@ import com.yeejoin.equipmanage.common.enums.GroupCodeEnum;
 import com.yeejoin.equipmanage.common.enums.GroupColumnDataType;
 import com.yeejoin.equipmanage.common.utils.RandomUtil;
 import com.yeejoin.equipmanage.common.vo.AreaTreeVo;
+import com.yeejoin.equipmanage.common.vo.UnitAreaTreeVo;
 import com.yeejoin.equipmanage.mapper.FormInstanceMapper;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
@@ -493,8 +494,8 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
     }
 
     @Override
-    public List<AreaTreeVo> getValueByColumn(Long instanceId) {
-        List<AreaTreeVo> listTree = new ArrayList<>();
+    public List<UnitAreaTreeVo> getValueByColumn(Long instanceId, String bizOrgcode) {
+        List<UnitAreaTreeVo> listTree = new ArrayList<>();
         LambdaQueryWrapper<FormInstance> queryWrapper = new LambdaQueryWrapper<>();
         if (instanceId != 0L) {
             queryWrapper.eq(FormInstance::getInstanceId, instanceId);
@@ -503,7 +504,7 @@ public class FormInstanceServiceImpl extends ServiceImpl<FormInstanceMapper, For
         FormInstance formInstance = formInstanceMapper.selectOne(queryWrapper);
         if (formInstance != null && formInstance.getFieldValue() != null && !"".equals(formInstance.getFieldValue())) {
             long fieldValue = Long.parseLong(formInstance.getFieldValue());
-            listTree = iAreaService.getAreaTreeVoById(fieldValue);
+            listTree = iAreaService.getAreaTreeVoById(fieldValue, bizOrgcode);
         }
 
         return listTree;

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

+package com.yeejoin.equipmanage.service.impl;
+
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
+import com.yeejoin.equipmanage.fegin.JcsFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author DELL
+ */
+@Service
+public class JCSRemoteService {
+
+    @Autowired
+    JcsFeign jcsFeignClient;
+
+    /**
+     * 公司部门树
+     * @param authKey 权限key
+     * @param orgType 树类型null,公司部门树，COMPANY: 公司树 DEPARTMENT部门树
+     * @return List<OrgMenuDto>
+     */
+    public List<OrgMenuDto> getCompanyDeptTreeWithAuth(String authKey, String orgType) {
+        FeignClientResult<List<OrgMenuDto>> feignClientResult = jcsFeignClient.getCompanyDeptTreeWithAuth(authKey, orgType);
+        return feignClientResult.getResult();
+    }
+
+    /**
+     *
+     * 查询有权限的公司部门列表
+     * @param authKey          权限key
+     * @param orgTypes(多个逗号分隔) 为空默认查询公司和部门，COMPANY: 公司树 DEPARTMENT部门树
+     * @return List<OrgUsrDto>
+     */
+    public List<OrgUsrDto> getCompanyDeptListWithAuth(String authKey, String orgTypes) {
+        FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, orgTypes);
+        return feignClientResult.getResult();
+    }
+
+}

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

 package com.yeejoin.equipmanage.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
-import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
-import com.yeejoin.equipmanage.common.entity.Video;
-import com.yeejoin.equipmanage.common.entity.VideoEquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.VideoImportantEquipment;
-import com.yeejoin.equipmanage.common.entity.VideoSource;
-import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
+import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
 import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
-import com.yeejoin.equipmanage.common.entity.vo.BuildingListVO;
-import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
-import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentCategoryTypeTreeVO;
-import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
-import com.yeejoin.equipmanage.common.entity.vo.PageSecurityVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.PageVideoVO;
-import com.yeejoin.equipmanage.common.entity.vo.VideoDownloadVO;
-import com.yeejoin.equipmanage.common.entity.vo.VideoListVo;
+import com.yeejoin.equipmanage.common.entity.vo.*;
 import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
 import com.yeejoin.equipmanage.common.enums.IndustryEnum;
 import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
+import com.yeejoin.equipmanage.fegin.VideoFeignClient;
 import com.yeejoin.equipmanage.mapper.VideoMapper;
-import com.yeejoin.equipmanage.service.IBuilldService;
-import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
-import com.yeejoin.equipmanage.service.IEquipmentIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexService;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
-import com.yeejoin.equipmanage.service.IVideoEquipmentSpecificService;
-import com.yeejoin.equipmanage.service.IVideoImportantEquipmentService;
-import com.yeejoin.equipmanage.service.IVideoService;
-import com.yeejoin.equipmanage.service.IVideoSourceService;
-import com.yeejoin.equipmanage.service.IWarehouseStructureService;
-
+import com.yeejoin.equipmanage.service.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @author ZeHua Li
@@ -102,8 +70,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
     @Autowired
     VideoMapper videoMapper;
-    
-    
+
     @Autowired
     VideoFeignClient videoFeignClient;
 
@@ -117,6 +84,12 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     @Value("${dcs.client-id}")
     private String clientId;
 
+    @Autowired
+    JCSRemoteService jcsRemoteService;
+
+    @Value("${auth-key-fire-video:fire_video_info}")
+    private String authKey;
+
     @Transactional
     @Override
     public Video saveVideo(VideoSaveDto videoSave) {
@@ -530,18 +503,23 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
         }
         return getFlvUrlByVideoIdOrPresetIndex(videoId, presetIndex);
     }
-    
-    private String getVideoUrl(String code){
-    	  String url = "";
-    	try{
-    		ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(code);
-    		if(!ObjectUtils.isEmpty(da)){
-    			url = da.getResult().substring(da.getResult().indexOf("openUrl"));
-    		}
-    	}catch (Exception e) {
-    		  log.error("视频服务调用失败", e.getMessage());
-		}
-		return url;
+
+    @Override
+    public List<OrgMenuDto> companyTreeByUserAndType(String type) {
+        return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, type);
+    }
+
+    private String getVideoUrl(String code) {
+        String url = "";
+        try {
+            ResponseModel<String> da = videoFeignClient.videoUrlByIndexCode(code);
+            if (!ObjectUtils.isEmpty(da)) {
+                url = da.getResult().substring(da.getResult().indexOf("openUrl"));
+            }
+        } catch (Exception e) {
+            log.error("视频服务调用失败", e.getMessage());
+        }
+        return url;
     }
 
     public String getFlvUrlByVideoIdOrPresetIndex(String videoId, String presetIndex) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -251,7 +251,7 @@ public class ExcelServiceImpl {
 				nameString =par.containsKey("name")?par.get("name").toString():null;
 				bizCompanyId =par.containsKey("bizCompanyId")?Long.parseLong(par.get("bizCompanyId").toString()):null;;
 			}
-			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString);
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false, bizCompanyId,nameString,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;
@@ -1637,7 +1637,7 @@ public class ExcelServiceImpl {
 					FireTeamDto.class, dataSourcesImpl, false);
 			break;
 		case "WXXFZ":
-			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false,null,null);
+			List<FireStationDto> fireStationDtoList = fireStationService.queryForFireStationList(false,null,null,null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireStationDtoList,
 					FireStationDto.class, null, false);
 			break;

amos-boot-system-equip/src/main/resources/application.properties

-spring.application.name= AMOS-EQUIPMANAGE
+spring.application.name=AMOS-EQUIPMANAGE
 server.servlet.context-path=/equip
-server.port= 8100
+server.port=8100
 #server.servlet.context-path=/case
-spring.profiles.active = dev
+spring.profiles.active=dev
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #mybatis mapper file
 mybatis.mapper-locations=classpath:mapper/*.xml
@@ -17,61 +17,41 @@ pagehelper.helper-dialect=mysql
 pagehelper.params=count=countSql
 pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
-
 #liquibase
-spring.liquibase.change-log = classpath:/changelog/changelog-master.xml
-spring.liquibase.enabled= true
-
+spring.liquibase.change-log=classpath:/changelog/changelog-master.xml
+spring.liquibase.enabled=true
 #\u5355\u4E2A\u6587\u4EF6\u6700\u5927\u5927\u5C0F
 spring.servlet.multipart.maxFileSize=100MB
 spring.servlet.multipart.maxRequestSize=100MB
-
 #saveUserRedis\u8FC7\u671F\u65F6\u95F428\u5929
 #redis_region_time_second=2419200
-
-patrol.fegin.name = AMOS-PATROL
-maintenance.feign.name = AMOS-MAINTENANCE-API
-
-precontrol.feign.name = JEPCC-PRECONTROL-SERVER
-
+patrol.fegin.name=AMOS-PATROL
+maintenance.feign.name=AMOS-MAINTENANCE-API
+precontrol.feign.name=JEPCC-PRECONTROL-SERVER
 security.privilege.name=AMOS-API-PRIVILEGE
-
 security.systemctl.name=AMOS-API-SYSTEMCTL
 #jpush
 Push.fegin.name=AppMessagePushService
-
 dutyMode.fegin.name=AMOS-DUTYMODE
-
 riskSource.feign.name=AMOS-AUTOSYS
-
 equipManage.name=AMOS-EQUIPMANAGE
-
 iot.vehicle.track=AMOS-API-IOT
-
-jcs.fegin.name=JCS
-
+jcs.fegin.name=JCS-SHG
 video.fegin.name=VIDEO
-
 #项目初始化画布id
 morphic.projectSeq=1390314016458514433
-
 #wl_equipment_category 表id （取火灾报警系统id）
 equipment.fire.systemid=1302870628873932802
-
 equipment.type=2
-
 equipment.hierarchy=1,2,4,6
-
 #装备查询根据装备类型编码过滤，4为过滤掉车相关数据，多个的话，添加方式为4,5
 equipment.filter.code=4
 #wl_equipment_category 编码  92040000 为消防行业 火灾系统分类编码
 equip.system.alarm.code=92040000
-
 #wl_equipment_category 编码  50000000 为安防行业 摄像头分类编码
 equip.security.code=50000000
 ## redis失效时间
 redis.cache.failure.time=10800
-
 #平台字典配置项
 systemctl.dict.iot-core-param=IOT_CORE_PARAM
 systemctl.dict.area-type=AREA_TYPE
@@ -79,16 +59,13 @@ systemctl.dict.allow-operation=ALLOW_OPERATION
 systemctl.dict.build-type=BUILD_TYPE
 systemctl.dict.build-use-type=BUILD_USE_TYPE
 systemctl.dict.building-structure-type=BUILDING_STRUCTURE_TYPE
-
 equip.dict.car-state=CarState
 equip.dict.name-key=FireCar_GDLongitude,FireCar_GDLatitude
-
 #Project application topic
 mqtt.vehicle.topic=${equipManage.name}.vehicle.state
 equip.point.equipmentdata.topic=${equipManage.name}.equipment.state
 equip.index.topic=${equipManage.name}.equipment.index.state
 equip.iot.monitor.topic=team/station/monitor/matrix
-
 # 接口地址
 equip.scene.detail.url=${server.servlet.context-path}/scene/%s/detail/list
 equip.point.equipmentdata.url=${server.servlet.context-path}/equipSpecific/getAll?id=
@@ -98,17 +75,21 @@ equip.point.equipmentDetail.url=${server.servlet.context-path}/equipSpecific/get
 firefightingsystem.detail.url=${server.servlet.context-path}/fire-fighting-system/getSystemById?id=
 #组态获取分页接口地址
 firefightingsystem.equip.alarms.url=${server.servlet.context-path}/fire-fighting-system/getEquipmentAlarmBySystemIdOrSourceIdVO
-
 building.detail=${server.servlet.context-path}/building/findByInstanceId
-
 building.floor.detail=${server.servlet.context-path}/building/getBuildDetaliByFloorId?instanceId=
-
-
-
 dcs.client-id=fire_system
 dcs.grant-type=client_credentials
 dcs.scope=all
 dcs.token-key=dcs_token_key
 dcs.client.secret=fire_system
 dcs.x.hw.id=NR_REST_APP
-dcs.x.hw.appKey=s+YkvQhwilx91TRJHhNDmw==
+dcs.x.hw.appKey=s+YkvQhwilx91TRJHhNDmw==
\ No newline at end of file
+
+# 权限标识-物联区域
+auth-key-area=area_info;
+# 权限标识-消防系统
+auth-key-fire-system=fire_system_info;
+# 权限标识-消防装备
+auth-key-fire-equip=fire_equip_info;
+# 权限标识-消防视频
+auth-key-fire-video=fire_video_info;
\ No newline at end of file

amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml

@@ -2132,4 +2132,28 @@
             ALTER TABLE `cb_fire_station` add column `biz_org_code` varchar(1000) DEFAULT NULL COMMENT '机构编码';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1640203458-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_area" columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>wl_area add column biz_org_code</comment>
+        <sql>
+            alter table `wl_area` add column `biz_org_code` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构编码';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1640203458-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="wl_area" columnName="biz_org_name"/>
+            </not>
+        </preConditions>
+        <comment>wl_area add column biz_org_name</comment>
+        <sql>
+            alter table `wl_area` add column `biz_org_name` varchar(128) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -18,6 +18,8 @@
             construction_unit as constructionUnitCode,
             maintenance_unit as maintenanceUnitCode,
             maintenance_frequency as maintenanceFrequency,
+            biz_org_code as bizOrgCode,
+            biz_org_name as bizOrgName,
             scene_id as sceneId,
             (select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount
             from
@@ -35,6 +37,12 @@
             <if test="maintenance != 'all' ">
                 AND MAINTENANCE_UNIT = #{maintenance}
             </if>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND biz_org_code like CONCAT(#{bizOrgCode},'%')
+            </if>
+            <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
+                AND form_group_id = #{formGroupId}
+            </if>
             order by id DESC
             LIMIT #{spage},#{pageSize}
     </select>
@@ -56,6 +64,12 @@
             <if test="maintenance != 'all' ">
                 AND maintenance_unit = #{maintenance}
             </if>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND biz_org_code like CONCAT(#{bizOrgCode},'%')
+            </if>
+            <if test="formGroupId != null and formGroupId != '' and formGroupId != '-1'">
+                AND form_group_id = #{formGroupId}
+            </if>
     </select>
     <select id="getUtils" resultType="com.yeejoin.equipmanage.common.vo.EquipmentManageVo">
          select

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -32,6 +32,9 @@
         <result property="code" column="code"></result>
         <result property="iotCode" column="iotCode"></result>
         <result property="eqtype" column="eqtype"></result>
+        <result property="bizOrgCode" column="bizOrgCode"></result>
+        <result property="bizOrgName" column="bizOrgName"></result>
+
     </resultMap>
     <select id="getEquiplistBySystemId" resultMap="EquiplistBySystemId">
        SELECT
@@ -90,7 +93,9 @@
                 instance_id,
                 pro_code,
                 factory,
-                contro_box_address
+                contro_box_address,
+                biz_org_code,
+                biz_org_name
                 )
                 VALUES(
                 #{id},
@@ -116,7 +121,9 @@
                 #{instanceId},
                 #{proCode},
                 #{factory},
-                #{controBoxAddress}
+                #{controBoxAddress},
+                #{bizOrgCode},
+                #{bizOrgName}
                 )
     </insert>
     <insert id="insertFile">
@@ -161,7 +168,9 @@
               factory=#{factory},
               code=#{code},
               form_group_id =#{formGroupId},
-              contro_box_address = #{controBoxAddress}
+              contro_box_address = #{controBoxAddress},
+              biz_org_code=#{bizOrgCode},
+              biz_org_name=#{bizOrgName}
               where id = #{id}
     </update>
     <delete id="deleteFilre">
@@ -586,9 +595,11 @@
             when '12' then '配装'
             else '未入库' END as status,
             wles.create_date as createDate,
-            wled.code as eqtype
+            wled.code as eqtype,
+            wles.biz_org_code as bizOrgCode,
+            wles.biz_org_name as bizOrgName
             FROM
-            (select id,qr_code,code ,iot_code ,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
+            (select id,qr_code,code ,iot_code ,biz_org_code ,biz_org_name,create_date ,equipment_detail_id ,system_id from wl_equipment_specific) wles
             LEFT JOIN (select id,amount,status,equipment_specific_id,warehouse_structure_id from wl_stock_detail ) wlsd on wlsd.equipment_specific_id = wles.id
             LEFT JOIN wl_warehouse_structure wlws on wlsd.warehouse_structure_id = wlws.id
             LEFT JOIN (select id,standard ,name ,area ,code, equipment_id ,manufacturer_id,is_import from wl_equipment_detail) wled on wles.equipment_detail_id = wled.id
@@ -640,6 +651,13 @@
               <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
                  where  s1.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
+
+            <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
+                where  s1.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+            </if>
+
+
+
         </if>
         <if test="(codeHead==null or codeHead=='' or codeHead==' ') and equipTypeAmountPage.status == null and equipTypeAmountPage.warehouseStructureId==null and equipTypeAmountPage.systemId==null">
             union all
@@ -675,7 +693,9 @@
             '报废' ELSE '未入库'
             END AS STATUS,
             wlc.create_date as createDate,
-            '2' as eqtype
+            '2' as eqtype,
+            wlc.biz_org_code as bizOrgCode,
+            wlc.biz_org_name as bizOrgName
             FROM
             wl_car wlc
             LEFT JOIN wl_equipment wle ON wle.id = wlc.equipment_id
@@ -708,6 +728,10 @@
               <if test="equipTypeAmountPage.warehouseStructureName!=null and equipTypeAmountPage.warehouseStructureName!=''">
                  where  s2.full_name LIKE CONCAT('%',#{equipTypeAmountPage.warehouseStructureName},'%')
             </if>
+            <if test="equipTypeAmountPage.bizOrgCode!=null and equipTypeAmountPage.bizOrgCode!=''">
+                where  s2.bizOrgCode LIKE CONCAT(#{equipTypeAmountPage.bizOrgCode},'%')
+            </if>
+
         </if>
         order by createDate DESC
     </select>

amos-boot-system-jcs/src/main/resources/application-dev.properties

 ## DB properties:
-spring.datasource.url=jdbc:mysql://172.16.6.60:3306/amos-jcs-biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.url=jdbc:mysql://172.16.10.85:3306/amos-jcs-biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
-spring.datasource.password=root_123
-
+spring.datasource.password=Amos2019Mysql8
 ## eureka properties:
 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/