diff --git a/src/main/java/com/whdc/model/entity/ERule.java b/src/main/java/com/whdc/model/entity/ERule.java index 7820aac..1cf5441 100644 --- a/src/main/java/com/whdc/model/entity/ERule.java +++ b/src/main/java/com/whdc/model/entity/ERule.java @@ -32,7 +32,7 @@ import static com.whdc.model.MyConstant.REC; @Data @ApiModel(description = "正常范围规则表") @Accessors(chain = true) -@TableName("E_RULE") +@TableName("SHZH_IOT.E_RULE") public class ERule extends Model { private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/whdc/model/entity/EStationRules.java b/src/main/java/com/whdc/model/entity/EStationRules.java index 2f5bd73..dbd606d 100644 --- a/src/main/java/com/whdc/model/entity/EStationRules.java +++ b/src/main/java/com/whdc/model/entity/EStationRules.java @@ -29,7 +29,7 @@ import static com.whdc.model.MyConstant.REC; @Data @ApiModel(description = "测站关联规则表") @Accessors(chain = true) -@TableName("E_STATION_RULES") +@TableName("SHZH_IOT.E_STATION_RULES") public class EStationRules extends Model { private static final long serialVersionUID = 1L; /** diff --git a/src/main/java/com/whdc/valid/mapper/ValidateMapper.java b/src/main/java/com/whdc/valid/mapper/ValidateMapper.java index 40c5827..da68d8f 100644 --- a/src/main/java/com/whdc/valid/mapper/ValidateMapper.java +++ b/src/main/java/com/whdc/valid/mapper/ValidateMapper.java @@ -17,7 +17,7 @@ public interface ValidateMapper { * @param stcd * @return */ - @Select("SELECT E.ITEM,E.MIN,E.MAX,E.DIFF_MAX,E.DURATION,E.LEADING_TIME,E.LAG_TIME,T.SORT FROM E_STATION_RULES T LEFT JOIN E_RULE E ON T.RULE_ID = E.ID WHERE T.DEL = 1 AND E.DEL = 1 AND T.STCD = #{stcd} ORDER BY T.SORT ASC;") + @Select("SELECT E.ITEM,E.MIN,E.MAX,E.DIFF_MAX,E.DURATION,E.LEADING_TIME,E.LAG_TIME,T.SORT FROM SHZH_IOT.E_STATION_RULES T LEFT JOIN SHZH_IOT.E_RULE E ON T.RULE_ID = E.ID WHERE T.DEL = 1 AND E.DEL = 1 AND T.STCD = #{stcd} ORDER BY T.SORT ASC;") List getRuleByStcd(String stcd); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b0e47e6..b62f668 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,12 +6,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://127.0.0.1:5236?schema=SYSDBA - username: SYSDBA - password: 199999999 -# url: jdbc:dm://10.42.6.142:5236?schema=SHZH -# username: SHZH -# password: Shzh_890 +# url: jdbc:dm://127.0.0.1:5236?schema=SYSDBA +# username: SYSDBA +# password: 199999999 + url: jdbc:dm://10.42.6.247:5236?schema=SHZH + username: SHZH + password: Shzh_890 druid: initialSize: 5 minIdle: 5 @@ -35,20 +35,20 @@ spring: # Redis redis: database: 5 -# host: 10.42.6.75 - host: 127.0.0.1 + host: 10.42.6.75 +# host: 127.0.0.1 port: 6379 - password: -# password: Whdc_890 +# password: + password: Whdc_890 # 数据清洗专用redis redisRules: database: 6 -# host: 10.42.6.75 - host: 127.0.0.1 + host: 10.42.6.75 +# host: 127.0.0.1 port: 6379 - password: Whdc_890 -# password: +# password: Whdc_890 + password: timeout: 60000 lettuce: pool: diff --git a/src/main/resources/mapper/ERuleMapper.xml b/src/main/resources/mapper/ERuleMapper.xml index dda70dc..f626c44 100644 --- a/src/main/resources/mapper/ERuleMapper.xml +++ b/src/main/resources/mapper/ERuleMapper.xml @@ -6,7 +6,7 @@ SELECT E.* FROM - E_RULE E + SHZH_IOT.E_RULE E WHERE 1=1 E.DEL = 1 AND E.CREATETIME >= '${findDto.stm}' and E.CREATETIME <= diff --git a/src/main/resources/mapper/EStationRulesMapper.xml b/src/main/resources/mapper/EStationRulesMapper.xml index 2bc7b4e..b52a1fc 100644 --- a/src/main/resources/mapper/EStationRulesMapper.xml +++ b/src/main/resources/mapper/EStationRulesMapper.xml @@ -5,7 +5,7 @@ - SELECT * FROM E_STATION_RULES T - LEFT JOIN E_RULE E ON T.RULE_ID = E.ID + SELECT * FROM SHZH_IOT.E_STATION_RULES T + LEFT JOIN SHZH_IOT.E_RULE E ON T.RULE_ID = E.ID WHERE 1 = 1 AND T.DEL = 1 AND T.NAME LIKE CONCAT('%', #{findDto.name}, '%')