From bb8986c98de7a9b9ac607faacbdf567f0511c597 Mon Sep 17 00:00:00 2001
From: caixiang <939387484@qq.com>
Date: Mon, 27 Feb 2023 15:49:58 +0800
Subject: [PATCH] mark

---
 .../src/main/resources/mapper/SysDeptDao.xml   |  9 ++++-----
 .../main/resources/mapper/SysDictDataDao.xml   |  2 +-
 .../main/resources/mapper/SysDictTypeDao.xml   |  2 +-
 .../src/main/resources/mapper/SysMenuDao.xml   |  6 +++---
 .../src/main/resources/mapper/SysParamsDao.xml |  5 ++---
 .../resources/mapper/SysRoleDataScopeDao.xml   |  4 +---
 .../main/resources/mapper/SysRoleMenuDao.xml   |  5 ++---
 .../main/resources/mapper/SysRoleUserDao.xml   |  4 +---
 .../src/main/resources/mapper/SysUserDao.xml   | 11 +++++------
 .../src/main/resources/application-dev.yml     | 18 +++++++++---------
 .../java/com/cnbm/dispatch/KukaJoinThread.java | 12 ++++++------
 11 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/ym-admin/src/main/resources/mapper/SysDeptDao.xml b/ym-admin/src/main/resources/mapper/SysDeptDao.xml
index 5101128..a558f10 100644
--- a/ym-admin/src/main/resources/mapper/SysDeptDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysDeptDao.xml
@@ -6,9 +6,8 @@
 	<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
 		<where>
-			t1.valid = 1
 			<if test="deptIdList != null">
-				and t1.id in
+				t1.id in
 				<foreach item="id" collection="deptIdList" open="(" separator="," close=")">
 					#{id}
 				</foreach>
@@ -19,15 +18,15 @@
 
 	<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
-		where t1.id = #{value}  AND t1.valid = 1
+		where t1.id = #{value}
 	</select>
 
 	<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 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>
 
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysDictDataDao.xml b/ym-admin/src/main/resources/mapper/SysDictDataDao.xml
index 8c88067..fa2f89f 100644
--- a/ym-admin/src/main/resources/mapper/SysDictDataDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysDictDataDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.cnbm.admin.dao.SysDictDataDao">
 
     <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>
 
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysDictTypeDao.xml b/ym-admin/src/main/resources/mapper/SysDictTypeDao.xml
index e2863a1..0698e4e 100644
--- a/ym-admin/src/main/resources/mapper/SysDictTypeDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysDictTypeDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.cnbm.admin.dao.SysDictTypeDao">
 
     <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>
 
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysMenuDao.xml b/ym-admin/src/main/resources/mapper/SysMenuDao.xml
index a831e30..078d5a4 100644
--- a/ym-admin/src/main/resources/mapper/SysMenuDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysMenuDao.xml
@@ -5,7 +5,7 @@
 
 	<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
-			where t1.id = #{id}  AND t1.valid = 1
+		where t1.id = #{id}  AND t1.valid = 1
 	</select>
 
 	<select id="getMenuList" resultType="com.cnbm.admin.entity.SysMenuEntity">
@@ -32,7 +32,7 @@
 
 	<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
-			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
 	</select>
 
@@ -43,5 +43,5 @@
 	<select id="getListPid" resultType="com.cnbm.admin.entity.SysMenuEntity">
 		select * from sys_menu where pid = #{value}  AND valid = 1
 	</select>
-	
+
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysParamsDao.xml b/ym-admin/src/main/resources/mapper/SysParamsDao.xml
index 3bbf120..3ada3b6 100644
--- a/ym-admin/src/main/resources/mapper/SysParamsDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysParamsDao.xml
@@ -5,7 +5,7 @@
 
     <!-- 根据参数编码，查询value -->
 	<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>
 
     <!-- 获取参数编码列表 -->
