定时任务修改

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -143,7 +143,7 @@
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>a746dde3-7a13-4521-b986-7369b0b7c269</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
                 <!--小程序配置-->
@@ -164,15 +164,15 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>10001</server.port>
+                <server.port>10021</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
                 <docker.tag>test</docker.tag>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip>47.104.85.99</nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.ip>219.146.91.110</nacos.ip>
+                <nacos.namespace>a746dde3-7a13-4521-b986-7369b0b7c269</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
                 <!--亿联小程序配置-->

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -231,6 +231,12 @@ public class SysUserController {
 
         return new Result<List<DataScopeDeptList>>().ok(data);
     }
+    @GetMapping("getWorkRecordRoleUser/{menuCode}")
+    public Result<List<Long>> getWorkRecordRoleUser(@PathVariable("menuCode") String menuCode) {
+        List<Long> data = sysRoleUserService.getWorkRecordRoleUser(menuCode);
+
+        return new Result<List<Long>>().ok(data);
+    }
 
     /**
      * 根据用户名更新用户微信openId

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleUserDao.java

@@ -43,4 +43,6 @@ public interface SysRoleUserDao extends BaseDao<SysRoleUserEntity> {
      * @return
      */
     List<Long> getRoleIdList(Long userId);
+
+    List<Long> getWorkRecordRoleUser(String menuCode);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleUserService.java

@@ -46,4 +46,10 @@ public interface SysRoleUserService extends BaseService<SysRoleUserEntity> {
      * @param userId  用户ID
      */
     List<Long> getRoleIdList(Long userId);
+
+    /**
+     * 用户ID列表
+     * @param menuCode  用户ID
+     */
+    List<Long> getWorkRecordRoleUser(String menuCode);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleUserServiceImpl.java

@@ -62,4 +62,9 @@ public class SysRoleUserServiceImpl extends BaseServiceImpl<SysRoleUserDao, SysR
 
         return baseDao.getRoleIdList(userId);
     }
+    @Override
+    public List<Long> getWorkRecordRoleUser(String menuCode) {
+
+        return baseDao.getWorkRecordRoleUser(menuCode);
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml

@@ -1,10 +1,10 @@
 spring:
   redis:
     database: 2
-    host: 47.104.224.45
+    host: 114.215.125.123
     timeout: 30s
-    port: 6379
-    password: elink@888
+    port: 9603
+    password: epdc!redis@master1405
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml

@@ -23,6 +23,7 @@ spring:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
         ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-admin-server-fescar-service-group

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleUserDao.xml

@@ -17,5 +17,17 @@
     <select id="getRoleIdList" resultType="long">
         select role_id from sys_role_user where user_id = #{value}
     </select>
-
+    <select id="getWorkRecordRoleUser" resultType="long">
+        SELECT
+        USER.user_id
+        FROM
+	sys_app_menu menu
+	LEFT JOIN sys_app_role_menu rm ON menu.id = rm.menu_id
+	LEFT JOIN sys_role_user USER ON rm.role_id = USER.role_id
+	WHERE
+	USER.user_id IS NOT NULL
+	AND menu.menu_code = #{value}
+	GROUP BY
+	USER.user_id
+    </select>
 </mapper>