fix

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

@@ -7,6 +7,7 @@ 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;
@@ -76,11 +77,15 @@ public class TdSchoolController extends BaseController {
     @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{
+                                     @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{
 
         IPage<TdSchool> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TdSchool> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByDesc("create_date");
+        QueryWrapper<TdSchool> queryWrapper = new QueryWrapper<TdSchool>()
+                .like(!StringUtils.isEmpty(name), "name", name)
+                .eq(null != status, "status", status)
+                .orderByDesc("create_date");
 
         IPage<TdSchool> result = iTdSchoolService.page(pg, queryWrapper);
         return ResponseBean.success(result);

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

@@ -69,6 +69,29 @@ public class TdSpecialtyController extends BaseController {
             return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @return
+     */
+    @RequestMapping(value="/admin/specialty",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean adminSpecialtyList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @ApiParam(value = "学校ID", required = false) @RequestParam(value ="schoolId", required = false) String schoolId,
+                                           @ApiParam(value = "名称", required = false) @RequestParam(value ="name", required = false) String name) throws Exception {
+
+        IPage<TdSpecialty> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<TdSpecialty>()
+                .eq(!StringUtils.isEmpty(schoolId),"schoolId", schoolId)
+                .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
+                .eq("status", Constants.STATUS_NORMAL)
+                .orderByAsc("sort_no")
+                .orderByDesc("create_date");
+
+        IPage<TdSpecialty> result = iTdSpecialtyService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param tdSpecialty 实体对象
@@ -85,13 +108,43 @@ public class TdSpecialtyController extends BaseController {
         }
     }
 
+    /**
+     * 保存对象
+     * @param tdSpecialty 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/specialty",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean specialtyAdd(@ApiParam("保存内容") @RequestBody TdSpecialty tdSpecialty) throws Exception{
+
+        if (iTdSpecialtyService.save(tdSpecialty)){
+            return ResponseBean.success(tdSpecialty);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 根据id删除对象
      * @param id  实体ID
      */
     @RequestMapping(value="/tdSpecialty/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean tdSpecialtyDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean tdSpecialtyDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTdSpecialtyService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/specialty/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean specialtyDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         if(iTdSpecialtyService.removeById(id)){
             return ResponseBean.success("success");
         }else {

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

@@ -27,7 +27,7 @@ public class TdSpecialty implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键")
-    @TableId(value = "specialty_id", type = IdType.INPUT)
+    @TableId(value = "specialty_id", type = IdType.UUID)
     private String specialtyId;
 
     @ApiModelProperty(value = "名称")