初步整合完成

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/TestController.java

@@ -2,6 +2,8 @@ package com.bizmatics.mhfire.controller.web;
 
 import com.bizmatics.mhfire.model.Alert;
 import com.bizmatics.mhfire.model.FireSite;
+import com.bizmatics.mhfire.model.WaterAj;
+import com.bizmatics.mhfire.service.WaterAjService;
 import com.bizmatics.mhfire.service.api.AlertAndSiteApi;
 import com.bizmatics.mhfire.service.job.AlertJob;
 import com.bizmatics.mhfire.service.job.FireSiteJob;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +29,8 @@ public class TestController {
 
     @Autowired
     private FireSiteJob fireSiteJob;
+    @Autowired
+    private WaterAjService waterAjService;
 
     @GetMapping("login")
     public String login(){
@@ -61,4 +66,21 @@ public class TestController {
         fireSiteJob.execute();
     }
 
+    @GetMapping("waterAjTest")
+    public void waterAjTest(){
+        WaterAj waterAj = new WaterAj();
+        waterAj.setCreateTime(new Date());
+        waterAj.setAjType("消防案件");
+        waterAj.setStreet("闵行街道");
+        waterAj.setAddress("所属街道");
+        waterAj.setGrid("网格通道");
+        waterAj.setDescribe("这个就是描述了");
+        waterAj.setDutyGroup("上海永天");
+        waterAj.setAjFlag(0);
+        waterAj.setEndTime(new Date());
+        waterAj.setEnclosure("meid");
+        waterAj.setImage("图片");
+        waterAjService.save(waterAj);
+    }
+
 }

mhfire-mapping/src/main/resources/mapper/mysql/WaterAjMapper.xml

@@ -1,9 +1,9 @@
 <?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.bizmatics.persistence.mapper.WaterAjMapper">
+<mapper namespace="com.bizmatics.mhfire.persistence.mapper.WaterAjMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.bizmatics.model.WaterAj">
+    <resultMap id="BaseResultMap" type="com.bizmatics.mhfire.model.WaterAj">
         <id column="id" property="id" />
         <result column="create_time" property="createTime" />
         <result column="aj_type" property="ajType" />

mhfire-model/src/main/java/com/bizmatics/mhfire/model/WaterAj.java

@@ -2,6 +2,8 @@ package com.bizmatics.mhfire.model;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -27,9 +29,9 @@ public class WaterAj implements Serializable {
     private Long id;
 
     /**
-     * 发生事件
+     * 发生时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 案件类型
@@ -69,7 +71,7 @@ public class WaterAj implements Serializable {
     /**
      * 截止时间
      */
-    private LocalDateTime endTime;
+    private Date endTime;
 
     /**
      * 附件

mhfire-service/src/main/java/com/bizmatics/mhfire/service/api/mhWater/OneCardApi.java

@@ -92,6 +92,7 @@ public class OneCardApi {
     public void sendApiBase(String url, Object param, Consumer<String> consumer){
         try {
             String result = HttpUtils.postJson(url, param, getAccessToken());
+            log.info("闵行水系统接口-----收到的数据"+result);
             JsonNode arrNode = MAPPER.readTree(result);
             if ("0".equals(arrNode.get("status").asText())){
                 JsonNode data = arrNode.get("data");

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/WaterAjServiceImpl.java

@@ -1,5 +1,6 @@
 package com.bizmatics.mhfire.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.mhfire.model.WaterAj;
 import com.bizmatics.mhfire.persistence.mapper.WaterAjMapper;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
  * @author ya
  * @since 2021-11-05
  */
+@DS("cy")
 @Service
 public class WaterAjServiceImpl extends AbstractCrudService<WaterAjMapper, WaterAj> implements WaterAjService {
 

mhfire-service/src/main/java/com/bizmatics/mhfire/service/listener/MqttListener.java

@@ -1,6 +1,8 @@
 package com.bizmatics.mhfire.service.listener;
 
 import com.bizmatics.common.spring.util.JsonUtils;
+import com.bizmatics.mhfire.model.WaterAj;
+import com.bizmatics.mhfire.service.WaterAjService;
 import com.bizmatics.mhfire.service.api.mhWater.OneCardApi;
 import com.bizmatics.mhfire.service.config.mqtt.MqttInConfig;
 
@@ -23,6 +25,8 @@ import java.util.Map;
 public class MqttListener {
     @Autowired
     private OneCardApi oneCardApi;
+    @Autowired
+    private WaterAjService waterAjService;
 
     public static final String MESSAGE_NAME = "messageInput";
 
@@ -45,6 +49,9 @@ public class MqttListener {
                     oneCardApi.callInfoApi(map);
                 }else if (topic.equals("mh/water/alert")){
                     oneCardApi.callAlarmApi(map);
+                }else if (topic.equals("mh/water/statistics")){
+                    WaterAj waterAj = JsonUtils.fromJson(payload, WaterAj.class);
+                    waterAjService.save(waterAj);
                 }
             }
         };