整合完成

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

@@ -17,6 +17,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import static com.bizmatics.mhfire.service.impl.JcjAjxxServiceImpl.ALERT_TYPE;
+
 /**
 
  * 警情
@@ -110,7 +112,12 @@ public class JcjAjxxController {
      */
     @GetMapping("/one")
     public ApiResult<JcjAjxx> getOne(@RequestParam String id) {
-        return ApiResult.success(jcjAjxxService.getOne(id));
+        JcjAjxx jcjAjxx = jcjAjxxService.getOne(id);
+        if (jcjAjxx.getAjlx().equals(ALERT_TYPE[0])){
+            //关联火灾查询
+            jcjAjxxService.getFire(jcjAjxx);
+        }
+        return ApiResult.success(jcjAjxx);
     }
 }
 

mhfire-controller/src/main/resources/application-dev.properties

@@ -23,6 +23,11 @@ spring.datasource.dynamic.datasource.mhfire.password=123456
 spring.datasource.dynamic.datasource.bulehelp.url=jdbc:mysql://101.133.214.75:3306/bulehelp?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
 spring.datasource.dynamic.datasource.bulehelp.username=root
 spring.datasource.dynamic.datasource.bulehelp.password=123456
+#Ïû·ÀÖ§¶Ó
+spring.datasource.dynamic.datasource.mhsystem.url=jdbc:mysql://101.133.214.75:3306/minhangsystem?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
+spring.datasource.dynamic.datasource.mhsystem.username=root
+spring.datasource.dynamic.datasource.mhsystem.password=123456
+
 
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5

mhfire-controller/src/main/resources/application-prod.properties

@@ -20,6 +20,11 @@ spring.datasource.dynamic.datasource.mhfire.url=jdbc:mysql://32.0.15.104:3306/mh
 spring.datasource.dynamic.datasource.mhfire.username=root
 spring.datasource.dynamic.datasource.mhfire.password=xfzdadmin#2021
 
+#Ïû·ÀÖ§¶Ó
+spring.datasource.dynamic.datasource.mhsystem.url=jdbc:mysql://32.1.7.42:3306/minhangsystem?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true
+spring.datasource.dynamic.datasource.mhsystem.username=mhzd119
+spring.datasource.dynamic.datasource.mhsystem.password=mysql570
+
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30

mhfire-service/src/main/java/com/bizmatics/mhfire/service/JcjAjxxService.java

@@ -56,4 +56,6 @@ public interface JcjAjxxService extends CrudService<JcjAjxx> {
     List<AlertStatisticsVO> getAlertStatistics(Date startTime, Date endTime);
 
     JcjAjxx getOne(String id);
+
+    void getFire(JcjAjxx jcjAjxx);
 }

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

@@ -1,5 +1,6 @@
 package com.bizmatics.mhfire.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,7 +13,6 @@ import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.mhfire.model.JcjAjxx;
-import com.bizmatics.mhfire.model.JcjZzclxx;
 import com.bizmatics.mhfire.persistence.mapper.JcjAjxxMapper;
 import com.bizmatics.mhfire.persistence.mapper.po.FireStatisticsPO;
 import com.bizmatics.mhfire.persistence.mapper.vo.LocateInfo;
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
  * @author ya
  * @since 2021-11-23
  */
