Merge branch 'develop_dl_plan6_temp' of…

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

@@ -411,5 +411,11 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "equipSpecific/getListByEquipmentCode/{code}", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>>  getListByEquipmentCode(@PathVariable("code") String code);
-
+    /**
+     * 根据code获取指定分类的装备列表
+     * @param code 分类
+     * @return 装备列表
+     */
+    @RequestMapping(value = "equipSpecific/getListByEquipmentCodeEQ/{code}", method = RequestMethod.GET)
+    ResponseModel<List<Map<String, Object>>>  getListByEquipmentCodeEQ(@PathVariable("code") String code);
 }

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

@@ -37,7 +37,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
 
     List<FirefightersDto> queryById(@Param("gw") String[] gw, @Param("name") String name);
 
-    List<Map<String, String>> selectNormalFirePerson(String jobId);
+    List<Map<String, String>> selectNormalFirePerson(String jobId,String bizOrgCode);
 
     List<Firefighters> getPersonByCodes(@Param("list") List<String> list);
 

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

@@ -217,7 +217,7 @@ public interface IOrgUsrService {
      * @param type  默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
      * @return
      */
-    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
+    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type, String station);
 
     /**
      * 获取公司部门树全量

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

@@ -255,10 +255,12 @@ SELECT
                 or LENGTH(cf.state_code) = 0
 			)
 		AND cf.is_delete = FALSE
-	<if test="jobCode != null">
-        AND find_in_set(#{jobCode},cf.job_title_code) > 0
-    </if>
-
+         <if test="jobId != null">
+             AND find_in_set(#{jobId},cf.job_title_code) > 0
+         </if>
+         <if test='bizOrgCode!=null and bizOrgCode!=""'>
+             and cf.biz_org_code like concat  (#{bizOrgCode},'%')
+         </if>
 	) cff
 LEFT JOIN cb_fire_team cft ON cff.fire_team_id = cft.sequence_nbr
 

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

@@ -956,6 +956,9 @@ LEFT JOIN (
                     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>

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/core/common/response/AppCheckInputRespone.java

@@ -32,7 +32,19 @@ public class AppCheckInputRespone{
 	private String riskDesc;
 	
 	private List<String> pointInputImgUrls;
-	
+
+
+	private String planTaskId;
+
+	public String getPlanTaskId() {
+		return planTaskId;
+	}
+
+	public void setPlanTaskId(String planTaskId) {
+		this.planTaskId = planTaskId;
+	}
+
+
 	public String getInputName() {
 		return inputName;
 	}

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

@@ -189,7 +189,7 @@ public class FireStationController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey()));
+        return ResponseHelper.buildResponse(iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(),null));
     }
     @PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -363,12 +363,12 @@ public class FireTeamController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司树", notes = "根据登录人及类型获取公司树")
-    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType() {
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false, value = "station")String station) {
         // 获取登陆人角色
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(),station);
         return ResponseHelper.buildResponse(menus);
     }
 

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

@@ -299,10 +299,10 @@ public class KeySiteController extends BaseController {
 		// 权限赋值
 		PermissionInterceptorContext.setDataAuthRule(authKey);
 		if ("all".equals(type)) {
-			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
 			return ResponseHelper.buildResponse(menus);
 		} else {
-			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+			List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
 			return ResponseHelper.buildResponse(menus);
 		}
 	}

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

@@ -445,7 +445,7 @@ public class OrgPersonController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/people/firefighter/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/people/firefighter/{id}/{type}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public ResponseModel<String> deleteFirefighterPeopleById(@PathVariable Long id,@PathVariable String type) {
         return ResponseHelper.buildResponse(iOrgUsrService.deleteFirefighterPeopleById(id,type));

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+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.enums.OrgPersonEnum;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,15 +38,6 @@ import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContex
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
 import com.yeejoin.amos.boot.module.common.api.entity.CompanyInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -111,6 +100,9 @@ public class OrgUsrController extends BaseController {
 	@Value("special-deptType")
 	String deptTypeKey;
 
+	@Autowired
+	DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
 	private static final String AUTH_SPECIAL_KEY = "fire_build_video_info";
 	/**
 	 * 新增单位信息
@@ -181,6 +173,31 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse("0");
 	}
 
+
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getUserTelephone", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+	public ResponseModel<Map<String,Object>> getUserTelephone(HttpServletRequest request, @RequestParam Long boss) throws Exception {
+
+		Map<String,Object> telephone=new HashMap<>();
+		OrgUsr org=iOrgUsrService.selectByAmosOrgId(boss);
+		if(org!=null){
+			QueryWrapper<DynamicFormInstance> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("field_code", "telephone");
+			queryWrapper.eq("instance_id", org.getSequenceNbr());
+			DynamicFormInstance dynamicFormInstance = dynamicFormInstanceMapper.selectOne(queryWrapper);
+			if(dynamicFormInstance!=null){
+				telephone.put("telephone",dynamicFormInstance.getFieldValue());
+			}else{
+				telephone.put("telephone","");
+			}
+		}
+		return ResponseHelper.buildResponse(telephone);
+	}
+
+
 	/**
 	 * 更新单位数据
 	 *
@@ -920,7 +937,7 @@ public class OrgUsrController extends BaseController {
 		}
 		// 权限处理
 		PermissionInterceptorContext.setDataAuthRule(authKey);
-		List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType);
+		List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, orgType, null);
 		return ResponseHelper.buildResponse(menus);
 	}
 

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

@@ -611,7 +611,7 @@ public class WaterResourceController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
         return ResponseHelper.buildResponse(menus);
     }
 

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

@@ -220,8 +220,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 		return	this.baseMapper.selectMaps(wrapper);
 	}
 
-	public Object getAllFirefightersPerson(String jobId) {
-		return firefightersMapper.selectNormalFirePerson(jobId);
+	public Object getAllFirefightersPerson(String jobId,String bizOrgCode) {
+		return firefightersMapper.selectNormalFirePerson(jobId,bizOrgCode);
 	}
 
 

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

@@ -1888,17 +1888,39 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return gettTreeByUser(user, companyDepartmentMsgList);
 	}
 
-	@Override
-	public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
+	public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type, String station) {
 		Map<String, Object> param = new HashMap<>();
 		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
-
+		if ("dl".equals(station)){
+			LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+			lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+			lambda.eq(OrgUsr::getIsDelete, false);
+			OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+			if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+				bizOrgCode = orgUsr.getBizOrgCode();
+			} else {
+				bizOrgCode = getCompanyNameById(orgUsr.getParentId());
+			}
+		}
 		param.put("bizOrgCode", bizOrgCode);
 		param.put("type", type);
 		List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);
 		return buildTreeParallel(list);
 	}
 
+	private String getCompanyNameById(String id) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getSequenceNbr, id);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+		if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+			return orgUsr.getBizOrgCode();
+		} else {
+			return getCompanyNameById(orgUsr.getParentId());
+		}
+
+	}
+
 	@Override
 	public List<OrgMenuDto> companyTreeAll(String type) {
 		Map<String, Object> param = new HashMap<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java

@@ -38,16 +38,14 @@ public class PersonIdentifyAspect {
     @Autowired
     private JcsFeign jcsFeignClient;
 
-//    package com.yeejoin.equipmanage.controller;
-//    com.yeejoin.amos.boot.biz.common.controller.BaseController
-//    @Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
-//    public void userDate() {
-//
-//    }
+    @Pointcut("execution(public * com.yeejoin.amos.*.business.controller..*(..))")
+    public void userDate() {
+
+    }
 
 
-    @Before(value = "@annotation(com.yeejoin.equipmanage.config.PersonIdentify) && @annotation(permission)")
-    public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) {
+    @Before(value = "userDate()")
+    public void personIdentity(JoinPoint joinPoint) {
         if(RequestContext.getToken() != null && RequestContext.getExeUserId() != null){
             ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 

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

@@ -3,6 +3,7 @@ package com.yeejoin.equipmanage.controller;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.constant.Constant;
 import com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO;
 import com.yeejoin.equipmanage.common.utils.*;
@@ -381,6 +382,16 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return equipmentSpecificSerivce.getListByEquipmentCode(code);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getListByEquipmentCodeEQ/{code}")
+    @ApiOperation(httpMethod = "GET", value = "根据装备分类code获取装备list", notes = "根据装备分类code获取装备list")
+    public List<Map<String, Object>> getFirePumpInfoEQ( @PathVariable String code){
+        ReginParams ReginParams=getSelectedOrgInfo();
+        String   bizCode= ReginParams.getPersonIdentity().getBizOrgCode();
+        return equipmentSpecificSerivce.getFirePumpInfoEQ(code,bizCode);
+    }
+
+
     @GetMapping(value = "/index/normal")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询非告警指标list", notes = "查询非告警指标list")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -230,6 +230,8 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<Map<String, Object>> getFireMonitorInfo(@Param("equipmentId") Long fireEquipmentId, @Param("list") String[] strings);
 
     List<Map<String, Object>> getFirePumpInfo(@Param("list") String[] strings);
+    List<Map<String, Object>> getFirePumpInfoEQ(@Param("list") String[] strings,@Param("bizOrgCode") String bizOrgCode);
+
 
     Integer getAllEquipNum(@Param("bizOrgCode") String bizOrgCode);
 

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

@@ -228,7 +228,7 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
      * @return 装备list
      */
     List<Map<String, Object>> getListByEquipmentCode(String code);
