Skip to content

T
traffic-signal-platform
Commit 3b25fe68 authored by zhouleilei's avatar zhouleilei
Browse files
Options

国产化替代-瀚高数据库替换MySQL

parent bca48b51
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 32 deletions
signal-control-service/pom.xml
View file @ 3b25fe68
......@@ -233,11 +233,11 @@
</configuration>
<dependencies>
<!-- 数据库驱动 -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
</dependency>-->
</dependencies>
</plugin>
......
signal-control-service/src/main/resources/bootstrap-docker.yaml
View file @ 3b25fe68
......@@ -21,5 +21,5 @@ feign:
readTimeout: 500000
inforsuite:
# license-path: D:\\license
license-path: /data/license
\ No newline at end of file
license-path: D:\\license
# license-path: /data/license
\ No newline at end of file
signal-feign-service/src/main/resources/application-docker.properties
View file @ 3b25fe68
utc.service.url=http://127.0.0.1:32000/utc
utc.dt.service.url=http://127.0.0.1:39002/utc-dt
utc.hisense.service.url=http://127.0.0.1:39003/utc-hisense
control.url=http://127.0.0.1:32001/web
ehualu.url=http://127.0.0.1:30015
utc.service.url=http://37.8.219.195:32000/utc
utc.dt.service.url=http://37.8.219.195:39002/utc-dt
utc.hisense.service.url=http://37.8.219.195:39003/utc-hisense
control.url=http://37.8.219.195:32001/web
ehualu.url=http://37.8.219.195:30015
inforsuite.license-path=D:\\license
#inforsuite.license-path=/license
#inforsuite.license-path=/data/license
\ No newline at end of file
signal-utc-hisense-service/pom.xml
View file @ 3b25fe68
......@@ -188,11 +188,11 @@
</configuration>
<dependencies>
<!-- 数据库驱动 -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
</dependency>-->
</dependencies>
</plugin>
......
signal-utc-service/pom.xml
View file @ 3b25fe68
......@@ -238,11 +238,11 @@
</configuration>
<dependencies>
<!-- 数据库驱动 -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
</dependency>-->
</dependencies>
</plugin>
......
signal-utc-service/src/main/java/net/wanji/utc/task/CommandFaildTask.java
View file @ 3b25fe68
......@@ -206,6 +206,7 @@ public class CommandFaildTask {
public void insertCommandLog(String queryTime, JsonViewObject jsonViewObject, JSONObject jsonObject, int commandType, int updateCount) {
updateCount = updateCount + 1;
SignalCommandLogPO signalCommandLogPO = new SignalCommandLogPO();
jsonObject.put("commandType",commandType);
signalCommandLogPO.setCrossId(jsonObject.getString("crossId"));
signalCommandLogPO.setDataInfo(jsonObject.toJSONString());
signalCommandLogPO.setCommandType(5);
......
wj-common/pom.xml
View file @ 3b25fe68
......@@ -377,9 +377,14 @@
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>com.highgo</groupId>
<artifactId>HgdbJdbc</artifactId>
<version>6.2.2</version>
</dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependency>-->
<!-- MP相关 start -->
<dependency>
<groupId>com.baomidou</groupId>
......
wj-databus/src/main/resources/mapper/BaseCrossSchemeMapper.xml
View file @ 3b25fe68
......@@ -239,19 +239,19 @@
WHERE
schedules.cross_id = #{crossId}
AND (
DATE_FORMAT(schedules.special_date, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
TO_CHAR(schedules.special_date, 'YYYY-MM-DD') = TO_CHAR(NOW(), 'YYYY-MM-DD')
OR
(
schedules.week = #{week}
AND (
DATE_FORMAT(schedules.special_date, '%Y-%m-%d') != DATE_FORMAT(NOW(), '%Y-%m-%d')
TO_CHAR(schedules.special_date, 'YYYY-MM-DD') != TO_CHAR(NOW(), 'YYYY-MM-DD')
OR schedules.special_date IS NULL
)
)
)
AND DATE_FORMAT( NOW(), '%H:%i' ) BETWEEN DATE_FORMAT( CAST( section.start_time AS TIME ), '%H:%i' )
AND DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' )
ORDER BY schedules.special_date, DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' ),schedules.special_date DESC LIMIT 1
AND TO_CHAR( NOW(), 'HH24:MI' ) BETWEEN TO_CHAR( CAST( section.start_time AS TIME ), 'HH24:MI' )
AND TO_CHAR( CAST( section.end_time AS TIME ), 'HH24:MI' )
ORDER BY schedules.special_date, TO_CHAR( CAST( section.end_time AS TIME ), 'HH24:MI' ),schedules.special_date DESC LIMIT 1
</select>
<select id="selectSchemeByParams" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
......@@ -266,20 +266,20 @@
WHERE
schedules.cross_id = #{crossId}
AND (
DATE_FORMAT(schedules.special_date, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
TO_CHAR(schedules.special_date, 'YYYY-MM-DD') = TO_CHAR(NOW(), 'YYYY-MM-DD')
OR
(
schedules.week = #{week}
AND (
DATE_FORMAT(schedules.special_date, '%Y-%m-%d') != DATE_FORMAT(NOW(), '%Y-%m-%d')
TO_CHAR(schedules.special_date, 'YYYY-MM-DD') != TO_CHAR(NOW(), 'YYYY-MM-DD')
OR schedules.special_date IS NULL
)
)
)
AND DATE_FORMAT( #{queryTime}, '%H:%i' ) BETWEEN DATE_FORMAT( CAST( section.start_time AS TIME ), '%H:%i' )
AND DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' )
ORDER BY schedules.special_date, DATE_FORMAT( CAST( section.end_time AS TIME ), '%H:%i' ),schedules.special_date DESC LIMIT 1
AND TO_CHAR( #{queryTime}, 'HH24:MI' ) BETWEEN TO_CHAR( CAST( section.start_time AS TIME ), 'HH24:MI' )
AND TO_CHAR( CAST( section.end_time AS TIME ), 'HH24:MI' )
ORDER BY schedules.special_date, TO_CHAR( CAST( section.end_time AS TIME ), 'HH24:MI' ),schedules.special_date DESC LIMIT 1
</select>
......
wj-databus/src/main/resources/mapper/CrossSchemeMapper.xml
View file @ 3b25fe68
......@@ -17,16 +17,16 @@
<!-- 批量新增数据 -->
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into t_cross_scheme(id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted)
insert into t_cross_scheme(id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.id},#{entity.schemeNo},#{entity.name},#{entity.crossId},#{entity.cycle},#{entity.coordPhase},#{entity.offset},#{entity.source},#{entity.isDeleted})
</foreach>
</insert>
<insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
insert into t_cross_scheme(id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted)
values (#{id},#{schemeNo},#{name},#{crossId},#{cycle},#{coordPhase},#{offset},#{source},#{isDeleted})
<insert id="insertOne" keyProperty="id" useGeneratedKeys="true" >
insert into t_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted)
values (#{schemeNo},#{name},#{crossId},#{cycle},#{coordPhase},#{offset},#{source},#{isDeleted})
</insert>
<delete id="deleteOne">
......@@ -41,21 +41,21 @@
<select id="selectByCrossIdAndSchemeNo" resultMap="BaseResultMap">
select
id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,gmt_create,gmt_modified
id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,gmt_create,gmt_modified
from t_cross_scheme
where cross_id = #{crossId} and scheme_no = #{schemeNo}
where cross_id = #{crossId} and scheme_no = CAST(#{schemeNo} AS VARCHAR)
</select>
<select id="selectByCrossId" resultMap="BaseResultMap">
select
id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,gmt_create,gmt_modified
id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,gmt_create,gmt_modified
from t_cross_scheme
where cross_id = #{crossId}
</select>
<select id="selectSchemePOById" resultMap="BaseResultMap">
select
id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,gmt_create,gmt_modified
id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,gmt_create,gmt_modified
from t_cross_scheme
where id = #{id}
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment