120警情填报

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

@@ -39,7 +39,7 @@ public interface FireTeamMapper extends BaseMapper<FireTeam> {
 	 *
 	 * @return
 	 */
-	List<FireBrigadeResourceDto> listMonitorFireBrigade();
+	List<FireBrigadeResourceDto> listMonitorFireBrigade(@Param("code") String code );
 
 	/**
 	 * 查询消防队伍卡片分页列表

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

@@ -10,7 +10,7 @@
         FROM cb_fire_team ft
                  LEFT JOIN cb_firefighters ff ON ff.fire_team_id = ft.sequence_nbr
         WHERE ft.is_delete = 0
-          and ft.type_code = 118
+          and ft.type_code = #{code}
         GROUP BY ft.sequence_nbr
     </select>
     <select id="queryFighterByTeamId" resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto">

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertNewsDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/9/15
+ */
+
+/**
+ *物联消息
+ *
+ * */
+public class AlertNewsDto {
+
+    private String title;
+
+    private String content;
+
+    private String id;
+
+
+    private Object data;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    public AlertNewsDto() {
+    }
+
+    public AlertNewsDto(String title, String content, String id, Object data) {
+        this.title = title;
+        this.content = content;
+        this.id = id;
+        this.data = data;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/NewsDate.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/9/16
+ */
+public class NewsDate {
+
+     private Long      id;               // 物联警情id
+     private Double    floorLongitude;   //  建筑经度
+     private Double    floorLatitude;    // 建筑纬度
+     private String    floorName;        // 建筑名称
+     private String    unitInvolvedId;   // 事发单位
+     private String    unitInvolvedName; // 事发单位名称
+
+
+
+    public Double getFloorLongitude() {
+        return floorLongitude;
+    }
+
+    public void setFloorLongitude(Double floorLongitude) {
+        this.floorLongitude = floorLongitude;
+    }
+
+    public Double getFloorLatitude() {
+        return floorLatitude;
+    }
+
+    public void setFloorLatitude(Double floorLatitude) {
+        this.floorLatitude = floorLatitude;
+    }
+
+    public String getFloorName() {
+        return floorName;
+    }
+
+    public void setFloorName(String floorName) {
+        this.floorName = floorName;
+    }
+
+    public String getUnitInvolvedId() {
+        return unitInvolvedId;
+    }
+
+    public void setUnitInvolvedId(String unitInvolvedId) {
+        this.unitInvolvedId = unitInvolvedId;
+    }
+
+    public String getUnitInvolvedName() {
+        return unitInvolvedName;
+    }
+
+    public void setUnitInvolvedName(String unitInvolvedName) {
+        this.unitInvolvedName = unitInvolvedName;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireBrigadeTypeEnum.java

@@ -12,6 +12,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FireBrigadeTypeEnum {
     专职消防队("fullTime", "116", "专职消防队"),
+    医疗救援队("monitorTeam", "830", "医疗救援队"),
     监控大队("monitorTeam", "118", "监控大队");
 
     private String key;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

@@ -33,7 +33,7 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
     /**
      * 获取力量调派资源树
      */
-    List<FireBrigadeResourceDto> getPowerTree();
+    List<FireBrigadeResourceDto> getPowerTree(String type);
     List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/StartLoader.java

+package com.yeejoin.amos.boot.module.jcs.biz.config;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertNewsDto;
+import com.yeejoin.amos.component.rule.config.ClazzUtils;
+import com.yeejoin.amos.component.rule.config.RuleConfig;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/9/16
+ */
+@Component
+public class StartLoader implements ApplicationRunner {
+    private final Logger logger = LoggerFactory.getLogger(StartLoader.class);
+
+
+    @Autowired
+    private EmqKeeper emqKeeper;
+    @Value("${mqtt.topic.alert.iot}")
+    private String topic;
+    @Value("${mqtt.topic.alert.iot.web}")
+    private String topicweb;
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        logger.info("開始監聽物聯警情======================================");
+        loadSysParams();
+    }
+
+    public void loadSysParams(){
+        try {
+            emqKeeper.getMqttClient().subscribe(topic, (s, mqttMessage) -> {
+                byte[] payload = mqttMessage.getPayload();
+
+
+                try {
+                    String obj = new String(payload);
+                    if (!ValidationUtil.isEmpty(obj)) {
+                        JSONObject json = JSON.parseObject(obj);
+                        JSONObject date = (JSONObject) JSON.toJSON(json.get("data"));
+                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", date.get("unitInvolvedName")+","+date.get("floorName")+"楼，发生警情，请处理。", date.get("id").toString(),  obj);
+                        emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes(), RuleConfig.DEFAULT_QOS, true);
+                 }
+                } catch (Exception e) {
+                    logger.error("系统异常", e);
+                }
+            });
+        } catch (MqttException e) {
+            logger.info("订阅物联警情异常", e);
+        }
+    }
+
+}

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

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
+import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FireTeamServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
@@ -29,6 +32,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 力量调派
@@ -43,7 +47,8 @@ public class PowerTransferController extends BaseController {
 
     @Autowired
     PowerTransferServiceImpl powerTransferService;
-
+    @Autowired
+    FireTeamServiceImpl fireTeamService;
     @Autowired
     EquipFeignClient equipFeignClient;
 
@@ -184,10 +189,11 @@ public class PowerTransferController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/power/tree")
     @ApiOperation(value = "力量调派资源树", notes = "力量调派资源树")
-    public ResponseModel<Object> getPowerTree() {
-        return ResponseHelper.buildResponse(powerTransferService.getPowerTree());
+    public ResponseModel<Object> getPowerTree( @RequestParam String type) {
+        return ResponseHelper.buildResponse(powerTransferService.getPowerTree(type));
     }
 
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/power/list")
     @ApiOperation(value = "力量出动列表", notes = "力量调派资源树")

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

@@ -67,8 +67,8 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
      *
      * @return
      */
-    public List<FireBrigadeResourceDto> listMonitorFireBrigade() {
-        return fireTeamMapper.listMonitorFireBrigade();
+    public List<FireBrigadeResourceDto> listMonitorFireBrigade(String code ) {
+        return fireTeamMapper.listMonitorFireBrigade(code);
     }
 
     /**

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

@@ -154,9 +154,22 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     }
 
     @Override
-    public List<FireBrigadeResourceDto> getPowerTree() {
+    public List<FireBrigadeResourceDto> getPowerTree(String type) {
         List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
 
+        if(type!=null&&!"".equals(type)){
+            // 3.消防队伍-监控大队
+            List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
+            FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();
+            monitorResourceDto1.setId("0");
+            monitorResourceDto1.setName(FireBrigadeTypeEnum.医疗救援队.getName());
+            monitorResourceDto1.setType(FireBrigadeTypeEnum.医疗救援队.getKey());
+            monitorResourceDto1.setChildren(monitorFireBrigadeList1);
+            if (!CollectionUtils.isEmpty(monitorFireBrigadeList1)) {
+                fireBrigadeResourceList.add(monitorResourceDto1);
+            }
+        }
+
         // 1.调用装备服务接口查询车辆列表
         List<FireBrigadeResourceDto> fireCarDtoList = Lists.newArrayList();
         ResponseModel<Object> result = equipFeignService.getFireCarListAll();
@@ -208,7 +221,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         }
 
         // 3.消防队伍-监控大队
-        List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade();
+        List<FireBrigadeResourceDto> monitorFireBrigadeList = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.监控大队.getCode());
         FireBrigadeResourceDto monitorResourceDto = new FireBrigadeResourceDto();
         monitorResourceDto.setId("0");
         monitorResourceDto.setName(FireBrigadeTypeEnum.监控大队.getName());
@@ -219,6 +232,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             fireBrigadeResourceList.add(monitorResourceDto);
         }
 
+
+
+
         return fireBrigadeResourceList;
     }
 

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

@@ -63,6 +63,10 @@ mqtt.topic.command.meteorological.notice=meteorological
 
 mqtt.topic.command.power.deployment=power
 
+mqtt.topic.alert.iot=iotnews
+mqtt.topic.alert.iot.web=iotNewsWeb
+
+
 security.systemctl.name=AMOS-API-SYSTEMCTL
 
 jcs.company.topic.add=jcs/company/topic/add