+@DS("mhsystem")
 @Service
 public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAjxx> implements JcjAjxxService {
 
@@ -48,7 +49,7 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
     private JcjZzclxxService jcjZzclxxService;
 
 
-    private static final String[] ALERT_TYPE = {"火灾","社会救助","抢险救援"};
+    public static final String[] ALERT_TYPE = {"火灾","社会救助","抢险救援","排爆安检"};
 
     @Override
     public Map<String, List<AlertStatisticsVO>> getAlertStatisticsByHouse(Date startTime, Date endTime) {
@@ -155,26 +156,28 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
     @Override
     public JcjAjxx getOne(String id) {
         JcjAjxx jcjAjxx = this.getById(id);
-        if (jcjAjxx.getAjlx().equals(ALERT_TYPE[0])){
-            Date startTime = DateUtils.addMonths(jcjAjxx.getLasj(), -30);
-            Date endTime = DateUtils.addMonths(jcjAjxx.getLasj(), 30);
-            List<LocateInfo> lonLat = GouldUtil.getLonLat(jcjAjxx.getAfdz());
-            LocateInfo locateInfo = lonLat.get(0);
-            //计算精度维度在一定范围内的数据和火灾关联
-            List<FireStatisticsPO> list = fireStatisticsService.distanceList(locateInfo.getLongitude(), locateInfo.getLatitude(), startTime, endTime);
-            if (CollectionUtils.isNotEmpty(list)){
-                FireStatisticsPO fireStatisticsPo = list.get(0);
-                jcjAjxx.setPropertyLoss(fireStatisticsPo.getPropertyLoss());
-                jcjAjxx.setDeathToll(fireStatisticsPo.getDeathToll());
-                jcjAjxx.setNonFatal(fireStatisticsPo.getNonFatal());
-            }
-        }
-        //查询车辆和人员信息
-        List<JcjZzclxx> carLit = jcjZzclxxService.getByAjId(jcjAjxx.getId());
-        jcjAjxx.setCarList(carLit);
+        //查询车辆
+        jcjAjxx.setCarList(jcjZzclxxService.getByAjId(id));
         return jcjAjxx;
     }
 
+    @DS("mhfire")
+    @Override
+    public void getFire(JcjAjxx jcjAjxx){
+        Date startTime = DateUtils.addMonths(jcjAjxx.getLasj(), -30);
+        Date endTime = DateUtils.addMonths(jcjAjxx.getLasj(), 30);
+        List<LocateInfo> lonLat = GouldUtil.getLonLat(jcjAjxx.getAfdz());
+        LocateInfo locateInfo = lonLat.get(0);
+        //计算精度维度在一定范围内的数据和火灾关联
+        List<FireStatisticsPO> list = fireStatisticsService.distanceList(locateInfo.getLongitude(), locateInfo.getLatitude(), startTime, endTime);
+        if (CollectionUtils.isNotEmpty(list)){
+            FireStatisticsPO fireStatisticsPo = list.get(0);
+            jcjAjxx.setPropertyLoss(fireStatisticsPo.getPropertyLoss());
+            jcjAjxx.setDeathToll(fireStatisticsPo.getDeathToll());
+            jcjAjxx.setNonFatal(fireStatisticsPo.getNonFatal());
+        }
+    }
+
     @Override
     public List<AlertStatisticsVO> getAlertStatistics(Date startTime, Date endTime) {
 
@@ -185,6 +188,7 @@ public class JcjAjxxServiceImpl extends AbstractCrudService<JcjAjxxMapper, JcjAj
         list.add(getAsV(startTime, endTime, ALERT_TYPE[0]));
         list.add(getAsV(startTime, endTime, ALERT_TYPE[1]));
         list.add(getAsV(startTime, endTime, ALERT_TYPE[2]));
+        list.add(getAsV(startTime, endTime, ALERT_TYPE[3]));
         list.forEach(alertStatisticsVO -> {
             AlertStatisticsVO upAsv = getAsV(upStartTime, upEndTime, alertStatisticsVO.getType());
             Integer number = alertStatisticsVO.getNumber();

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

@@ -1,9 +1,10 @@
 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.JcjCjjl;
 import com.bizmatics.mhfire.persistence.mapper.JcjCjjlMapper;
 import com.bizmatics.mhfire.service.JcjCjjlService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
  * @author ya
  * @since 2021-11-23
  */
+@DS("mhsystem")
 @Service
 public class JcjCjjlServiceImpl extends AbstractCrudService<JcjCjjlMapper, JcjCjjl> implements JcjCjjlService {
 

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

@@ -1,7 +1,7 @@
 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.CarPerson;
 import com.bizmatics.mhfire.model.JcjZzclxx;
 import com.bizmatics.mhfire.persistence.mapper.JcjZzclxxMapper;
 import com.bizmatics.mhfire.service.JcjZzclxxService;
@@ -17,6 +17,7 @@ import java.util.List;
  * @author ya
  * @since 2021-11-23
  */
+@DS("mhsystem")
 @Service
 public class JcjZzclxxServiceImpl extends AbstractCrudService<JcjZzclxxMapper, JcjZzclxx> implements JcjZzclxxService {
 

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

@@ -1,5 +1,6 @@
 package com.bizmatics.mhfire.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -9,7 +10,6 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.mhfire.model.JcjZzclxx;
 import com.bizmatics.mhfire.model.XfzWxz;
 import com.bizmatics.mhfire.persistence.mapper.XfzWxzMapper;
-import com.bizmatics.mhfire.service.FireSiteDetailService;
 import com.bizmatics.mhfire.service.JcjZzclxxService;
 import com.bizmatics.mhfire.service.XfzWxzService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,13 +25,10 @@ import java.util.List;
  * @author ya
  * @since 2021-11-23
  */
+@DS("mhsystem")
 @Service
 public class XfzWxzServiceImpl extends AbstractCrudService<XfzWxzMapper, XfzWxz> implements XfzWxzService {
 
-
-    @Autowired
-    private FireSiteDetailService fireSiteDetailService;
-
     @Autowired
     private JcjZzclxxService jcjZzclxxService;
     @Override