@@ -14,11 +14,10 @@
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-        AND valid = 1
     </select>
 
     <!-- 根据参数编码，更新value -->
     <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>
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysRoleDataScopeDao.xml b/ym-admin/src/main/resources/mapper/SysRoleDataScopeDao.xml
index 60c96d4..e01c48a 100644
--- a/ym-admin/src/main/resources/mapper/SysRoleDataScopeDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysRoleDataScopeDao.xml
@@ -4,13 +4,12 @@
 <mapper namespace="com.cnbm.admin.dao.SysRoleDataScopeDao">
 
     <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 id="getDataScopeList" resultType="long">
         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
-            AND t1.valid = 1
     </select>
 
     <delete id="deleteByRoleIds">
@@ -18,7 +17,6 @@
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-        AND valid = 1
     </delete>
 
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysRoleMenuDao.xml b/ym-admin/src/main/resources/mapper/SysRoleMenuDao.xml
index 8ceb0f2..aa4261a 100644
--- a/ym-admin/src/main/resources/mapper/SysRoleMenuDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysRoleMenuDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.cnbm.admin.dao.SysRoleMenuDao">
 
 	<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>
 
 	<delete id="deleteByRoleIds">
@@ -12,10 +12,9 @@
 		<foreach item="roleId" collection="array" open="(" separator="," close=")">
 			#{roleId}
 		</foreach>
-		AND valid = 1
 	</delete>
 
 	<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>
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysRoleUserDao.xml b/ym-admin/src/main/resources/mapper/SysRoleUserDao.xml
index 0380ae0..1ece0b5 100644
--- a/ym-admin/src/main/resources/mapper/SysRoleUserDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysRoleUserDao.xml
@@ -8,7 +8,6 @@
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
-        AND valid = 1
     </delete>
 
     <delete id="deleteByUserIds">
@@ -16,11 +15,10 @@
         <foreach item="userId" collection="array" open="(" separator="," close=")">
             #{userId}
         </foreach>
-        AND valid = 1
     </delete>
 
     <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>
 
 </mapper>
\ No newline at end of file
diff --git a/ym-admin/src/main/resources/mapper/SysUserDao.xml b/ym-admin/src/main/resources/mapper/SysUserDao.xml
index 399968f..c305412 100644
--- a/ym-admin/src/main/resources/mapper/SysUserDao.xml
+++ b/ym-admin/src/main/resources/mapper/SysUserDao.xml
@@ -5,7 +5,7 @@
 
 	<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
-		where t1.super_admin = 0 AND t1.valid = 1
+		where t1.super_admin = 0
 		<if test="username != null and username.trim() != ''">
 			and t1.username like #{username}
 		</if>
@@ -25,19 +25,19 @@
 
 	<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
-			where t1.id = #{value}  AND t1.valid = 1
+			where t1.id = #{value}
 	</select>
 
 	<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>
 
 	<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>
 
 	<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 id="getUserIdListByDeptId" resultType="Long">
@@ -45,7 +45,6 @@
 			<foreach item="deptId" collection="list" open="(" separator="," close=")">
 				#{deptId}
 			</foreach>
-		AND valid = 1
 	</select>
 
 </mapper>
\ No newline at end of file
diff --git a/ym-gateway/src/main/resources/application-dev.yml b/ym-gateway/src/main/resources/application-dev.yml
index d85aabd..3bbe591 100644
--- a/ym-gateway/src/main/resources/application-dev.yml
+++ b/ym-gateway/src/main/resources/application-dev.yml
@@ -61,14 +61,14 @@ dynamic:
 #      username: root
 #      password: 1qaz@WSX3edc$RFV
     ## 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:
       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
\ No newline at end of file
+      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:
+#      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
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
index 41c714d..bf0016a 100644
--- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
+++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
@@ -150,12 +150,12 @@ public class KukaJoinThread implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
-        kukaStep1.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                logger.info("=================  现在开始执行 过程一 任务   ==================");
-            }
-        },1,1, TimeUnit.SECONDS);
+//        kukaStep1.scheduleAtFixedRate(new Runnable() {
+//            @Override
+//            public void run() {
+//                logger.info("=================  现在开始执行 过程一 任务   ==================");
+//            }
+//        },1,1, TimeUnit.SECONDS);