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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -5,6 +5,8 @@ import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
+import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -13,6 +15,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
@@ -65,8 +68,14 @@ public class ControllerAop {
 
     @Before("userCache()")
     public void doBefore(JoinPoint joinPoint) {
+        PermissionInterceptorContext.clean();
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        HttpServletRequest request = attributes.getRequest();
+        HttpServletRequest request = null;
+        if(ObjectUtils.isNotEmpty(attributes)){
+            request = attributes.getRequest();
+        } else {
+            return;
+        }
         // 不需要添加请求头的接口
         String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo",
@@ -77,16 +86,16 @@ public class ControllerAop {
                 return;
             }
         }
+        //TODO tyboot 框架拦截器已缓存数据
+        String token = RequestContext.getToken();
 
         // 不需要校验token的接口直接返回
         if (joinPoint.getSignature() instanceof MethodSignature) {
-            if (!((MethodSignature) joinPoint.getSignature()).getMethod().getAnnotation(TycloudOperation.class).needAuth()) {
+            if (!((MethodSignature) joinPoint.getSignature()).getMethod().getAnnotation(TycloudOperation.class).needAuth() && !request.getParameterMap().containsKey("token") && ValidationUtil.isEmpty(token)) {
                 return;
             }
         }
 
-        //TODO tyboot 框架拦截器已缓存数据
-        String token = RequestContext.getToken();
         // 平台studio配置的下载接口token从url里取
         if (ValidationUtil.isEmpty(token)) {
             fillRequestContext(request);
@@ -102,6 +111,7 @@ public class ControllerAop {
                 if (userModel == null) {
                     throw new Exception("无法获取用户信息");
                 }
+                RequestContext.setExeUserId(userModel.getUserId());
             } catch (Exception e) {
                 //删除失效token缓存
                 redisUtils.getAndDeletePatternKeys(pattern);

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

@@ -26,6 +26,7 @@ public class ReginParams implements Serializable {
         private String personName;
         private String companyId;
         private String companyName;
+        private String bizOrgCode;
     }
 
     public PersonIdentity getPersonIdentity() {

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

@@ -196,7 +196,7 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
@@ -218,7 +218,7 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}
@@ -299,14 +299,14 @@ public class DataDictionaryController extends BaseController {
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
 			menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-					null);
+					null,null);
 		} else {
 			list = iDataDictionaryService.list(queryWrapper);
 			// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
 			menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",
-					null);
+					null,null);
 		}
 		// 创建根节点
 		Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
@@ -367,7 +367,7 @@ public class DataDictionaryController extends BaseController {
 		} else {
 			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
 			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
-					"getParent", null);
+					"getParent", null,null);
 			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
 			return ResponseHelper.buildResponse(menus);
 		}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

@@ -28,4 +28,12 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
 	 * @return
 	 */
 	public DataDictionary getByCode(String code,String type);
+	
+	public List<DataDictionary>  getFireTeamTypeTree(String bizOrgCode);
+	
+	public List<DataDictionary> getwaterResourceTypeTree(String bizOrgCode);
+
+	public List<DataDictionary> getFirefightersJobTitle(String type);
+
+
 }

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

@@ -41,5 +41,7 @@ public class BaseDto implements Serializable{
 	
 	@ExcelIgnore
 	@ApiModelProperty(value = "是否删除")
-    private Boolean isDelete;
+    private Boolean isDelete=false;
+
+
 }

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-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

@@ -35,5 +35,6 @@ public class BaseEntity implements Serializable{
 	 * 是否删除
 	 */
 	@TableField(value = "is_delete")
-	private Boolean isDelete;
+	public Boolean isDelete=false;
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java

@@ -48,4 +48,10 @@ public class DataDictionary extends BaseEntity {
     @TableField(exist = false)
     private int count;
 
+    @ApiModelProperty(value = "树code")
+    @TableField(exist = false)
+    private String  treeCode;
+
+
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -79,26 +79,13 @@ public class PermissionInterceptor implements Interceptor {
         if(!ValidationUtil.isEmpty(dataAuth)){
             dataAuthRule = !ValidationUtil.isEmpty(dataAuthRule) ? dataAuthRule : dataAuth.interfacePath();
         }
-        // 数据权限地址为空返回空数据
-        if(ValidationUtil.isEmpty(dataAuthRule)){
-            // method.getReturnType().isPrimitive() = true 是count语句
-            PermissionInterceptorContext.clean();
-            return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
-        }
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId()
                 , RequestContext.getToken())).toString(), ReginParams.class);
-        if (ValidationUtil.isEmpty(reginParam) || ValidationUtil.isEmpty(reginParam.getUserModel())) {
-            // method.getReturnType().isPrimitive() = true 是count语句
-            PermissionInterceptorContext.clean();
-            return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
-        }
         // 用户数据权限配置信息
