Merge branch 'dev' of http://git.ycjcjy.com/shigongli/service-v2 into dev

src/main/java/com/yunzhi/shigongli/controller/TaExtendContentController.java

@@ -4,6 +4,7 @@ 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.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,14 +54,16 @@ public class TaExtendContentController extends BaseController {
     public ResponseBean taExtendContentList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                             @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("内容类型") @RequestParam(value ="contentType") String contentType,
                                             HttpServletRequest request) throws Exception{
 
-		    IPage<TaExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaExtendContent> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaExtendContent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("content_type", contentType);
+        queryWrapper.orderByAsc("sort");
 
-            IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaExtendContent> result = iTaExtendContentService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -72,6 +75,9 @@ public class TaExtendContentController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taExtendContentAdd(@ApiParam("保存内容") @RequestBody TaExtendContent taExtendContent) throws Exception{
 
+        int max = iTaExtendContentService.getMaxSort(taExtendContent.getContentType());
+        taExtendContent.setSort(max + 1);
+
         if (iTaExtendContentService.save(taExtendContent)){
             return ResponseBean.success(taExtendContent);
         }else {
@@ -86,7 +92,7 @@ public class TaExtendContentController extends BaseController {
     @RequestMapping(value="/admin/taExtendContent/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taExtendContentDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaExtendContentService.removeLogicById(id)){
+        if(iTaExtendContentService.removeById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/shigongli/controller/TdTypeController.java

@@ -4,7 +4,9 @@ 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.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -50,14 +52,19 @@ public class TdTypeController extends BaseController {
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean tdTypeList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                    @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 ="typeName", required = false) String typeName) throws Exception{
 
-		    IPage<TdType> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TdType> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TdType> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isEmpty(typeName), "type_name", "%"+typeName+"%");
+        queryWrapper.eq("wx".equals(plat), "status", Constants.STATUS_NORMAL);
+        queryWrapper.gt("admin".equals(plat), "status", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("weight");
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TdType> result = iTdTypeService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TdType> result = iTdTypeService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/yunzhi/shigongli/service/ITaExtendContentService.java

@@ -13,4 +13,5 @@ import com.yunzhi.shigongli.entity.TaExtendContent;
  */
 public interface ITaExtendContentService extends IBaseService<TaExtendContent> {
 
+    int getMaxSort(String contentType);
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaExtendContentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yunzhi.shigongli.entity.TaExtendContent;
 import com.yunzhi.shigongli.mapper.TaExtendContentMapper;
 import com.yunzhi.shigongli.service.ITaExtendContentService;
@@ -17,4 +18,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaExtendContentServiceImpl extends BaseServiceImpl<TaExtendContentMapper, TaExtendContent> implements ITaExtendContentService {
 
+    @Override
+    public int getMaxSort(String contentType) {
+        LambdaQueryWrapper<TaExtendContent> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaExtendContent::getContentType, contentType);
+        queryWrapper.orderByDesc(TaExtendContent::getSort);
+        queryWrapper.last("limit 1");
+
+        TaExtendContent extendContent = getOne(queryWrapper);
+
+        return null == extendContent ? 0 : extendContent.getSort();
+    }
 }