Skip to content

E
education
Commit 75351358 authored by root's avatar root
Browse files
Options

Merge branch 'meiteng' of ssh://103.249.252.28:10022/lcy/education into meiteng 

# Conflicts:
#	src/main/java/org/rcisoft/business/bcourse/controller/BCourseController.java
parents c3c2cb21 fdb35fb2
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 35 deletions
src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java
View file @ 75351358
......@@ -48,6 +48,7 @@ import java.util.Map;
/**
* Created by gwf on 2017-7-21 15:08:47.
*/
@Api(tags = "2 章节")
@RestController
@RequestMapping("/BChapter")
@Slf4j
......@@ -63,7 +64,7 @@ public class BChapterController extends PaginationController<BChapter> {
@Autowired
private Global global;
@ApiOperation(value = "添加/编辑章节", notes = "businessId为空时是添加方法，不为空时是修改方法")
@ApiOperation(value = "201 添加/编辑章节", notes = "businessId为空时是添加方法，不为空时是修改方法")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "课程id 修改章节时传入", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "lessonId", value = "课程ID", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "chapterName", value = "章节名", required = true, dataType = "varchar"),
......@@ -80,7 +81,7 @@ public class BChapterController extends PaginationController<BChapter> {
}
@ApiOperation(value = "删除章节", notes = "根据ID删除一条记录")
@ApiOperation(value = "202 删除章节", notes = "根据ID删除一条记录")
@ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar")
@PostMapping(value = "/remove")
public Result remove(CurUser curUser,@Valid String id,BindingResult br) {
......@@ -91,7 +92,7 @@ public class BChapterController extends PaginationController<BChapter> {
id);
}
@ApiOperation(value = "分页查询章节", notes = "根据条件分页查询章节")
@ApiOperation(value = "203 分页查询章节", notes = "根据条件分页查询章节")
@PostMapping(value = "/queryBChaptersByPagination")
public Result queryBChaptersByPagination(CurUser curUser,@Valid QueryChapterListDTO param,BindingResult br) {
bChapterService.queryBChaptersByPagination(getPaginationUtility(), param);
......@@ -102,7 +103,7 @@ public class BChapterController extends PaginationController<BChapter> {
gridModel);
}
@ApiOperation(value = "查询章节", notes = "根据lessonId查询章节")
@ApiOperation(value = "204 查询章节", notes = "根据lessonId查询章节")
@GetMapping(value = "/queryBChaptersWithoutAuth")
public Result queryBChapters(CurUser curUser,@Valid QueryChapterListDTO param,BindingResult br) {
Map<String, Object> map = new HashedMap();
......
src/main/java/org/rcisoft/business/bchapter/dao/BChapterRepository.java
View file @ 75351358
......@@ -387,5 +387,10 @@ public interface BChapterRepository extends BaseMapper<BChapter> {
"where del_flag = 0 and flag = 1 " +
"and pid = #{pid} order by state desc</script>")
List<String> queryChapterStateByPid(String pid);
@Update("update b_lesson set class_hour =" +
"(select count(*) from b_chapter where lesson_id = #{lessonId} and chapter_level = 2 and del_flag != 1 and flag =1) " +
"where business_id = #{lessonId}")
int updateClassHourInLesson(@Param("lessonId") String lessonId);
}
src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java
View file @ 75351358
......@@ -82,12 +82,13 @@ public class BChapterServiceImpl implements BChapterService {
/**
* dto查询章节信息
*
* @param model
* @return
*/
public List<QueryChapterListResDTO> queryChapterListResDTO(QueryChapterListDTO model) {
Map param = new HashMap<String, Object>();
if (model.getLessonId() != null && !"".equals(model.getLessonId())){
if (model.getLessonId() != null && !"".equals(model.getLessonId())) {
param.put("lessonId", model.getLessonId());
}
return bChapterRepository.queryBChapters(param);
......@@ -114,7 +115,9 @@ public class BChapterServiceImpl implements BChapterService {
}
int sort = bChapterRepository.selectMaxSort(model.getPid(), model.getLessonId());
model.setSort(sort);
line = bChapterRepository.insertSelective(model);
bChapterRepository.updateClassHourInLesson(model.getLessonId());//更新b_lesson表中 class_hour
} else {
UserUtil.setCurrentMergeOperation(model);
line = bChapterRepository.updateByPrimaryKeySelective(model);
......
src/main/java/org/rcisoft/business/bfile/controller/BFileController.java
View file @ 75351358
package org.rcisoft.business.bfile.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
......@@ -28,6 +29,7 @@ import java.util.List;
/**
* Created by gaowenfneg on 2017-10-9 14:34:56.
*/
@Api(tags = "4 文件")
@RestController
@RequestMapping("/BVideo")
public class BFileController extends PaginationController<BFile> {
......@@ -102,7 +104,7 @@ public class BFileController extends PaginationController<BFile> {
// }
@ApiOperation(value="上传文件", notes="上传文件")
@ApiOperation(value="401 上传文件", notes="上传文件")
@ApiImplicitParams({@ApiImplicitParam(name = "chapterId", value = "章节ID", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "type", value = "0视频 1音频 2ppt 3pdf 4附件", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "lessonId", value = "章节所在课程id", required = true, dataType = "varchar"),
......
src/main/java/org/rcisoft/business/blabel/controller/BLabelController.java
View file @ 75351358
package org.rcisoft.business.blabel.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
......@@ -21,14 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@Api(tags = "5 标签")
@RestController
@RequestMapping("/BLabel")
public class BLabelController extends PaginationController<BLabel> {
@Autowired
private BLabelService bLabelService;
@ApiOperation(value="根据条件分页查询", notes="根据条件分页查询标签")
@ApiOperation(value="501 根据条件分页查询", notes="根据条件分页查询标签")
@ApiImplicitParam(name = "lName", value = "(标签名)模糊查询条件", required = false, dataType = "varchar")
@GetMapping(value = "/queryBlabelsByPagination")
public GridModel queryBlabelsByPagination(CurUser curUser, @Valid String lName, BindingResult br){
......@@ -37,7 +38,7 @@ public class BLabelController extends PaginationController<BLabel> {
return gridModel;
}
@ApiOperation(value="物理删除", notes="根据ID删除一条记录")
@ApiOperation(value="502 物理删除", notes="根据ID删除一条记录")
@ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "varchar")
@PostMapping(value = "/remove")
public Result remove(CurUser curUser,@Valid String id,BindingResult br) {
......@@ -48,7 +49,7 @@ public class BLabelController extends PaginationController<BLabel> {
id);
}
@ApiOperation(value="更新标签名", notes="根据businessId更新标签名")
@ApiOperation(value="503 更新标签名", notes="根据businessId更新标签名")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "标签id", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "lName", value = "标签名", required = true, dataType = "varchar")})
@PostMapping(value = "/update")
......@@ -60,10 +61,10 @@ public class BLabelController extends PaginationController<BLabel> {
bLabel.getBusinessId());
}
@ApiOperation(value="插入新标签", notes="根据businessId插入新标签")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "name", value = "lName", required = true, dataType = "varchar")})
@PostMapping(value = "/insert")
@ApiOperation(value="504 添加新标签", notes="根据businessId插入新标签")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "标签id", required = true, dataType = "varchar"),
@ApiImplicitParam(name = "lName", value = "标签名", required = true, dataType = "varchar")})
@PostMapping(value = "/add")
public Result insert(CurUser curUser,@Valid BLabel bLabel,BindingResult br){
PersistModel data = bLabelService.insertLabel(bLabel);
return Result.builder(data,
......
src/main/java/org/rcisoft/sys/user/controller/SysUserController.java
View file @ 75351358
......@@ -33,7 +33,7 @@ import java.util.List;
/**
* Created by Andrew on 2017/7/6.
*/
@Api(tags = "用户管理")
@Api(tags = "7 用户管理")
@RestController
@RequestMapping(value = "/user")
public class SysUserController extends PaginationController<SysUser> {
......@@ -44,7 +44,7 @@ public class SysUserController extends PaginationController<SysUser> {
@Autowired
private Global global;
@ApiOperation(value = "分页查询用户", notes = "分页查询用户")
@ApiOperation(value = "701 分页查询用户", notes = "分页查询用户")
@ApiImplicitParams({@ApiImplicitParam(name = "name", value = "用户名（模糊查询条件）", required = false, dataType = "varchar"),
@ApiImplicitParam(name = "flag", value = "用户启用状态 0未启用 1启用", required = false, dataType = "varchar"),
@ApiImplicitParam(name = "roleName", value = "用户角色", required = false, dataType = "varchar")})
......@@ -55,9 +55,9 @@ public class SysUserController extends PaginationController<SysUser> {
return gridModel;
}
@ApiOperation(value = "分配角色", notes = "分配角色")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "用户id(可多选 用 ，分开传字符串)", required = true, dataType = "varchar", paramType = "path"),
@ApiImplicitParam(name = "roleId", value = "角色id(可多选 用 ，分开传字符串)", required = true, dataType = "varchar", paramType = "path")})
@ApiOperation(value = "702 分配角色", notes = "分配角色")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "用户id（批量操作时 id用，隔开）", required = true, dataType = "varchar", paramType = "path"),
@ApiImplicitParam(name = "roleId", value = "角色id（批量操作时 id用，隔开）", required = true, dataType = "varchar", paramType = "path")})
@PostMapping(value = "/AssignRoles")
public Result AssignRoles(CurUser curUser, @Valid String id, BindingResult br,String roleId) {
int line = userServiceImpl.AssignRoles(id,roleId);
......@@ -67,19 +67,19 @@ public class SysUserController extends PaginationController<SysUser> {
id);
}
@ApiOperation(value = "删除用户", notes = "删除用户")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "varchar", paramType = "path")
@ApiOperation(value = "703 删除用户", notes = "删除用户")
@ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar", paramType = "path")
@PostMapping(value = "/delete")
public Result roleDelete(CurUser curUser, @Valid String id, BindingResult br) {
int line = userServiceImpl.removeUser(id);
public Result roleDelete(CurUser curUser, @Valid String businessId, BindingResult br) {
int line = userServiceImpl.removeUser(businessId);
return Result.builder(new PersistModel(line),
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
id);
businessId);
}
@ApiOperation(value = "停用用户", notes = "停用用户")
@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path")
@ApiOperation(value = "704 停用用户", notes = "停用用户")
@ApiImplicitParam(name = "businessId", value = "用户Id（批量操作时 id用，隔开）", required = true, dataType = "varchar", paramType = "path")
@PostMapping(value = "/stop")
public Result stop(CurUser curUser, @Valid String businessId, BindingResult br) {
int line = userServiceImpl.stopUserByUserBusinessId(businessId);
......@@ -89,8 +89,8 @@ public class SysUserController extends PaginationController<SysUser> {
businessId);
}
@ApiOperation(value = "启用用户", notes = "启用用户")
@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path")
@ApiOperation(value = "705 启用用户", notes = "启用用户")
@ApiImplicitParam(name = "businessId", value = "用户Id（批量操作时 id用，隔开）", required = true, dataType = "varchar", paramType = "path")
@PostMapping(value = "/start")
public Result Start(CurUser curUser, @Valid String businessId, BindingResult br) {
int line = userServiceImpl.startUserByUserBusinessId(businessId);
......
src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java
View file @ 75351358
......@@ -36,8 +36,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
"</script>")
int stopFlag(@Param("businessId") List<String> businessId);
@Select("select ur.user_id from s_r_user_role ur left JOIN s_role sr on ur.role_id = sr.business_id where sr.role_name=#{roleName}")
List<String> adminId(@Param("roleName") String roleName);
@Select("<script>select ur.user_id from s_r_user_role ur left JOIN s_role sr on ur.role_id = sr.business_id where sr.role_name in" +
"<foreach item='item' index='index' collection='roleName' open='(' separator=',' close=')'> #{item} </foreach> " +
"</script>")
List<String> adminId(@Param("roleName") List<String> roleName);
@Select("<script> select * from s_r_user_role where user_id in" +
" <foreach item='item' index='index' collection='userId' open='(' separator=',' close=')'> #{item} </foreach>" +
......
src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java
View file @ 75351358
......@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static java.util.Arrays.asList;
@Service
@Transactional(readOnly = true, propagation = Propagation.NOT_SUPPORTED)
public class SysUserServiceImpl implements SysUserService {
......@@ -52,13 +54,14 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public int AssignRoles(String userId, String roleId) {
List<String> adminIds = sysUserMapper.adminId("主管理员");
List<String> adminRoleName = asList("主管理员", "子管理员");
List<String> adminIds = sysUserMapper.adminId(adminRoleName);
if (adminIds.size() != 0) {
for (int i = 0; i < adminIds.size(); i++) {
userId = userId.replace(adminIds.get(i), "");
}
List<String> userIds = Arrays.asList(StringUtils.split(userId, ","));
List<String> roleIds = Arrays.asList(StringUtils.split(roleId, ","));
List<String> userIds = asList(StringUtils.split(userId, ","));
List<String> roleIds = asList(StringUtils.split(roleId, ","));
List<UserRole> userRoles = new ArrayList<>();
sysUserMapper.delUserRoleById(userIds);
int result = 0;
......@@ -105,13 +108,13 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public int stopUserByUserBusinessId(String businessId) {
List<String> ids = Arrays.asList(StringUtils.split(businessId, ","));
List<String> ids = asList(StringUtils.split(businessId, ","));
return sysUserMapper.stopFlag(ids);
}
@Override
public int startUserByUserBusinessId(String businessId) {
List<String> ids = Arrays.asList(StringUtils.split(businessId, ","));
List<String> ids = asList(StringUtils.split(businessId, ","));
return sysUserMapper.startFlag(ids);
}
......
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