国产化替代-瀚高数据库替换MySQL --修改utc和hisen服务兼容瀚高数据库

signal-control-service/src/main/resources/mapper/TBaseAreaInfoMapper.xml

@@ -34,10 +34,10 @@
         where id = #{id,jdbcType=INTEGER}
     </delete>
     <insert id="insert" parameterType="net.wanji.web.entity.TBaseAreaInfo">
-        insert into t_base_area_info (id, code, name,
+        insert into t_base_area_info (code, name,
                                       type, parent_code, location,
                                       gmt_create, gmt_modified, polylines)
-        values (#{id,jdbcType=INTEGER}, #{code,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
+        values (#{code,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR},
                 #{type,jdbcType=TINYINT}, #{parentCode,jdbcType=INTEGER}, #{location,jdbcType=VARCHAR},
                 #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{polylines,jdbcType=LONGVARCHAR})
     </insert>

signal-optimize-service/src/main/resources/mapper/CrossSchemeOptLogMapper.xml

@@ -29,7 +29,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, cross_id, scheme_id, dir_type, turn_type, offset, ring_no, phase_no, phase_order_id, ori_green_time,
+        id, cross_id, scheme_id, dir_type, turn_type, "offset", ring_no, phase_no, phase_order_id, ori_green_time,
         opt_time, opt_type, opt_reason, start_time, end_time, is_relation, relation_cross_id, opt_result, opt_result_desc,
         data_batch_time, restore_result, data_extend
     </sql>
@@ -71,7 +71,7 @@
     </select>
 
     <insert id="insertOne" parameterType="net.wanji.opt.po.base.CrossSchemeOptLogPO">
-        insert into t_base_cross_scheme_opt_log (cross_id, scheme_id, dir_type, turn_type, offset, ring_no, phase_no,
+        insert into t_base_cross_scheme_opt_log (cross_id, scheme_id, dir_type, turn_type, "offset", ring_no, phase_no,
                                                phase_order_id, ori_green_time, opt_time, opt_type, opt_reason,
                                                start_time,
                                                end_time, is_relation, relation_cross_id, opt_result, opt_result_desc,
@@ -83,7 +83,7 @@
 
     <insert id="insertBatch" parameterType="net.wanji.opt.po.base.CrossSchemeOptLogPO">
         insert into t_base_cross_scheme_opt_log
-               (cross_id, scheme_id, dir_type, turn_type, offset, ring_no, phase_no,
+               (cross_id, scheme_id, dir_type, turn_type, "offset", ring_no, phase_no,
                 phase_order_id, ori_green_time, opt_time, opt_type, opt_reason,
                 start_time, end_time, is_relation, relation_cross_id, opt_result, opt_result_desc,
                 data_batch_time, restore_result, data_extend)

wj-databus/src/main/resources/mapper/BaseCrossSchemeMapper.xml

@@ -19,7 +19,7 @@
     </resultMap>
 
     <sql id="baseColumnList">
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
     </sql>
 
     <!-- 查询方案基础信息列表 -->
@@ -31,7 +31,7 @@
         cross_id,
         cycle,
         coord_phase,
-        offset
+        "offset"
         from
         t_base_cross_scheme
         where 1=1
@@ -47,7 +47,7 @@
     </select>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status)
+        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.schemeNo},#{entity.name},#{entity.crossId},#{entity.cycle},#{entity.coordPhase},#{entity.offset},#{entity.source},#{entity.isDeleted},#{entity.status})
@@ -55,7 +55,7 @@
     </insert>
 
     <insert id="insertOne">
-        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status)
+        insert into t_base_cross_scheme(scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status)
         values (#{schemeNo},#{name},#{crossId},#{cycle},#{coordPhase},#{offset},#{source},#{isDeleted},#{status})
     </insert>
 
@@ -79,7 +79,7 @@
                 coord_phase = #{coordPhase},
             </if>
             <if test="offset != null and offset != ''">
-                offset = #{offset},
+                "offset" = #{offset},
             </if>
             <if test="source != null and source != ''">
                 source = #{source},
@@ -118,7 +118,7 @@
 
     <select id="selectByCrossId" resultMap="BaseResultMap">
         select
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where cross_id = #{crossId}
     </select>
@@ -130,14 +130,14 @@
 
     <select id="selectByCrossIdAndSchemeName" resultMap="BaseResultMap">
         select
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where cross_id = #{crossId} and name = #{schemeName}
     </select>
 
     <select id="selectById" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
         select
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where id = #{id}
     </select>
@@ -157,7 +157,7 @@
 
     <select id="selectByCrossIdAndSchemeNo" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
         select
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where cross_id = #{crossId} and scheme_no = #{schemeNo}
     </select>
@@ -175,13 +175,13 @@
 
     <select id="selectAll" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
         select
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
     </select>
 
     <select id="selectByCrossIdAndSchemeId" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
         select
-        id,scheme_no,name,cross_id,cycle,coord_phase,offset,source,is_deleted,status,gmt_create,gmt_modified
+        id,scheme_no,name,cross_id,cycle,coord_phase,"offset",source,is_deleted,status,gmt_create,gmt_modified
         from t_base_cross_scheme
         where cross_id = #{crossId} and id = #{schemeId}
     </select>
@@ -228,7 +228,7 @@
             scheme.scheme_no AS schemeId,
             scheme.`name` AS name,
             scheme.cycle AS cycle,
-            scheme.`offset` AS offset,
+            scheme."offset" AS offset,
             section.control_mode AS controlMode
         FROM
             t_cross_schedules schedules
@@ -256,7 +256,7 @@
     </select>
     <select id="selectSchemeByParams" resultType="net.wanji.databus.dao.entity.BaseCrossSchemePO">
         SELECT
-        scheme.id	AS	id,scheme.scheme_no	AS	schemeNo,scheme.name	AS	name,scheme.cross_id	AS	crossId,scheme.cycle	AS	cycle,scheme.coord_phase	AS	coordPhase,scheme.offset	AS	offset,scheme.source	AS	source,scheme.is_deleted	AS	isDeleted,scheme.status	AS	status,scheme.gmt_create	AS	gmtCreate,scheme.gmt_modified	AS	gmtModified
+        scheme.id	AS	id,scheme.scheme_no	AS	schemeNo,scheme.name	AS	name,scheme.cross_id	AS	crossId,scheme.cycle	AS	cycle,scheme.coord_phase	AS	coordPhase,scheme."offset"	AS	offset,scheme.source	AS	source,scheme.is_deleted	AS	isDeleted,scheme.status	AS	status,scheme.gmt_create	AS	gmtCreate,scheme.gmt_modified	AS	gmtModified
         FROM
             t_cross_schedules schedules
             LEFT JOIN t_cross_section section ON section.cross_id = schedules.cross_id
@@ -277,7 +277,7 @@
                     )
                 )
             )
-            AND TO_CHAR( #{queryTime}, 'HH24:MI' ) BETWEEN TO_CHAR( CAST( section.start_time AS TIME ), 'HH24:MI' )
+            AND TO_CHAR( CAST( #{queryTime} AS TIME ), '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
 

wj-databus/src/main/resources/mapper/CrossLightsMapper.xml

@@ -15,8 +15,8 @@
     </resultMap>
 
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_lights(id,lights_no,name,type,dir,turn,cross_id,in_out_type)
-        values (#{id},#{lightsNo},#{name},#{type},#{dir},#{turn},#{crossId},#{inOutType})
+        insert into t_cross_lights(lights_no,name,type,dir,turn,cross_id,in_out_type)
+        values (#{lightsNo},#{name},#{type},#{dir},#{turn},#{crossId},#{inOutType})
     </insert>
 
     <delete id="deleteOne">

wj-databus/src/main/resources/mapper/CrossPhaseLightsMapper.xml

@@ -12,10 +12,10 @@
 
     <!-- 批量新增数据 -->
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_phase_lights(id,lights_id,phase_id,cross_id)
+        insert into t_cross_phase_lights(lights_id,phase_id,cross_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.lightsId},#{entity.phaseId},#{entity.crossId})
+            (#{entity.lightsId},#{entity.phaseId},#{entity.crossId})
         </foreach>
     </insert>
 

wj-databus/src/main/resources/mapper/CrossPhaseMapper.xml

@@ -32,16 +32,16 @@
     </sql>
 
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_phase(id,phase_no,name,sort,cross_id,plan_id,ring_no,group_no,phase_type,control_mode,phase_time,green_time,green_flash_time,ped_flash_time,yellow_time,yellow_flash_time,red_time,red_flash_time,min_green_time,max_green_time)
-        values (#{id},#{phaseNo},#{name},#{sort},#{crossId},#{planId},#{ringNo},#{groupNo},#{phaseType},#{controlMode},#{phaseTime},#{greenTime},#{greenFlashTime},#{pedFlashTime},#{yellowTime},#{yellowFlashTime},#{redTime},#{redFlashTime},#{minGreenTime},#{maxGreenTime})
+        insert into t_cross_phase(phase_no,name,sort,cross_id,plan_id,ring_no,group_no,phase_type,control_mode,phase_time,green_time,green_flash_time,ped_flash_time,yellow_time,yellow_flash_time,red_time,red_flash_time,min_green_time,max_green_time)
+        values (#{phaseNo},#{name},#{sort},#{crossId},#{planId},#{ringNo},#{groupNo},#{phaseType},#{controlMode},#{phaseTime},#{greenTime},#{greenFlashTime},#{pedFlashTime},#{yellowTime},#{yellowFlashTime},#{redTime},#{redFlashTime},#{minGreenTime},#{maxGreenTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_phase(id,phase_no,name,sort,cross_id,plan_id,ring_no,control_mode,phase_time,green_time,
+        insert into t_cross_phase(phase_no,name,sort,cross_id,plan_id,ring_no,control_mode,phase_time,green_time,
         green_flash_time,ped_flash_time,yellow_time,red_time,min_green_time,max_green_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.phaseNo},#{entity.name},#{entity.sort},#{entity.crossId},#{entity.planId},#{entity.ringNo},
+            (#{entity.phaseNo},#{entity.name},#{entity.sort},#{entity.crossId},#{entity.planId},#{entity.ringNo},
             #{entity.controlMode},#{entity.phaseTime},#{entity.greenTime},#{entity.greenFlashTime},#{entity.pedFlashTime},
             #{entity.yellowTime},#{entity.redTime},#{entity.minGreenTime},#{entity.maxGreenTime})
         </foreach>
@@ -73,12 +73,12 @@
 
     <select id="selectIdsByPhaseNo" resultType="java.lang.Integer">
         select id from t_cross_phase
-        where cross_id = #{crossId} and phase_no = #{phaseNo}
+        where cross_id = #{crossId} and phase_no = CAST(#{phaseNo} AS VARCHAR)
     </select>
 
     <select id="selectPhaseId" resultType="java.lang.Integer">
         select id from t_cross_phase
-        where cross_id = #{crossId}  and plan_id = #{schemeId} and phase_no = #{phaseNo}
+        where cross_id = #{crossId}  and plan_id = #{schemeId} and phase_no = CAST(#{phaseNo} AS VARCHAR)
     </select>
 
     <select id="selectByCrossId" resultMap="BaseResultMap">

wj-databus/src/main/resources/mapper/CrossPlanMapper.xml

@@ -12,27 +12,27 @@
 
     <!--新增数据-->
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_plan(id,plan_no,name,cross_id)
-        values (#{id},#{planNo},#{name},#{crossId})
+        insert into t_cross_plan(plan_no,name,cross_id)
+        values (#{planNo},#{name},#{crossId})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_plan(id,plan_no,name,cross_id)
+        insert into t_cross_plan(plan_no,name,cross_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.planNo},#{entity.name},#{entity.crossId})
+            (#{entity.planNo},#{entity.name},#{entity.crossId})
         </foreach>
     </insert>
 
     <delete id="deleteOne">
         delete from t_cross_plan
-        where cross_id = #{crossId} and plan_no = #{planNo}
+        where cross_id = #{crossId} and plan_no = CAST(#{planNo} AS VARCHAR)
     </delete>
 
     <select id="selectIdByNo" resultType="java.lang.Integer">
         select id
         from t_cross_plan
-        where cross_id = #{crossId} and plan_no = #{planNo}
+        where cross_id = #{crossId} and plan_no = CAST(#{planNo} AS VARCHAR)
     </select>
 
     <select id="selectByCrossId" resultMap="BaseResultMap">
@@ -46,7 +46,7 @@
         select
             id,plan_no,name,cross_id,gmt_create,gmt_modified
         from t_cross_plan
-        where cross_id = #{crossId} and plan_no = #{planNo}
+        where cross_id = #{crossId} and plan_no = CAST(#{planNo} AS VARCHAR)
     </select>
 
     <select id="selectById" resultType="net.wanji.databus.dao.entity.CrossPlanPO">

wj-databus/src/main/resources/mapper/CrossSchedulesMapper.xml

@@ -18,10 +18,10 @@
 
     <!-- 批量新增数据 -->
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_schedules(id,schedule_no,name,cross_id,plan_id,week,special_date,months,weeks,days)
+        insert into t_cross_schedules(schedule_no,name,cross_id,plan_id,week,special_date,months,weeks,days)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.scheduleNo},#{entity.name},#{entity.crossId},#{entity.planId},#{entity.week},
+            (#{entity.scheduleNo},#{entity.name},#{entity.crossId},#{entity.planId},#{entity.week},
             #{entity.specialDate},#{entity.months},#{entity.weeks},#{entity.days})
         </foreach>
     </insert>

wj-databus/src/main/resources/mapper/CrossSchemeMapper.xml

@@ -17,10 +17,10 @@
 
     <!-- 批量新增数据 -->
     <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(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})
+            (#{entity.schemeNo},#{entity.name},#{entity.crossId},#{entity.cycle},#{entity.coordPhase},#{entity.offset},#{entity.source},#{entity.isDeleted})
         </foreach>
     </insert>
 

wj-databus/src/main/resources/mapper/CrossSectionMapper.xml

@@ -15,15 +15,15 @@
     </resultMap>
 
     <insert id="insertOne" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_section(id,section_no, start_time, end_time, cross_id, plan_id, control_mode, scheme_id)
-        values (#{id},#{sectionNo}, #{startTime}, #{endTime}, #{crossId}, #{planId}, #{controlMode}, #{schemeId})
+        insert into t_cross_section(section_no, start_time, end_time, cross_id, plan_id, control_mode, scheme_id)
+        values (#{sectionNo}, #{startTime}, #{endTime}, #{crossId}, #{planId}, #{controlMode}, #{schemeId})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into t_cross_section(id,section_no,start_time,end_time,cross_id,plan_id,control_mode,scheme_id)
+        insert into t_cross_section(section_no,start_time,end_time,cross_id,plan_id,control_mode,scheme_id)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id},#{entity.sectionNo},#{entity.startTime},#{entity.endTime},#{entity.crossId},#{entity.planId},#{entity.controlMode},#{entity.schemeId})
+            (#{entity.sectionNo},#{entity.startTime},#{entity.endTime},#{entity.crossId},#{entity.planId},#{entity.controlMode},#{entity.schemeId})
         </foreach>
     </insert>
 

wj-databus/src/main/resources/mapper/GreenwaveCrossMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="net.wanji.databus.dao.mapper.GreenwaveCrossMapper">
 
     <sql id="Base_Column_List">
-        id,green_id,cross_id,in_dir,out_dir,offset,sort,section_id,next_cross_len,
+        id,green_id,cross_id,in_dir,out_dir,"offset",sort,section_id,next_cross_len,
             is_key_route,gmt_create,gmt_modified, start_time, end_time, week
     </sql>