feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.shigongli</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>0.0.1</version>
+	<version>0.0.3</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
 
@@ -36,6 +36,11 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+
 		<!--mysql start-->
 		<dependency>
 			<groupId>mysql</groupId>

src/main/java/com/shigongli/annotations/ParamNotEmpty.java

@@ -0,0 +1,12 @@
+package com.shigongli.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ParamNotEmpty {
+    String name();
+}

src/main/java/com/shigongli/config/BaseConfig.java

@@ -1,5 +1,6 @@
 package com.shigongli.config;
 
+import com.shigongli.interceptor.ParamNotEmptyInterceptor;
 import com.shigongli.interceptor.PermissionInterceptor;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,9 @@ public class BaseConfig implements WebMvcConfigurer {
     @Autowired
     private PermissionInterceptor permissionInterceptor;
 
+    @Autowired
+    private ParamNotEmptyInterceptor paramNotEmptyInterceptor;
+
     @Autowired
     private InterceptorConfig interceptorConfig;
 
@@ -31,5 +35,7 @@ public class BaseConfig implements WebMvcConfigurer {
                     .addPathPatterns(interceptorConfig.getPermission().getIncludePaths())
                     .excludePathPatterns(interceptorConfig.getPermission().getExcludePaths());
         }
+
+//        registry.addInterceptor(paramNotEmptyInterceptor).addPathPatterns("/**");
     }
 }

src/main/java/com/shigongli/controller/TaHouseController.java

@@ -9,8 +9,10 @@ import com.shigongli.common.ScreenShotUtil;
 import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
+import com.shigongli.entity.TaShop;
 import com.shigongli.entity.TaShopKeeper;
 import com.shigongli.service.ITaShopKeeperService;
