Merge branch 'master' of http://git.ycjcjy.com/medical-plat/service

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

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.TaPost;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -59,6 +62,26 @@ public class SysBannerController extends BaseController {
             return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/banner",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean bannerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @ApiParam("标题") @RequestParam(value = "title", required = false) String title) throws Exception{
+
+        IPage<SysBanner> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<SysBanner>().like(!StringUtils.isEmpty(title), "title", title);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<SysBanner> result = iSysBannerService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param sysBanner 实体对象
@@ -75,6 +98,22 @@ public class SysBannerController extends BaseController {
         }
     }
 
+    /**
+     * 保存对象
+     * @param sysBanner 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/banner",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean bannerAdd(@ApiParam("保存内容") @RequestBody SysBanner sysBanner) throws Exception{
+
+        if (iSysBannerService.save(sysBanner)){
+            return ResponseBean.success(sysBanner);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id删除对象
      * @param id  实体ID
@@ -89,6 +128,20 @@ public class SysBannerController extends BaseController {
         }
     }
 
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/banner/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean bannerDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iSysBannerService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 修改对象
      * @param id  实体ID
@@ -107,6 +160,24 @@ public class SysBannerController extends BaseController {
         }
     }
 
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysBanner 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/banner/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean bannerUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody SysBanner sysBanner) throws Exception{
+
+        if (iSysBannerService.updateById(sysBanner)){
+            return ResponseBean.success(iSysBannerService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -116,4 +187,14 @@ public class SysBannerController extends BaseController {
     public ResponseBean sysBannerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iSysBannerService.getById(id));
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/banner/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean bannerGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iSysBannerService.getById(id));
+    }
 }

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

@@ -59,6 +59,25 @@ public class TaTopicController extends BaseController {
             return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/topic",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean topicList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        IPage<TaTopic> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaTopic> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaTopic> result = iTaTopicService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param taTopic 实体对象
@@ -75,6 +94,22 @@ public class TaTopicController extends BaseController {
         }
     }
 
+    /**
+     * 保存对象
+     * @param taTopic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/topic",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean topicAdd(@ApiParam("保存内容") @RequestBody TaTopic taTopic) throws Exception{
+
+        if (iTaTopicService.save(taTopic)){
+            return ResponseBean.success(taTopic);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id删除对象
      * @param id  实体ID
@@ -89,6 +124,20 @@ public class TaTopicController extends BaseController {
         }
     }
 
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/topic/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean topicDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iTaTopicService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 修改对象
      * @param id  实体ID
@@ -107,6 +156,24 @@ public class TaTopicController extends BaseController {
         }
     }
 
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taTopic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/topic/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean topicUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                      @ApiParam("更新内容") @RequestBody TaTopic taTopic) throws Exception{
+
+        if (iTaTopicService.updateById(taTopic)){
+            return ResponseBean.success(iTaTopicService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
@@ -116,4 +183,14 @@ public class TaTopicController extends BaseController {
     public ResponseBean taTopicGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaTopicService.getById(id));
     }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/topic/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean topicGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaTopicService.getById(id));
+    }
 }

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

@@ -67,6 +67,25 @@ public class TdSchoolController extends BaseController {
             return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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) 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 tdSchool 实体对象
@@ -83,13 +102,43 @@ public class TdSchoolController extends BaseController {
         }
     }
 
+    /**
+     * 保存对象
+     * @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{
+
+        if (iTdSchoolService.save(tdSchool)){
+            return ResponseBean.success(tdSchool);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据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 Integer id) throws Exception{
+    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)){
             return ResponseBean.success("success");
         }else {
@@ -105,7 +154,7 @@ public class TdSchoolController extends BaseController {
      */
     @RequestMapping(value="/tdSchool/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean tdSchoolUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean tdSchoolUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TdSchool tdSchool) throws Exception{
 
         if (iTdSchoolService.updateById(tdSchool)){
@@ -115,13 +164,41 @@ public class TdSchoolController extends BaseController {
         }
     }
 
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdSchool 实体对象
+     * @return
+     */
+    @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{
+
+        if (iTdSchoolService.updateById(tdSchool)){
+            return ResponseBean.success(iTdSchoolService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
     @RequestMapping(value="/tdSchool/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdSchoolGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean tdSchoolGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTdSchoolService.getById(id));
+    }
+
+    /**
+     * 根据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));
     }
 }

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

@@ -2,6 +2,8 @@ package com.yunzhi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -37,6 +39,7 @@ public class TdSchool implements Serializable {
     private String logo;
 
     @ApiModelProperty(value = "简介")
+    @TableField ("`desc`")
     private String desc;
 
     @ApiModelProperty(value = "排序")