预警相关jcs代码提交

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

@@ -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)

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.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface StationInfoMapper extends BaseMapper {
+    Long count(@Param("bizOrgCode") String bizOrgCode, @Param("stationType") String stationType);
+    Map<String, String> selectStationInfo(@Param("bizOrgCode") String bizOrgCode);
+    List<Map<String, Object>> selectStationInfoList();
+}

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.common.api.mapper.StationInfoMapper">
+    <select id="count" resultType="long">
+        SELECT
+            COUNT(1)
+        FROM idx_biz_station_info t
+        <where>
+            <if test="bizOrgCode != null and bizOrgCode != ''">
+                AND t.BIZ_ORG_CODE LIKE CONCAT(#{bizOrgCode}, '%')
+            </if>
+            <if test="stationType != null and stationType != ''">
+                AND t.STATION_TYPE = #{stationType}
+            </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>
+
+    <select id="selectStationInfoList" resultType="java.util.Map">
+        SELECT
+        *
+        FROM
+        idx_biz_station_info
+    </select>
+</mapper>

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

@@ -1067,6 +1067,36 @@ public class OrgUsrController extends BaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "查询公司bizOrgCode", notes = "查询公司bizOrgCode")
+	@GetMapping(value = "/getCompanyBiz")
+	public ResponseModel<Map<String, Object>> getCompanyBiz(@RequestParam("bizOrgCode") String bizOrgCode) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		if(orgUsrMapper.selectList(lambda).size() > 0) {
+			Map map = new HashMap();
+			OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+			try {
+				OrgUsrFormDto orgUsrFormDto = iOrgUsrService.selectCompanyById(orgUsr.getSequenceNbr());
+				map.put("bizOrgCode", orgUsrFormDto.getBizOrgCode());
+				map.put("bizOrgName", orgUsrFormDto.getBizOrgName());
+				map.put("parentName", orgUsrFormDto.getParentName());
+				map.put("companyPhone", orgUsrFormDto.getDynamicFormAlert().stream().filter(e->e.getKey().equals("companyPhone")).findFirst().get().getValue());
+				map.put("code", orgUsrFormDto.getCode());
+				map.put("dwfz", orgUsrFormDto.getDwfz());
+				map.put("xfaq", orgUsrFormDto.getXfaq());
+				map.put("xfgl", orgUsrFormDto.getXfgl());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return ResponseHelper.buildResponse(map);
+		} else {
+			return ResponseHelper.buildResponse(null);
+		}
+
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "查询公司bizOrgCode", notes = "查询公司bizOrgCode")
 	@GetMapping(value = "/getCompany")
 	public ResponseModel<String> getBizByAmos(@RequestParam("bizOrgCode") String bizOrgCode) {
 		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();

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;
@@ -126,6 +123,9 @@ 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;
@@ -1394,11 +1394,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<String, String> Xfgl = null;
 		Map<String, String> Dwfz = null;
 		List<OrgUsr> orgUsrs = getIdByOrgCode(orgUsr.getBizOrgCode(), id);
-		List<Long> ids = orgUsrs.stream().map(x -> x.getSequenceNbr()).collect(Collectors.toList());
-		if (CollectionUtils.isNotEmpty(ids)) {
-			Xfaq = orgUsrMapper.getManagePerson("消防安全负责人", ids);
-			Xfgl = orgUsrMapper.getManagePerson("消防安全管理人", ids);
-			Dwfz = orgUsrMapper.getManagePerson("法定代表人", ids);
+		if(orgUsrs!=null){
+			List<Long> ids = orgUsrs.stream().map(x -> x.getSequenceNbr()).collect(Collectors.toList());
+			if (CollectionUtils.isNotEmpty(ids)) {
+				Xfaq = orgUsrMapper.getManagePerson("消防安全负责人", ids);
+				Xfgl = orgUsrMapper.getManagePerson("消防安全管理人", ids);
+				Dwfz = orgUsrMapper.getManagePerson("法定代表人", ids);
+			}
 		}
 		orgUsrFormVo.setXfaq(Xfaq != null ? Xfaq.get("uname") : "");
 		orgUsrFormVo.setXfgl(Xfgl != null ? Xfgl.get("uname") : "");
@@ -1408,6 +1410,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;
 	}