德兴分支,修改db->ndb

eladmin-system/src/main/java/me/zhengjie/gemho/entity/data/DbData.java

@@ -27,7 +27,7 @@ import java.util.List;
 @ApiModel(value = "干滩")
 @Getter
 @Setter
-@TableName("tb_db_data")
+@TableName("tb_ndb_data")
 public class DbData implements Serializable {
 
     public static final long serialVersionUID = 1L;

eladmin-system/src/main/java/me/zhengjie/gemho/mapper/data/DbDataMapper.java

@@ -22,12 +22,12 @@ import java.util.List;
 
 @Mapper
 public interface DbDataMapper extends BaseMapper<DbData> {
-    @Select(value = "SELECT  a.*,CASE WHEN b.alarmlevel IS NULL THEN 0 ELSE b.alarmlevel END AS alarmlevel from `tb_db_data` a left join tab_abnormal b on a.time =b.time  ${ew.customSqlSegment} ")
+    @Select(value = "SELECT  a.*,CASE WHEN b.alarmlevel IS NULL THEN 0 ELSE b.alarmlevel END AS alarmlevel from `tb_ndb_data` a left join tab_abnormal b on a.time =b.time  ${ew.customSqlSegment} ")
     Page<DbData> pageAll(Page<DbData> page, @Param("ew") Wrapper wrapper);
 
-    @Select("select a.* from tb_db_data a join (select max(time) as time ,sensorid from tb_db_data  GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid  where a.sensorid=#{deviceid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')")
+    @Select("select a.* from tb_ndb_data a join (select max(time) as time ,sensorid from tb_ndb_data  GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid  where a.sensorid=#{deviceid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')")
     List<DbData> dealmonth(String deviceid, String start, String end);
 
-    @Select(value = "select  b.eqdanwei as eqdanwei,b.equipno equipno,b.equipname as sensorname,a.lenth  as `lenth`,a.angle as angle ,a.safeheight as safeheight ,DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_db_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_db_data  GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC")
+    @Select(value = "select  b.eqdanwei as eqdanwei,b.equipno equipno,b.equipname as sensorname,a.lenth  as `lenth`,a.angle as angle ,a.safeheight as safeheight ,DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_ndb_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_ndb_data  GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC")
     List<HashMap<String, Object>> real(String tailingid);
 }

eladmin-system/src/main/java/me/zhengjie/gemho/mapper/tab/DrybeachequipinforMapper.java

@@ -48,7 +48,7 @@ public interface DrybeachequipinforMapper extends BaseMapper<Drybeachequipinfor>
     @Select(value = "select count(id) from tb_drybeachequipinfor where tailingid=#{tailingid} and equipname!='基准点'")
     int getallcount(String equipno);
 
-    @Select("SELECT  count(distinct sensorid)AS `online`  from tb_db_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno WHERE a.time >=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d') and b.tailingid=#{tailingid}" +
+    @Select("SELECT  count(distinct sensorid)AS `online`  from tb_ndb_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno WHERE a.time >=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d') and b.tailingid=#{tailingid}" +
             "UNION ALL\n" +
             "SELECT count(distinct sensorid)AS `online`   from tb_dm_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno  WHERE a.time >=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%m-%d')and b.tailingid=#{tailingid}" +
             "UNION ALL\n" +

eladmin-system/src/main/resources/config/application-prod.yml

@@ -5,7 +5,7 @@ spring:
       connectionProperties: druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:8.142.46.126}:${DB_PORT:3306}/${DB_NAME:intest}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:8.142.46.126}:${DB_PORT:3306}/${DB_NAME:huajiao}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:jinghe2021//}
       # 初始连接数