-
+    List<Map<String, Object>> getFirePumpInfoEQ(String code,String bizOrgCode);
     /**
      * 根据装备id获取物联日志
      * @param iotCode code

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

@@ -1841,6 +1841,16 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     }
 
     @Override
+    public List<Map<String, Object>> getFirePumpInfoEQ(String code,String bizCode) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (StringUtil.isNotEmpty(code)) {
+            String[] strings = code.split(",");
+            list = equipmentSpecificMapper.getFirePumpInfoEQ(strings,bizCode);
+        }
+        return list;
+    }
+
+    @Override
     public List<IotIndexInfoVo> getIndexInfoList(String iotCode, ResponseModel entity, Integer isTrend, String fieldKey) {
         List<IotIndexInfoVo> infoVoList = new ArrayList<>();
         String json = JSON.toJSONString(entity.getResult());

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

@@ -689,6 +689,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             EquipmentSpecificAlarmLog log = logs.get(0);
             EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
             Date date = new Date();
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String dateString = formatter.format(date);
             logs.forEach(x -> {
                 x.setCleanTime(new Date());
                 x.setStatus(AlarmStatusEnum.HF.getCode());
@@ -701,7 +703,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     } else {
                         x.setAlarmReason(equipmentName + "引起设备报警");
                     }
-                    x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                    x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
                     x.setConfirmUser("");
                     x.setConfirmUserName("系统自动处理");
                     x.setConfirmDate(date);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -113,6 +113,8 @@ public class FirefightersController extends BaseController {
 
     @Value("${auth-key-fire-fighters:fire_fighters_info}")
     private String authKey;
+    @Value("${system.type}")
+    private String type;
     @Autowired
     IUserCarService userCarService;
 
@@ -198,7 +200,7 @@ public class FirefightersController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         // 权限赋值
         PermissionInterceptorContext.setDataAuthRule(authKey);
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
         return ResponseHelper.buildResponse(menus);
     }
 
@@ -420,11 +422,18 @@ public class FirefightersController extends BaseController {
      * @return
      * @throws Exception
      */
