Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBpmNodeScriptController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -110,4 +112,13 @@ public class SysBpmNodeScriptController extends BaseController
     {
         return toAjax(sysBpmNodeScriptService.deleteSysBpmNodeScriptByIds(ids));
     }
+
+    /**
+     *  根据scriptKey获取流程节点脚本详细信息
+     */
+    @Anonymous
+    @GetMapping("/selectSysBpmNodeScriptByScriptKey/{scriptKey}")
+    public AjaxResult selectSysBpmNodeScriptByScriptKey(@PathVariable("scriptKey") String scriptKey){
+        return success(sysBpmNodeScriptService.selectSysBpmNodeScriptByScriptKey(scriptKey));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -263,4 +265,13 @@ public class SysRoleController extends BaseController
         ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
         return ajax;
     }
+
+    /**
+     * 根据角色权限字符查询该角色下是否存在真实用户
+     */
+    @Anonymous
+    @GetMapping("/selectUserByRoleKey/{roleKeys}")
+    public AjaxResult selectUserByRoleKey(@PathVariable("roleKeys") List<String> roleKeys){
+        return AjaxResult.success(roleService.selectUserByRoleKey(roleKeys));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -282,4 +282,13 @@ public class SysUserController extends BaseController
     public AjaxResult selectAllUser(){
         return AjaxResult.success(userService.selectAllUser());
     }
+
+    /**
+     * 查询这组用户中是否存在真实用户
+     */
+    @Anonymous
+    @GetMapping("/selectUserByUserIds/{userIds}")
+    public AjaxResult selectUserByUserIds(@PathVariable("userIds") List<Long> userIds){
+        return AjaxResult.success(userService.selectUserByUserIds(userIds));
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysBpmNodeScriptMapper.java

@@ -58,4 +58,11 @@ public interface SysBpmNodeScriptMapper
      * @return 结果
      */
     int deleteSysBpmNodeScriptByIds(Long[] ids);
+
+    /**
+     * 根据scriptKey查询流程节点脚本
+     * @param scriptKey 唯一标识
+     * @return
+     */
+    SysBpmNodeScript selectSysBpmNodeScriptByScriptKey(String scriptKey);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -136,4 +136,11 @@ public interface SysUserMapper
      * 根据租户编号查询用户编号
      */
     Long[] selectUserIdByTenantIds(Long[] tenantIds);
+
+    /**
+     * 查询这组用户中是否存在真实用户
+     * @param userIds
+     * @return
+     */
+    int selectUserByUserIds(List<Long> userIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -59,4 +59,11 @@ public interface SysUserRoleMapper
      * @return 结果
      */
     public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+
+    /**
+     * 根据角色权限字符查询该角色下是否存在真实用户
+     * @param roleKeys
+     * @return
+     */
+    int selectUserByRoleKey(List<String> roleKeys);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysBpmNodeScriptService.java

@@ -58,4 +58,11 @@ public interface ISysBpmNodeScriptService
      * @return 结果
      */
     int deleteSysBpmNodeScriptById(Long id);
+
+    /**
+     * 根据scriptKey查询流程节点脚本
+     * @param scriptKey 唯一标识
+     * @return
+     */
+    SysBpmNodeScript selectSysBpmNodeScriptByScriptKey(String scriptKey);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -178,4 +178,11 @@ public interface ISysRoleService
      * @return 结果
      */
     public int insertAuthUsers(Long roleId, Long[] userIds);
+
+    /**
+     * 根据角色权限字符查询该角色下是否存在真实用户
+     * @param roleKeys
+     * @return
+     */
+    int selectUserByRoleKey(List<String> roleKeys);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -209,4 +209,11 @@ public interface ISysUserService
      */
     List<SysUser> selectAllUser();
 
+    /**
+     * 查询这组用户中是否存在真实用户
+     * @param userIds
+     * @return
+     */
+    int selectUserByUserIds(List<Long> userIds);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysBpmNodeScriptServiceImpl.java

@@ -98,4 +98,9 @@ public class SysBpmNodeScriptServiceImpl implements ISysBpmNodeScriptService
     {
         return sysBpmNodeScriptMapper.deleteSysBpmNodeScriptById(id);
     }
+
+    @Override
+    public SysBpmNodeScript selectSysBpmNodeScriptByScriptKey(String scriptKey) {
+        return sysBpmNodeScriptMapper.selectSysBpmNodeScriptByScriptKey(scriptKey);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -394,4 +394,9 @@ public class SysRoleServiceImpl implements ISysRoleService {
         }
         return userRoleMapper.batchUserRole(list);
     }
+
+    @Override
+    public int selectUserByRoleKey(List<String> roleKeys) {
+        return userRoleMapper.selectUserByRoleKey(roleKeys);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -546,4 +546,9 @@ public class SysUserServiceImpl implements ISysUserService
     public List<SysUser> selectAllUser() {
         return userMapper.selectAllUser();
     }
+
+    @Override
+    public int selectUserByUserIds(List<Long> userIds) {
+        return userMapper.selectUserByUserIds(userIds);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysBpmNodeScriptMapper.xml

@@ -96,4 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
+
+    <select id="selectSysBpmNodeScriptByScriptKey" parameterType="String" resultMap="SysBpmNodeScriptResult">
+        <include refid="selectSysBpmNodeScriptVo"/>
+        where script_key = #{scriptKey}
+    </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -314,5 +314,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{tenantId}
 		</foreach>
 	</select>
+
+	<select id="selectUserByUserIds" resultType="int">
+		select count(1) from sys_user where `status` = '0' and del_flag = '0' and user_id in
+		<foreach collection="list" item="userId" open="(" close=")" separator=",">
+			#{userId}
+		</foreach>
+	</select>
 	
 </mapper> 

ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -41,4 +41,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	        #{userId}
             </foreach> 
 	</delete>
+
+	<select id="selectUserByRoleKey" resultType="int">
+		SELECT count(1) from sys_user where `status` = '0' and del_flag = '0' and user_id in
+			(
+				select user_id from sys_user_role where role_id in (
+					select role_id from sys_role where `status` = '0' and del_flag = '0' and role_key in
+					<foreach collection="list" item="roleKey" open="(" close=")" separator=",">
+						#{roleKey}
+					</foreach>
+				)
+			)
+	</select>
 </mapper>