修改接口

src/main/java/org/rcisoft/business/bbanner/controller/BBannerController.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.business.bbanner.dto.AddOrUpdateDTO;
+import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
 import org.rcisoft.business.bbanner.dto.TopDownDTO;
 import org.rcisoft.common.controller.PaginationController;
 import org.rcisoft.common.model.GridModel;
@@ -14,7 +16,6 @@ import org.rcisoft.business.bbanner.entity.BBanner;
 import org.rcisoft.business.bbanner.service.BBannerService;
 import org.rcisoft.sys.user.bean.CurUser;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.Banner;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,22 +39,13 @@ public class BBannerController extends PaginationController<BBanner> {
     private BBannerService bBannerService;
 
     @ApiOperation(value="添加/编辑Banner", notes="businessId为空时是添加方法，不为空时是修改方法")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "title", value = "标题", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "imageUrl", value = "图片地址", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "isEexternalLink", value = "是否为外部链接（0：否，1：是）", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "externalUrl", value = "外部URL", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "lineType", value = "类型（0：线下，1：线上）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "courseId", value = "课程ID", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "bannerSort", value = "排序", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PostMapping(value = "/add")
-    public Result add(CurUser curUser, @Valid BBanner bBanner, BindingResult bindingResult) {
-        PersistModel data = bBannerService.persist(bBanner);
+    public Result add(CurUser curUser, @Valid AddOrUpdateDTO addOrUpdateDTO, BindingResult bindingResult) {
+        PersistModel data = bBannerService.persist(addOrUpdateDTO);
         return Result.builder(data,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                bBanner);
+                addOrUpdateDTO);
     }
 
 
@@ -81,14 +73,8 @@ public class BBannerController extends PaginationController<BBanner> {
 
 
     @ApiOperation(value="获取banner分页", notes="根据条件分页查询")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "title", value = "标题", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "isExternalLink", value = "是否为外部链接（0：否，1：是）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "externalUrl", value = "外部URL", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "lineType", value = "类型（0：线下，1：线上）", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryBBannerByPagination")
-    public Result queryBBannerByPagination(CurUser curUser, @Valid BBanner param,BindingResult bindingResult) {
+    public Result queryBBannerByPagination(CurUser curUser, @Valid FindBannerPaginDTO param, BindingResult bindingResult) {
         bBannerService.queryBannerByPagination(getPaginationUtility(),param);
         GridModel gridModel = getGridModelResponse();
         return  Result.builder(new PersistModel(1),

src/main/java/org/rcisoft/business/bbanner/dao/BBannerRepository.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
+import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
 import org.rcisoft.business.bbanner.dto.TopDownDTO;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.business.bbanner.entity.BBanner;
@@ -27,14 +28,15 @@ public interface BBannerRepository extends BaseMapper<BBanner> {
      * @return
      */
     @Select("<script>select * from b_banner where del_flag='0' and flag = '1' " +
+            " <if test=\"businessId!=null and businessId != ''\">and title business_id = #{businessId})</if>" +
             " <if test=\"title!=null and title != ''\">and title like CONCAT('%',#{title},'%')</if>" +
             " <if test=\"isExternalLink!=null and isExternalLink != ''\">and is_external_link=#{isExternalLink}</if>" +
             " <if test=\"lineType!=null and lineType != ''\">and line_type=#{lineType}</if>" +
-            " <if test=\"remarks!=null and remarks != ''\">and remarks like CONCAT('%',#{remarks},'%')</if>" +
+//            " <if test=\"remarks!=null and remarks != ''\">and remarks like CONCAT('%',#{remarks},'%')</if>" +
             " order by banner_sort asc" +
             "</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BBanner> queryBanners(BBanner param);
+    List<BBanner> queryBanners(FindBannerPaginDTO param);
 
     /**
      * 按id查询个数
@@ -50,8 +52,7 @@ public interface BBannerRepository extends BaseMapper<BBanner> {
      * 获取sort最大值 +1
      * @return
      */
-    @Select("<script>select DISTINCT IFNULL((select max(sort) from b_chapter where " +
-            "and del_flag = 0 and flag = 1 ),0)+1 as sort</script>")
+    @Select("<script> </script>")
     int selectMaxSort();
 
     /**
@@ -91,7 +92,7 @@ public interface BBannerRepository extends BaseMapper<BBanner> {
 
     @Select("<script>select * from b_banner where banner_sort &gt; #{bannerSort} " +
             " and del_flag = 0 and flag = 1 " +
-            "ORDER BY sort asc LIMIT 1</script>")
+            "ORDER BY banner_sort asc LIMIT 1</script>")
     @ResultMap(value = "BaseResultMap" )
     BBanner getBigChapter(TopDownDTO param);
 
@@ -100,7 +101,7 @@ public interface BBannerRepository extends BaseMapper<BBanner> {
 
     @Select("<script>select * from b_banner where banner_sort &lt; #{bannerSort} " +
             "and del_flag = 0 and flag = 1 " +
-            "ORDER BY sort desc LIMIT 1</script>")
+            "ORDER BY banner_sort desc LIMIT 1</script>")
     @ResultMap(value = "BaseResultMap" )
     BBanner getlessChapter(TopDownDTO param);
 }

src/main/java/org/rcisoft/business/bbanner/dto/AddOrUpdateDTO.java

+package org.rcisoft.business.bbanner.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class AddOrUpdateDTO {
+
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "BannerId" ,required = false, dataType = "varchar")
+    private String businessId;
+
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @NotBlank
+    @ApiModelProperty(value = "标题" ,required = true, dataType = "varchar")
+    private String title;
+
+    @Length(min = 1,max = 128,message = "长度最小为1,最大为256")
+    @NotBlank
+    @ApiModelProperty(value = "图片地址",required = true, dataType = "varchar")
+    private String imageUrl;
+
+    @Length(min = 1,max = 1,message = "长度最小为1,最大为1")
+    @NotBlank
+    @ApiModelProperty(value = "是否为外部链接（0：否，1：是）",required = true, dataType = "varchar")
+    private String isExternalLink;
+
+    @Length(min = 1,max = 256,message = "长度最小为1,最大为256")
+    @ApiModelProperty(value = "外部URL",required = false, dataType = "varchar")
+    private String externalUrl;
+
+    @Length(min = 1,max = 1,message = "长度最小为1,最大为1")
+    @ApiModelProperty(value = "类型（0：线下，1：线上）",required = false, dataType = "varchar")
+    private String lineType;
+
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "课程ID",required = false, dataType = "varchar")
+    private String courseId;
+
+}

src/main/java/org/rcisoft/business/bbanner/dto/FindBannerPaginDTO.java

+package org.rcisoft.business.bbanner.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Data
+public class FindBannerPaginDTO {
+
+    @NotBlank
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "主键bannerId",required = true,dataType = "varchar")
+    private String businessId;
+
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
+    @ApiModelProperty(value = "标题",required = false,dataType = "varchar")
+    private String title;
+
+    @Length(min = 1,max = 1,message = "长度最小为1,最大为1")
+    @ApiModelProperty(value = "是否为外部链接（0：否，1：是）",required = false,dataType = "varchar")
+    private String isExternalLink;
+
+    @ApiModelProperty(value = "类型（0：线下，1：线上）",required = false,dataType = "varchar")
+    private String lineType;
+
+}

src/main/java/org/rcisoft/business/bbanner/dto/TopDownDTO.java

@@ -11,11 +11,10 @@ public class TopDownDTO {
 
     @NotNull
     @Length(min = 1,max = 50,message = "长度最小为1,最大为50")
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "主键",required = true,dataType = "varchar")
     private String businessId;
 
     @NotNull
-    @Length(min = 1,max = 11,message = "长度最小为1,最大为11")
-    @ApiModelProperty(value = "排序")
+    @ApiModelProperty(value = "排序",required = true,dataType = "int")
     private Integer bannerSort;
 }

src/main/java/org/rcisoft/business/bbanner/entity/BBanner.java

@@ -42,12 +42,15 @@ public class BBanner extends IdEntity<SysDept> {
     @ApiModelProperty(value = "是否为外部链接（0：否，1：是）")
     private String isExternalLink;
 
+    @Length(min = 1,max = 256,message = "长度最小为1,最大为256")
     @ApiModelProperty(value = "外部URL")
     private String externalUrl;
 
+    @Length(min = 1,max = 1,message = "长度最小为1,最大为1")
     @ApiModelProperty(value = "类型（0：线下，1：线上）")
     private String lineType;
 
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
     @ApiModelProperty(value = "课程ID")
     private String courseId;
 

src/main/java/org/rcisoft/business/bbanner/service/BBannerService.java

 package org.rcisoft.business.bbanner.service;
 
+import org.rcisoft.business.bbanner.dto.AddOrUpdateDTO;
 import org.rcisoft.business.bbanner.dto.BannerInfoRspDTO;
+import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
 import org.rcisoft.business.bbanner.dto.TopDownDTO;
 import org.rcisoft.business.bchapter.entity.BChapter;
 import org.rcisoft.core.aop.PageUtil;
@@ -13,10 +15,10 @@ public interface BBannerService {
 
     /**
      * 插入/修改
-     * @param model
+     * @param addOrUpdateDTO
      * @return
      */
-    PersistModel persist(BBanner model);
+    PersistModel persist(AddOrUpdateDTO addOrUpdateDTO);
 
     /**
      * 逻辑删除
@@ -38,7 +40,7 @@ public interface BBannerService {
      * @param model
      * @return
      */
-    List<BBanner> queryBannerByPagination(PageUtil pageUtil, BBanner model);
+    List<BBanner> queryBannerByPagination(PageUtil pageUtil, FindBannerPaginDTO model);
 
 
     /**

src/main/java/org/rcisoft/business/bbanner/service/impl/BBannerServiceImpl.java

 package org.rcisoft.business.bbanner.service.impl;
 
 import org.apache.commons.lang3.StringUtils;
+import org.rcisoft.business.bbanner.dto.AddOrUpdateDTO;
 import org.rcisoft.business.bbanner.dto.BannerInfoRspDTO;
+import org.rcisoft.business.bbanner.dto.FindBannerPaginDTO;
 import org.rcisoft.business.bbanner.dto.TopDownDTO;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.exception.ServiceException;
@@ -12,6 +14,7 @@ import org.rcisoft.business.bbanner.entity.BBanner;
 import org.rcisoft.business.bbanner.service.BBannerService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.Banner;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +36,10 @@ public class BBannerServiceImpl implements BBannerService {
 
     @Transactional(readOnly = true, propagation = Propagation.NOT_SUPPORTED)
     @Override
-    public PersistModel persist(BBanner model) {
+    public PersistModel persist(AddOrUpdateDTO addOrUpdateDTO) {
+
+        BBanner model = new BBanner();
+        BeanUtils.copyProperties(addOrUpdateDTO,model);
 
         int line = 0;
         //外部链接但外部URL为空或长度为0 抛异常
@@ -47,11 +53,11 @@ public class BBannerServiceImpl implements BBannerService {
                 throw new ServiceException("该数据不存在");
             }
             UserUtil.setCurrentMergeOperation(model);
-            int sort = bBannerRepository.selectMaxSort();
-            model.setBannerSort(sort);
             line = bBannerRepository.updateById(model);
         } else {
             UserUtil.setCurrentPersistOperation(model);
+            int sort = bBannerRepository.selectMaxSort();
+            model.setBannerSort(sort);
             line = bBannerRepository.insertSelective(model);
         }
         return new PersistModel(line);
@@ -76,7 +82,7 @@ public class BBannerServiceImpl implements BBannerService {
     }
 
     @Override
-    public List<BBanner> queryBannerByPagination(PageUtil pageUtil, BBanner model) {
+    public List<BBanner> queryBannerByPagination(PageUtil pageUtil, FindBannerPaginDTO model) {
         return bBannerRepository.queryBanners(model);
     }
 

src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java

@@ -81,7 +81,7 @@ public class BLessonController extends PaginationController<BLesson> {
     @ApiImplicitParams({@ApiImplicitParam(name = "importFile", value = "图片文件", required = true, dataType = "MultipartFile"),
             @ApiImplicitParam(name = "code", value = "课程编号", required = true, dataType = "varchar")})
     @PostMapping(value = "picImport")
-    public Result picImport(MultipartFile importFile,String code) throws Exception {
+    public Result picImport(CurUser curUser, MultipartFile importFile,String code) throws Exception {
         Result result = new Result();
         String path = global.getBASE_UPLOAD_SERVER_LOCATION();
         String course_logo_path =global.getIMAGE_LOCATION()+global.getCOURSE_LOGO_LOCATION();

src/main/java/org/rcisoft/business/blessonperson/controller/BLessonPersonController.java

@@ -33,7 +33,7 @@ public class BLessonPersonController extends PaginationController<BLesson> {
     private BLessonPersonService bLessonPersonService;
 
     @ApiOperation(value="退出课程", notes="根据ID停用一条记录")
-    @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")
+    @ApiImplicitParam(name = "businessId", value = "退出课程的选课id", required = true, dataType = "varchar")
     @PostMapping(value = "/quit")
     public Result remove(CurUser curUser, String businessId, BindingResult bindingResult) {
         PersistModel data = bLessonPersonService.quit(businessId);

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -8,6 +8,8 @@ import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
+import org.rcisoft.sys.role.dto.AddOrUpdateRoleDTO;
+import org.rcisoft.sys.role.dto.FindRolePaginDTO;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.SysRoleService;
 import org.rcisoft.sys.user.bean.CurUser;
@@ -31,27 +33,22 @@ public class SysRoleController extends PaginationController<SysRole> {
 
 
     @ApiOperation(value="分页查询角色", notes="分页查询角色")
-    @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "角色名称", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "code", value = "权限编号", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryRoles")
-    public GridModel queryRolesByPagination(CurUser curUser, @Valid SysRole sysRole, BindingResult bindingResult){
-        sysRoleServiceImpl.queryRolesByPagination(getPaginationUtility(), sysRole);
+    public GridModel queryRolesByPagination(CurUser curUser, @Valid FindRolePaginDTO findRolePaginDTO, BindingResult bindingResult){
+        sysRoleServiceImpl.queryRolesByPagination(getPaginationUtility(), findRolePaginDTO);
         GridModel gridModel = getGridModelResponse();
         return  gridModel;
     }
 
 
     @ApiOperation(value="增加/修改角色", notes="增加/修改角色")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "roleName", value = "角色名称", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "code", value = "角色编号", required = true, dataType = "varchar")})
     @PostMapping(value = "/add")
-    public Result roleAdd(CurUser curUser, @Valid SysRole sysRole, BindingResult bindingResult){
-        int line = sysRoleServiceImpl.persistRole(sysRole);
+    public Result roleAdd(CurUser curUser, @Valid AddOrUpdateRoleDTO addOrUpdateRoleDTO, BindingResult bindingResult){
+        int line = sysRoleServiceImpl.persistRole(addOrUpdateRoleDTO);
         return Result.builder(new PersistModel(line),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                sysRole);
+                addOrUpdateRoleDTO);
     }
 
 

src/main/java/org/rcisoft/sys/role/dto/AddOrUpdateRoleDTO.java

+package org.rcisoft.sys.role.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class AddOrUpdateRoleDTO {
+
+    @ApiModelProperty(value = "businessId", required = false, dataType = "varchar")
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
+    private String businessId;
+
+    @ApiModelProperty(value = "角色名称", required = true, dataType = "varchar")
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
+    @NotBlank
+    private String roleName;
+
+    @ApiModelProperty(value = "角色编号", required = true, dataType = "varchar")
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
+    @NotBlank
+    private String code;
+
+}

src/main/java/org/rcisoft/sys/role/dto/FindRolePaginDTO.java

+package org.rcisoft.sys.role.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+
+@Data
+public class FindRolePaginDTO {
+
+    @ApiModelProperty(value = "角色名称", required = false, dataType = "varchar")
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
+    private String roleName;
+
+    @ApiModelProperty(value = "角色编号", required = false, dataType = "varchar")
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
+    private String code;
+}

src/main/java/org/rcisoft/sys/role/entity/SysRole.java

@@ -4,11 +4,11 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.NotBlank;
 import org.rcisoft.core.entity.IdEntity;
 
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import javax.validation.constraints.NotBlank;
 
 /**
  * Created by gaowenfeng on 2017/8/9.

src/main/java/org/rcisoft/sys/role/service/SysRoleService.java

@@ -5,6 +5,8 @@ package org.rcisoft.sys.role.service;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.dept.entity.DeptRole;
+import org.rcisoft.sys.role.dto.AddOrUpdateRoleDTO;
+import org.rcisoft.sys.role.dto.FindRolePaginDTO;
 import org.rcisoft.sys.role.entity.SysRole;
 
 import java.util.List;
@@ -16,10 +18,10 @@ public interface SysRoleService {
 
     /**
      * 保存
-     * @param sysRole
+     * @param addOrUpdateRoleDTO
      * @return
      */
-    int persistRole(SysRole sysRole);
+    int persistRole(AddOrUpdateRoleDTO addOrUpdateRoleDTO);
 
 
     /**
@@ -36,10 +38,10 @@ public interface SysRoleService {
     /**
      * 分页查询角色
      * @param pageUtil
-     * @param sysRole
+     * @param findRolePaginDTO
      * @return
      */
-    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, SysRole sysRole);
+    List<SysRole> queryRolesByPagination(PageUtil pageUtil, FindRolePaginDTO findRolePaginDTO);
 
     //select 
     List<SysRole> queryRolesSelect(SysRole sysRole);
@@ -60,7 +62,7 @@ public interface SysRoleService {
      * @param sysRole
      * @return
      */
-    public List<DeptRole> queryUserRolesByPagination(PageUtil<SysRole> paginationUtility, String userId, SysRole sysRole);
+    List<DeptRole> queryUserRolesByPagination(PageUtil<SysRole> paginationUtility, String userId, SysRole sysRole);
 
     /**
      *
@@ -69,5 +71,5 @@ public interface SysRoleService {
      * @param sysRole
      * @return
      */
-    public List<SysRole> queryDeptRolesByPagination(PageUtil<SysRole> paginationUtility, String DeptId, SysRole sysRole);
+    List<SysRole> queryDeptRolesByPagination(PageUtil<SysRole> paginationUtility, String DeptId, SysRole sysRole);
 }

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -10,9 +10,12 @@ import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.sys.dept.entity.DeptRole;
 import org.rcisoft.sys.role.dao.SysRoleRepository;
+import org.rcisoft.sys.role.dto.AddOrUpdateRoleDTO;
+import org.rcisoft.sys.role.dto.FindRolePaginDTO;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.role.service.SysRoleService;
 import org.rcisoft.sys.user.dao.SysUserMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -40,7 +43,9 @@ public class SysRoleServiceImpl implements SysRoleService {
 
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
-    public int persistRole(SysRole sysRole) {
+    public int persistRole(AddOrUpdateRoleDTO addOrUpdateRoleDTO) {
+        SysRole sysRole = new SysRole();
+        BeanUtils.copyProperties(addOrUpdateRoleDTO,sysRole);
         int line;
         if(sysRole.getBusinessId()!=null){//修改
             List<SysRole> roles = sysRoleRepository.queryRolesByName(sysRole);
@@ -79,7 +84,9 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, SysRole sysRole) {
+    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, FindRolePaginDTO findRolePaginDTO) {
+        SysRole sysRole = new SysRole();
+        BeanUtils.copyProperties(findRolePaginDTO,sysRole);
         sysRole.setNotDeleted();
         sysRole.setStart();
         return sysRoleRepository.queryRoles(sysRole);

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -75,7 +75,7 @@ public class SysUserController extends PaginationController<SysUser> {
 //    }
 
     @ApiOperation(value = "停用用户", notes = "停用用户")
-    @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
+    @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path")
     @PostMapping(value = "/stop")
     public Result stop(CurUser curUser, @Valid String businessId, BindingResult br) {
         int line = userServiceImpl.stopUserByUserBusinessId(businessId);
@@ -86,7 +86,7 @@ public class SysUserController extends PaginationController<SysUser> {
     }
 
     @ApiOperation(value = "启用用户", notes = "启用用户")
-    @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
+    @ApiImplicitParam(name = "businessId", value = "businessId", 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/resources/application-dev.yml

@@ -14,7 +14,7 @@ server:
 
 druid:
 #  url: jdbc:mysql://127.0.0.1:3306/edu_db0917?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
-  url: jdbc:mysql://127.0.0.1:3306/new_edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+  url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   #url: jdbc:mysql://120.52.179.75:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
   password: root