完善duty

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.cy.url=jdbc:mysql://32.0.15.67:13306/mhdsj_xfdata?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC&characterEncoding=utf8
+spring.datasource.dynamic.datasource.cy.username=mysql
+spring.datasource.dynamic.datasource.cy.password=1qaz@WSX#mysql
+
 spring.datasource.dynamic.druid.initial-size=5                                                                       
 spring.datasource.dynamic.druid.min-idle=5
 spring.datasource.dynamic.druid.max-active=30
@@ -77,7 +82,7 @@ mqtt.url=tcp://47.98.201.73:1883
 
 
 # 对接闵行的网络
-mhwater.path=http://180.169.15.121:1680
+mhwater.path=http://32.0.15.62:1680
 
 
 # eureka

mhfire-mapping/src/main/java/com/bizmatics/mhfire/persistence/mapper/DutyMapper.java

@@ -1,7 +1,8 @@
-package com.bizmatics.persistence.mapper;
+package com.bizmatics.mhfire.persistence.mapper;
+
 
-import com.bizmatics.model.Duty;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.mhfire.model.Duty;
 
 /**
  * <p>

mhfire-model/src/main/java/com/bizmatics/model/Duty.java → mhfire-model/src/main/java/com/bizmatics/mhfire/model/Duty.java

@@ -1,11 +1,12 @@
-package com.bizmatics.model;
+package com.bizmatics.mhfire.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 

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

@@ -1,7 +1,8 @@
 package com.bizmatics.mhfire.service;
 
-import com.bizmatics.model.Duty;
+
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.mhfire.model.Duty;
 
 /**
  * <p>

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

@@ -29,7 +29,7 @@ public class OneCardApi {
     /**
      * token
      */
-    private static final String ACCESS_TOKEN = "";
+    private static final String ACCESS_TOKEN = "3kqxQdFCS5tcXPrEYZHlLeIgBUm0MDWi";
 
     /**
      * 内网地址
@@ -110,7 +110,7 @@ public class OneCardApi {
      */
     public void callInfoApi(Object param){
         log.info("闵行水系统心跳---开始");
-        sendApiBase(String.format("%s%s",path,"/iot/bomb/{XX}"),param,data -> log.info("获取到的数据"+ data));
+        sendApiBase(String.format("%s%s",path,"/iot/bomb/yt"),param,data -> log.info("获取到的数据"+ data));
         log.info("闵行水系统心跳---结束");
     }
 
@@ -121,7 +121,7 @@ public class OneCardApi {
     public void callAlarmApi(Object param){
 
         log.info("闵行水系统告警---开始");
-        sendApiBase(String.format("%s%s",path,"/iot/alarm/{XX}"),param,data -> log.info("获取到的数据"+ data));
+        sendApiBase(String.format("%s%s",path,"/iot/alarm/yt"),param,data -> log.info("获取到的数据"+ data));
         log.info("闵行水系统告警---结束");
     }
 

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

@@ -1,7 +1,8 @@
 package com.bizmatics.mhfire.service.impl;
 
-import com.bizmatics.model.Duty;
-import com.bizmatics.persistence.mapper.DutyMapper;
+
+import com.bizmatics.mhfire.model.Duty;
+import com.bizmatics.mhfire.persistence.mapper.DutyMapper;
 import com.bizmatics.mhfire.service.DutyService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;