+    @PersonIdentify
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/all/fire/person", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "所有的消防人员", notes = "所有的消防人员")
     public ResponseModel<Object> getAllFirefightersPerson(String jobCode)throws Exception {
-        return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(jobCode));
+        String bizOrgCode = null;
+        if("dl".equals(type)){
+            // 获取登陆人角色firefighters/all/fire/person
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        }
+        return ResponseHelper.buildResponse(iFirefightersService.getAllFirefightersPerson(jobCode,bizOrgCode));
     }
 
     /**

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

@@ -318,7 +318,7 @@ public class DataSourcesImpl implements DataSources {
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("fire_station_info");
 
-        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
         //List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
           //      OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         List<String> stringList = new ArrayList<String>();
@@ -368,7 +368,7 @@ public class DataSourcesImpl implements DataSources {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("fire_water_info");
-        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
         //       List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
         //  OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         List<String> stringList = new ArrayList<String>();
@@ -476,7 +476,7 @@ public class DataSourcesImpl implements DataSources {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("fire_team_info");
-        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey());
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
 
 //        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
 //                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
@@ -493,7 +493,7 @@ public class DataSourcesImpl implements DataSources {
         // 权限处理
         PermissionInterceptorContext.setDataAuthRule("key_site_info");
         // 修改bug6829 查询单位和部门数据
-        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, null);
+        List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
 
 //        List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
 //                OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
@@ -702,7 +702,9 @@ public class DataSourcesImpl implements DataSources {
 
     private String[] getListByEquipmentCode() {
         String code = "92010700,92011500";
-        ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentCode(code);
+        //ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentCode(code);
+        ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentCodeEQ(code);
+
         List<Map<String, Object>> equipmentList = response.getResult();
         String[] str = null;
         List<String> resultList = Lists.newArrayList();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

@@ -249,7 +249,7 @@ public class InputItemController extends AbstractBaseController {
 			inputItemService.addNewInputItem(inputItem);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("检查项新增失败: " + e.getMessage());
+			return CommonResponseUtil.failure("检查项新增失败: 请联系管理员 ");
 		}
 	}
 
@@ -292,7 +292,7 @@ public class InputItemController extends AbstractBaseController {
 			inputItemService.updateInputItem(inputItem);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("检查项新增失败: " + e.getMessage());
+			return CommonResponseUtil.failure("检查项新增失败:请联系管理员  " );
 		}
 	}
 
@@ -317,7 +317,7 @@ public class InputItemController extends AbstractBaseController {
 			redisUtils.del(EQUIP_AND_FIRE_TREE + (reginParams.getPersonIdentity().getBizOrgCode() == null? "" :reginParams.getPersonIdentity().getBizOrgCode()));
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("检查项新增失败: " + e.getMessage());
+			return CommonResponseUtil.failure("检查项新增失败:请联系管理员  " );
 		}
 	}
 
@@ -335,7 +335,7 @@ public class InputItemController extends AbstractBaseController {
 			inputItemService.delInputItem(itemID);
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("检查项新增失败: " + e.getMessage());
+			return CommonResponseUtil.failure("检查项新增失败:请联系管理员 ");
 		}
 	}
 
@@ -361,7 +361,7 @@ public class InputItemController extends AbstractBaseController {
 			inputItemService.saveAs(ids, user.getUserId());
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("检查项另存为失败: " + e.getMessage());
+			return CommonResponseUtil.failure("检查项另存为失败:请联系管理员 " );
 		}
 	}
 
@@ -637,7 +637,7 @@ public class InputItemController extends AbstractBaseController {
 			redisUtils.del(EQUIP_AND_FIRE_TREE + (reginParams.getPersonIdentity().getBizOrgCode() == null? "" :reginParams.getPersonIdentity().getBizOrgCode()));
 			return CommonResponseUtil.success();
 		} catch (Exception e) {
-			return CommonResponseUtil.failure("检查项新增失败: " + e.getMessage());
+			return CommonResponseUtil.failure("检查项新增失败:请联系管理员 ");
 		}
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/entity/mybatis/PointCheckDetailBo.java

@@ -56,6 +56,18 @@ public class PointCheckDetailBo {
 	private String userId;
 
 	private String checkDepartmentId;
+
+
+	private String planTaskId;
+
+	public String getPlanTaskId() {
+		return planTaskId;
+	}
+
+	public void setPlanTaskId(String planTaskId) {
+		this.planTaskId = planTaskId;
+	}
+
 	public String getUserId() {
 		return userId;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -1006,7 +1006,7 @@ public class CheckServiceImpl implements ICheckService {
                 appCheckInputRespone.setClassifyId(action.getClassifyId());
                 appCheckInputRespone.setClassifyName(action.getClassifyName());
                 appCheckInputRespone.setRemark(action.getRemark());
-
+                appCheckInputRespone.setPlanTaskId(action.getPlanTaskId());
                 String classifyName = action.getClassifyName();
                 if (!StringUtil.isNotEmpty(classifyName)) {
                     classifyName = "其他";

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -1377,6 +1377,8 @@ public class PointServiceImpl implements IPointService {
     @Override
     public HashMap<String, Object> getCheckPtListNew(String orgCode, CommonPageable commonPageable) {
         CheckPtListPageParam param =new CheckPtListPageParam();
+        param.setPageNumber(commonPageable.getPageNumber());
+        param.setPageSize(commonPageable.getPageSize());
         long total = pointMapper.getCheckPointCountNew(param);
         List<CheckPtListBo> content = pointMapper.getCheckPointListNew(param);
         param.setPageNumber(commonPageable.getPageNumber());

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

@@ -1702,6 +1702,40 @@
         ORDER BY realtiemIotIndexUpdateDate DESC
     </select>
 
+
+
+    <select id="getFirePumpInfoEQ" resultType="Map">
+        SELECT
+        wes.id,
+        wes.name,
+        wes.position,
+        wes.code,
+        wes.equipment_code equipmentCode,
+        wes.realtime_iot_index_name realtimeIotIndexName,
+        wes.realtime_iot_index_key realtimeIotIndexKey,
+        wes.realtime_iot_index_value realtimeIotIndexValue,
+        wes.value_label valueLabel,
+        wes.realtime_iot_es_index_id realtimeIotSpecificIndexId,
+        wes.realtime_iot_index_update_date realtiemIotIndexUpdateDate,
+        wes.realtime_iot_index_id realtimeIotIndexId
+        FROM
+        wl_equipment_specific wes
+        <where>
+            <if test="list != null and list.length > 0">
+                <foreach collection="list" item="item" index="index" open="(" close=")" separator="OR">
+                   wes.equipment_code LIKE <![CDATA[CONCAT(#{item},'%')]]>
+                </foreach>
+            </if>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                and  wes.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+            </if>
+
+        </where>
+        ORDER BY realtiemIotIndexUpdateDate DESC
+    </select>
+
+
+
     <select id="getAllEquipNum" resultType="java.lang.Integer">
         select count(*) from wl_equipment_specific
         <where>

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

@@ -2920,7 +2920,7 @@
         </if>
 
         <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
-            and wesp.biz_org_code like concat(#{bizOrgCode}, '%')
+            and wesp.biz_org_code like concat(#{dto.bizOrgCode}, '%')
         </if>
      </where>
     </select>

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

@@ -137,6 +137,8 @@ mqtt.topic.command.car.jw=carCoordinates
 management.security.enabled=true
 spring.security.user.name=admin
 spring.security.user.password=a1234560
+#?????????
+system.type=dl
 
 ##代码中有部分逻辑冲突需要处理  为区分机场和电力逻辑 增加开关 若为true 则为机场逻辑 为false 则为电力逻辑
 logic=false

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -409,7 +409,8 @@
 			pci.input_id checkInputId,
 			pci.order_no orderNo,
 			pci.point_classify_name classifyName,
-			pci.point_classify_id classifyId
+			pci.point_classify_id classifyId,
+            pc.plan_task_id as planTaskId
 		FROM
 			p_check_input pci
 		INNER JOIN p_input_item pii ON  pii.id = pci.input_id