Commit 8e5a0926 authored by luzhuang's avatar luzhuang

menu

parent abe8ed99
......@@ -83,7 +83,7 @@ public class BCourseController extends PaginationController<BCourse> {
@ApiImplicitParam(name = "businessId", value = "课程分类id", required = true, dataType = "varchar")
@PostMapping(value = "/remove")
public Result remove(CurUser curUser, @Valid String businessId, BindingResult br) {
PersistModel data = bCourseServiceImpl.removeCourse(businessId);
PersistModel data = bCourseServiceImpl.removeCourse(curUser.getCorpId(),businessId);
return Result.builder(data,
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
......
......@@ -36,8 +36,13 @@ public interface BCourseRepository extends BaseMapper<BCourse> {
"AND c_name=#{cName}")
List<BCourse> selectOneByName(@Param("cName") String id, @Param("corpId") String corpId);
@Update("UPDATE b_course SET del_flag='1' WHERE business_id = #{businessId}")
int removeCourse(@Param("businessId") String id);
// @Update("UPDATE b_course SET del_flag='1' WHERE business_id = #{businessId}")
@Update("<script>" +
"<foreach collection=\"courseIds\" item=\"item\" separator=\";\">" +
"UPDATE b_course SET del_flag='1' WHERE business_id = #{item}" +
"</foreach>" +
"</script>")
int removeCourse(@Param("courseIds") List<String> courseIds);
@Update("UPDATE b_course SET c_name = #{cName} WHERE business_id = #{businessId}")
int updateCourse(BCourse bCourse);
......
......@@ -17,7 +17,7 @@ public interface BCourseService {
PersistModel insertCourse(BCourse bCourse);
PersistModel removeCourse(String id);
PersistModel removeCourse(String corpId,String id);
PersistModel updateCourse(BCourse bCoursee);
......
......@@ -7,6 +7,7 @@ import org.rcisoft.business.bcourse.dto.AllCourseDTO;
import org.rcisoft.business.bcourse.dto.QueryCourseResDTO;
import org.rcisoft.business.bcourse.entity.BCourse;
import org.rcisoft.business.bcourse.service.BCourseService;
import org.rcisoft.business.blesson.util.recursion;
import org.rcisoft.core.aop.PageUtil;
import org.rcisoft.core.constant.MessageConstant;
import org.rcisoft.core.exception.ServiceException;
......@@ -85,9 +86,22 @@ public class BCourseServiceImpl implements BCourseService {
}
@Override
public PersistModel removeCourse(String id) {
public PersistModel removeCourse(String corpId,String id) {
List<AllCourseDTO> allCourse = null;
if (org.apache.commons.lang3.StringUtils.isNotEmpty(id)){
allCourse = this.findAllCourse(corpId);
}
List<String> courseIds = null;
if (allCourse != null){
//查询出所有子分类
courseIds = recursion.FindSons(id,allCourse);
//将一级分类放入分类集合中
courseIds.add(id);
}
return new PersistModel(
bCourseRepository.removeCourse(id), MessageConstant.MESSAGE_ALERT_SUCCESS);
bCourseRepository.removeCourse(courseIds), MessageConstant.MESSAGE_ALERT_SUCCESS);
}
@Override
......
......@@ -46,16 +46,7 @@ public class SysMenuController extends ResponseController {
// }
@ApiOperation(value = "根据id 查询 menu", notes = "根据id 查询 menu")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path"),
@ApiImplicitParam(name = "modelId", value = "businessId", required = true, dataType = "varchar", paramType = "path")})
@GetMapping("/queryMenuById")
public Result queryMenu(CurUser curUser,String businessId,String modelId) {
return Result.builder(new PersistModel(1),
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
sysMenuServiceImpl.queryMenusById(curUser.getCorpId(),businessId,modelId));
}
@ApiOperation(value = "根据id 查询 menu", notes = "根据id 查询 menu")
@ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "Integer", paramType = "path")
......
......@@ -3,7 +3,6 @@ package org.rcisoft.sys.menu.dao;
import org.apache.ibatis.annotations.*;
import org.rcisoft.core.base.BaseMapper;
import org.rcisoft.sys.menu.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.MenuDto;
import org.rcisoft.sys.menu.entity.SysMenu;
import org.springframework.stereotype.Repository;
......@@ -38,28 +37,6 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
List<SysMenu> findByUserId(@Param("id") String id);
//s_dept_role_user,,s_dept_role,,s_role_menu
/**
* 查询用户 menu 19-09-30
* @param corpId
* @param businessId
* @param modelId
* @return
*/
@Select("SELECT DISTINCT ur.user_id, rm.MENU_ID menu_id, sm.`NAME` menu_name, sm.PARENT_ID, sm.HREF href " +
"FROM s_user su " +
"LEFT JOIN s_r_user_role ur ON ur.user_id = su.business_id " +
"LEFT JOIN s_role_menu rm ON ur.role_id = rm.role_id " +
"LEFT JOIN s_menu sm ON sm.business_id = rm.MENU_ID " +
"WHERE " +
"su.del_flag != 1 " +
"AND su.flag = 1 " +
"AND su.corp_id = #{corpId} " +
"AND su.business_id = #{businessId} " +
"AND sm.MODEL_ID = #{modelId} " +
"ORDER BY sm.SORT ")
@ResultMap(value = "ChildResultMap")
List<QueryMenuResDTO> queryMenus(@Param("corpId") String corpId,@Param("businessId") String businessId,@Param("modelId") String modelId );
/**
* 查询根节点 dept tree
......
......@@ -2,10 +2,8 @@ package org.rcisoft.sys.menu.service;
import org.rcisoft.common.model.CommonMenuModel;
import org.rcisoft.common.model.TreeViewModel;
import org.rcisoft.core.model.PersistModel;
import org.rcisoft.sys.menu.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.SysMenu;
import java.util.List;
......@@ -61,5 +59,4 @@ public interface SysMenuService {
*/
List<SysMenu> queryMenus();
List<QueryMenuResDTO> queryMenusById(String corpId,String id,String modelId);
}
......@@ -9,9 +9,7 @@ import org.rcisoft.common.model.HomeMenuModel;
import org.rcisoft.common.model.SysMenuModel;
import org.rcisoft.common.model.TreeViewModel;
import org.rcisoft.core.model.PersistModel;
import org.rcisoft.core.util.UserUtil;
import org.rcisoft.sys.menu.dao.SysMenuRepository;
import org.rcisoft.sys.menu.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.SysMenu;
import org.rcisoft.sys.menu.service.SysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -128,11 +126,6 @@ public class SysMenuServiceImpl implements SysMenuService {
return menuRepository.selectAll();
}
@Override
public List<QueryMenuResDTO> queryMenusById(String corpId,String id,String modelId) {
return menuRepository.queryMenus(corpId,id,modelId);
}
/**
* 设置选中 active
* @param model
......
......@@ -102,6 +102,17 @@ public class SysUserController extends PaginationController<SysUser> {
businessId);
}
@ApiOperation(value = "706 根据id 查询 menu", notes = "根据id 查询 menu")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path"),
@ApiImplicitParam(name = "modelId", value = "businessId", required = true, dataType = "varchar", paramType = "path")})
@GetMapping("/queryMenuById")
public Result queryMenu(CurUser curUser,String businessId,String modelId) {
return Result.builder(new PersistModel(1),
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
userServiceImpl.queryMenusById(curUser.getCorpId(),businessId,modelId));
}
/**
* 查询菜单
*
......
......@@ -3,6 +3,7 @@ package org.rcisoft.sys.user.dao;
import org.apache.ibatis.annotations.*;
import org.rcisoft.core.base.BaseMapper;
import org.rcisoft.sys.user.dto.QueryMenuResDTO;
import org.rcisoft.sys.user.dto.QuerySysUserDTO;
import org.rcisoft.sys.user.entity.SysUser;
import org.rcisoft.sys.user.entity.UserRole;
......@@ -173,4 +174,26 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
"WHERE su.del_flag = 0 " +
"AND su.business_id = #{userId}</script>")
List<String> queryRoleTypeByUserId(@Param("userId")String userId);
/**
* 查询用户 menu 19-09-30
* @param corpId
* @param businessId
* @param modelId
* @return
*/
@Select("SELECT DISTINCT ur.user_id, rm.MENU_ID menu_id, sm.`NAME` menu_name, sm.PARENT_ID, sm.HREF href " +
"FROM s_user su " +
"LEFT JOIN s_r_user_role ur ON ur.user_id = su.business_id " +
"LEFT JOIN s_role_menu rm ON ur.role_id = rm.role_id " +
"LEFT JOIN s_menu sm ON sm.business_id = rm.MENU_ID " +
"WHERE " +
"su.del_flag != 1 " +
"AND su.flag = 1 " +
"AND su.corp_id = #{corpId} " +
"AND su.business_id = #{businessId} " +
"AND sm.MODEL_ID = #{modelId} " +
"ORDER BY sm.SORT ")
@ResultMap(value = "DtoResultMap")
List<QueryMenuResDTO> queryMenus(@Param("corpId") String corpId, @Param("businessId") String businessId, @Param("modelId") String modelId );
}
package org.rcisoft.sys.menu.dto;
package org.rcisoft.sys.user.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -16,7 +16,7 @@ public class QueryMenuResDTO {
@ApiModelProperty(value = "跳转链接")
private String href;
@ApiModelProperty(value = "子集菜单")
private List<QueryMenuResDTO> child;
//
// @ApiModelProperty(value = "子集菜单")
// private List<QueryMenuResDTO> child;
}
package org.rcisoft.sys.user.service;
import org.rcisoft.common.model.GridModel;
import org.rcisoft.core.aop.PageUtil;
import org.rcisoft.core.model.PersistModel;
import org.rcisoft.sys.user.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.SysMenu;
import org.rcisoft.sys.user.bean.CurUser;
import org.rcisoft.sys.user.dto.QuerySysUserDTO;
......@@ -32,4 +31,6 @@ public interface SysUserService {
int startUserByUserBusinessId(String businessId);
List<SysMenu> queryUserMenus(CurUser user);
List<QueryMenuResDTO> queryMenusById(String corpId, String id, String modelId);
}
......@@ -7,6 +7,7 @@ import org.rcisoft.core.exception.ServiceException;
import org.rcisoft.core.result.ResultServiceEnums;
import org.rcisoft.core.util.UserUtil;
import org.rcisoft.sys.menu.dao.SysMenuRepository;
import org.rcisoft.sys.user.dto.QueryMenuResDTO;
import org.rcisoft.sys.menu.entity.SysMenu;
import org.rcisoft.sys.user.bean.CurUser;
import org.rcisoft.sys.user.dao.SysUserMapper;
......@@ -16,12 +17,10 @@ import org.rcisoft.sys.user.entity.UserRole;
import org.rcisoft.sys.user.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static java.util.Arrays.asList;
......@@ -127,5 +126,8 @@ public class SysUserServiceImpl implements SysUserService {
return sysMenuRepository.queryMyMenu(sysMenu);
}
@Override
public List<QueryMenuResDTO> queryMenusById(String corpId, String id, String modelId) {
return sysUserMapper.queryMenus(corpId,id,modelId);
}
}
......@@ -26,16 +26,6 @@
<result column="FLAG" property="flag" jdbcType="VARCHAR" />
</resultMap>
<resultMap id="DtoResultMap" type="org.rcisoft.sys.menu.dto.QueryMenuResDTO">
<result column="menu_id" jdbcType="VARCHAR" property="menuId" />
<result column="menu_name" jdbcType="VARCHAR" property="menuName" />
<result column="href" jdbcType="VARCHAR" property="href" />
<!-- <result column="href" jdbcType="VARCHAR" property="child" />-->
</resultMap>
<resultMap id="ChildResultMap" type="org.rcisoft.sys.menu.dto.QueryMenuResDTO" extends="DtoResultMap">
<association column="business_id" property="childList" select="org.rcisoft.sys.menu.dao.SysMenuRepository"></association>
</resultMap>
......
......@@ -23,6 +23,18 @@
column="business_id">
</collection>
</resultMap>
<resultMap id="DtoResultMap" type="org.rcisoft.sys.user.dto.QueryMenuResDTO">
<result column="menu_id" jdbcType="VARCHAR" property="menuId" />
<result column="menu_name" jdbcType="VARCHAR" property="menuName" />
<result column="href" jdbcType="VARCHAR" property="href" />
</resultMap>
<resultMap id="ChildResultMap" type="org.rcisoft.sys.user.dto.QueryMenuResDTO" extends="DtoResultMap">
<association column="business_id" property="childList" select="org.rcisoft.sys.menu.dao.SysMenuRepository"></association>
</resultMap>
<select id="selectByTeacherCode" parameterType="java.util.List" resultMap="BaseResultMap">
SELECT business_id FROM s_user where del_flag = 0 and flag = 1 and login_name IN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment