feats

src/main/java/com/yunzhi/inte/common/StringUtils.java

@@ -0,0 +1,203 @@
+package com.yunzhi.inte.common;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringUtils {
+    private static Pattern humpPattern = Pattern.compile("[A-Z]");
+
+    public static boolean isEmpty(String str) {
+        return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
+    }
+
+    public static String trim(String src, String...st) {
+        if (null == src) return src;
+        if (null == st || st.length == 0) return src.trim();
+
+        String start = st[0];
+        if (!src.startsWith(start)) {
+            return src;
+        }
+
+        return src.substring(start.length());
+    }
+
+    public static String trimEnd(String src, String str) {
+        if (null == src || null == str) {
+            return src;
+        }
+
+        if (src.endsWith(str)) {
+            return src.substring(0, src.length() - str.length());
+        }
+
+        return src;
+    }
+
+    public static String ifNull(String src, String defaultVal) {
+        return isEmpty(src) ? defaultVal : src;
+    }
+
+    public static String random(int length) {
+        String str="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for(int i=0;i<length;i++){
+            int number=random.nextInt(62);
+            sb.append(str.charAt(number));
+        }
+        return sb.toString();
+    }
+
+    public static String urlEncode(String str) {
+        if (isEmpty(str)) return str;
+
+        try {
+            return URLEncoder.encode(str, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return str;
+        }
+    }
+
+    public static String urlDecode(String str) {
+        if (isEmpty(str)) return str;
+
+        try {
+            return URLDecoder.decode(str, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return str;
+        }
+    }
+
+    public static String encodeURIComponent(String str) {
+        String result = urlEncode(str);
+
+        return result.replaceAll("\\+", "%20")
+                .replaceAll("\\%21", "!")
+                .replaceAll("\\%27", "'")
+                .replaceAll("\\%28", "(")
+                .replaceAll("\\%29", ")")
+                .replaceAll("\\%7E", "~");
+    }
+
+    public static String humpToLine(String str) {
+        if (null == str || "".equals(str)) return "";
+
+        Matcher matcher = humpPattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, "_" + matcher.group(0).toLowerCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    public static String strToUnicode(String str) {
+        char[] chars = str.toCharArray();
+        String returnStr = "";
+        for (int i = 0; i < chars.length; i++) {
+            returnStr += "\\u" + Integer.toString(chars[i], 16);
+        }
+        return returnStr;
+    }
+
+    public static String repeat(String src, int len) {
+        if (null == src) {
+            return null;
+        }
+
+        if (len <= 0) {
+            return src;
+        }
+
+        String res = "";
+        for (int i = 0; i < len; i ++) {
+            res += src;
+        }
+
+        return res;
+    }
+
+    public static String lpad(String src, String padStr, int len) {
+        if (null == src) {
+            return null;
+        }
+
+        if (len <= 0 || src.length() >= len) {
+            return src;
+        }
+
+        if (null == padStr) {
+            padStr = "";
+        }
+
+        int padLen = len - src.length();
+        String prefix = repeat(padStr, padLen);
+        prefix = prefix.substring(0, padLen);
+        return prefix + src;
+    }
+
+    /**
+     * 解析 QueryString
+     * @param queryStr
+     * @return
+     */
+    public static Map<String, String> parseQueryString(String queryStr) {
+        if (isEmpty(queryStr)) {
+            return null;
+        }
+        Map<String, String> result = new HashMap<String, String>();
+
+        String[] fields = queryStr.split("&");
+        for (String field : fields) {
+            String[] pairs = field.split("=");
+            if (2 != pairs.length) {
+                continue;
+            }
+
+            try {
+                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+
+                result.put(key, val);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Map 转 QueryString
+     * @param params
+     * @return
+     */
+    public static String buildQueryString(Map<String, Object> params) {
+        if (null == params) {
+            return null;
+        }
+
+        List<String> lst = new ArrayList<>();
+        for (Map.Entry<String, Object> entry : params.entrySet()) {
+            String key = StringUtils.urlEncode(entry.getKey());
+            Object o = entry.getValue();
+            if (null == o) {
+                continue;
+            }
+            String val = o.toString();
+            if (StringUtils.isEmpty(val)) {
+                continue;
+            }
+            String queryStr = key + "=" + StringUtils.urlEncode(val);
+            lst.add(queryStr);
+        }
+        return String.join("&", lst);
+    }
+}

src/main/java/com/yunzhi/inte/controller/DishesController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,12 +51,15 @@ public class DishesController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/dishes")
     public ResponseBean list(@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) throws Exception {
 
         IPage<Dishes> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<Dishes> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<Dishes> result = dishesService.page(pg);
+        QueryWrapper<Dishes> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByDesc("id");
+        IPage<Dishes> result = dishesService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }
@@ -68,6 +73,7 @@ public class DishesController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/dishes")
     public ResponseBean add(Dishes dishes) throws Exception {
+        dishes.setStatus(1);
         dishesService.save(dishes);
         return ResponseBean.success(dishes);
     }
@@ -81,6 +87,7 @@ public class DishesController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/dishes/{id}")
     public ResponseBean edit(Dishes dishes) throws Exception {
+        dishes.setStatus(1);
         dishesService.updateById(dishes);
         return ResponseBean.success(dishes);
     }

src/main/java/com/yunzhi/inte/controller/PackageController.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -49,12 +51,15 @@ public class PackageController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/package")
     public ResponseBean list(@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) throws Exception {
 
         IPage<Package> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<Package> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<Package> result = packageService.page(pg);
+        QueryWrapper<Package> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByDesc("id");
+        IPage<Package> result = packageService.page(pg, queryWrapper);
 
         return ResponseBean.success(result);
     }
@@ -67,7 +72,7 @@ public class PackageController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/package")
-    public ResponseBean add(Package pkg) throws Exception {
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody Package pkg) throws Exception {
         packageService.save(pkg);
         return ResponseBean.success(pkg);
     }
@@ -80,7 +85,7 @@ public class PackageController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/package/{id}")
-    public ResponseBean edit(Package pkg) throws Exception {
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody Package pkg) throws Exception {
         packageService.updateById(pkg);
         return ResponseBean.success(pkg);
     }

src/main/java/com/yunzhi/inte/controller/PackageDetailController.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
 import java.util.List;
+
+import com.yunzhi.inte.entity.Dishes;
+import com.yunzhi.inte.service.DishesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,6 +30,9 @@ public class PackageDetailController extends BaseController {
     @Autowired
     private PackageDetailService packageDetailService;
 
+    @Autowired
+    private DishesService dishesService;
+
     /**
      * 通过ID查询单条数据
      *
@@ -49,12 +55,11 @@ public class PackageDetailController extends BaseController {
     @ApiOperation("分页查询")
     @GetMapping("/packageDetail")
     public ResponseBean list(@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("套餐ID") @RequestParam(value ="packageId") Integer packageId) throws Exception {
 
-        IPage<PackageDetail> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<PackageDetail> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<PackageDetail> result = packageDetailService.page(pg);
+        IPage<Dishes> pg = new Page<>(pageNum, pageSize);
+        IPage<Dishes> result = packageDetailService.getPageByPackage(pg, packageId);
 
         return ResponseBean.success(result);
     }
@@ -67,9 +72,22 @@ public class PackageDetailController extends BaseController {
      */
     @ApiOperation("新增数据")
     @PostMapping("/packageDetail")
-    public ResponseBean add(PackageDetail packageDetail) throws Exception {
+    public ResponseBean add(@ApiParam("实例对象") @RequestBody PackageDetail packageDetail) throws Exception {
+
+        QueryWrapper<PackageDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("package_id", packageDetail.getPackageId());
+        queryWrapper.eq("dish_id", packageDetail.getDishId());
+
+        int total = packageDetailService.count(queryWrapper);
+        if (total > 0) {
+            return ResponseBean.error("当前菜肴已存在");
+        }
+
         packageDetailService.save(packageDetail);
-        return ResponseBean.success(packageDetail);
+
+        Dishes dishes = dishesService.getById(packageDetail.getDishId());
+
+        return ResponseBean.success(dishes);
     }
 
     /**
@@ -80,7 +98,7 @@ public class PackageDetailController extends BaseController {
      */
     @ApiOperation("更新数据")
     @PutMapping("/packageDetail/{id}")
-    public ResponseBean edit(PackageDetail packageDetail) throws Exception {
+    public ResponseBean edit(@ApiParam("实例对象") @RequestBody PackageDetail packageDetail) throws Exception {
         packageDetailService.updateById(packageDetail);
         return ResponseBean.success(packageDetail);
     }
@@ -88,13 +106,20 @@ public class PackageDetailController extends BaseController {
     /**
      * 通过主键删除数据
      *
-     * @param id 主键
+     * @param packageId 套餐ID
+     * @param dishId 菜肴ID
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/packageDetail/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        packageDetailService.removeLogicById(id);
+    @DeleteMapping("/packageDetail")
+    public ResponseBean deleteById(@ApiParam("套餐ID") @RequestParam Integer packageId,
+                                   @ApiParam("菜肴ID") @RequestParam Integer dishId){
+
+        QueryWrapper<PackageDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("package_id", packageId);
+        queryWrapper.eq("dish_id", dishId);
+
+        packageDetailService.remove(queryWrapper);
         return ResponseBean.success("success");
     }
 }

src/main/java/com/yunzhi/inte/entity/Package.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 public class Package implements Serializable,Cloneable{
     /** 套餐ID */
     @ApiModelProperty(name = "套餐ID",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 套餐名称 */
     @ApiModelProperty(name = "套餐名称",notes = "")

src/main/java/com/yunzhi/inte/entity/PackageDetail.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 public class PackageDetail implements Serializable,Cloneable{
     /** 序号 */
     @ApiModelProperty(name = "序号",notes = "")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id ;
     /** 套餐ID */
     @ApiModelProperty(name = "套餐ID",notes = "")

src/main/java/com/yunzhi/inte/mapper/PackageDetailMapper.java

@@ -1,6 +1,8 @@
 package com.yunzhi.inte.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.entity.Dishes;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.yunzhi.inte.entity.PackageDetail;
@@ -13,4 +15,5 @@ import com.yunzhi.inte.entity.PackageDetail;
 @Mapper
 public interface PackageDetailMapper  extends BaseMapper<PackageDetail>{
 
+    IPage<Dishes> getPageByPackage(IPage<Dishes> pg, @Param("packageId") Integer packageId);
 }

src/main/java/com/yunzhi/inte/service/PackageDetailService.java

@@ -1,6 +1,8 @@
 package com.yunzhi.inte.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.inte.entity.Dishes;
 import com.yunzhi.inte.entity.PackageDetail;
 
 /**
@@ -10,4 +12,5 @@ import com.yunzhi.inte.entity.PackageDetail;
  */
 public interface PackageDetailService extends IBaseService<PackageDetail> {
 
+    IPage<Dishes> getPageByPackage(IPage<Dishes> pg, Integer packageId);
 }

src/main/java/com/yunzhi/inte/service/impl/BaseServiceImpl.java

@@ -16,7 +16,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
 
         TableInfo tableInfo = SqlHelper.table(currentModelClass());
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("state", -1)
+        updateWrapper.set("status", -1)
                 .eq(tableInfo.getKeyColumn(), id);
 
         return update(updateWrapper);
@@ -26,7 +26,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
     public int countBy(String column, Object value, boolean notDelete) {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(column, value);
-        queryWrapper.gt(notDelete, "state", -1);
+        queryWrapper.gt(notDelete, "status", -1);
 
         return count(queryWrapper);
     }
@@ -36,7 +36,7 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(column, value);
         queryWrapper.ne(col, val);
-        queryWrapper.gt(notDelete, "state", -1);
+        queryWrapper.gt(notDelete, "status", -1);
         queryWrapper.last("limit 1");
 
         return getOne(queryWrapper);
@@ -46,8 +46,8 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
     public T getExistBy(String column, Object value, boolean normal, boolean notDelete) {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(column, value);
-        queryWrapper.eq(normal, "state", 1);
-        queryWrapper.gt(notDelete, "state", -1);
+        queryWrapper.eq(normal, "status", 1);
+        queryWrapper.gt(notDelete, "status", -1);
         queryWrapper.last("limit 1");
         return getOne(queryWrapper);
     }

src/main/java/com/yunzhi/inte/service/impl/PackageDetailServiceImpl.java

@@ -1,5 +1,7 @@
 package com.yunzhi.inte.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.inte.entity.Dishes;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yunzhi.inte.entity.PackageDetail;
@@ -13,4 +15,8 @@ import com.yunzhi.inte.service.PackageDetailService;
 @Service
 public class PackageDetailServiceImpl extends BaseServiceImpl<PackageDetailMapper, PackageDetail> implements PackageDetailService {
 
+    @Override
+    public IPage<Dishes> getPageByPackage(IPage<Dishes> pg, Integer packageId) {
+        return baseMapper.getPageByPackage(pg, packageId);
+    }
 }

src/main/resources/mapper/PackageDetailMapper.xml

@@ -3,4 +3,15 @@
 
 <mapper namespace="com.yunzhi.inte.mapper.PackageDetailMapper">
 
+    <select id="getPageByPackage" resultType="com.yunzhi.inte.entity.Dishes">
+        SELECT
+            t.*
+        FROM
+            dishes t
+                INNER JOIN package_detail s ON t.id = s.dish_id
+        WHERE
+            s.package_id = #{packageId}
+        ORDER BY
+            t.id
+    </select>
 </mapper>