CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mark

Browse Source
This commit is contained in:
caixiang
2023-02-27 15:49:58 +08:00
parent fed8f82ff0
commit bb8986c98d
11 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ym-admin/src/main/resources/mapper/SysDeptDao.xml
View File

@@ -6,9 +6,8 @@
<select id="getList" resultType="com.cnbm.admin.entity.SysDeptEntity"> <select id="getList" resultType="com.cnbm.admin.entity.SysDeptEntity">
select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1 select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
<where> <where>
t1.valid = 1
<if test="deptIdList != null"> <if test="deptIdList != null">
and t1.id in t1.id in
<foreach item="id" collection="deptIdList" open="(" separator="," close=")"> <foreach item="id" collection="deptIdList" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
@@ -19,15 +18,15 @@
<select id="getById" resultType="com.cnbm.admin.entity.SysDeptEntity"> <select id="getById" resultType="com.cnbm.admin.entity.SysDeptEntity">
select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1 select t1.*,(select t2.name from sys_dept t2 where t2.id=t1.pid)parentName from sys_dept t1
where t1.id = #{value} AND t1.valid = 1 where t1.id = #{value}
</select> </select>
<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity"> <select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity">
select t1.id, t1.pid from sys_dept t1 AND t1.valid = 1 select t1.id, t1.pid from sys_dept t1
</select> </select>
<select id="getSubDeptIdList" resultType="long"> <select id="getSubDeptIdList" resultType="long">
select id from sys_dept where pids like #{id} AND valid = 1 select id from sys_dept where pids like #{id}
</select> </select>
</mapper> </mapper>

2
ym-admin/src/main/resources/mapper/SysDictDataDao.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.cnbm.admin.dao.SysDictDataDao"> <mapper namespace="com.cnbm.admin.dao.SysDictDataDao">
<select id="getDictDataList" resultType="com.cnbm.admin.entity.DictData"> <select id="getDictDataList" resultType="com.cnbm.admin.entity.DictData">
select dict_type_id, dict_label, dict_value from sys_dict_data WHERE valid = 1 order by dict_type_id, sort select dict_type_id, dict_label, dict_value from sys_dict_data order by dict_type_id, sort
</select> </select>
</mapper> </mapper>

2
ym-admin/src/main/resources/mapper/SysDictTypeDao.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.cnbm.admin.dao.SysDictTypeDao"> <mapper namespace="com.cnbm.admin.dao.SysDictTypeDao">
<select id="getDictTypeList" resultType="com.cnbm.admin.entity.DictType"> <select id="getDictTypeList" resultType="com.cnbm.admin.entity.DictType">
select id, dict_type from sys_dict_type WHERE valid = 1 order by dict_type, sort select id, dict_type from sys_dict_type order by dict_type, sort
</select> </select>
</mapper> </mapper>

6
ym-admin/src/main/resources/mapper/SysMenuDao.xml
View File

@@ -5,7 +5,7 @@
<select id="getById" resultType="com.cnbm.admin.entity.SysMenuEntity"> <select id="getById" resultType="com.cnbm.admin.entity.SysMenuEntity">
select t1.*, (select name from sys_menu t2 where t2.id=t1.pid) as parentName from sys_menu t1 select t1.*, (select name from sys_menu t2 where t2.id=t1.pid) as parentName from sys_menu t1
where t1.id = #{id} AND t1.valid = 1 where t1.id = #{id} AND t1.valid = 1
</select> </select>
<select id="getMenuList" resultType="com.cnbm.admin.entity.SysMenuEntity"> <select id="getMenuList" resultType="com.cnbm.admin.entity.SysMenuEntity">
@@ -32,7 +32,7 @@
<select id="getUserPermissionsList" resultType="string"> <select id="getUserPermissionsList" resultType="string">
select t3.permissions from sys_role_user t1 left join sys_role_menu t2 on t1.role_id = t2.role_id select t3.permissions from sys_role_user t1 left join sys_role_menu t2 on t1.role_id = t2.role_id
left join sys_menu t3 on t2.menu_id = t3.id left join sys_menu t3 on t2.menu_id = t3.id
where t1.user_id = #{userId} AND t1.valid = 1 order by t3.sort asc where t1.user_id = #{userId} AND t1.valid = 1 order by t3.sort asc
</select> </select>
@@ -43,5 +43,5 @@
<select id="getListPid" resultType="com.cnbm.admin.entity.SysMenuEntity"> <select id="getListPid" resultType="com.cnbm.admin.entity.SysMenuEntity">
select * from sys_menu where pid = #{value} AND valid = 1 select * from sys_menu where pid = #{value} AND valid = 1
</select> </select>
</mapper> </mapper>