-        Map<String, List<PermissionDataruleModel>> dataAuthorization = Privilege.permissionDataruleClient.queryByUser(reginParam.getUserModel().getUserId(),
+        Map<String, List<PermissionDataruleModel>> dataAuthorization = null;
+        if (!ValidationUtil.isEmpty(reginParam) && !ValidationUtil.isEmpty(reginParam.getUserModel())) {
+            dataAuthorization = Privilege.permissionDataruleClient.queryByUser(reginParam.getUserModel().getUserId(),
                     dataAuthRule).getResult();
-        // 没有数据权限直接返回空数据
-        if (ValidationUtil.isEmpty(dataAuthorization)) {
-            PermissionInterceptorContext.clean();
-            return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
         }
 
         BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
@@ -194,6 +181,9 @@ public class PermissionInterceptor implements Interceptor {
                 mainTable : selectBody.getFromItem().getAlias().getName();
 
         String authSql;
+        if (ValidationUtil.isEmpty(dataAuthorization)) {
+            authSql = falseCondition;
+        } else {
             // 过滤没有配置数据权限的用户组
             Map<String, List<PermissionDataruleModel>> nonEmptyDataAuthorization =
                     dataAuthorization.entrySet().stream().filter(map -> !ValidationUtil.isEmpty(map.getValue())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
@@ -204,6 +194,7 @@ public class PermissionInterceptor implements Interceptor {
                 // 解析数据权限sql
                 authSql = parseDataAuthorization(nonEmptyDataAuthorization, reginParams, mainTableAlias, boundSql);
             }
+        }
         // 替换数据权限
         if (!ValidationUtil.isEmpty(authSql)) {
             if (ValidationUtil.isEmpty(selectBody.getWhere())) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IDataDictionaryService.java

@@ -21,4 +21,6 @@ public interface IDataDictionaryService {
     List<MenuFrom> getGWMCDataDictionary(String type) throws Exception;
     
     public List<DataDictionary> getByType(String type);
+    
+    public List<DataDictionary> getAllChildNodes(String type,Long parent) throws Exception;
 }

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

@@ -12,6 +12,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.dto.DataDictionaryDto;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -75,7 +76,7 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
             // 数据字典生成树方法 原先通过getCode做主键  现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code  by kongfm 2021-09-08
             // 数据字典还原 by kongfm 2021-09-09
             List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
-                    , "getParent", null);
+                    , "getParent", null,null);
             redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
             return menus;
         }
@@ -104,13 +105,64 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
     
     public List<DataDictionary> getDataDictionaryAndCount(){
     	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount();
+    	for (DataDictionary data : list) {
+    		Long id = data.getSequenceNbr();
+    		int num = data.getCount();
+    		for (DataDictionary dataDictionary : list) {
+    			if(id.equals(dataDictionary.getParent())) {
+    				num =num+dataDictionary.getCount();
+    			}
+    		}
+    		data.setCount(num);
+		}
 		return list;
     	
     }
+    @Override
     public List<DataDictionary> getByType(String type)  {
     	LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<DataDictionary>();
     	wrapper.eq(DataDictionary::getIsDelete, false);
     	wrapper.eq(DataDictionary::getType, type);
     return	this.baseMapper.selectList(wrapper);
     }
+    
+    public List<Menu> getFireTeamTypeTree(String bizOrgCode) throws Exception {
+    	// Menu root = new Menu(null, "消防队伍类型", null, null,0);
+    	List<DataDictionary> list=	dataDictionaryMapper.getFireTeamTypeTree(bizOrgCode);
+
+    	List<Menu> menus = TreeParser.getTreeContainsCount(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+				"getParent", "getCount","getTreeCode");
+    	// root.setChildren(menus);
+        for (Menu m:menus
+        ) {
+            if( null != m.children) {
+                List<Menu> children = m.getChildren();
+                int count = m.num;
+                for (Menu mm:children
+                ) {
+                    count = count + mm.num;
+                }
+                m.setNum(count);
+            }
+        }
+
+		return Lists.newArrayList(menus);
+    }
+    public List<DataDictionary> getwaterResourceTypeTree(String bizOrgCode) throws Exception {
+    	List<DataDictionary> list=	dataDictionaryMapper.getwaterResourceTypeTree(bizOrgCode);
+//    	List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+//				"getParent", null);
+//    	root.setChildren(menus);
+		return list;
+    }
+    
+    public List<DataDictionary> getAllChildNodes(String type,Long parent) throws Exception {
+    	LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<DataDictionary>();
+    	wrapper.eq(DataDictionary::getIsDelete, false);
+    	wrapper.eq(DataDictionary::getType, type);
+    	if(parent!=null){
+    	    wrapper.eq(DataDictionary::getParent, parent);
+        }
+    	return	this.baseMapper.selectList(wrapper);
+    }
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/Menu.java

@@ -16,6 +16,7 @@ public class Menu {
 	    public Long parentId;
 	    public Boolean isRoot;
 	    public List<Menu> children;
+	    public String  treeCode;
 	    public int num;
 		public int getNum() {
 			return num;
@@ -30,7 +31,14 @@ public class Menu {
 			this.parentId = parentId2;	
 			this.num = num;
 		}
-		
+	public Menu(Long id, String name, Long parentId2,int num,String  treeCode) {
+		super();
+		this.id = id;
+		this.name = name;
+		this.parentId = parentId2;
+		this.num = num;
+		this.treeCode = treeCode;
+	}
 		public Menu(Long id, String name, Long parentId, List<Menu> children,int num) {
 			super();
 			this.id = id;

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisUtils.java

@@ -456,6 +456,10 @@ public class RedisUtils {
         }
         return null;
     }
+
+    public Set<String> getPatternKeys(String pattern) {
+        return redisTemplate.keys(pattern);
+    }
     /**
      * 获取指定前缀key列表
      *

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -84,9 +84,9 @@ public class MetaHandler implements MetaObjectHandler {
         if (isExistField("userName", entity)) {
             this.setFieldValByName("userName", agencyUserModel.getRealName(), metaObject);
         }
-        if (isExistField("companyName", entity)) {
-            this.setFieldValByName("companyName", reginParams.getCompany().getCompanyName(), metaObject);
-        }
+//        if (isExistField("companyName", entity)) {
+//            this.setFieldValByName("companyName", reginParams.getCompany().getCompanyName(), metaObject);
+//        }
         if (isExistField("orgCode", entity)) {
             this.setFieldValByName("orgCode", reginParams.getCompany().getOrgCode(), metaObject);
         }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

 package com.yeejoin.amos.boot.biz.config;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  *
- * 
  **/
 @Configuration
 public class MyBatisPlusConfig {
     /**
      * 自动填充功能
+     *
      * @return
      */
     @Bean
@@ -27,7 +27,7 @@ public class MyBatisPlusConfig {
     }
 
     @Bean
-    public Sequence sequence(){
+    public Sequence sequence() {
         return new Sequence();
     }
     /**
@@ -55,8 +55,10 @@ public class MyBatisPlusConfig {
             public void customize(MybatisConfiguration configuration) {
                 configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
             }
-        };}
+        };
+    }
 
+    @ConditionalOnProperty(name = "mybatis.interceptor.enabled",havingValue = "true", matchIfMissing = true)
     @Bean
     public PermissionInterceptor permissionInterceptor() {
         return new PermissionInterceptor();

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -57,4 +57,61 @@ GROUP BY
 		WHERE
 			cbb.code = #{code} and cbb.is_delete = 0 and cbb.type = #{type}
 	</select>
+	
+	<select id="getFireTeamTypeTree" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+	SELECT
+		cdd.*,getChildLstCode(cdd.sequence_nbr) treeCode,  case when fire.count is null then 0 else fire.count end as count
+	FROM
+		cb_data_dictionary cdd
+	LEFT JOIN (
+		SELECT
+			cf.type_code,
+			COUNT(cf.sequence_nbr) AS count
+		FROM
+			cb_fire_team cf
+		WHERE
+			cf.is_delete = 0
+		<if test='bizOrgCode != null and bizOrgCode!=""'>and cf.biz_org_code like CONCAT(  #{bizOrgCode},'%')</if>
+		GROUP BY
+		cf.type_code
+	) fire ON cdd.`code` = fire.type_code
+	WHERE
+	cdd.type = 'XFJGLX'
+	</select>
+
+	<select id ="getFirefightersJobTitle" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+		SELECT
+			cbb.*,getChildLstCode(cbb.sequence_nbr) treeCode
+		FROM
+			cb_data_dictionary cbb
+
+		WHERE
+			cbb.type = #{type}
+	</select>
+
+
+
+	<select id="getwaterResourceTypeTree" resultType="com.yeejoin.amos.boot.biz.common.entity.DataDictionary">
+	SELECT
+	cdd.*, case when fire.count is null then 0 else fire.count end as count
+FROM
+	cb_data_dictionary cdd
+LEFT JOIN (
+	SELECT
+		cf.resource_type,
+		COUNT(cf.sequence_nbr) AS count
+	FROM
+		cb_water_resource cf
+	WHERE
+		cf.is_delete = 0
+	<if test='bizOrgCode != null and bizOrgCode!=""'>and cf.biz_org_code like CONCAT(  #{bizOrgCode},'%')</if>
+	GROUP BY
+		cf.resource_type
+) fire ON cdd.`code` = fire.resource_type
+WHERE
+	cdd.type = 'XFSYLX'
+	
+	</select>
+	
+	
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/core/framework/PersonIdentify.java

+package com.yeejoin.amos.boot.module.common.api.core.framework;
+
+import java.lang.annotation.*;
+
+/**
+ * @author DELL
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface PersonIdentify {
+	/**
+	 * 是否进行人员校验
+	 * @return boolean
+	 */
+	boolean isNeedIdentity() default true;
+}
+

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/core/framework/PersonIdentifyAspect.java

+package com.yeejoin.amos.boot.module.common.api.core.framework;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
+import com.yeejoin.amos.boot.module.common.api.exception.PermissionException;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+/**
+ * @author DELL
+ */
+@Aspect
+@Component
+@ResponseBody
+@Order(value = 1)
+public class PersonIdentifyAspect {
+
+    @Autowired
+    RedisUtils redisUtils;
+    @Autowired
+    private IOrgUsrService orgUsrService;
+
+    @Before(value = "@annotation(com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify) && @annotation(permission)")
+    public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) throws PermissionException {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if (permission.isNeedIdentity() && reginParam != null) {
+            String userId = reginParam.getUserModel().getUserId();
+            UserDto userDto = orgUsrService.getUserParentInfo(userId);
+            ReginParams.PersonIdentity personIdentity = new ReginParams.PersonIdentity();
+            personIdentity.setBizOrgCode(userDto.getBizOrgCode());
+            personIdentity.setCompanyId(userDto.getCompanyId());
+            personIdentity.setCompanyName(userDto.getCompanyName());
+            personIdentity.setPersonSeq(userDto.getPersonSeq());
+            personIdentity.setPersonName(userDto.getPersonName());
+            personIdentity.setIdentityType(userDto.getIdentityType());
+            reginParam.setPersonIdentity(personIdentity);
+            redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
+        }
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2022/3/3
+ */
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@ApiModel(value = "车辆信息视图对象")
+@Data
+public class CarInfoDto implements Serializable {
+
+    @ApiModelProperty(value = "设备id")
+    private Long id;
+
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    @ApiModelProperty(value = "所属队伍")
+    private String teamId;
+
+    @ApiModelProperty(value = "所属队伍名称")
+    private String teamName;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNum;
+
+    @ApiModelProperty(value = "车辆类型")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "车辆类型名称")
+    private String equipmentName;
+
+    @ApiModelProperty(value = "分类id名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "分类id")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "车辆状态")
+    private String carState;
+
+    @ApiModelProperty(value = "车辆状态描述")
+    private String carStateDesc;
+
+    @ApiModelProperty(value = "品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "规格型号")
+    private String standard;
+
+    @ApiModelProperty(value = "底盘品牌")
+    private String chassisBrand;
+
+    @ApiModelProperty(value = "厂商id")
+    private Long manufacturerId;
+
+    @ApiModelProperty(value = "底盘国别")
+    private String chassisCountry;
+
+    @ApiModelProperty(value = "国别")
+    private String country;
+
+    @ApiModelProperty(value = "进口国产")
+    private Boolean isImport;
+
+    @ApiModelProperty(value = "二维码")
+    private String qrCode;
+
+    @ApiModelProperty(value = "保养周期")
+    private String maintenanceCycle;
+
+    @ApiModelProperty(value = "3c认证")
+    private Boolean cccAuth;
+
+    @ApiModelProperty(value = "物联编码")
+    private String iotCode;
+
+    @ApiModelProperty(value = "所属单位id(来源于平台)")
+    private String agencyId;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "车辆图片")
+    private List<String> image;
+
+    @ApiModelProperty(value = "车辆资源列表")
+    private List<Map<String, Object>> resourceList;
+
+    @ApiModelProperty(value = "绑定人姓名")
+    private String userName;
+}
+

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.Date;
+
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.excel.CommonExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 微型消防站
  *
@@ -39,6 +40,9 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "所在建筑物名称")
     private String whereBuilding;
     
+    @ExcelIgnore
+    private String parentBuildingId;
+
     @ExcelProperty(value = "地址", index = 2)
     @ApiModelProperty(value = "地址")
     private String address;
@@ -47,7 +51,13 @@ public class FireStationDto extends BaseDto {
     @ApiModelProperty(value = "值班室电话")
     private String dutyRoomTelephone;
 
-    @ExcelProperty(value = "负责人名称", index = 4)
+    @ExcelIgnore
+    @ApiModelProperty(value = "负责人名称id")
+    private String personChargeId;
+
+
+    @ExplicitConstraint(indexNum = 4, sourceClass = CommonExplicitConstraint.class, method = "getFireStationContactUser")
+    @ExcelProperty(value = "负责人", index = 4)
     @ApiModelProperty(value = "负责人名称")
     private String personChargeName;
 
@@ -122,4 +132,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/dto/FireTeamCardDto.java

@@ -15,6 +15,11 @@ import lombok.Data;
 public class FireTeamCardDto {
 
     private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
 
     @ApiModelProperty(value = "消防队伍图片")
     private String img;

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

@@ -39,7 +39,7 @@ public class FireTeamDto extends BaseDto {
     @ApiModelProperty(value = "机构code")
     private String companyCode;
 
-    @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class,method="getFireTeam") //动态下拉内容
+    @ExplicitConstraint(indexNum = 1, sourceClass = CommonExplicitConstraint.class,method="getFireTeamList") //动态下拉内容
     @ExcelProperty(value = "上级队伍", index = 1)
     @ApiModelProperty(value = "父级名称")
     private String parentName;
@@ -77,7 +77,7 @@ public class FireTeamDto extends BaseDto {
     @ApiModelProperty(value = "联系人id")
     private Long contactUserId;
 
-    @ExplicitConstraint(indexNum = 7, sourceClass = CommonExplicitConstraint.class,method = "getFirefighters") //动态下拉内容
+    @ExplicitConstraint(indexNum = 7, sourceClass = CommonExplicitConstraint.class,method = "getFireTeamContactUser") //动态下拉内容
     @ExcelProperty(value = "联系人", index = 7)
     @ApiModelProperty(value = "联系人")
     private String contactUser;

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

@@ -11,6 +11,11 @@ import java.util.List;
  */
 @Data
 public class FireTeamListDto {
+	@ApiModelProperty(value = "机构/部门名称")
+	private String bizOrgName;
+
+	@ApiModelProperty(value = "机构编码")
+	private String bizOrgCode;
 
 	@ApiModelProperty(value = "单位名称")
 	private String name;
@@ -39,4 +44,7 @@ public class FireTeamListDto {
 	@ApiModelProperty(value = "所属单位")
 	private String company;
 
+	@ApiModelProperty(value = "树节点子节点id集合")
+	private List<String> typeCodes;
+
 }

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

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
+
 /**
 * 消防队员
 *
@@ -71,6 +73,9 @@ public class FirefightersDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称")
     private String jobTitle;
 
+    @ApiModelProperty(value = "岗位名称")
+    private List<String>  jobTitles;
+
     @ApiModelProperty(value = "岗位code")
     private String jobTitleCode;
 
@@ -120,4 +125,13 @@ public class FirefightersDto extends BaseDto {
 
     @ApiModelProperty(value = "amos账户id")
     private String amosUserId;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "现居住地详情地址")
+    private String address;
 }

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

@@ -37,6 +37,9 @@ public class KeySiteDto  extends BaseDto implements Serializable{
     @ApiModelProperty(value = "所属建筑id")
     private Long buildingId;
     
+    @ApiModelProperty("当前所在建筑物id的所有父节点id")
+    private String parentBuildingId;
+    
     @ApiModelProperty(value = "所属建筑名称")
     private String buildingName;
 
@@ -100,4 +103,15 @@ public class KeySiteDto  extends BaseDto implements Serializable{
     @ApiModelProperty(value = "数组形式附件")
     private List<String> attachmentsList;
 
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    /**
+     * 责任人code
+     */
+    private String chargePersonCode;
+
 }

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

@@ -29,7 +29,7 @@ public class KeySiteExcleDto implements Serializable {
 	private String name;
 
 	@ExcelProperty(value = "所属单位/部门id", index = 1)
-	@ExplicitConstraint(indexNum = 1,  sourceClass = CommonExplicitConstraint.class, method = "getCompanyDetailTree") //固定下拉内容
+	@ExplicitConstraint(indexNum = 1,  sourceClass = CommonExplicitConstraint.class, method = "getKeySiteCompanyDetailTree") //固定下拉内容
 	@ApiModelProperty(value = "所属单位/部门id")
 	private String belongName;
 
@@ -101,4 +101,12 @@ public class KeySiteExcleDto implements Serializable {
 	@ExcelProperty(value = "备注", index = 15)
 	@ApiModelProperty(value = "备注")
 	private String remark;
+
+	@ExcelIgnore
+	@ApiModelProperty(value = "机构/部门名称")
+	private String bizOrgName;
+
+	@ExcelIgnore
+	@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/dto/OrgMenuDto.java

@@ -27,6 +27,7 @@ public class OrgMenuDto {
     private List<OrgMenuDto> children;
     private String bizOrgType;
     private String bizOrgCode;
+    private Long total;
     
     public Boolean getLeaf() {
     	return ObjectUtils.isEmpty(children);

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

@@ -75,6 +75,9 @@ public class OrgPersonFormDto extends BaseEntity{
 
     private String orgExpandAttr8;
 
+    //当前登录人id
+    private String userId;
+
     public OrgPersonFormDto() {
     }
 

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

@@ -24,7 +24,6 @@ import lombok.EqualsAndHashCode;
 public class OrgUsrDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "机构/部门名称")
     private String bizOrgName;
 
@@ -78,4 +77,13 @@ public class OrgUsrDto extends BaseDto {
     
     @ApiModelProperty(value = "动态表单值-DTO类型")
     private List<DynamicFormInstanceDto> dynamicFormValueDto;
+
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
 }

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

@@ -66,11 +66,6 @@ public class OrgUsrFormDto implements Serializable {
     @ApiModelProperty(value = "单位人员信息值")
     private List<OrgPersonFormDto> children;
 
-    
-   
-    
-    
-    
     public List<FormValue> getDynamicFormAlert() {
 		return dynamicFormAlert;
 	}
@@ -79,6 +74,24 @@ public class OrgUsrFormDto implements Serializable {
     @ApiModelProperty(value = "转换动态表单")
     private Map<String,Object> map=new HashMap<>();;
 
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
+    @ApiModelProperty(value = "归属机构/部门")
+    private String parentName;
+
+
+    @ApiModelProperty(value = "消防管理人")
+    private String xfgl;
+    @ApiModelProperty(value = "单位负责人")
+    private String dwfz;
+    @ApiModelProperty(value = "消防安全负责人")
+    private String xfaq;
 
 	public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
 		  if(dynamicFormAlert!=null) {

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;
@@ -37,6 +38,9 @@ public class FireStation extends BaseEntity {
     @ApiModelProperty(value = "所在建筑物名称")
     private String whereBuilding;
     
+    @ApiModelProperty("当前所在建筑物id的所有父节点id")
+    private String parentBuildingId;
+
     @ApiModelProperty(value = "装备简要情况")
     private String equipmentBrief;
 
@@ -61,6 +65,9 @@ public class FireStation extends BaseEntity {
     @ApiModelProperty(value = "负责人名称")
     private String personChargeName;
 
+    @ApiModelProperty(value = "负责人名称id")
+    private String personChargeId;
+
     @ApiModelProperty(value = "负责人电话")
     private String personChargeTelephone;
 
@@ -87,4 +94,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/entity/FireTeam.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
 /**
@@ -28,6 +30,12 @@ public class FireTeam extends BaseEntity {
 	 */
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
 	@ApiModelProperty(value = "消防队伍图片")
     private String img;
 
@@ -35,6 +43,7 @@ public class FireTeam extends BaseEntity {
     private String name;
     
     @ApiModelProperty(value = "父级")
+    @TableField(value = "parent",updateStrategy = FieldStrategy.IGNORED,jdbcType = JdbcType.BIGINT)
     private Long parent;
     
     @ApiModelProperty(value = "父级队伍名称")
@@ -81,9 +90,4 @@ public class FireTeam extends BaseEntity {
     @ApiModelProperty(value = "树结构层级code")
     private String treeCode;
 
-    @ApiModelProperty(value = "bizOrgCode")
-    private String bizOrgCode;
-
-    @ApiModelProperty(value = "bizOrgName")
-    private String bizOrgName;
 }

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

@@ -138,4 +138,10 @@ public class Firefighters extends BaseEntity {
 
     @ApiModelProperty(value = "amos账户id")
     private String amosUserId;
+
+    @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/entity/KeySite.java

@@ -34,12 +34,24 @@ public class KeySite extends BaseEntity {
 	@TableField("belong_id")
     private Long belongId;
    
+
+    /**
+     * 所属单位/部门名称
+     */
+    private String belongName;
+
     /**
      * 所属建筑id
      */
 	@TableField("building_id")
     private Long buildingId;
 	
+	  /**
+     * 所属父节点的建筑id集合
+     */
+	@TableField("parent_building_id")
+    private String parentBuildingId;
+	
 	@TableField("building_name")
     private String buildingName;
 
@@ -144,4 +156,19 @@ public class KeySite extends BaseEntity {
     @TableField("latitude")
     private Double latitude;
 
+    /**
+     * 责任人code
+     */
+    private String chargePersonCode;
+
+    /**
+     * 机构/部门名称
+     */
+    private String bizOrgName;
+
+    /**
+     * 机构编码
+     */
+    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/entity/OrgUsr.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
@@ -69,4 +70,17 @@ public class OrgUsr extends BaseEntity {
     private String orgExpandAttr7;
 
     private String orgExpandAttr8;
+
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
+
+    @ApiModelProperty(value = "数量")
+    @TableField(exist = false)
+    private Long total;
 }

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

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -12,11 +13,11 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
-* 
-*
-* @author system_generator
-* @date 2021-06-29
-*/
+ * 
+ *
+ * @author system_generator
+ * @date 2021-06-29
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
@@ -24,7 +25,11 @@ import java.util.Date;
 public class WaterResource extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
+	@ApiModelProperty(value = "机构/部门名称")
+	private String bizOrgName;
 	
+	@ApiModelProperty(value = "机构编码")
+	private String bizOrgCode;
 
 	/**
 	 * 资源名称
@@ -137,6 +142,13 @@ public class WaterResource extends BaseEntity {
 	private String contactUser;
 
 	/**
+	 * 联系人姓名id
+	 */
+	@TableField("contact_user_id")
+	private String contactUserId;
+
+
+	/**
 	 * 联系人电话
 	 */
 	@TableField("contact_phone")
@@ -182,6 +194,10 @@ public class WaterResource extends BaseEntity {
 	@TableField("equip_category_name")
 	private String equipCategoryName;
 
+	@ApiModelProperty("设施分类编码")
+	@TableField("equip_category_code")
+	private String equipCategoryCode;
+	
 	@ApiModelProperty("设施编码")
 	@TableField("equip_code")
 	private String equipCode;
@@ -189,4 +205,6 @@ public class WaterResource extends BaseEntity {
 	@ApiModelProperty("维保周期")
 	@TableField("maintenance_period")
 	private String maintenancePeriod;
+
+
 }

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

@@ -31,7 +31,7 @@ public class WaterResourceCrane extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private Float height;
+    private float height;
     /**
 	  * 水源可用状态类别代码
      */
@@ -66,17 +66,17 @@ public class WaterResourceCrane extends BaseEntity {
 	  * 官网直径（cm）
      */
 	@TableField("pipe_diameter")
-    private Float pipeDiameter;
+    private float pipeDiameter;
     /**
 	  * 进水管直径(cm)
      */
 	@TableField("inlet_pipe_diameter")
-    private Float inletPipeDiameter;
+    private float inletPipeDiameter;
     /**
 	  * 出水管直径(cm)
      */
 	@TableField("outlet_pipe_diameter")
-    private Float outletPipeDiameter;
+    private float outletPipeDiameter;
     /**
 	  * 加水车道数量(个)
      */

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

@@ -106,7 +106,7 @@ public class WaterResourceHydrant extends BaseEntity {
 	  * 官网直径（cm）
      */
 	@TableField("pipe_diameter")
-    private Float pipeDiameter;
+    private float pipeDiameter;
     /**
 	  * 供水单位名称
      */

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

@@ -31,7 +31,7 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 高度（cm）
      */
 	@TableField("height")
-    private Float height;
+    private float height;
     /**
 	  * 水源类型代码
      */
@@ -46,12 +46,12 @@ public class WaterResourceNatural extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private Float volume;
+    private float volume;
     /**
 	  * 面积（㎡）
      */
 	@TableField("area")
-    private Float area;
+    private float area;
     /**
 	  * 水质情况
      */

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

@@ -31,7 +31,7 @@ public class WaterResourcePool extends BaseEntity {
 	  * 容积（m³）
      */
 	@TableField("volume")
-    private Float volume;
+    private float volume;
     /**
 	  * 水源可用状态类别代码
      */
@@ -56,12 +56,12 @@ public class WaterResourcePool extends BaseEntity {
 	  * 取水高度(cm)
      */
 	@TableField("intake_height")
-    private Float intakeHeight;
+    private float intakeHeight;
     /**
 	  * 水源标高差(cm)
      */
 	@TableField("elevation_difference")
-    private Float elevationDifference;
+    private float elevationDifference;
     /**
 	  * 停车位置
      */
@@ -71,7 +71,7 @@ public class WaterResourcePool extends BaseEntity {
 	  * 停车数量(个)
      */
 	@TableField("parking_num")
-    private Integer parkingNum;
+    private int parkingNum;
     /**
 	  * 消防给水管网形式类型代码
      */

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.excel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
@@ -70,8 +71,9 @@ public class TemplateDynamicCellWriteHandlerDate implements SheetWriteHandler{
 		            // 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
 		            if (v.length > LIMIT_NUMBER) {
 		                //定义sheet的名称
-		                //1.创建一个隐藏的sheet 名称为 hidden + k
-		                String sheetName = "hidden" +startIndex + k;
+		                //1.创建一个隐藏的sheet 名称为 hidden + k+随机数防止数据过多造成的名字重复
+						Random random = new Random();
+						String sheetName = "hidden" +startIndex + k+random.nextInt(1000);
 		                Workbook workbook = writeWorkbookHolder.getWorkbook();
 		                Sheet hiddenSheet = workbook.createSheet(sheetName);
 		                for (int i = 0, length = v.length; i < length; i++) {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/exception/PermissionException.java

+package com.yeejoin.amos.boot.module.common.api.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class PermissionException extends RuntimeException{
+
+	private static final long serialVersionUID = -6126611364667754200L;
+
+	public PermissionException(String message) {
+		super(message);
+	}
+
+	public PermissionException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public HttpStatus getStatus() {
+		return HttpStatus.FORBIDDEN; // 403
+	}
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

 package com.yeejoin.amos.boot.module.common.api.feign;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.module.common.api.dto.CarInfoDto;
+import org.springframework.cloud.openfeign.FeignClient;
+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.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import com.yeejoin.amos.boot.module.common.api.dto.EquipmentIndexDto;
 import com.yeejoin.amos.boot.module.common.api.dto.PerfQuotaIotDTO;
 import com.yeejoin.amos.boot.module.common.api.dto.VideoDto;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 装备服务feign
  *
  * @author Dell
  */
-@FeignClient(name = "${equip.fegin.name}", path = "equip", configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${equip.fegin.name:AMOS-EQUIPMENT}", path = "equip", configuration = {MultipartSupportConfig.class})
 public interface EquipFeignClient {
 
     /**
@@ -79,7 +87,7 @@ public interface EquipFeignClient {
      * @return
      */
     @RequestMapping(value = "/car/list-allpag", method = RequestMethod.GET)
-    ResponseModel<Object> equipmentCarList( @RequestParam("teamId") Long teamId,
+    ResponseModel<Page<CarInfoDto>> equipmentCarList(@RequestParam("teamId") Long teamId,
                                                      @RequestParam("name") String name,
                                                      @RequestParam("code") String code ,
                                                      @RequestParam("pageNum") String pageNum,
@@ -192,7 +200,8 @@ public interface EquipFeignClient {
                                                           @RequestParam("size") String size,
                                                           @RequestParam("buildingId") String buildingId,
                                                           @RequestParam("code") String code,
-                                                          @RequestParam("equipmentName") String equipmentName
+                                                          @RequestParam("equipmentName") String equipmentName,
+                                                          @RequestParam("bizOrgCode") String bizOrgCode
     );
 
 
@@ -353,4 +362,17 @@ public interface EquipFeignClient {
 
     @RequestMapping(value = "/equipment/list/{typeCode}", method = RequestMethod.GET)
     ResponseModel<List> getEquipmentList(@PathVariable("typeCode") String typeCode);
+    
+    @RequestMapping(value = "equipment-category/list-tree", method = RequestMethod.GET)
+    ResponseModel<Object>   list() ;
+
+    //获取消防装备权限
+    @RequestMapping(value = "/equipment-detail/permissions/export", method = RequestMethod.GET)
+    ResponseModel<ReginParams>  getPermissions() ;
+    
+    @RequestMapping(value = "/building/getBuildingList", method = RequestMethod.GET)
+    ResponseModel<List<Map<String, Object>>>  getBuildingTreeList();
+    
+    @RequestMapping(value = "/building/companyBuildingTree", method = RequestMethod.GET)
+    public  ResponseModel<Object> getCompanyBuildingTree();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -17,7 +17,7 @@ import java.util.Map;
  *
  * @author Dell
  */
-@FeignClient(name ="${iot.fegin.name}", path = "iot", configuration = {MultipartSupportConfig.class})
+@FeignClient(name ="${iot.fegin.name:AMOS-API-IOT}", path = "iot", configuration = {MultipartSupportConfig.class})
 public interface IotFeignClient {
 
       

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/JcsControlServerClient.java

@@ -15,7 +15,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
  * @author gwb
  * @version $Id: JcsControlServerClient.java, v 0.1 2021年8月19日 上午9:41:10 gwb Exp $
  */
-@FeignClient(name = "${control.fegin.name}", configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${control.fegin.name:JCS-API-CONTROL}", configuration = {MultipartSupportConfig.class})
 public interface JcsControlServerClient {
 
 	/**

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/KnowledgebaseFeignClient.java

@@ -9,7 +9,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 
-@FeignClient(name = "${Knowledgebase.fegin.name}",path = "knowledgebase" ,configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${Knowledgebase.fegin.name:AMOS-API-KNOWLEDGEBASE}",path = "knowledgebase" ,configuration = {MultipartSupportConfig.class})
 public interface KnowledgebaseFeignClient {
 	
 		 @RequestMapping(value = "/v1/tagvalue/getAll/tegartValue", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/LatentDangerFeignClient.java

@@ -15,7 +15,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
  *
  * @author Dell
  */
-@FeignClient(name = "${latentDanger.feign.name}", path = "latentDanger", configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${latentDanger.feign.name:AMOS-LATENT-DANGER}", path = "latentDanger", configuration = {MultipartSupportConfig.class})
 public interface LatentDangerFeignClient {
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/SupervisionFeignClient.java

@@ -20,7 +20,7 @@ import java.util.Map;
  *
  * @author Dell
  */
-@FeignClient(name = "${supervision.feign.name}", path = "equip", configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${supervision.feign.name:AMOS-SUPERVISION-API}", path = "equip", configuration = {MultipartSupportConfig.class})
 public interface SupervisionFeignClient {
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/VideoFeignClient.java

@@ -14,10 +14,8 @@ import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
  * @author: tw
  * @createDate: 2021/10/20
  */
-@FeignClient(name = "${video.fegin.name}", path = "video", configuration = {MultipartSupportConfig.class})
+@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-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -28,17 +28,21 @@ 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>"
+			+"<if test='nodeIds != null' > AND  where_building_id in  <foreach collection='nodeIds' item='buildingId' open='(' close=')' separator=','>   #{buildingId}   </foreach></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);
+	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par,List<String> nodeIds);
 	@Select("<script>"
 			+ "select COUNT(cb_fire_station.sequence_nbr) num from  cb_fire_station  where cb_fire_station.is_delete=0 "
 			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
 			+ "<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>"
+			+"<if test='nodeIds != null' > AND  where_building_id in  <foreach collection='nodeIds' item='buildingId' open='(' close=')' separator=','>   #{buildingId}   </foreach></if>"
 			+ "</script>")	
-	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
+	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par,List<String> nodeIds);
 
 
 
@@ -56,4 +60,6 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 	Integer getStationListCount(@Param("par")RequestData par);
 
 	FireStationDto getFireStationDetails(Long id);
+	
+	List<Map<String, Object>> getfireStatioCount(String bizOrgCode);
 }

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

@@ -104,7 +104,7 @@ public interface FireTeamMapper extends BaseMapper<FireTeam> {
 	 */
 	List<FireTeam> byTeamId(Long teamId);
 
-	List<FireTeamDto> listFireTeamDto(Boolean isDelete, String nodeId, String nodeType, String name, String typeCode,List<String> nodeIds);
+	List<FireTeamDto> listFireTeamDto(Boolean isDelete, String nodeId, String nodeType, String name, String typeCode,List<String> nodeIds, String bizOrgCode);
 
 	List<FireTeamDto> listFireTeamDtoTree(Boolean isDelete);
 

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

@@ -30,12 +30,12 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     Map<String, Object> listToSelectById(@Param("id") Long id);
 
-    List<FirefightersTreeDto> getFirefightersJobTitleCount();
+    List<FirefightersTreeDto> getFirefightersJobTitleCount(String bizOrgCode);
 
     List<Map<String,String>> getFirefightersName( );
 
 	List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId,
-			String state, String areasExpertise, String jobTitle);
+			String state, String areasExpertise, String jobTitle,String bizOrgCode);
 
 	List<FirefightersDto> queryById(@Param("gw")String[] gw, @Param("name")String name);
 	

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,8 +10,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 
-import java.util.List;
-
 /**
  * 重点部位 Mapper 接口
  *
@@ -20,14 +21,14 @@ public interface KeySiteMapper extends BaseMapper<KeySite> {
  * 分页查询
  */
 
-public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
-			String useNature, String fireFacilitiesInfo, Long belongId,String belongName);
+public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, List<Long> buildingIds, String fireEnduranceRate,
+			String useNature, String fireFacilitiesInfo, String bizOrgCode);
 /**
  * 获取所有的重点部位数据
  * @return
  */
 public List<KeySiteDto> getKeySiteList( String name, Long buildingId, String fireEnduranceRate,
-										String useNature, String fireFacilitiesInfo, Long belongId);
+										String useNature, String fireFacilitiesInfo, String bizOrgCode);
 /**
  * 根据id查找
  * @param sequenceNbr
@@ -39,4 +40,11 @@ public KeySiteDto getSequenceNbr(Long sequenceNbr);
 public  List<KeySiteDateDto> getKeySiteDate(Long id);
 public List<String> getAddress();
 
+/**
+ * 查询该单位下对应建筑的重点部位数量
+ * @param belong_id
+ * @return
+ */
+public List<Map<String, Object>> getKeySiteCount(String bizOrgCode);
+
 }

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 
@@ -65,7 +66,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
 
     List< Map<String,Object>> getparent();
-    List< OrgUsrExcelDto> exportToExcel(String parentId ,String bizOrgName,String internalPositionCode ,String positionType);
+    List< OrgUsrExcelDto> exportToExcel(String parentId ,String bizOrgCode,String internalPositionCode ,String positionType);
 
     /**
      * 查询单位基本信息列表和单位下所有的重点部位数量。
@@ -97,4 +98,22 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List<Map<String,Object>> queryCompanyIdNew(String bizOrgName);
 
     OrgUsr queryByUserId(@Param("userId")Long userId);
+
+    @DataAuth(interfacePath = "")
+    List<OrgUsr> companyTreeByUserAndType(Map<String, Object> param);
+
+    OrgUsr queryBySequenceNbr(@Param("parentId") String parentId);
+
+    @DataAuth(interfacePath="")
+    List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param);
+
+    List<OrgUsr> companyTreeByUser(String bizOrgCode);
+
+    Map<String,String> selectPersonone(@Param("name")String name ,@Param("id")Long id);
+
+    List<OrgUsr> listByOrgTypes(@Param("orgTypeList") List<String> orgTypeList,@Param("bizOrgCode") String bizOrgCode);
+
+    String getParentList(@Param("id") String id);
+
+    List<OrgUsr> selectPersonListByCompanyIdList(@Param("companyIdList") List<String> companyIdList);
 }

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

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -20,7 +21,7 @@ import java.util.List;
  */
 public interface WaterResourceMapper extends BaseMapper<WaterResource> {
 
-    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType);
+    List<WaterResourceDto> exportToExcel(@Param("isDelete")Boolean isDelete,@Param("name")String name, @Param("resourceType")String resourceType, @Param("bizOrgCode")String bizOrgCode);
 
 
     /***
@@ -46,5 +47,7 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
      */
     Page<WaterResourceDto> getWaterResourcePageByParams(Page<WaterResourceDto> page, String name, String resourceType,
                                                         ArrayList<Long> belongBuildingId, Long belongFightingSystemId,
-                                                        Long sequenceNbr, String equipId);
-}
+                                                        Long sequenceNbr, String equipId,String bizOrgCode, String equipCateGoryCode);
+
+    List<Map<String, Object>> getWaterTypeByBizOrgCode(String bizOrgCode);
+ }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCarService.java

@@ -34,4 +34,6 @@ public interface IDutyCarService extends IDutyCommonService {
     JSONObject isFireCarDriver();
     int getDutyCarCount(Long carId);
     List<Map<String, Object>> getDutyCaruser(Long carId);
+
+    List<Map<String, Object>> theCarDutyPerson(Long carId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireExpertsService.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+
+import java.util.List;
+
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,8 +18,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 public interface IFireExpertsService {
 
 
+    public Page<FireExpertsDto> queryForFireExpertsPage1(Page<FireExpertsDto> page,
+                                                        @Condition(Operator.eq) Boolean isDelete,
+                                                        @Condition(Operator.like) String name,
+                                                        @Condition(Operator.in) List<String> expertCode);
+    
     public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
             @Condition(Operator.eq) Boolean isDelete,
             @Condition(Operator.like) String name,
-                                                        @Condition(Operator.eq) String expertCode);
+            @Condition(Operator.eq)String expertCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireTeamService.java

@@ -46,4 +46,7 @@ public interface IFireTeamService {
     
     public List<FireTeam> getFirstAidForTypeCodeAndCompanyId(String dicCode,String typeCode,Long companyId);
 
+    List<FireTeam> getFireTeamList();
+
+    List<FireTeam> getExcelFireTeamList(String bizOrgCode) ;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFirefightersService.java

@@ -25,7 +25,7 @@ public interface IFirefightersService {
 
     Map<String, Object> listToSelectById(Long id);
 
-    List<Menu> getFirefightersJobTitleCount() throws Exception;
+    List<Menu> getFirefightersJobTitleCount(String bizOrgCode) throws Exception;
 
     void saveFirefighters(FirefightersInfoDto firefighters);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IKeySiteService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
@@ -7,8 +11,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
-import java.util.List;
-
 /**
  * 重点部位接口类
  *
@@ -37,14 +39,15 @@ public boolean update(KeySiteDto keySite, AgencyUserModel userInfo) ;
 /**
  * 获取机场单位部位树，包含单位下所包含的部位的统计
  * @return
+ * @param reginParams
  */
-public  List<OrgMenuDto> getOrguserTree();
+public  List<OrgMenuDto> getOrgUserTree(ReginParams reginParams);
 /**
  * 
  * @return
  */
 public List<KeySiteDto> queryForKeySiteList( String name, Long buildingId, String fireEnduranceRate,
-											String useNature, String fireFacilitiesInfo, Long belongId) ;
+											String useNature, String fireFacilitiesInfo, String bizOrgCode) ;
 /**根据id查找
  * 
  * @param sequenceNbr
@@ -53,7 +56,7 @@ public List<KeySiteDto> queryForKeySiteList( String name, Long buildingId, Strin
 public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
 public List<KeySiteExcleDto> exportToExcel(String name, Long buildingId, String fireEnduranceRate,
-										   String useNature, String fireFacilitiesInfo, Long belongId);
+										   String useNature, String fireFacilitiesInfo, String bizOrgCode);
 
 /**获取所在建筑的树结构信息
  * 
@@ -73,4 +76,10 @@ public  List<KeySiteDateDto> getKeySiteDate(Long id);
 
 public List<KeySite> getKeySiteDateByNameLike(Long companyId);
 
+public List<Map<String, Object>> keySiteCountAndBuildingTree(String bizOrgCode);
+
+public Map<String, String> getNodeAllParentIds(List<String> ids) ;
+
+public List<Long> getNodeAllnodeIds(Long id) ;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -203,6 +204,17 @@ public interface IOrgUsrService {
      */
     List<OrgMenuDto> companyTreeByUser(AgencyUserModel user);
 
+
+    /**
+     * 根据登录人及类型获取公司部门树
+     * @param reginParams 公司及部门信息
+     * @param type  默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
+     * @return
+     */
+    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
+
+   List<OrgUsr> companyTreeByUserAndTypeNoTree(ReginParams reginParams, String type) ;
+
     /**
      * 根据登陆人获取公司列表(关联重点部位)
      */
@@ -286,4 +298,24 @@ public interface IOrgUsrService {
     void updateByIdOrgPersonFlc(OrgPersonDto OrgPersonVo, Long id) throws Exception;
 
     JSONObject selectPersonByUserId(Long userId) throws Exception;
+
+    UserDto getUserParentInfo(String userId);
+
+    /**
+     * 根据机构类型获取列表不分页
+     * @param orgTypes 机构类型（逗号分割）
+     * @param orgCode 机构编码
+     * @return list不分页
+     */
+    List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode);
+
+    /**
+     *  公司部门树，包含用户数量统计
+     * @param reginParams 用户信息
+     * @return List<OrgMenuDto>
+     */
+    List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams);
+
+    List<OrgMenuDto> companyTreeByUser(ReginParams reginParams);
+
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper">
+<mapper
+	namespace="com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper">
 
 
-    <select id="getStationList" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto">
+	<select id="getStationList"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto">
 
 		SELECT
 		a.sequence_nbr sequenceNbr,
@@ -17,12 +19,15 @@
 		cb_dynamic_form_instance i
 		where
 		i.field_value = a.sequence_nbr ) As userNum,
-    (SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id = a.sequence_nbr and is_delete =0) AS eqNum,
-    Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
+		(SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id =
+		a.sequence_nbr and is_delete =0) AS eqNum,
+		Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
+		AS distance
 		FROM cb_fire_station a
 		where a.is_delete=0 and a.longitude is not null and a.latitude is not null
 		<if test='par.distance!=null'>
-        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}
+			Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
+			&lt;= #{par.distance}
 		</if>
 		ORDER BY distance limit #{pageNum},#{pageSize}
 	</select>
@@ -33,12 +38,14 @@
 		FROM cb_fire_station a
 		where a.is_delete=0 and a.longitude is not null and a.latitude is not null
 		<if test='par.distance!=null'>
-        Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}
+			Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
+			&lt;= #{par.distance}
 		</if>
 	</select>
 
 
-    <select id="getFireStationDetails" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireStationDto">
+	<select id="getFireStationDetails"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.FireStationDto">
 		SELECT
 		a.*,
 		(SELECT
@@ -52,5 +59,18 @@
 		a.sequence_nbr = #{id}
 	</select>
 
-
+	<select id="getfireStatioCount" resultType="map">
+		SELECT
+		parent_building_id,
+		count(1) as count
+		FROM
+		cb_fire_station
+		WHERE is_delete= false 
+		and parent_building_id is not null
+		<if test="bizOrgCode != null and bizOrgCode != ''">
+		AND	biz_org_code like concat(#{bizOrgCode}, '%')
+		</if>
+		GROUP BY
+		where_building_id
+	</select>
 </mapper>

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

@@ -36,13 +36,19 @@
         a.NAME,
         a.contact_user contactUser,
         a.contact_phone contactPhone,
-        a.address
+        a.address,
+        a.biz_org_code as bizOrgCode,
+        a.biz_org_name as bizOrgName
         FROM
         cb_fire_team a
         WHERE
         a.is_delete = 0
         <if test='par.parent != null'>and a.parent = #{par.parent}</if>
-        <if test='par.typeCode != null'>and a.type_code = #{par.typeCode}</if>
+        <if test='par.typeCodes != null'>and a.type_code in
+            <foreach collection="par.typeCodes" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+           </if>
         <if test='par.companyCode != null'>and a.company_code = #{par.companyCode}</if>
         <if test='par.company != null and par.company != -1'>and a.company = #{par.company}</if>
         <if test='par.name != null'>and a.name like concat('%', #{par.name}, '%')</if>
@@ -65,6 +71,7 @@
                 and a.sequence_nbr = #{par.nodeId}
             </if>
         </if>
+           <if test='par.bizOrgCode != null'>and a.biz_org_code like CONCAT(  #{par.bizOrgCode},'%')</if>
         order by a.rec_date desc
     </select>
     <select id="listFireTeamDto" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">
@@ -96,6 +103,9 @@
          <if test='typeCode!=null  and typeCode!=""'>
            and t.type_code = #{typeCode}
         </if>
+        <if test='bizOrgCode!=null  and bizOrgCode!=""'>
+            and t.biz_org_code like CONCAT( '%', #{bizOrgCode},'%')
+        </if>
     </select>
  	<select id="listFireTeamDtoTree" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto">
         select t.*, p.name parentName
@@ -131,6 +141,8 @@
         a.name ,
         a.contact_user contactUser,
         a.contact_phone contactPhone,
+         a.biz_org_code as bizOrgCode,
+        a.biz_org_name as bizOrgName,
         ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
@@ -197,6 +209,4 @@
           AND is_delete = 0
     </select>
 
-
-
 </mapper>

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

@@ -10,6 +10,7 @@
                                      jobTitleCode
         from cb_firefighters a
         where a.is_delete = 0
+        <if test='bizOrgCode!=null and bizOrgCode!=""'>and a.biz_org_code like concat  ('%',#{bizOrgCode},'%')</if>
         GROUP BY a.job_title_code
     </select>
     <!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
@@ -20,17 +21,26 @@
         cb_firefighters_post b on
         a.sequence_nbr=b.firefighters_id where
         a.is_delete=0
+        <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
         <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
+        <if test='par.address!=null'>and a.residence_detail_val like concat ('%',#{par.address},'%')</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
-        <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
+        <if test='par.jobTitles!=null'>and a.job_title_code in
+            <foreach collection="par.jobTitles" item="id" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         <if
                 test='par.areasExpertiseCode!=null and par.areasExpertiseCode!="0"'>and b.areas_expertise_code
             =#{par.areasExpertiseCode}
         </if>
+        <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
+
+
         <if test='par.areasExpertiseCode=="0"'>and b.areas_expertise_code is not null</if>
         ORDER BY a.rec_date desc limit #{pageNum},#{pageSize}
     </select>
@@ -39,9 +49,11 @@
         select COUNT(a.sequence_nbr) num from cb_firefighters a LEFT JOIN
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
         a.is_delete=0
+        <if test='par.bizOrgCode!=null'>and a.biz_org_code like concat ('%',#{par.bizOrgCode},'%')</if>
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
         <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
         <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
+        <if test='par.address!=null'>and a.residence_detail_val like concat ('%',#{par.address},'%')</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.company!=null and par.company!= -1'>and a.company= #{par.company}</if>
@@ -61,6 +73,7 @@
                a.sequence_nbr
                                               sequenceNbr,
                IFNULL(a.`name`, '无')          `name`,
+               IFNULL(a.`biz_org_name`, '无')          `bizOrgName`,
                IFNULL(a.job_title, '无')
                                               jobTitle,
                IFNULL(b.administrative_position, '无')
@@ -162,6 +175,7 @@
         <if test='state !=null'>and f.state_code = #{state}</if>
         <if test='areasExpertise!=null'>and fp.areas_expertise_code = #{areasExpertise}</if>
         <if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
+        <if test='bizOrgCode!=null'>and f.biz_org_code  like concat ('%',#{bizOrgCode},'%')  </if>
     </select>
 
     <select id="getFirefightersName" resultType="Map">

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

@@ -3,22 +3,27 @@
 <mapper
 	namespace="com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper">
 
-	<select id="getPageList" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
+	<select id="getPageList"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
 		SELECT
 		c.`name` as name,
 		c.belong_id as belongId,
-		cou.biz_org_name as belongName,
+		c.biz_org_name as
+		belongName,
 		c.building_id as buildingId,
-		c.building_name as buildingName,
+		c.building_name as
+		buildingName,
 		c.address_desc as addressDesc,
-		c.building_area as buildingArea,
+		c.building_area as
+		buildingArea,
 		c.building_height as buildingHeight,
 		c.fire_endurance_rate as fireEnduranceRate,
 		c.use_nature as useNature,
 		c.charge_person AS chargePerson,
 		c.sequence_nbr AS sequenceNbr,
 		c.charge_person_id AS chargePersonId,
-		c.key_prevention_reason AS keyPreventionReason,
+		c.key_prevention_reason AS
+		keyPreventionReason,
 		c.fire_facilities_info AS fireFacilitiesInfo,
 		c.fire_prevention_flag AS firePreventionFlag,
 		c.hazard AS hazard,
@@ -27,19 +32,23 @@
 		c.remark AS remark,
 		c.is_delete AS isDelete,
 		c.rec_user_id AS recUserId,
-		c.rec_user_name AS recUserName,
+		c.rec_user_name AS
+		recUserName,
 		c.rec_date AS recDate,
-		c.fire_endurance_rate_name as fireEnduranceRateName,
+		c.fire_endurance_rate_name as
+		fireEnduranceRateName,
 		c.use_nature_name as useNatureName
 		FROM
 		cb_key_site c
-		left join cb_org_usr cou on c.belong_id =cou.sequence_nbr
 		where c.is_delete=FALSE
 		<if test="name != null and name != ''">
 			AND c.`name` like concat('%',#{name}, '%')
 		</if>
-		<if test="buildingId != null and buildingId != -1 and buildingId != '-1'">
-			AND c.`building_id`= #{buildingId}
+		<if test="buildingIds != null">
+			AND c.`building_id` in  
+			  <foreach collection="buildingIds" item="buildingId" open="(" close=")" separator=",">
+                #{buildingId}
+            </foreach>
          </if>
 		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
@@ -50,16 +59,14 @@
 		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
 			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
 		</if>
-		<if test="belongId != null and belongId!='-1' and belongId != -1">
-			AND c.`belong_id`= #{belongId}
-		</if>
-		<if test="belongName != null and belongName !=''">
-			AND c.`belong_name` like concat('%',#{belongName},'%')
+		<if test="bizOrgCode != null and bizOrgCode !=''">
+			AND c.`biz_org_code` like concat(#{bizOrgCode},'%')
 		</if>
 		order by c.rec_date desc
 	</select>
 
-	<select id="getSequenceNbr" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
+	<select id="getSequenceNbr"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
 		SELECT c.`name` as name,
 		c.belong_id as belongId,
 		cou.biz_org_name as belongName,
@@ -85,17 +92,22 @@
 		c.rec_user_name AS recUserName,
 		c.rec_date AS recDate,
 		c.fire_endurance_rate_name as fireEnduranceRateName,
-			   c.use_nature_name            as useNatureName
+		c.use_nature_name as useNatureName,
+		c.charge_person_code chargePersonCode,
+		c.biz_org_name as bizOrgName,
+		c.biz_org_code as bizOrgCode
 		FROM cb_key_site c
 		left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
-		where c.sequence_nbr = #{sequenceNbr}
+		where
+		c.sequence_nbr = #{sequenceNbr}
 		and c.is_delete = FALSE;
 	</select>
 
-	<select id="getKeySiteList" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
+	<select id="getKeySiteList"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto">
 		SELECT c.`name` as name,
 		c.belong_id as belongId,
-			   cou.biz_org_name             as belongName,
+		c.biz_org_name as belongName,
 		c.building_id as buildingId,
 		c.building_name as buildingName,
 		c.address_desc as addressDesc,
@@ -120,40 +132,43 @@
 		c.fire_endurance_rate_name as fireEnduranceRateName,
 		c.use_nature_name as useNatureName
 		FROM cb_key_site c
-				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
 		where c.is_delete = FALSE
-		<if test="name != null and name != ''">
+		<if test="name != null and name != '' and name != 'null'">
 			AND c.`name` like concat('%',#{name}, '%')
 		</if>
 		<if test="buildingId != null and buildingId != -1">
 			AND c.`building_id`= #{buildingId}
 		</if>
-		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
+		<if test="fireEnduranceRate != null and fireEnduranceRate != '' and fireEnduranceRate != 'null'">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}
 		</if>
-		<if test="useNature != null and useNature != ''">
+		<if test="useNature != null and useNature != '' and useNature != 'null'">
 			AND c.`use_nature`= #{useNature}
 		</if>
-		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != ''">
+		<if test="fireFacilitiesInfo != null and fireFacilitiesInfo != '' and fireFacilitiesInfo != 'null' ">
 			AND c.`fire_facilities_info`= #{fireFacilitiesInfo}
 		</if>
-		<if test="belongId != null and belongId!='-1' and belongId != -1">
-			AND c.`belong_id`= #{belongId}
+		<if test="bizOrgCode != null and bizOrgCode!='' and bizOrgCode!='null' ">
+			AND c.`biz_org_code` like concat(#{bizOrgCode}, '%')
 		</if>
 	</select>
 
-	<select id="getKeySiteDate" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto">
+	<select id="getKeySiteDate"
+		resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto">
 		SELECT
 		c.sequence_nbr AS `key`,
 		c.sequence_nbr AS `value`,
-		c.`name`                     as label,
+		c.`name` as
+		label,
 		c.address_desc as fireLocation,
 		c.longitude as floorLongitude,
 		c.latitude AS floorLatitude,
 		cou.biz_org_name as belongName,
 		c.belong_id as belongId
-		FROM cb_key_site c LEFT JOIN cb_org_usr cou on cou.sequence_nbr = c.belong_id
-		where c.is_delete=FALSE 
+		FROM cb_key_site c LEFT JOIN
+		cb_org_usr cou on cou.sequence_nbr = c.belong_id
+		where
+		c.is_delete=FALSE
 		<if test="id != null and id != -1">
 			AND c.`belong_id`= #{id}
 		</if>
@@ -171,4 +186,20 @@
 		GROUP BY
 		cb_key_site.address_desc
 	</select>
+
+	<select id="getKeySiteCount" resultType="map">
+		SELECT
+		parent_building_id,
+		count(1) as count
+		FROM
+		cb_key_site
+		WHERE
+		is_delete=false
+		and parent_building_id is not null
+			<if test="bizOrgCode != null and bizOrgCode != ''">
+			and biz_org_code like concat(#{bizOrgCode}, '%')
+		</if>
+		GROUP BY
+		building_id
+	</select>
 </mapper>

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

@@ -202,7 +202,7 @@
 		) AS personNumber
 		FROM
 		cb_linkage_unit clu
-		WHERE clu.is_delete=0
+		WHERE 1=1
 
 		<if test="unitName != null and unitName != ''">
 			AND clu.unit_name LIKE concat('%',#{unitName}, '%')
@@ -233,6 +233,7 @@
 			test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
 			AND clu.linkage_unit_type_code =#{linkageUnitTypeCode}
 		</if>
+		and clu.is_delete=0
 		order by clu.rec_date desc
 	</select>
 </mapper>

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

@@ -23,6 +23,7 @@
                                      u.sequence_nbr sequenceNbr,
                                      u.biz_org_name bizOrgName,
                                      u.biz_org_code bizOrgCode,
+                                     u.amos_org_id amosOrgId,
                                      u.parent_id parent_id,
                                      g.*
                                  FROM
@@ -94,6 +95,7 @@
             DISTINCT
             u.sequence_nbr sequenceNbr,
             u.biz_org_name bizOrgName,
+            u.amos_org_id amosOrgId,
             u.biz_org_code bizOrgCode,
             g.*
             FROM
@@ -112,7 +114,7 @@
             max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
             max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,
             max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode,
-            max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,v.field_value) end) positionType,
+            max(case v.field_code when 'positionType' then IFNULL(v.field_value,v.field_value_label) end) positionType,
             max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType,
             max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
             max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle,
@@ -544,12 +546,12 @@ GROUP BY
     max(case field_code when 'telephone' then field_value end)                            telephone
     FROM cb_dynamic_form_instance GROUP BY instance_id) b
 
-    on b.instance_id=a.sequence_nbr where a.biz_org_name is not null and a.is_delete = 0
+    on b.instance_id=a.sequence_nbr where a.biz_org_name is not null and a.is_delete = 0 and a.biz_org_type = 'PERSON'
      		<if test="parentId  != null and parentId  != '' and parentId  != '-1'">
                 and a.parent_id = #{parentId}
             </if>
-             <if test="bizOrgName != null and bizOrgName != ''">
-                AND  a.biz_org_name LIKE CONCAT( '%',#{bizOrgName}, '%')
+             <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND  a.biz_org_code LIKE CONCAT( '%',#{bizOrgCode}, '%')
             </if>
              <if test="internalPositionCode  != null and internalPositionCode  != ''">
                and b.internalPositionCode = #{internalPositionCode}
@@ -693,7 +695,7 @@ LEFT JOIN (
                 FROM cb_org_usr
                 WHERE biz_org_code LIKE concat(t1.biz_org_code, '%')
                   AND biz_org_type = 'DEPARTMENT'
-                  AND parent_id = t1.sequence_nbr) count,
+                  AND parent_id = t1.sequence_nbr and is_delete = 0 ) count,
                sequence_nbr
         FROM cb_org_usr t1
         WHERE sequence_nbr IN
@@ -743,4 +745,105 @@ LEFT JOIN (
             AND amos_org_id = #{userId}
         </if>
     </select>
+    <select id="queryBySequenceNbr" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT *
+        FROM cb_org_usr
+        WHERE is_delete = 0
+        <if test="parentId != null and parentId != ''">
+            AND sequence_nbr = #{parentId}
+        </if>
+    </select>
+    <select id="companyTreeByUserAndType" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            *
+        FROM
+            cb_org_usr usr
+        <where>
+            usr.is_delete = false
+            <choose>
+                <when test="type != null and type != ''">
+                    AND usr.biz_org_type = #{type}
+                </when>
+                <otherwise>
+                    AND ( usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
+                </otherwise>
+            </choose>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND usr.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
+            </if>
+            order by usr.rec_date
+        </where>
+    </select>
+    <select id="companyDeptListWithPersonCount"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            usr.*,
+            (select count(1) from cb_org_usr u where u.biz_org_type = 'PERSON' and u.is_delete = false and u.biz_org_code like CONCAT(usr.biz_org_code,'%')) as total
+        FROM
+            cb_org_usr usr
+        where
+         (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
+        and usr.is_delete = false
+    </select>
+
+    <select id="companyTreeByUser"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            usr.*
+        FROM
+            cb_org_usr usr
+        where
+            (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
+          and usr.is_delete = false
+          and usr.biz_org_code like CONCAT(#{bizOrgCode},'%')
+    </select>
+
+    <select id="listByOrgTypes" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        select
+            *
+        from
+            cb_org_usr usr
+        where
+        usr.is_delete = false
+        <if test="orgTypeList != null and orgTypeList.size > 0 ">
+            and usr.biz_org_type  in
+            <foreach collection="orgTypeList" item="bizOrgType" open="(" close=")" separator=",">
+                #{bizOrgType}
+            </foreach>
+        </if>
+        <if test="bizOrgCode != null and bizOrgCode  != ''">
+            and usr.biz_org_code LIKE CONCAT (#{bizOrgCode},'%')
+        </if>
+        order by usr.rec_date
+    </select>
+
+
+
+    <select id="selectPersonone" resultType="Map">
+    select	 group_concat(	CONCAT(	u.biz_org_name,' ',
+    IFNULL((select c.field_value from cb_dynamic_form_instance c where field_code='telephone' and c.instance_id=u.sequence_nbr),"")
+    ))	name
+    from  cb_org_usr u		LEFT JOIN
+    cb_dynamic_form_instance g on g.instance_id=u.sequence_nbr
+    where u.biz_org_type='PERSON' and g.field_code='fireManagementPostCode' and  g.field_value_label =#{name} and u.parent_id=#{id}
+
+</select>
+
+    <select id="getParentList" resultType="java.lang.String">
+       select getParentList(#{id}) as id;
+    </select>
+    <select id="selectPersonListByCompanyIdList"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        select *
+        from cb_org_usr
+        where biz_org_type = 'PERSON'
+        and is_delete = 0
+        and biz_org_code regexp
+        (select GROUP_CONCAT(biz_org_code SEPARATOR '|') from cb_org_usr where sequence_nbr in
+        <foreach collection="companyIdList" item="companyId" open="(" close=")" separator=",">
+            #{companyId}
+        </foreach>);
+    </select>
+
+
 </mapper>

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

@@ -71,6 +71,9 @@
         <if test='resourceType!=null and resourceType!=""'>
             and r.resource_type= #{resourceType}
         </if>
+        <if test='bizOrgCode !=null and bizOrgCode!=""'>
+            and r.biz_org_code like concat('%',#{bizOrgCode}, '%')
+        </if>
     </select>
 
 
@@ -134,6 +137,7 @@
         select * from cb_water_resource where is_delete = 1
         <if test="sequenceNbr != null and sequenceNbr != ''">and sequence_nbr = #{sequenceNbr}</if>
         <if test="resourceType != null and resourceType != ''">and resource_type = #{resourceType}</if>
+        <if test="equipCateGoryCode != null and equipCateGoryCode != ''">and equip_category_code = #{equipCateGoryCode}</if>
         <if test="equipId != null and equipId != ''">and equip_id = #{equipId}</if>
         <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
         <if test="belongFightingSystemId != null">
@@ -147,8 +151,23 @@
         <if test="belongBuildingId != null and belongBuildingId.size() > 0">
             and find_in_set(belong_building_id, #{belongBuildingId}) > 0
         </if>
+          <if test="bizOrgCode != null and bizOrgCode != ''">and biz_org_code  like concat( #{bizOrgCode}, '%')</if>
         order by cb_water_resource.rec_date desc
     </select>
+	<select id="getWaterTypeByBizOrgCode" resultType="map">
+     SELECT
+        equip_category_code type,
+		COUNT(sequence_nbr) as num
+	FROM
+		cb_water_resource
+	WHERE
+		is_delete = 1
+		   <if test="bizOrgCode != null and bizOrgCode != ''">AND biz_org_code like concat( #{bizOrgCode}, '%')</if>
+	GROUP BY
+    equip_category_code
+
 
 
+	</select>
+
 </mapper>

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

@@ -93,4 +93,7 @@ public class CarInfoDto implements Serializable {
 
     @ApiModelProperty(value = "车辆资源列表")
     private List<Map<String, Object>> resourceList;
+
+    @ApiModelProperty(value = "绑定人姓名")
+    private String userName;
 }

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

@@ -30,4 +30,9 @@ public class EquipmentSpecificDto extends BaseDTO<EquipmentSpecificDto> {
     private Long teamId;
     private Long agencyId;
 
+    private String team;
+    private String carId;
+
+    private String bizOrgCode;
+
 }
\ No newline at end of file

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;
+
+    @ApiModelProperty(value = "建筑ID")
+    private String buildId;
+}

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/EquipmentDetail.java

@@ -163,4 +163,13 @@ public class EquipmentDetail extends BaseEntity {
 	@ApiModelProperty(value = "位置信息")
 	private String area;
 
+
+	@ApiModelProperty(value = "经度")
+	@TableField(value = "longitude")
+	private Double longitude;
+
+	@ApiModelProperty(value = "纬度")
+	@TableField(value = "latitude")
+	private Double latitude;
+
 }

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

@@ -105,6 +105,12 @@ public class EquipmentIndex extends BaseEntity {
     @TableField(exist = false)
     private String perfQuotaStr;
 
+    /**
+     * 是否支持趋势查看
+     */
+    @TableField(value = "is_trend")
+    private Boolean isTrend;
+
     @TableField(value = "emergency_level_color")
     private String emergencyLevelColor;
 

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/EquipmentSpecificAlarmLog.java

@@ -192,6 +192,10 @@ public class EquipmentSpecificAlarmLog extends BaseEntity {
     @TableField(exist = false)
     private String cleanStatus;
 
+    @ApiModelProperty(value = "机场单位人员姓名")//只做筛选用
+    @TableField(exist = false)
+    private String jcsConfirmUserName;
+
     /**
      * 颜色
      */

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

@@ -123,6 +123,14 @@ public class FireFightingSystemEntity {
     @ApiModelProperty("系统类型编码")
     private String systemTypeCode;
 
+
+    @ApiModelProperty("机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
     @ApiModelProperty(value = "分析报告统计用参数（为空不统计） ")
     private String analysisIndexKey;
+
 }

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

 package com.yeejoin.equipmanage.common.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
@@ -128,4 +129,12 @@ public class Video extends BaseEntity {
     @ApiModelProperty(value = "监控区域ID")
     @TableField(value = "belongAreaId")
     private String belongAreaId;
+
+    @ApiModelProperty(value = "机构编码")
+    @TableField(value = "biz_org_code", updateStrategy = FieldStrategy.IGNORED)
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    @TableField(value = "biz_org_name", updateStrategy = FieldStrategy.IGNORED)
+    private String bizOrgName;
 }

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

@@ -34,4 +34,7 @@ public class VideoSource {
 
     @TableField(exist = false)
     private Date createDate;
+
+    @ApiModelProperty(value = "本级及父级建筑ids，冗余树形搜索")
+    private String parentSourceIds;
 }

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

@@ -48,6 +48,19 @@ public class WarehouseStructure extends BaseEntity {
 	@ApiModelProperty(value = "仓库ID")
 	private Long warehouseId;
 
+
+	//新加
+
+	@ApiModelProperty(value = "机构/部门名称")
+	@TableField("biz_org_name")
+	private String bizOrgName;
+
+	@ApiModelProperty(value = "机构编码")
+	@TableField("biz_org_code")
+	private String bizOrgCode;
+
+
+
 	private String remark;
 	
 	@ApiModelProperty(value = "预控系统中的ID字段")

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

@@ -30,4 +30,6 @@ public class BuildSearchDTO {
      * 分组类型
      */
     private String groupType;
+
+    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,15 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
     
     @ApiModelProperty(value = "所在位置名称")
     private String warehouseStructureName;
+
+    @ApiModelProperty(value = "单位部门名陈")
+    private String bizOrgName;
+    @ApiModelProperty(value = "单位部门org")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "队伍id")
+    private String teamId;
+
+    @ApiModelProperty(value = "是否物联")
+    private String isIot;
 }

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

@@ -15,4 +15,6 @@ public class VideoDTO extends BaseDTO<Video> {
      * 监控
      */
     Video video;
+
+    String orgTypes;
 }

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

@@ -59,4 +59,10 @@ public class BuildingVideoListVO {
     @ApiModelProperty("部门号")
     private String orgCode;
 
+    /**
+     * id列表
+     */
+    @ApiModelProperty("机构编码")
+    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/entity/vo/EquipmentIndexVO.java

@@ -63,6 +63,9 @@ public class EquipmentIndexVO {
     @ApiModelProperty(value = "更新日期")
     private Date updateDate;
 
+    @ApiModelProperty(value = "是否支持趋势查看")
+    private Integer isTrend;
+
     @ApiModelProperty(value = "指标枚举")
     private String valueEnum;
 

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

@@ -18,4 +18,5 @@ public class PageVideoVO {
     private String type;
     private String url;
     private String img;
+    private String bizOrgName;
 }

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

@@ -25,25 +25,31 @@ public class VideoDownloadVO implements Serializable {
     @ExcelProperty(value = "token", index = 3)
     private String token;
 
-    @ExcelProperty(value = "所属建筑编码", index = 4)
+    @ExcelProperty(value = "机构编码", index = 4)
+    private String bizOrgCode;
+
+    @ExcelProperty(value = "机构/部门名称", index = 5)
+    private String bizOrgName;
+
+    @ExcelProperty(value = "所属建筑编码", index = 6)
     private String buildingCodes;
 
-    @ExcelProperty(value = "关联消防设备编码(多个分号分隔)", index = 5)
+    @ExcelProperty(value = "关联消防设备编码(多个分号分隔)", index = 7)
     private String equipmentSpecificCodes;
 
-    @ExcelProperty(value = "详细地址(必填)", index = 6)
+    @ExcelProperty(value = "详细地址", index = 8)
     private String address;
 
-    @ExcelProperty(value = "备注", index = 7)
+    @ExcelProperty(value = "备注", index = 9)
     private String remark;
 
-    @ExcelProperty(value = "关联电力设备编码(多个分号分隔)", index = 8)
+    @ExcelProperty(value = "关联电力设备编码(多个分号分隔)", index = 10)
     private String importantEquipmentCodes;
     
-    @ExcelProperty(value = "视频类型(枪机/球机)(必填)", index = 9)
+    @ExcelProperty(value = "视频类型(枪机/球机)(必填)", index = 11)
     private String type;
     
-    @ExcelProperty(value = "图片地址", index = 10)
+    @ExcelProperty(value = "图片地址", index = 12)
     private String img;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/SourceTypeEnum.java

+package com.yeejoin.equipmanage.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author DELL
+ */
+@AllArgsConstructor
+@Getter
+public enum SourceTypeEnum {
+    /**
+     * 资源类型枚举
+     */
+    EQUIPMENT("装备","equipment", "equipmentSpecificSerivceImpl","refreshStaData"),
+    CAR("车辆","car", "carServiceImpl","refreshStaData"),
+    IOT("iot","car", "carServiceImpl","iotrefreshStaData");
+    private String name;
+
+    private String code;
+
+    private String beanName;
+
+    private String methodName;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/StringUtil.java

@@ -156,4 +156,12 @@ public class StringUtil {
 		}
 		return code;
 	}
+	
+	  public static String toString(Object s){
+	    	if(ObjectUtils.isEmpty(s)){
+	    		return "";
+	    	}
+			return String.valueOf(s);
+	    }
+	    
 }

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/BuildingTreeVo.java

@@ -5,12 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -74,4 +68,10 @@ public class BuildingTreeVo {
     @ApiModelProperty("建筑地址")
     private String address;
 
+    @ApiModelProperty("机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty("机构名称")
+    private String bizOrgName;
+    
 }

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/EquipmentOnCarVo.java

@@ -69,4 +69,5 @@ public class EquipmentOnCarVo {
 
     private String equipDefinitionName;
 
+    private String bizOrgCode;
 }

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;
+}