luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:瀚高适配

Browse Source
hangao
wangxy 5 months ago
parent 5595375ddc
commit e809daa7e6
8 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File

6
ruoyi-admin/pom.xml
Unescape View File

@ -56,6 +56,12 @@
<version>8.6.0</version>
</dependency>
<!--highgo jdbc-->
<dependency>
<groupId>com.highgo</groupId>
<artifactId>HgdbJdbc</artifactId>
<version>6.2.3</version>
</dependency>
<!-- 核心模块-->
<dependency>

28
ruoyi-admin/src/main/resources/application-prod.yml
Unescape View File

@ -2,24 +2,24 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.cj.jdbc.Driver
driverClassName: com.kingbase8.Driver
#driverClassName: org.postgresql.Driver
driverClassName: com.highgo.jdbc.Driver
druid:
# 主库数据源
master:
url: jdbc:kingbase8://192.168.110.55:54321/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&clientEncoding=UTF8
#username: root
#password: qwer1234
username: ENC(ElFzIjuV3codlxGotvqqyA==)
# password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ)
password: ENC(1p5e3vtTaq7oHGRDipJo/Q==)
#url: jdbc:postgresql://192.168.254.176:5432/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:highgo://127.0.0.1:5866/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#username: postgres highgo
#password: Qwer@1234 Qwer@1234
username: ENC(JLAHIbU3w8J5iJ1Uye0G3A==)
password: ENC(SRDnQl+5Iv2SC4UzwhSeILfFUUmY4pka)
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
@ -39,11 +39,11 @@ spring:
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
validationQuery: SELECT 1
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
webStatFilter:
enabled: true
statViewServlet:
enabled: true
@ -62,4 +62,4 @@ spring:
merge-sql: true
wall:
config:
multi-statement-allow: true
multi-statement-allow: true

2
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -59,7 +59,7 @@ spring:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
active: dev
active: prod
# 文件上传
servlet:
multipart:

4
ruoyi-system/src/main/resources/mapper/system/ElExamMapper.xml
Unescape View File

