Merge branch 'develop_dl_plan6_temp' of…

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

@@ -253,7 +253,7 @@ public class OrgPersonController extends BaseController {
         Map<String, Object> req = new HashMap<>();
         ReginParams reginParams = getSelectedOrgInfo();
         String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
-        req.put("bizOrgCode", bizOrgCode);
+        req.put("OrgCode", bizOrgCode);
 //        if(redisUtils.get("userList:" + bizOrgCode) != null){
 //            return ResponseHelper.buildResponse(redisUtils.get("userList:" + 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

@@ -676,7 +676,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	public IPage<Map<String, Object>> listAllByCurrentUser(String pageNum, String pageSize, Map<String, Object> req) {
-		String bizOrgCode = req.get("bizOrgCode").toString();
+
 		IPage<Map<String, Object>> pageBean = null;
 		if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
 			pageBean = new Page<>(0, Long.MAX_VALUE);
@@ -3173,7 +3173,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
 			}
 			if ("positionType".equals(dynamicFormInstance.getFieldCode()) && peopleInfoDto.getFirefighters().getJobTitleCode() != null){
-				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(peopleInfoDto.getFirefighters().getJobTitleCode()).getName());
+				dynamicFormInstance.setFieldValueLabel(peopleInfoDto.getFirefighters().getJobTitle());
 			}
 			if ("administrativePositionCode".equals(dynamicFormInstance.getFieldCode()) && firefightersPost.getAdministrativePositionCode() != null){
 				dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(map1.get("administrativePositionCode").toString()).getName());

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

@@ -380,7 +380,10 @@ public class EquipmentSpecificController extends AbstractBaseController {
     @GetMapping(value = "/getListByEquipmentCode/{code}")
     @ApiOperation(httpMethod = "GET", value = "根据装备分类code获取装备list", notes = "根据装备分类code获取装备list")
     public List<Map<String, Object>> getListByEquipmentCode( @PathVariable String code){
-        return equipmentSpecificSerivce.getListByEquipmentCode(code);
+        ReginParams ReginParams=getSelectedOrgInfo();
+        String   bizCode= ReginParams.getPersonIdentity().getCompanyBizOrgCode();
+
+        return equipmentSpecificSerivce.getListByEquipmentCode(code,bizCode);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -229,7 +229,7 @@ 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>> getFirePumpInfo(@Param("list") String[] strings,@Param("bizOrgCode") String bizOrgCode);
     List<Map<String, Object>> getFirePumpInfoEQ(@Param("list") String[] strings,@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

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

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

@@ -58,7 +58,7 @@ public class EquipmentInfoOnPlanServiceImpl implements IEquipmentInfoOnPlanServi
     @Override
     public List<Map<String, Object>> getFirePumpInfo() {
         String[] strings = pumpCodes.split(",");
-        List<Map<String, Object>> list = equipmentSpecificMapper.getFirePumpInfo(strings);
+        List<Map<String, Object>> list = equipmentSpecificMapper.getFirePumpInfo(strings,null);
         return Optional.ofNullable(list).orElse(Lists.newArrayList());
     }
 

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

@@ -1831,11 +1831,11 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     }
 
     @Override
-    public List<Map<String, Object>> getListByEquipmentCode(String code) {
+    public List<Map<String, Object>> getListByEquipmentCode(String code,String bizOrgCode) {
         List<Map<String, Object>> list = new ArrayList<>();
         if (StringUtil.isNotEmpty(code)) {
             String[] strings = code.split(",");
-            list = equipmentSpecificMapper.getFirePumpInfo(strings);
+            list = equipmentSpecificMapper.getFirePumpInfo(strings,bizOrgCode);
         }
         return list;
     }

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

@@ -440,34 +440,34 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
 
             //字段长度效验
             if (!ValidationUtil.isEmpty(x.getName())&&x.getName().length()>100) {
-                throw new RuntimeException("错误行" + rowNum + "：名字过长");
+                throw new RuntimeException("错误行" + rowNum + "：名字不能大于100");
             }
             if (!ValidationUtil.isEmpty(x.getCode())&&x.getCode().length()>100) {
-                throw new RuntimeException("错误行" + rowNum + "：编号过长");
+                throw new RuntimeException("错误行" + rowNum + "：编号不能大于100");
             }
             if (!ValidationUtil.isEmpty(x.getUrl())&&x.getUrl().length()>255) {
                 throw new RuntimeException("错误行" + rowNum + "：视频地址过长");
             }
             if (!ValidationUtil.isEmpty(x.getToken())&&x.getToken().length()>255) {
-                throw new RuntimeException("错误行" + rowNum + "：token过长");
+                throw new RuntimeException("错误行" + rowNum + "：token不能大于255");
             }
             if (!ValidationUtil.isEmpty(x.getBizOrgCode())&&x.getBizOrgCode().length()>64) {
-                throw new RuntimeException("错误行" + rowNum + "：机构编码过长");
+                throw new RuntimeException("错误行" + rowNum + "：机构编码不能大于64");
             }
             if (!ValidationUtil.isEmpty(x.getBizOrgName())&&x.getBizOrgName().length()>128) {
-                throw new RuntimeException("错误行" + rowNum + "：机构名称过长");
+                throw new RuntimeException("错误行" + rowNum + "：机构名称不能大于128");
             }
 
             if (!ValidationUtil.isEmpty(x.getAddress())&&x.getAddress().length()>2000) {
-                throw new RuntimeException("错误行" + rowNum + "：地址过长");
+                throw new RuntimeException("错误行" + rowNum + "：地址不能大于2000");
             }
 
             if (ValidationUtil.isEmpty(x.getRemark())&&x.getRemark().length()>255) {
-                throw new RuntimeException("错误行" + rowNum + "：备注过长");
+                throw new RuntimeException("错误行" + rowNum + "：备注不能大于255");
             }
 
             if (!ValidationUtil.isEmpty(x.getImg())&&x.getImg().length()>100) {
-                throw new RuntimeException("错误行" + rowNum + "：备注过长");
+                throw new RuntimeException("错误行" + rowNum + "：备注不能大于100");
             }
 
 //            if (!urlPattern.matcher(x.getUrl().trim()).matches()) {

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

@@ -1706,6 +1706,9 @@
                     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>