5
ym-admin/src/main/resources/mapper/SysParamsDao.xml
View File

@@ -5,7 +5,7 @@
<!-- 根据参数编码，查询value --> <!-- 根据参数编码，查询value -->
<select id="getValueByCode" resultType="String"> <select id="getValueByCode" resultType="String">
select param_value from sys_params where param_code = #{value} AND valid = 1 select param_value from sys_params where param_code = #{value}
</select> </select>
<!-- 获取参数编码列表 --> <!-- 获取参数编码列表 -->
@@ -14,11 +14,10 @@
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
AND valid = 1
</select> </select>
<!-- 根据参数编码，更新value --> <!-- 根据参数编码，更新value -->
<update id="updateValueByCode"> <update id="updateValueByCode">
update sys_params set param_value = #{paramValue} where param_code = #{paramCode} AND valid = 1 update sys_params set param_value = #{paramValue} where param_code = #{paramCode}
</update> </update>
</mapper> </mapper>

4
ym-admin/src/main/resources/mapper/SysRoleDataScopeDao.xml
View File

@@ -4,13 +4,12 @@
<mapper namespace="com.cnbm.admin.dao.SysRoleDataScopeDao"> <mapper namespace="com.cnbm.admin.dao.SysRoleDataScopeDao">
<select id="getDeptIdList" resultType="long"> <select id="getDeptIdList" resultType="long">
select dept_id from sys_role_data_scope where role_id = #{value} AND valid = 1 select dept_id from sys_role_data_scope where role_id = #{value}
</select> </select>
<select id="getDataScopeList" resultType="long"> <select id="getDataScopeList" resultType="long">
select t2.dept_id from sys_role_user t1, sys_role_data_scope t2 select t2.dept_id from sys_role_user t1, sys_role_data_scope t2
where t1.user_id = #{value} and t1.role_id = t2.role_id where t1.user_id = #{value} and t1.role_id = t2.role_id
AND t1.valid = 1
</select> </select>
<delete id="deleteByRoleIds"> <delete id="deleteByRoleIds">
@@ -18,7 +17,6 @@
<foreach item="roleId" collection="array" open="(" separator="," close=")"> <foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId} #{roleId}
</foreach> </foreach>
AND valid = 1
</delete> </delete>
</mapper> </mapper>

5
ym-admin/src/main/resources/mapper/SysRoleMenuDao.xml
View File

@@ -4,7 +4,7 @@
<mapper namespace="com.cnbm.admin.dao.SysRoleMenuDao"> <mapper namespace="com.cnbm.admin.dao.SysRoleMenuDao">
<select id="getMenuIdList" resultType="long"> <select id="getMenuIdList" resultType="long">
select menu_id from sys_role_menu where role_id = #{value} AND valid = 1 select menu_id from sys_role_menu where role_id = #{value}
</select> </select>
<delete id="deleteByRoleIds"> <delete id="deleteByRoleIds">
@@ -12,10 +12,9 @@
<foreach item="roleId" collection="array" open="(" separator="," close=")"> <foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId} #{roleId}
</foreach> </foreach>
AND valid = 1
</delete> </delete>
<delete id="deleteByMenuId"> <delete id="deleteByMenuId">
delete from sys_role_menu where menu_id = #{value} AND valid = 1 delete from sys_role_menu where menu_id = #{value}
</delete> </delete>
</mapper> </mapper>

4
ym-admin/src/main/resources/mapper/SysRoleUserDao.xml
View File

@@ -8,7 +8,6 @@
<foreach item="roleId" collection="array" open="(" separator="," close=")"> <foreach item="roleId" collection="array" open="(" separator="," close=")">
#{roleId} #{roleId}
</foreach> </foreach>
AND valid = 1
</delete> </delete>
<delete id="deleteByUserIds"> <delete id="deleteByUserIds">
@@ -16,11 +15,10 @@
<foreach item="userId" collection="array" open="(" separator="," close=")"> <foreach item="userId" collection="array" open="(" separator="," close=")">
#{userId} #{userId}
</foreach> </foreach>
AND valid = 1
</delete> </delete>
<select id="getRoleIdList" resultType="long"> <select id="getRoleIdList" resultType="long">
select role_id from sys_role_user where user_id = #{value} AND valid = 1 select role_id from sys_role_user where user_id = #{value}
</select> </select>
</mapper> </mapper>

11
ym-admin/src/main/resources/mapper/SysUserDao.xml
View File

@@ -5,7 +5,7 @@
<select id="getList" resultType="com.cnbm.admin.entity.SysUserEntity"> <select id="getList" resultType="com.cnbm.admin.entity.SysUserEntity">
select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1 select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
where t1.super_admin = 0 AND t1.valid = 1 where t1.super_admin = 0
<if test="username != null and username.trim() != ''"> <if test="username != null and username.trim() != ''">
and t1.username like #{username} and t1.username like #{username}
</if> </if>
@@ -25,19 +25,19 @@
<select id="getById" resultType="com.cnbm.admin.entity.SysUserEntity"> <select id="getById" resultType="com.cnbm.admin.entity.SysUserEntity">
select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1 select t1.*, (select t2.name from sys_dept t2 where t2.id=t1.dept_id) deptName from sys_user t1
where t1.id = #{value} AND t1.valid = 1 where t1.id = #{value}
</select> </select>
<select id="getByUsername" resultType="com.cnbm.admin.entity.SysUserEntity"> <select id="getByUsername" resultType="com.cnbm.admin.entity.SysUserEntity">
select * from sys_user where username = #{value} AND valid = 1 select * from sys_user where username = #{value}
</select> </select>
<update id="updatePassword"> <update id="updatePassword">
update sys_user set password = #{newPassword} where id = #{id} AND valid = 1 update sys_user set password = #{newPassword} where id = #{id}
</update> </update>
<select id="getCountByDeptId" resultType="int"> <select id="getCountByDeptId" resultType="int">
select count(*) from sys_user where dept_id = #{value} AND valid = 1 select count(*) from sys_user where dept_id = #{value}
</select> </select>
<select id="getUserIdListByDeptId" resultType="Long"> <select id="getUserIdListByDeptId" resultType="Long">
@@ -45,7 +45,6 @@
<foreach item="deptId" collection="list" open="(" separator="," close=")"> <foreach item="deptId" collection="list" open="(" separator="," close=")">
#{deptId} #{deptId}
</foreach> </foreach>
AND valid = 1
</select> </select>
</mapper> </mapper>

18
ym-gateway/src/main/resources/application-dev.yml
View File

@@ -61,14 +61,14 @@ dynamic:
# username: root # username: root
# password: 1qaz@WSX3edc$RFV # password: 1qaz@WSX3edc$RFV
## camline系统 ## camline系统
# camline:
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: root
# password: 1qaz@WSX3edc$RFV
#
camline: camline:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: offline_data username: root
password: tpvmfab4 password: 1qaz@WSX3edc$RFV
#
# camline:
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: offline_data
# password: tpvmfab4

12
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File

@@ -150,12 +150,12 @@ public class KukaJoinThread implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
kukaStep1.scheduleAtFixedRate(new Runnable() { // kukaStep1.scheduleAtFixedRate(new Runnable() {
@Override // @Override
public void run() { // public void run() {
logger.info("================= 现在开始执行 过程一 任务 =================="); // logger.info("================= 现在开始执行 过程一 任务 ==================");
} // }
},1,1, TimeUnit.SECONDS); // },1,1, TimeUnit.SECONDS);