feats

src/main/java/com/yunzhi/demo/common/Constants.java

     // 资源类型
     public final static String RESOURCE_TYPE_POST = "post"; // 科普文章
 
+    // 超级管理员
     public final static String SUPER_ADMIN_ID = "1";
     public final static Integer SUPER_ADMIN_ROLE = 1;
+
+    // 系统参数
+    // 阅读文章可获取的积分
+    public final static String SYS_PARAM_POST_POINTS = "POINTS_OF_PER_POST";
+    // 学分积分转换比例
+    public final static String SYS_PARAM_POINT_CREDIT_RATIO = "POINT_CREDIT_RATIO";
 }

src/main/java/com/yunzhi/demo/controller/SysConfigController.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysConfig",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/sys-config",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysConfigList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<SysConfig> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<SysConfig> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
+        queryWrapper.orderByAsc("sort_no");
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<SysConfig> result = iSysConfigService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 保存对象
-     * @param sysConfig 实体对象
-     * @return
-     */
-    @RequestMapping(value="/sysConfig",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean sysConfigAdd(@ApiParam("保存内容") @RequestBody SysConfig sysConfig) throws Exception{
-
-        if (iSysConfigService.save(sysConfig)){
-            return ResponseBean.success(sysConfig);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysConfig/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean sysConfigDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysConfigService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+        IPage<SysConfig> result = iSysConfigService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
      * @param sysConfig 实体对象
      * @return
      */
-    @RequestMapping(value="/sysConfig/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/sys-config/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean sysConfigUpdate(@ApiParam("对象ID") @PathVariable Integer id,
                                         @ApiParam("更新内容") @RequestBody SysConfig sysConfig) throws Exception{
+        if (!id.equals(sysConfig.getSerialNo())) {
+            throw new Exception("校验修改参数ID不正确");
+        }
 
-        if (iSysConfigService.updateById(sysConfig)){
+        SysConfig origin = iSysConfigService.getById(id);
+        if (!origin.getCode().equals(sysConfig.getCode())) {
+            throw new Exception("校验修改参数内容不正确");
+        }
+
+        origin.setValue(sysConfig.getValue());
+        if (Constants.STATUS_NORMAL.equals(sysConfig.getStatus()) || Constants.STATUS_READY.equals(sysConfig.getStatus())) {
+            origin.setStatus(sysConfig.getStatus());
+        }
+
+        if (iSysConfigService.updateById(origin)){
             return ResponseBean.success(iSysConfigService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/sysConfig/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysConfigGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysConfigService.getById(id));
-    }
 }

src/main/java/com/yunzhi/demo/controller/SysRoleMenuController.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.entity.SysRole;
+import com.yunzhi.demo.service.ISysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.yunzhi.demo.entity.SysRoleMenu;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 角色菜单 前端控制器
     private final Logger logger = LoggerFactory.getLogger(SysRoleMenuController.class);
 
     @Autowired
-    public ISysRoleMenuService iSysRoleMenuService;
+    ISysRoleMenuService iSysRoleMenuService;
 
+    @Autowired
+    ISysRoleService iSysRoleService;
 
     /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
+     * 查询角色授权菜单
+     * @param roleId
      * @return
+     * @throws Exception
      */
-    @RequestMapping(value="/sysRoleMenu",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean sysRoleMenuList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<SysRoleMenu> pg = new Page<>(pageNum, pageSize);
+    @RequestMapping(value="/admin/role-menu",method= RequestMethod.GET)
+    @ApiOperation(value="查询角色授权菜单", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysRoleMenuList(@ApiParam("角色ID") @RequestParam Integer roleId) throws Exception{
             QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq("role_id", roleId);
 
-            IPage<SysRoleMenu> result = iSysRoleMenuService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+            List<SysRoleMenu> roleMenuList = iSysRoleMenuService.list(queryWrapper);
+            return ResponseBean.success(roleMenuList);
     }
 
     /**
-     * 保存对象
-     * @param sysRoleMenu 实体对象
+     * 授权菜单
+     * @param roleId
+     * @param roleMenuList
      * @return
+     * @throws Exception
      */
-    @RequestMapping(value="/sysRoleMenu",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean sysRoleMenuAdd(@ApiParam("保存内容") @RequestBody SysRoleMenu sysRoleMenu) throws Exception{
+    @RequestMapping(value="/admin/role-menu/{roleId}",method= RequestMethod.POST)
+    @ApiOperation(value="授权菜单", notes = "授权菜单", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean sysRoleMenuAdd(@ApiParam("角色ID") @PathVariable Integer roleId,
+                                       @ApiParam("保存内容") @RequestBody List<SysRoleMenu> roleMenuList) throws Exception{
+        if (Constants.SUPER_ADMIN_ROLE.equals(roleId)) {
+            throw new Exception("您无权进行此操作");
+        }
+
+        SysRole sysRole = iSysRoleService.getById(roleId);
+        if (null == sysRole || Constants.STATUS_DELETED.equals(sysRole.getStatus())) {
+            throw new Exception("验证角色信息失败: 当前角色不存在");
+        }
+
+        // 先删除所有授权信息
+        iSysRoleMenuService.deleteByRole(roleId);
+        if (null == roleMenuList || roleMenuList.size() == 0) {
+            return ResponseBean.success("success");
+        }
+
+        for (SysRoleMenu roleMenu : roleMenuList) {
+            roleMenu.setRoleId(roleId);
+        }
 
-        if (iSysRoleMenuService.save(sysRoleMenu)){
-            return ResponseBean.success(sysRoleMenu);
+        if (iSysRoleMenuService.saveBatch(roleMenuList)){
+            return ResponseBean.success(roleMenuList);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/yunzhi/demo/controller/SysUserController.java

         List<SysMenu> sysMenuList = iSysMenuService.getListWithRoles();
         List<SysUserRole> sysUserRoleList = iSysUserRoleService.getListByUser(sysUser.getUserId());
 
+        SysLogin sysLogin = iSysLoginService.getByUser(sysUser.getUserId());
+        sysUser.setLoginName(sysLogin.getLoginName());
+
         Map<String, Object> result = new HashMap<String, Object>() {{
             put("user", sysUser);
             put("menus", sysMenuList);

src/main/java/com/yunzhi/demo/controller/TdHospitalController.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.TdSchool;
+import com.yunzhi.demo.service.ITdSchoolService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import com.yunzhi.demo.entity.TdHospital;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 医务室 前端控制器
     private final Logger logger = LoggerFactory.getLogger(TdHospitalController.class);
 
     @Autowired
-    public ITdHospitalService iTdHospitalService;
+    ITdHospitalService iTdHospitalService;
+
+    @Autowired
+    ITdSchoolService iTdSchoolService;
 
 
     /**
-     * 分页查询列表
+     * 学校诊室管理
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdHospital",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/admin/hospital",method= RequestMethod.GET)
+    @ApiOperation(value="学校诊室管理", notes = "学校诊室管理", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean tdHospitalList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("所属学校") @RequestParam(value ="schoolId") String schoolId,
+                                       @ApiParam("诊室名称") @RequestParam(value ="name", required = false) String name) throws Exception{
 
-		    IPage<TdHospital> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TdHospital> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        TdSchool tdSchool = iTdSchoolService.getById(schoolId);
+        if (null == tdSchool || Constants.STATUS_DELETED.equals(tdSchool.getStatus())) {
+            throw new Exception("没有找到所属学校信息");
+        }
 
-            IPage<TdHospital> result = iTdHospitalService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TdHospital> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdHospital> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("school_id", schoolId);
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
+        queryWrapper.like(!StringUtils.isEmpty(name),"name", "%"+name+"%");
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TdHospital> result = iTdHospitalService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
-     * 保存对象
+     * 保存诊室信息
      * @param tdHospital 实体对象
      * @return
      */
-    @RequestMapping(value="/tdHospital",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean tdHospitalAdd(@ApiParam("保存内容") @RequestBody TdHospital tdHospital) throws Exception{
+    @RequestMapping(value="/admin/hospital",method= RequestMethod.POST)
+    @ApiOperation(value="保存诊室信息", notes = "保存诊室信息", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean tdHospitalAdd(@ApiParam("诊室信息") @RequestBody TdHospital tdHospital) throws Exception{
+        if (StringUtils.isEmpty(tdHospital.getSchoolId())) {
+            throw new Exception("没有找到所属学校信息");
+        }
+
+        TdSchool tdSchool = iTdSchoolService.getById(tdHospital.getSchoolId());
+        if (null == tdSchool || Constants.STATUS_DELETED.equals(tdSchool.getStatus())) {
+            throw new Exception("没有找到所属学校信息");
+        }
+
+        if (StringUtils.isEmpty(tdHospital.getName())) {
+            throw new Exception("没有填写诊室信息");
+        }
 
         if (iTdHospitalService.save(tdHospital)){
             return ResponseBean.success(tdHospital);
     }
 
     /**
-     * 根据id删除对象
+     * 删除诊室
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdHospital/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdHospitalDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTdHospitalService.removeById(id)){
+    @RequestMapping(value="/admin/hospital/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除诊室", notes = "删除诊室", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean tdHospitalDelete(@ApiParam("诊室ID") @PathVariable String id) throws Exception{
+        TdHospital tdHospital = iTdHospitalService.getById(id);
+        if (null == tdHospital || Constants.STATUS_DELETED.equals(tdHospital.getStatus())) {
+            return ResponseBean.success("success");
+        }
+
+        tdHospital.setStatus(Constants.STATUS_DELETED);
+
+        if(iTdHospitalService.updateById(tdHospital)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
     }
 
     /**
-     * 修改对象
+     * 修改诊室信息
      * @param id  实体ID
      * @param tdHospital 实体对象
      * @return
      */
-    @RequestMapping(value="/tdHospital/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/hospital/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean tdHospitalUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TdHospital tdHospital) throws Exception{
+    public ResponseBean tdHospitalUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                         @ApiParam("更新内容") @RequestBody TdHospital tdHospital) throws Exception{
+        TdHospital origin = iTdHospitalService.getById(id);
+        if (null == origin || Constants.STATUS_DELETED.equals(origin)) {
+            throw new Exception("未找到更新记录");
+        }
+
+        if (StringUtils.isEmpty(tdHospital.getName())) {
+            throw new Exception("没有填写诊室信息");
+        }
+
+        if (!id.equals(tdHospital.getHospitalId())) {
+            throw new Exception("校验诊室信息出错");
+        }
 
-        if (iTdHospitalService.updateById(tdHospital)){
+        // 允许修改的字段
+        origin.setName(tdHospital.getName());
+        origin.setStatus(tdHospital.getStatus());
+        origin.setUpdateDate(LocalDateTime.now());
+
+        if (iTdHospitalService.updateById(origin)){
             return ResponseBean.success(iTdHospitalService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/tdHospital/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdHospitalGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTdHospitalService.getById(id));
-    }
 }

src/main/java/com/yunzhi/demo/controller/TdSchoolController.java

         return ResponseBean.success(iTdSchoolService.list(queryWrapper));
     }
 
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/tdSchool",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdSchoolList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TdSchool> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TdSchool> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TdSchool> result = iTdSchoolService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
     /**
      * 分页查询列表
      * @param pageNum
     @RequestMapping(value="/admin/school",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean schoolList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @ApiParam("名称") @RequestParam(value = "name", required = false) String name,
                                    @ApiParam("状态") @RequestParam(value = "status", required = false) String status) throws Exception{
 
         QueryWrapper<TdSchool> queryWrapper = new QueryWrapper<TdSchool>()
                 .like(!StringUtils.isEmpty(name), "name", name)
                 .eq(null != status, "status", status)
+                .gt("status", Constants.STATUS_DELETED)
                 .orderByDesc("create_date");
 
         IPage<TdSchool> result = iTdSchoolService.page(pg, queryWrapper);
      * @param tdSchool 实体对象
      * @return
      */
-    @RequestMapping(value="/tdSchool",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/school",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean tdSchoolAdd(@ApiParam("保存内容") @RequestBody TdSchool tdSchool) throws Exception{
+    public ResponseBean schoolAdd(@ApiParam("保存内容") @RequestBody TdSchool tdSchool) throws Exception{
 
-        if (iTdSchoolService.save(tdSchool)){
-            return ResponseBean.success(tdSchool);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        if (StringUtils.isEmpty(tdSchool.getName())) {
+            throw new Exception("学校名称不能为空");
         }
-    }
 
-    /**
-     * 保存对象
-     * @param tdSchool 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/school",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean schoolAdd(@ApiParam("保存内容") @RequestBody TdSchool tdSchool) throws Exception{
+        TdSchool exitSchool = iTdSchoolService.getByName(tdSchool.getName());
+        if (null != exitSchool) {
+            throw new Exception("学校名称已经存在");
+        }
 
         if (iTdSchoolService.save(tdSchool)){
             return ResponseBean.success(tdSchool);
         }
     }
 
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/tdSchool/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdSchoolDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTdSchoolService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
     /**
      * 根据id删除对象
      * @param id  实体ID
     @RequestMapping(value="/admin/school/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean schoolDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTdSchoolService.removeById(id)){
+        TdSchool origin = iTdSchoolService.getById(id);
+        if (null == origin || Constants.STATUS_DELETED.equals(origin.getStatus())) {
             return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param tdSchool 实体对象
-     * @return
-     */
-    @RequestMapping(value="/tdSchool/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean tdSchoolUpdate(@ApiParam("对象ID") @PathVariable String id,
-                                        @ApiParam("更新内容") @RequestBody TdSchool tdSchool) throws Exception{
+        origin.setStatus(Constants.STATUS_DELETED);
 
-        if (iTdSchoolService.updateById(tdSchool)){
-            return ResponseBean.success(iTdSchoolService.getById(id));
+        if(iTdSchoolService.updateById(origin)){
+            return ResponseBean.success("success");
         }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     @RequestMapping(value="/admin/school/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean schoolUpdate(@ApiParam("对象ID") @PathVariable String id,
-                                       @ApiParam("更新内容") @RequestBody TdSchool tdSchool) throws Exception{
+                                     @ApiParam("更新内容") @RequestBody TdSchool tdSchool) throws Exception{
+        TdSchool origin = iTdSchoolService.getById(id);
+        if (null == origin || Constants.STATUS_DELETED.equals(origin.getStatus())) {
+            throw new Exception("没有找到对应的学校信息");
+        }
+
+        if (!id.equals(tdSchool.getSchoolId())) {
+            throw new Exception("校验学校信息失败");
+        }
+
+        if (StringUtils.isEmpty(tdSchool.getName())) {
+            throw new Exception("学校名称不能为空");
+        }
+
+        TdSchool exitSchool = iTdSchoolService.getByName(tdSchool.getName());
+        if (null != exitSchool && !id.equals(exitSchool.getSchoolId())) {
+            throw new Exception("学校名称已经存在");
+        }
 
         if (iTdSchoolService.updateById(tdSchool)){
             return ResponseBean.success(iTdSchoolService.getById(id));
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdSchool/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/school/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean tdSchoolGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTdSchoolService.getById(id));
-    }
+        TdSchool tdSchool = iTdSchoolService.getById(id);
+        if (null == tdSchool || Constants.STATUS_DELETED.equals(tdSchool.getStatus())) {
+            throw new Exception("学校信息不存在");
+        }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/school/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean schoolGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTdSchoolService.getById(id));
+        return ResponseBean.success(tdSchool);
     }
 }

src/main/java/com/yunzhi/demo/entity/TaTopic.java

     @ApiModelProperty(value = "对象ID")
     private String targetId;
 
+    @ApiModelProperty(value = "对象名称")
+    private String targetTitle;
+
     @ApiModelProperty(value = "封面")
     private String poster;
 

src/main/java/com/yunzhi/demo/entity/TdHospital.java

     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "医务室ID")
-    @TableId(value = "hospital_id", type = IdType.INPUT)
+    @TableId(value = "hospital_id", type = IdType.UUID)
     private String hospitalId;
 
     @ApiModelProperty(value = "名称")

src/main/java/com/yunzhi/demo/service/ISysRoleMenuService.java

  */
 public interface ISysRoleMenuService extends IService<SysRoleMenu> {
 
+    boolean deleteByRole(Integer roleId);
 }

src/main/java/com/yunzhi/demo/service/ITdSchoolService.java

  */
 public interface ITdSchoolService extends IService<TdSchool> {
 
+    TdSchool getByName(String name);
 }

src/main/java/com/yunzhi/demo/service/impl/SysRoleMenuServiceImpl.java

 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.demo.entity.SysRoleMenu;
 import com.yunzhi.demo.mapper.SysRoleMenuMapper;
 import com.yunzhi.demo.service.ISysRoleMenuService;
 @Service
 public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements ISysRoleMenuService {
 
+    @Override
+    public boolean deleteByRole(Integer roleId) {
+        QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<SysRoleMenu>()
+                .eq("role_id", roleId);
+        return remove(queryWrapper);
+    }
 }

src/main/java/com/yunzhi/demo/service/impl/TdSchoolServiceImpl.java

 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.entity.TdSchool;
 import com.yunzhi.demo.mapper.TdSchoolMapper;
 import com.yunzhi.demo.service.ITdSchoolService;
 @Service
 public class TdSchoolServiceImpl extends ServiceImpl<TdSchoolMapper, TdSchool> implements ITdSchoolService {
 
+    @Override
+    public TdSchool getByName(String name) {
+        QueryWrapper<TdSchool> queryWrapper = new QueryWrapper<TdSchool>()
+                .eq("name", name)
+                .gt("status", Constants.STATUS_DELETED)
+                .last("limit 1");
+        return getOne(queryWrapper);
+    }
 }