+import com.shigongli.service.ITaShopService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -52,6 +54,9 @@ public class TaHouseController extends BaseController {
     @Autowired
     ITaShopKeeperService iTaShopKeeperService;
 
+    @Autowired
+    ITaShopService iTaShopService;
+
     @Autowired
     ScreenShotUtil screenShotUtil;
 
@@ -185,7 +190,10 @@ public class TaHouseController extends BaseController {
     @RequestMapping(value="/ma/taHouse/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean houseDetail(@ApiParam("房源ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaHouseService.getById(id));
+        TaHouse taHouse = iTaHouseService.getById(id);
+        TaShop taShop = iTaShopService.getById(taHouse.getShopId());
+        taHouse.setTaShop(taShop);
+        return ResponseBean.success(taHouse);
     }
 
     @GetMapping("/ma/taHouse/{id}/share")

src/main/java/com/shigongli/controller/TaMateTagController.java

@@ -73,6 +73,14 @@ public class TaMateTagController extends BaseController {
     @RequestMapping(value="/mp/taMateTag",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taMateTagAdd(@ApiParam("保存内容") @RequestBody TaMateTag taMateTag) throws Exception{
+        if (StringUtils.isEmpty(taMateTag.getName())) {
+            return ResponseBean.error("名称不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaMateTag origin = iTaMateTagService.getByName(taMateTag.getName());
+        if (null != origin) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
 
         if (iTaMateTagService.save(taMateTag)){
             return ResponseBean.success(taMateTag);

src/main/java/com/shigongli/controller/TaMateTagGroupController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaMateTag;
 import com.shigongli.service.ITaMateTagService;
@@ -87,6 +88,15 @@ public class TaMateTagGroupController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taMateTagGroupAdd(@ApiParam("保存内容") @RequestBody TaMateTagGroup taMateTagGroup) throws Exception{
 
+        if (StringUtils.isEmpty(taMateTagGroup.getName())) {
+            return ResponseBean.error("名称不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaMateTagGroup origin = iTaMateTagGroupService.getByName(taMateTagGroup.getName());
+        if (null != origin) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         if (iTaMateTagGroupService.save(taMateTagGroup)){
             return ResponseBean.success(taMateTagGroup);
         }else {
@@ -121,6 +131,15 @@ public class TaMateTagGroupController extends BaseController {
     public ResponseBean taMateTagGroupUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaMateTagGroup taMateTagGroup) throws Exception{
 
+        if (StringUtils.isEmpty(taMateTagGroup.getName())) {
+            return ResponseBean.error("名称不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaMateTagGroup origin = iTaMateTagGroupService.getByName(taMateTagGroup.getName());
+        if (null != origin && !id.equals(origin.getGroupId())) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         if (iTaMateTagGroupService.updateById(taMateTagGroup)){
             return ResponseBean.success(iTaMateTagGroupService.getById(id));
         }else {

src/main/java/com/shigongli/controller/TaShopController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -70,6 +71,15 @@ public class TaShopController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taShopAdd(@ApiParam("保存内容") @RequestBody TaShop taShop) throws Exception{
 
+        if (StringUtils.isEmpty(taShop.getName())) {
+            return ResponseBean.error("名称不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShop origin = iTaShopService.getByName(taShop.getName());
+        if (null != origin) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         if (iTaShopService.save(taShop)){
             return ResponseBean.success(taShop);
         }else {
@@ -104,6 +114,14 @@ public class TaShopController extends BaseController {
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taShopUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
+        if (StringUtils.isEmpty(taShop.getName())) {
+            return ResponseBean.error("名称不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShop origin = iTaShopService.getByName(taShop.getName());
+        if (null != origin && !origin.getShopId().equals(id)) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
 
         if (iTaShopService.updateById(taShop)){
             return ResponseBean.success(iTaShopService.getById(id));

src/main/java/com/shigongli/controller/TaShopKeeperController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
 import com.shigongli.service.ITaPersonService;
@@ -77,6 +78,21 @@ public class TaShopKeeperController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taShopKeeperAdd(@ApiParam("保存内容") @RequestBody TaShopKeeper taShopKeeper) throws Exception{
 
+        if (StringUtils.isEmpty(taShopKeeper.getName())) {
+            return ResponseBean.error("姓名不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        if (StringUtils.isEmpty(taShopKeeper.getPhone())) {
+            return ResponseBean.error("电话不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        if (StringUtils.isEmpty(taShopKeeper.getShopId())) {
+            return ResponseBean.error("没有指定所属民宿", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShopKeeper origin = iTaShopKeeperService.getByPhone(taShopKeeper.getPhone(), taShopKeeper.getShopId());
+        if (null != origin) {
+            return ResponseBean.error("电话号码重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         TaPerson taPerson = iTaPersonService.getByPhone(taShopKeeper.getPhone());
         if (null != taPerson) {
             taShopKeeper.setPersonId(taPerson.getPersonId());
@@ -121,6 +137,21 @@ public class TaShopKeeperController extends BaseController {
             taShopKeeper.setPersonId(taPerson.getPersonId());
         }
 
+        if (StringUtils.isEmpty(taShopKeeper.getName())) {
+            return ResponseBean.error("姓名不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        if (StringUtils.isEmpty(taShopKeeper.getPhone())) {
+            return ResponseBean.error("电话不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        if (StringUtils.isEmpty(taShopKeeper.getShopId())) {
+            return ResponseBean.error("没有指定所属民宿", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShopKeeper origin = iTaShopKeeperService.getByPhone(taShopKeeper.getPhone(), taShopKeeper.getShopId());
+        if (null != origin && !id.equals(origin.getKeeperId())) {
+            return ResponseBean.error("电话号码重复", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         if (iTaShopKeeperService.updateById(taShopKeeper)){
             return ResponseBean.success(iTaShopKeeperService.getById(id));
         }else {

src/main/java/com/shigongli/entity/TaHouse.java

@@ -79,4 +79,7 @@ public class TaHouse implements Serializable {
 
     @TableField(exist = false)
     private List<TaHouseSurround> surroundList;
+
+    @TableField(exist = false)
+    private TaShop taShop;
 }

src/main/java/com/shigongli/entity/TaShop.java

@@ -2,8 +2,12 @@ package com.shigongli.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 com.shigongli.annotations.ParamNotEmpty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,6 +35,7 @@ public class TaShop implements Serializable {
     private String shopId;
 
     @ApiModelProperty(value = "店铺名称")
+    @TableField("`name`")
     private String name;
 
     @ApiModelProperty(value = "店铺logo")

src/main/java/com/shigongli/interceptor/ParamNotEmptyAspect.java

@@ -0,0 +1,11 @@
+package com.shigongli.interceptor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Aspect
+@Component
+public class ParamNotEmptyAspect {
+}

src/main/java/com/shigongli/interceptor/ParamNotEmptyInterceptor.java

@@ -0,0 +1,96 @@
+package com.shigongli.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import com.shigongli.annotations.ParamNotEmpty;
+import com.shigongli.common.ResponseBean;
+import com.shigongli.common.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Parameter;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Slf4j
+@Component
+public class ParamNotEmptyInterceptor extends HandlerInterceptorAdapter {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (!(handler instanceof HandlerMethod)) {
+            return true;
+        }
+
+        HandlerMethod hm = (HandlerMethod) handler;
+
+        // 获取控制器方法参数列表
+        Parameter[] parameters = hm.getMethod().getParameters();
+        if (parameters.length < 1) {
+            return true;
+        }
+
+        // 遍历所有参数
+        for (Parameter parameter: parameters) {
+            if (null == parameter) {
+                continue;
+            }
+
+            // 遍历所有参数字段
+            Field[] declaredFields = parameter.getClass().getDeclaredFields();
+            if (declaredFields.length < 1) {
+                continue;
+            }
+
+            for (Field field : declaredFields) {
+                // 查找带有 ParamNotNull 注解的字段
+                ParamNotEmpty annotation = field.getAnnotation(ParamNotEmpty.class);
+                if (null == annotation) {
+                    continue;
+                }
+
+                boolean isEmpty = false;
+                Object val = field.get(parameter);
+                if (null == val) {
+                    isEmpty = true;
+                } else if (field.getType().equals(String.class)) {
+                    // 字符串
+                    isEmpty = StringUtils.isEmpty(val.toString());
+                } else if (null != field.getType().getComponentType()) {
+                    // 数组
+                    isEmpty = Array.getLength(val) < 1;
+                } else if (isCollection(field.getType())) {
+                    // 集合
+                    int size = (int) field.getType().getDeclaredMethod("size", int.class).invoke(val);
+                    isEmpty = size < 1;
+                } else {
+                    // others
+                }
+
+                if (isEmpty) {
+                    String errMessage = annotation.name() + " 不能为空";
+                    response.addHeader("Content-type", "application/json");
+                    response.getOutputStream().write(
+                            JSONObject.toJSONBytes(
+                                    ResponseBean.error(errMessage, ResponseBean.ERROR_MISSING_PARAMS)
+                            ));
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    private boolean isCollection(Class cla) {
+        return cla.equals(List.class)
+                || cla.equals(Map.class)
+                || cla.equals(Set.class);
+    }
+}

src/main/java/com/shigongli/service/ITaMateTagGroupService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaMateTagGroupService extends IService<TaMateTagGroup> {
 
+    TaMateTagGroup getByName(String name);
 }

src/main/java/com/shigongli/service/ITaMateTagService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ITaMateTagService extends IService<TaMateTag> {
 
     List<TaMateTag> getByGroup(String groupId);
+
+    TaMateTag getByName(String name);
 }

src/main/java/com/shigongli/service/ITaShopKeeperService.java

@@ -21,4 +21,6 @@ public interface ITaShopKeeperService extends IService<TaShopKeeper> {
     List<TaShopKeeper> getByPhone(String phone);
 
     List<TaShopKeeper> getByPerson(String personId);
+
+    TaShopKeeper getByPhone(String phone, String shopId);
 }

src/main/java/com/shigongli/service/ITaShopService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaShopService extends IService<TaShop> {
 
+    TaShop getByName(String name);
 }

src/main/java/com/shigongli/service/impl/TaMateTagGroupServiceImpl.java

@@ -1,5 +1,7 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaMateTagGroup;
 import com.shigongli.mapper.TaMateTagGroupMapper;
 import com.shigongli.service.ITaMateTagGroupService;
@@ -17,4 +19,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaMateTagGroupServiceImpl extends ServiceImpl<TaMateTagGroupMapper, TaMateTagGroup> implements ITaMateTagGroupService {
 
+    @Override
+    public TaMateTagGroup getByName(String name) {
+        QueryWrapper<TaMateTagGroup> queryWrapper = new QueryWrapper<TaMateTagGroup>()
+                .eq("name", name)
+                .gt("status", StatusConstant.DELETE)
+                .last("limit 1");
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/shigongli/service/impl/TaMateTagServiceImpl.java

@@ -29,4 +29,14 @@ public class TaMateTagServiceImpl extends ServiceImpl<TaMateTagMapper, TaMateTag
                 .orderByDesc("create_date");
         return list(queryWrapper);
     }
+
+    @Override
+    public TaMateTag getByName(String name) {
+        QueryWrapper<TaMateTag> queryWrapper = new QueryWrapper<TaMateTag>()
+                .eq("name", name)
+                .gt("status", StatusConstant.DELETE)
+                .last("limit 1");
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/shigongli/service/impl/TaShopKeeperServiceImpl.java

@@ -71,4 +71,15 @@ public class TaShopKeeperServiceImpl extends ServiceImpl<TaShopKeeperMapper, TaS
 
         return list;
     }
+
+    @Override
+    public TaShopKeeper getByPhone(String phone, String shopId) {
+        QueryWrapper<TaShopKeeper> queryWrapper = new QueryWrapper<TaShopKeeper>()
+                .eq("shop_id", shopId)
+                .eq("phone", phone)
+                .gt("status", StatusConstant.DELETE)
+                .last("limit 1");
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/shigongli/service/impl/TaShopServiceImpl.java

@@ -1,5 +1,7 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaShop;
 import com.shigongli.mapper.TaShopMapper;
 import com.shigongli.service.ITaShopService;
@@ -17,4 +19,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaShopServiceImpl extends ServiceImpl<TaShopMapper, TaShop> implements ITaShopService {
 
+    @Override
+    public TaShop getByName(String name) {
+        QueryWrapper<TaShop> queryWrapper = new QueryWrapper<TaShop>()
+                .eq("name", name)
+                .gt("status", StatusConstant.DELETE)
+                .last("limit 1");
+
+        return getOne(queryWrapper);
+    }
 }