@ -50,9 +50,9 @@
<select id="onlineExamList" resultType="com.ruoyi.system.domain.exam.dto.response.ExamOnlineRespDTO">
SELECT ex.*
FROM el_exam ex
LEFT JOIN el_exam_depart dept ON ex.id=dept.exam_id AND ex.open_type=2
LEFT JOIN el_exam_depart dept ON ex.id=dept.exam_id AND ex.open_type='2'
LEFT JOIN ${prefix}sys_user uc ON uc.dept_id=dept.depart_id
WHERE ex.state=0 AND (ex.open_type=1 OR ex.open_type=3 OR uc.user_id=#{userId})
WHERE ex.state='0' AND (ex.open_type='1' OR ex.open_type='3' OR uc.user_id=#{userId})
<if test="title!=null and title!=''">
AND ex.title LIKE CONCAT('%',#{title},'%')
</if>

16
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
Unescape View File

@ -25,24 +25,24 @@
</resultMap>
<sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, ifnull(perms,'') as perms, icon, create_by, create_time
select menu_id, menu_name, parent_id, order_num, url, target, menu_type, visible, is_refresh, COALESCE(perms,'') as perms, icon, create_by, create_time
from sys_menu
</sql>
<select id="selectMenusByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, COALESCE(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
LEFT JOIN sys_role ro on ur.role_id = ro.role_id
where ur.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = 0 AND ro.status = 0
where ur.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = '0' AND ro.status = '0'
order by m.parent_id, m.order_num
</select>
<select id="selectMenuNormalAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, COALESCE(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
where m.menu_type in ('M', 'C') and m.visible = 0
where m.menu_type in ('M', 'C') and m.visible = '0'
order by m.parent_id, m.order_num
</select>
@ -52,7 +52,7 @@
</select>
<select id="selectMenuAllByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, COALESCE(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@ -78,7 +78,7 @@
</select>
<select id="selectMenuTree" parameterType="Long" resultType="String">
select concat(m.menu_id, ifnull(m.perms,'')) as perms
select concat(m.menu_id, COALESCE(m.perms,'')) as perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where rm.role_id = #{roleId}
@ -99,7 +99,7 @@
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, ifnull(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.url, m.visible, m.is_refresh, COALESCE(m.perms,'') as perms, m.target, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id

14
ruoyi-system/src/main/resources/mapper/system/SysUserOnlineMapper.xml
Unescape View File

@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.system.mapper.SysUserOnlineMapper">
<resultMap type="SysUserOnline" id="SysUserOnlineResult">
<id property="sessionId" column="sessionId" />
<id property="sessionId" column="session_id" />
<result property="loginName" column="login_name" />
<result property="deptName" column="dept_name" />
<result property="ipaddr" column="ipaddr" />
@ -19,17 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectOnlineVo">
select sessionId, login_name, dept_name, ipaddr, login_location, browser, os, status, start_timestamp, last_access_time, expire_time
select session_id, login_name, dept_name, ipaddr, login_location, browser, os, status, start_timestamp, last_access_time, expire_time
from sys_user_online
</sql>
<select id="selectOnlineById" parameterType="String" resultMap="SysUserOnlineResult">
<include refid="selectOnlineVo"/>
where sessionId = #{sessionId}
where session_id = #{sessionId}
</select>
<insert id="saveOnline" parameterType="SysUserOnline">
insert into sys_user_online(sessionId, login_name, dept_name, ipaddr, login_location, browser, os, status, start_timestamp, last_access_time, expire_time)
insert into sys_user_online(session_id, login_name, dept_name, ipaddr, login_location, browser, os, status, start_timestamp, last_access_time, expire_time)
values (#{sessionId}, #{loginName}, #{deptName}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{status}, #{startTimestamp}, #{lastAccessTime}, #{expireTime})
</insert>
@ -47,11 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lastAccessTime != null ">last_access_time = #{lastAccessTime},</if>
<if test="expireTime != null ">expire_time = #{expireTime},</if>
</set>
where sessionId = #{sessionId}
where session_id = #{sessionId}
</update>
<delete id="deleteOnlineById" parameterType="String">
delete from sys_user_online where sessionId = #{sessionId}
delete from sys_user_online where session_id = #{sessionId}
</delete>
<select id="selectUserOnlineList" parameterType="SysUserOnline" resultMap="SysUserOnlineResult">
@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOnlineByExpired" parameterType="String" resultMap="SysUserOnlineResult">
<include refid="selectOnlineVo"/> o
WHERE o.last_access_time <![CDATA[ <= ]]> #{lastAccessTime} ORDER BY o.last_access_time ASC
WHERE o.last_access_time &lt;= CAST(#{lastAccessTime} AS TIMESTAMP) ORDER BY o.last_access_time ASC
</select>
</mapper>

8
ruoyi-system/src/main/resources/mapper/system/TdCarrierIssuedMapper.xml
Unescape View File

@ -38,7 +38,7 @@
<result property="destoryStand" column="destory_stand" jdbcType="VARCHAR"/>
<result property="issuedDept" column="issued_dept" jdbcType="VARCHAR"/>
<result property="expirationTime" column="expiration_time" jdbcType="VARCHAR"/>
<result property="mentsendTime" column="mentSend_time" jdbcType="TIMESTAMP"/>
<result property="mentsendTime" column="mentsend_time" jdbcType="TIMESTAMP"/>
<result property="reclaimTime" column="reclaim_time" jdbcType="TIMESTAMP"/>
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap>
@ -55,7 +55,7 @@
update_time,remark,carrier_name,
area_city,area_district,maintain_stand,
destory_stand,issued_dept,expiration_time,
mentSend_time,reclaim_time,dept_id
mentsend_time,reclaim_time,dept_id
</sql>
<select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrierIssued">
select <include refid="Base_Column_List"/> from td_carrier_issued d
@ -115,7 +115,7 @@
<if test="areaDistrict!=null and areaDistrict!=''">
AND area_district = #{areaDistrict}
</if>
AND status in (1,2)
AND status in ('1','2')
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>
@ -179,7 +179,7 @@
<if test="areaDistrict!=null and areaDistrict!=''">
AND area_district = #{areaDistrict}
</if>
AND status in (3,4)
AND status in ('3','4')
<!-- 数据范围过滤 -->
${params.dataScope}
</trim>

8
ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
Unescape View File

@ -18,9 +18,9 @@
<result property="receivingUnits" column="receiving_units" jdbcType="VARCHAR"/>
<result property="receivingTime" column="receiving_time" jdbcType="TIMESTAMP"/>
<result property="receivingUser" column="receiving_user" jdbcType="VARCHAR"/>
<result property="issuingUnit" column="Issuing_unit" jdbcType="VARCHAR"/>
<result property="issuingTime" column="Issuing_time" jdbcType="TIMESTAMP"/>
<result property="issuingUser" column="Issuing_user" jdbcType="VARCHAR"/>
<result property="issuingUnit" column="issuing_unit" jdbcType="VARCHAR"/>
<result property="issuingTime" column="issuing_time" jdbcType="TIMESTAMP"/>
<result property="issuingUser" column="issuing_user" jdbcType="VARCHAR"/>
<result property="deliveryMethod" column="delivery_method" jdbcType="VARCHAR"/>
<result property="carrierVehicle" column="carrier_vehicle" jdbcType="VARCHAR"/>
<result property="mentsUse" column="ments_use" jdbcType="VARCHAR"/>
@ -53,7 +53,7 @@
carrier_extent,carrier_alliance,carrier_secret,
carrier_number,carrier_term,carrier_content,
receiving_units,receiving_time,receiving_user,
Issuing_unit,Issuing_time,Issuing_user,
issuing_unit,issuing_time,issuing_user,
delivery_method,carrier_vehicle,ments_use,
ments_time,usage_user,save_location,
location_require,maintain_depart,maintain_user,

Write Preview
Loading…
Cancel
Save