diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index d6f0350..972e069 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -10,12 +10,18 @@ 4.0.0 jar ruoyi-admin - web服务入口 - + + 8.1.1.193 + + + com.dameng + DmJdbcDriver18 + ${dameng-jdbc-driver.version} + org.projectlombok @@ -34,7 +40,7 @@ knife4j-openapi2-spring-boot-starter - + mysql mysql-connector-java @@ -77,15 +83,15 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 false ${project.artifactId} - - + + ${project.artifactId} diff --git a/ruoyi-admin/src/main/resources/application-dm.yml b/ruoyi-admin/src/main/resources/application-dm.yml new file mode 100644 index 0000000..b7b8e24 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-dm.yml @@ -0,0 +1,62 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: dm.jdbc.driver.DmDriver + druid: + # 主库数据源 + master: + url: jdbc:dm://localhost:5236/SZYJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #url: jdbc:dm://localhost:5236/JCDBA?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: SZYJ + password: Qu8tDy25Jknx + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间,单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间,单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单,不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 951efa6..0edbee1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -59,7 +59,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: internet + active: dm # 文件上传 servlet: multipart: diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index e608e42..f728500 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time - from sys_job_log + from SZYJ.sys_job_log - delete from sys_job_log where job_log_id = #{jobLogId} + delete from SZYJ.sys_job_log where job_log_id = #{jobLogId} - delete from sys_job_log where job_log_id in + delete from SZYJ.sys_job_log where job_log_id in #{jobLogId} - truncate table sys_job_log + truncate table SZYJ.sys_job_log - insert into sys_job_log( + insert into SZYJ.sys_job_log( job_log_id, job_name, job_group, diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 5605c44..26c85c3 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark - from sys_job + from SZYJ.sys_job - delete from sys_job where job_id = #{jobId} + delete from SZYJ.sys_job where job_id = #{jobId} - delete from sys_job where job_id in + delete from SZYJ.sys_job where job_id in #{jobId} - update sys_job + update SZYJ.sys_job job_name = #{jobName}, job_group = #{jobGroup}, @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_job( + insert into SZYJ.sys_job( job_id, job_name, job_group, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index ca39f47..49a583c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark - from sys_config + from SZYJ.sys_config @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_config ( + insert into SZYJ.sys_config ( config_name, config_key, config_value, @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_config + update SZYJ.sys_config config_name = #{configName}, config_key = #{configKey}, @@ -104,11 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_config where config_id = #{configId} + delete from SZYJ.sys_config where config_id = #{configId} - delete from sys_config where config_id in + delete from SZYJ.sys_config where config_id in #{configId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index cf439f6..c1bd27c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time - from sys_dept d + from SZYJ.sys_dept d select d.dept_id - from sys_dept d - left join sys_role_dept rd on d.dept_id = rd.dept_id + from SZYJ.sys_dept d + left join SZYJ.sys_role_dept rd on d.dept_id = rd.dept_id where rd.role_id = #{roleId} and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) @@ -60,26 +60,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_dept( + insert into SZYJ.sys_dept( dept_id, parent_id, dept_name, @@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept + update SZYJ.sys_dept parent_id = #{parentId}, dept_name = #{deptName}, @@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set ancestors = + update SZYJ.sys_dept set ancestors = when #{item.deptId} then #{item.ancestors} @@ -146,14 +146,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dept set status = '0' where dept_id in + update SZYJ.sys_dept set status = '0' where dept_id in #{deptId} - update sys_dept set del_flag = '2' where dept_id = #{deptId} + update SZYJ.sys_dept set del_flag = '2' where dept_id = #{deptId} \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index b840700..4e0a921 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark - from sys_dict_data + from SZYJ.sys_dict_data @@ -57,22 +57,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_dict_data where dict_code = #{dictCode} + delete from SZYJ.sys_dict_data where dict_code = #{dictCode} - delete from sys_dict_data where dict_code in + delete from SZYJ.sys_dict_data where dict_code in #{dictCode} - update sys_dict_data + update SZYJ.sys_dict_data dict_sort = #{dictSort}, dict_label = #{dictLabel}, @@ -90,11 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + update SZYJ.sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} - insert into sys_dict_data( + insert into SZYJ.sys_dict_data( dict_sort, dict_label, dict_value, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 55b4075..0d211e0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select dict_id, dict_name, dict_type, status, create_by, create_time, remark - from sys_dict_type + from SZYJ.sys_dict_type - delete from sys_dict_type where dict_id = #{dictId} + delete from SZYJ.sys_dict_type where dict_id = #{dictId} - delete from sys_dict_type where dict_id in + delete from SZYJ.sys_dict_type where dict_id in #{dictId} - update sys_dict_type + update SZYJ.sys_dict_type dict_name = #{dictName}, dict_type = #{dictType}, @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_dict_type( + insert into SZYJ.sys_dict_type( dict_name, dict_type, status, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 822d665..9061d2c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + insert into SZYJ.sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) - delete from sys_logininfor where info_id in + delete from SZYJ.sys_logininfor where info_id in #{infoId} - truncate table sys_logininfor + truncate table SZYJ.sys_logininfor \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index 6762007..4c0b89d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -29,7 +29,7 @@ select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time - from sys_menu + from SZYJ.sys_menu select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time - from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 + from SZYJ.sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 order by m.parent_id, m.order_num select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time - from sys_menu m + from SZYJ.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 @@ -86,25 +86,25 @@ select distinct m.perms - from sys_menu m + from SZYJ.sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id where m.status = '0' and rm.role_id = #{roleId} @@ -124,7 +124,7 @@ - update sys_menu + update SZYJ.sys_menu menu_name = #{menuName}, parent_id = #{parentId}, @@ -156,7 +156,7 @@ - insert into sys_menu( + insert into SZYJ.sys_menu( menu_id, parent_id, menu_name, @@ -196,7 +196,7 @@ - delete from sys_menu where menu_id = #{menuId} + delete from SZYJ.sys_menu where menu_id = #{menuId} \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 65d3079..77389ce 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark - from sys_notice + from SZYJ.sys_notice - insert into sys_notice ( + insert into SZYJ.sys_notice ( notice_title, notice_type, notice_content, @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_notice + update SZYJ.sys_notice notice_title = #{noticeTitle}, notice_type = #{noticeType}, @@ -76,11 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_notice where notice_id = #{noticeId} + delete from SZYJ.sys_notice where notice_id = #{noticeId} - delete from sys_notice where notice_id in + delete from SZYJ.sys_notice where notice_id in #{noticeId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 96bc621..5535ecb 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time - from sys_oper_log + from SZYJ.sys_oper_log - insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) + insert into SZYJ.sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate()) @@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_oper_log where oper_id in + delete from SZYJ.sys_oper_log where oper_id in #{operId} @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - truncate table sys_oper_log + truncate table SZYJ.sys_oper_log \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 227c459..c226b23 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark - from sys_post + from SZYJ.sys_post select p.post_id - from sys_post p - left join sys_user_post up on up.post_id = p.post_id - left join sys_user u on u.user_id = up.user_id + from SZYJ.sys_post p + left join SZYJsys_user_post up on up.post_id = p.post_id + left join SZYJsys_user u on u.user_id = up.user_id where u.user_id = #{userId} @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_post + update SZYJ.sys_post post_code = #{postCode}, post_name = #{postName}, @@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_post( + insert into SZYJ.sys_post( post_id, post_code, post_name, @@ -109,11 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_post where post_id = #{postId} + delete from SZYJ.sys_post where post_id = #{postId} - delete from sys_post where post_id in + delete from SZYJ.sys_post where post_id in #{postId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139b..edb62b9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_role_dept where role_id=#{roleId} + delete from SZYJ.sys_role_dept where role_id=#{roleId} - delete from sys_role_dept where role_id in + delete from SZYJ.sys_role_dept where role_id in #{roleId} - insert into sys_role_dept(role_id, dept_id) values + insert into SZYJ.sys_role_dept(role_id, dept_id) values (#{item.roleId},#{item.deptId}) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 52306c2..26376e1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -24,10 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark - from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id - left join sys_dept d on u.dept_id = d.dept_id + from SZYJ.sys_role r + left join SZYJ.sys_user_role ur on ur.role_id = r.role_id + left join SZYJ.sys_user u on u.user_id = ur.user_id + left join SZYJ.sys_dept d on u.dept_id = d.dept_id select r.role_id - from sys_role r - left join sys_user_role ur on ur.role_id = r.role_id - left join sys_user u on u.user_id = ur.user_id + from SZYJ.sys_role r + left join SZYJ.sys_user_role ur on ur.role_id = r.role_id + left join SZYJ.sys_user u on u.user_id = ur.user_id where u.user_id = #{userId} @@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into sys_role( + insert into SZYJ.sys_role( role_id, role_name, role_key, @@ -122,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_role + update SZYJ.sys_role role_name = #{roleName}, role_key = #{roleKey}, @@ -139,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_role set del_flag = '2' where role_id = #{roleId} + update SZYJ.sys_role set del_flag = '2' where role_id = #{roleId} - update sys_role set del_flag = '2' where role_id in + update SZYJ.sys_role set del_flag = '2' where role_id in #{roleId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a85..0a5bc6b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_role_menu where role_id=#{roleId} + delete from SZYJ.sys_role_menu where role_id=#{roleId} - delete from sys_role_menu where role_id in + delete from SZYJ.sys_role_menu where role_id in #{roleId} - insert into sys_role_menu(role_id, menu_id) values + insert into SZYJ.sys_role_menu(role_id, menu_id) values (#{item.roleId},#{item.menuId}) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 486738a..2056901 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -86,10 +86,10 @@ r.role_sort, r.data_scope, r.status as role_status - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user_role ur on u.user_id = ur.user_id - left join sys_role r on r.role_id = ur.role_id + from SZYJ.sys_user u + left join SZYJ.sys_dept d on u.dept_id = d.dept_id + left join SZYJ.sys_user_role ur on u.user_id = ur.user_id + left join SZYJ.sys_role r on r.role_id = ur.role_id select user_id, user_name - from sys_user + from SZYJ.sys_user where user_name = #{userName} and del_flag = '0' limit 1 - insert into sys_user( + insert into SZYJ.sys_user( user_id, dept_id, user_name, @@ -247,7 +247,7 @@ - update sys_user + update SZYJ.sys_user dept_id = #{deptId}, user_name = #{userName}, @@ -273,31 +273,31 @@ - update sys_user + update SZYJ.sys_user set status = #{status} where user_id = #{userId} - update sys_user + update SZYJ.sys_user set avatar = #{avatar} where user_name = #{userName} - update sys_user + update SZYJ.sys_user set password = #{password} where user_name = #{userName} - update sys_user + update SZYJ.sys_user set del_flag = '2' where user_id = #{userId} - update sys_user set del_flag = '2' where user_id in + update SZYJ.sys_user set del_flag = '2' where user_id in #{userId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc4..f3c36e7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_user_post where user_id=#{userId} + delete from SZYJ.sys_user_post where user_id=#{userId} - delete from sys_user_post where user_id in + delete from SZYJ.sys_user_post where user_id in #{userId} - insert into sys_user_post(user_id, post_id) values + insert into SZYJ.sys_user_post(user_id, post_id) values (#{item.userId},#{item.postId}) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd72689..01a730c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -10,33 +10,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sys_user_role where user_id=#{userId} + delete from SZYJ.sys_user_role where user_id=#{userId} - delete from sys_user_role where user_id in + delete from SZYJ.sys_user_role where user_id in #{userId} - insert into sys_user_role(user_id, role_id) values + insert into SZYJ.sys_user_role(user_id, role_id) values (#{item.userId},#{item.roleId}) - delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + delete from SZYJ.sys_user_role where user_id=#{userId} and role_id=#{roleId} - delete from sys_user_role where role_id=#{roleId} and user_id in + delete from SZYJ.sys_user_role where role_id=#{roleId} and user_id in #{userId} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeDivisionMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeDivisionMapper.xml index 65f72b3..ec0a92f 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeDivisionMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeDivisionMapper.xml @@ -15,7 +15,7 @@ select id, district_code, district, county_code, county, sort - from b_administrative_division + from SZYJ.b_administrative_division - insert into b_administrative_division + insert into SZYJ.b_administrative_division district_code, district, @@ -67,7 +67,7 @@ - update b_administrative_division + update SZYJ.b_administrative_division district_code = #{districtCode}, district = #{district}, @@ -80,12 +80,12 @@ delete - from b_administrative_division + from SZYJ.b_administrative_division where id = #{id} - delete from b_administrative_division where id in + delete from SZYJ.b_administrative_division where id in #{id} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml index 4502861..5b59e54 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml @@ -16,7 +16,7 @@ select id, region, province, city, county, subdistrict, institution_name - from b_administrative + from SZYJ.b_administrative select county, subdistrict, institution_name as institutionName - from b_administrative + from SZYJ.b_administrative where institution_name!='苏州市' group by county - insert into b_administrative + insert into SZYJ.b_administrative region, province, @@ -134,7 +134,7 @@ - update b_administrative + update SZYJ.b_administrative region = #{region}, province = #{province}, @@ -148,12 +148,12 @@ delete - from b_administrative + from SZYJ.b_administrative where id = #{id} - delete from b_administrative where id in + delete from SZYJ.b_administrative where id in #{id} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml index 11b8226..55c4ad7 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BEnterpriseNewMapper.xml @@ -42,7 +42,7 @@ remark, user_id, dept_id - from b_enterprise_new + from SZYJ.b_enterprise_new @@ -68,8 +68,8 @@ a.user_id, a.dept_id, CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint - FROM b_enterprise_new a - LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code + FROM SZYJ.b_enterprise_new a + LEFT JOIN SZYJ.b_key_enterprise b ON a.enterprise_id = b.ent_code ) s and s.enterprise_id = #{enterpriseId} @@ -115,7 +115,7 @@ - insert into b_enterprise_new + insert into SZYJ.b_enterprise_new enterprise_id, enterprise_name, @@ -155,7 +155,7 @@ - update b_enterprise_new + update SZYJ.b_enterprise_new enterprise_id = #{enterpriseId}, enterprise_name = #{enterpriseName}, @@ -179,18 +179,18 @@ delete - from b_enterprise_new + from SZYJ.b_enterprise_new where id = #{id} - delete from b_enterprise_new where id in + delete from SZYJ.b_enterprise_new where id in #{id} - truncate table b_enterprise_new + truncate table SZYJ.b_enterprise_new @@ -229,9 +229,9 @@ a.user_id, a.dept_id, CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint - FROM b_enterprise_new a - LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code - LEFT JOIN b_plan_enterprise d ON a.enterprise_id = d.enterprise_id + FROM SZYJ.b_enterprise_new a + LEFT JOIN SZYJ.b_key_enterprise b ON a.enterprise_id = b.ent_code + LEFT JOIN SZYJ.b_plan_enterprise d ON a.enterprise_id = d.enterprise_id WHERE d.enterprise_id IS NULL)s diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml index 5706bfa..2a66608 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml @@ -6,7 +6,7 @@ - insert into b_key_enterprise + insert into SZYJ.b_key_enterprise ent_code, year, @@ -22,7 +22,7 @@ - select count(*) as count from b_key_enterprise where district like concat('%',#{district},'%') + select count(*) as count from SZYJ.b_key_enterprise where district like concat('%',#{district},'%') \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index cba592d..433cd66 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -32,7 +32,7 @@ check_ageing, uuto, check_time - from b_plan_enterprise + from SZYJ.b_plan_enterprise delete - from b_plan_enterprise + from SZYJ.b_plan_enterprise where plan_id = #{planId} @@ -145,10 +145,10 @@ c.EXAMINE_END_TIME as examineEndTime, CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS isPoint, CONCAT(d.district,'-', d.county) AS districtcounty - FROM b_plan_enterprise a - LEFT JOIN b_key_enterprise b ON a.enterprise_id = b.ent_code - LEFT JOIN b_enterprise_new c ON a.enterprise_id = c.enterprise_id - left join b_administrative_division d on a.district=d.county_code + FROM SZYJ.b_plan_enterprise a + LEFT JOIN SZYJ.b_key_enterprise b ON a.enterprise_id = b.ent_code + LEFT JOIN SZYJ.b_enterprise_new c ON a.enterprise_id = c.enterprise_id + left join SZYJ.b_administrative_division d on a.district=d.county_code and a.planned_year =#{req.plannedYear} @@ -181,7 +181,7 @@ order by law_sort,planned_month+0 - UPDATE b_plan_enterprise + UPDATE SZYJ.b_plan_enterprise SET status = 1 WHERE id in @@ -444,7 +444,7 @@ - update b_plan_enterprise + update SZYJ.b_plan_enterprise enterprise_id=#{enterpriseId}, district=#{district}, @@ -471,13 +471,13 @@ where id = #{id} - UPDATE b_enterprise_new a + UPDATE SZYJ.b_enterprise_new a INNER JOIN ( SELECT USC_CODE, MAX_EXAMINE_END_TIME FROM - ( SELECT ROW_NUMBER ( ) over ( PARTITION BY USC_CODE ORDER BY EXAMINE_END_TIME DESC ) rowId, USC_CODE, EXAMINE_END_TIME AS MAX_EXAMINE_END_TIME FROM sz_enfor_examine ) S + ( SELECT ROW_NUMBER ( ) over ( PARTITION BY USC_CODE ORDER BY EXAMINE_END_TIME DESC ) rowId, USC_CODE, EXAMINE_END_TIME AS MAX_EXAMINE_END_TIME FROM SZYJ.sz_enfor_examine ) S WHERE rowId = 1 ) c @@ -487,7 +487,7 @@ - insert into b_plan_enterprise + insert into SZYJ.b_plan_enterprise enterprise_id, district, diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BStandardizationMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BStandardizationMapper.xml index eae77e3..e8b1095 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BStandardizationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BStandardizationMapper.xml @@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, enterprise_name, standardized_grade from b_standardization + select id, enterprise_name, standardized_grade from SZYJ.b_standardization - insert into b_standardization + insert into SZYJ.b_standardization enterprise_name, standardized_grade, @@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update b_standardization + update SZYJ.b_standardization enterprise_name = #{enterpriseName}, standardized_grade = #{standardizedGrade}, @@ -49,11 +49,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from b_standardization where id = #{id} + delete from SZYJ.b_standardization where id = #{id} - delete from b_standardization where id in + delete from SZYJ.b_standardization where id in #{id} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/DictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/DictDataMapper.xml index bbdcb93..f1dc511 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/DictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/DictDataMapper.xml @@ -7,7 +7,7 @@ @@ -135,7 +135,7 @@ SOURCE_DATA, EXPERTS_IN_FLAG, EXPERTS_NAME - FROM sz_enfor_examine + FROM SZYJ.sz_enfor_examine WHERE USC_CODE = '913205097500181704' ORDER BY EXAMINE_END_TIME DESC LIMIT 1; @@ -143,7 +143,7 @@ - insert into sz_enfor_examine + insert into SZYJ.sz_enfor_examine dms_timestamp, ID, @@ -203,7 +203,7 @@ - update sz_enfor_examine + update SZYJ.sz_enfor_examine dms_timestamp = #{dmsTimestamp}, PLAN_EXAMINE_ID = #{planExamineId}, @@ -237,12 +237,12 @@ delete - from sz_enfor_examine + from SZYJ.sz_enfor_examine where ID = #{ID} - delete from sz_enfor_examine where ID in + delete from SZYJ.sz_enfor_examine where ID in #{ID} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/SzEntBasicInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/SzEntBasicInfoMapper.xml index 735f30b..d245167 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/SzEntBasicInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/SzEntBasicInfoMapper.xml @@ -178,7 +178,7 @@ ISBUYSAFETYINSURANCE, TURNOVER, SOURCE_DATA - from sz_ent_basic_info + from SZYJ.sz_ent_basic_info @@ -322,9 +322,9 @@ a.*, CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS is_point FROM - sz_ent_basic_info_new a + SZYJ.sz_ent_basic_info_new a LEFT JOIN - b_key_enterprise b ON a.USC_CODE = b.ent_code )s + SZYJ.b_key_enterprise b ON a.USC_CODE = b.ent_code )s and s.USC_CODE=#{req.uscCode} and s.ENTPRCOLOR=#{req.entprColor} @@ -346,12 +346,12 @@ - insert into sz_ent_basic_info + insert into SZYJ.sz_ent_basic_info dms_timestamp, ID, @@ -532,7 +532,7 @@ - update sz_ent_basic_info + update SZYJ.sz_ent_basic_info dms_timestamp = #{dmsTimestamp}, ENTPR_ID = #{entprId}, @@ -630,12 +630,12 @@ delete - from sz_ent_basic_info + from SZYJ.sz_ent_basic_info where ID = #{ID} - delete from sz_ent_basic_info where ID in + delete from SZYJ.sz_ent_basic_info where ID in #{ID} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/SzsAdministrativeDivisionMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/SzsAdministrativeDivisionMapper.xml index 3421223..787a02a 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/SzsAdministrativeDivisionMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/SzsAdministrativeDivisionMapper.xml @@ -42,7 +42,7 @@ UPDATETIME, SPELLING, IS_DELETE - from szs_administrative_division + from SZYJ.szs_administrative_division - insert into szs_administrative_division + insert into SZYJ.szs_administrative_division jhpt_update_time, LATITUDE, @@ -137,7 +137,7 @@ - update szs_administrative_division + update SZYJ.szs_administrative_division jhpt_update_time = #{jhptUpdateTime}, LATITUDE = #{LATITUDE}, @@ -162,12 +162,12 @@ delete - from szs_administrative_division + from SZYJ.szs_administrative_division where ID = #{ID} - delete from szs_administrative_division where ID in + delete from SZYJ.szs_administrative_division where ID in #{ID} diff --git a/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml index 9d66b35..2fb5b2d 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/SzsEnterpriseInformationMapper.xml @@ -130,7 +130,7 @@ MAJOR_PRODUCT, HTML_TEXT, FIXED_ASSETS - from szs_enterprise_information + from SZYJ.szs_enterprise_information