fix: BUG#22148 分析诊断>健康指数>详情，三级页面的基本信息缺少换流站类型

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

@@ -38,7 +38,7 @@ public class OrgUsrFormDto implements Serializable {
 
     @ApiModelProperty(value = "归属机构/部门")
     private String parentId;
-    
+
     @ApiModelProperty(value = "机构/部门名称")
     private String bizOrgName;
 
@@ -94,6 +94,8 @@ public class OrgUsrFormDto implements Serializable {
     private String dwfz;
     @ApiModelProperty(value = "消防安全负责人")
     private String xfaq;
+    @ApiModelProperty(value = "换流站类型")
+    private String stationType;
 
     @ApiModelProperty(value = "公司消防信息")
     @TableField(exist = false)
@@ -113,9 +115,9 @@ public class OrgUsrFormDto implements Serializable {
 
 				});
 		  }
-		
+
 		  this.dynamicFormAlert=dynamicFormAlert;
-		
+
 	}
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/StationInfoMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/StationInfoMapper.java

-package com.yeejoin.amos.boot.module.jcs.api.mapper;
+package com.yeejoin.amos.boot.module.common.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 public interface StationInfoMapper extends BaseMapper {
     Long count(@Param("stationType") String stationType);
+    Map<String, String> selectStationInfo(@Param("bizOrgCode") String bizOrgCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/StationInfoMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/StationInfoMapper.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.jcs.api.mapper.StationInfoMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.StationInfoMapper">
     <select id="count" resultType="long">
         SELECT
             COUNT(1)
@@ -11,5 +11,16 @@
             </if>
         </where>
     </select>
-
+    <select id="selectStationInfo" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            idx_biz_station_info t
+        <where>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND t.BIZ_ORG_CODE = #{bizOrgCode}
+            </if>
+        </where>
+        LIMIT 1
+    </select>
 </mapper>

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

@@ -28,10 +28,7 @@ import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.feign.AmosTrainingFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IdxFeignClient;
-import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
-import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
-import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersJacketMapper;
-import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import com.yeejoin.amos.boot.module.common.api.mapper.*;
 import com.yeejoin.amos.boot.module.common.api.service.IDataSyncService;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
@@ -136,6 +133,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	@Autowired
 	OrgUsrServiceImpl iOrgUsrService;
 
+	@Autowired
+	private StationInfoMapper stationInfoMapper;
 
 	@Value("${jcs.company.topic.delete:jcs/company/topic/delete}")
 	private String airportDeleteTopic;
@@ -1421,6 +1420,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		CompanyInfo info = fireCompanyInfoServiceImpl.getOne(new QueryWrapper<CompanyInfo>().eq("instance_id", id).eq("is_delete", 0));
 		orgUsrFormVo.setCompanyInfo(info);
+		// 获取换流站类型
+		Map<String, String> stationInfo = stationInfoMapper.selectStationInfo(orgUsr.getBizOrgCode());
+		if (Objects.nonNull(stationInfo)) {
+			orgUsrFormVo.setStationType(stationInfo.getOrDefault("station_type", ""));
+		}
 		return orgUsrFormVo;
 	}
 

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

@@ -6,12 +6,12 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.mapper.StationInfoMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SignDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SinStaticDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Sign;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.SignMapper;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.StationInfoMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.ISignService;
 import com.yeejoin.amos.component.rule.config.RuleConfig;
 import lombok.extern.slf4j.Slf4j;