~

server/like-common/src/main/java/com/mdd/common/entity/AppCircle.java

@@ -34,7 +34,7 @@ public class AppCircle implements Serializable {
     private Integer typeInfo;
 
     @ApiModelProperty(value = "创建用户")
-    private Integer userInfo;
+    private Integer userId;
 
     @ApiModelProperty(value = "是否开启sos通知1是2否")
     private Integer isSos;

server/like-common/src/main/java/com/mdd/common/entity/AppCircleUser.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
@@ -54,4 +55,7 @@ public class AppCircleUser implements Serializable {
     @ApiModelProperty(value = "删除时间")
     private Long deleteTime;
 
+    @ApiModelProperty(value = "是否圈主1是2否")
+    private Integer isOwner;
+
 }

server/like-front/src/main/java/com/mdd/front/controller/AppCircleController.java

@@ -46,8 +46,7 @@ public class AppCircleController {
     @PostMapping("/add")
     @ApiOperation(value="圈子信息新增")
     public AjaxResult<Object> add(@Validated @RequestBody AppCircleCreateValidate createValidate) {
-        iAppCircleService.add(createValidate);
-        return AjaxResult.success();
+        return AjaxResult.success(iAppCircleService.add(createValidate));
     }
 
     @Log(title = "圈子信息编辑")

server/like-front/src/main/java/com/mdd/front/service/IAppCircleService.java

@@ -1,5 +1,6 @@
 package com.mdd.front.service;
 
+import com.mdd.common.core.AjaxResult;
 import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.validate.AppCircleCreateValidate;
 import com.mdd.front.validate.AppCircleUpdateValidate;
@@ -39,7 +40,7 @@ public interface IAppCircleService {
      * @author LikeAdmin
      * @param createValidate 参数
      */
-    void add(AppCircleCreateValidate createValidate);
+    AjaxResult add(AppCircleCreateValidate createValidate);
 
     /**
      * 圈子信息编辑

server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleServiceImpl.java

@@ -1,9 +1,11 @@
 package com.mdd.front.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.query.MPJQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mdd.common.core.AjaxResult;
+import com.mdd.common.entity.AppCircleUser;
+import com.mdd.common.mapper.AppCircleUserMapper;
 import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.service.IAppCircleService;
 import com.mdd.front.validate.AppCircleCreateValidate;
@@ -11,13 +13,10 @@ import com.mdd.front.validate.AppCircleUpdateValidate;
 import com.mdd.front.validate.AppCircleSearchValidate;
 import com.mdd.front.vo.AppCircleListedVo;
 import com.mdd.front.vo.AppCircleDetailVo;
-import com.mdd.common.config.GlobalConfig;
 import com.mdd.common.core.PageResult;
 import com.mdd.common.entity.AppCircle;
 import com.mdd.common.mapper.AppCircleMapper;
-import com.mdd.common.util.ListUtils;
 import com.mdd.common.util.TimeUtils;
-import com.mdd.common.util.UrlUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -35,6 +34,9 @@ public class AppCircleServiceImpl implements IAppCircleService {
     @Resource
     AppCircleMapper appCircleMapper;
 
+    @Resource
+    AppCircleUserMapper appCircleUserMapper;
+
     /**
      * 圈子信息列表
      *
@@ -111,14 +113,21 @@ public class AppCircleServiceImpl implements IAppCircleService {
      * @param createValidate 参数
      */
     @Override
-    public void add(AppCircleCreateValidate createValidate) {
+    public AjaxResult add(AppCircleCreateValidate createValidate) {
+        if (createValidate.getType() == 3 && createValidate.getTypeInfo() == null) {
+            return AjaxResult.failed(9999,"圈子类型补充不能为空");
+        }
+
+        if (createValidate.getType() == 3 && (createValidate.getLongitude() == null || createValidate.getLatitude() == null)) {
+            return AjaxResult.failed(9999,"经纬度不能为空");
+        }
         AppCircle model = new AppCircle();
         model.setName(createValidate.getName());
         model.setImgUrl(createValidate.getImgUrl());
         model.setContent(createValidate.getContent());
         model.setType(createValidate.getType());
         model.setTypeInfo(createValidate.getTypeInfo());
-        model.setUserInfo(createValidate.getUserInfo());
+        model.setUserId(createValidate.getUserId());
         model.setIsSos(createValidate.getIsSos());
         model.setSosUse(createValidate.getSosUse());
         model.setIsWrite(createValidate.getIsWrite());
@@ -129,6 +138,16 @@ public class AppCircleServiceImpl implements IAppCircleService {
         model.setCreateTime(System.currentTimeMillis() / 1000);
         model.setUpdateTime(System.currentTimeMillis() / 1000);
         appCircleMapper.insert(model);
+
+        // 保存群主为群内用户信息
+        AppCircleUser appCircleUser = new AppCircleUser();
+        appCircleUser.setCircleId(model.getId());
+        appCircleUser.setIsOwner(1);
+        appCircleUser.setUserId(createValidate.getUserId());
+        appCircleUser.setLatitude(createValidate.getLatitude());
+        appCircleUser.setLongitude(createValidate.getLongitude());
+        appCircleUserMapper.insert(appCircleUser);
+        return  AjaxResult.success();
     }
 
     /**
@@ -153,7 +172,7 @@ public class AppCircleServiceImpl implements IAppCircleService {
         model.setContent(updateValidate.getContent());
         model.setType(updateValidate.getType());
         model.setTypeInfo(updateValidate.getTypeInfo());
-        model.setUserInfo(updateValidate.getUserInfo());
+        model.setUserId(updateValidate.getUserId());
         model.setIsSos(updateValidate.getIsSos());
         model.setSosUse(updateValidate.getSosUse());
         model.setIsWrite(updateValidate.getIsWrite());

server/like-front/src/main/java/com/mdd/front/validate/AppCircleCreateValidate.java

@@ -28,27 +28,22 @@ public class AppCircleCreateValidate implements Serializable {
     @ApiModelProperty(value = "圈子类型1私密群2好友圈3位置圈")
     private Integer type;
 
-    @NotNull(message = "typeInfo参数缺失")
     @ApiModelProperty(value = "圈子类型补充1固定位置2可变位置")
     private Integer typeInfo;
 
-    @NotNull(message = "userInfo参数缺失")
+    @NotNull(message = "userId参数缺失")
     @ApiModelProperty(value = "创建用户")
-    private Integer userInfo;
+    private Integer userId;
 
-    @NotNull(message = "isSos参数缺失")
     @ApiModelProperty(value = "是否开启sos通知1是2否")
     private Integer isSos;
 
-    @NotNull(message = "sosUse参数缺失")
     @ApiModelProperty(value = "sos消耗金额")
     private Integer sosUse;
 
-    @NotNull(message = "isWrite参数缺失")
     @ApiModelProperty(value = "圈子内容是否仅圈友可写入1是2否")
     private Integer isWrite;
 
-    @NotNull(message = "isRead参数缺失")
     @ApiModelProperty(value = "圈子内容是否仅圈友可见1是2否")
     private Integer isRead;
 
@@ -56,11 +51,9 @@ public class AppCircleCreateValidate implements Serializable {
     @ApiModelProperty(value = "加入是否需要审核")
     private Integer isCheck;
 
-    @NotNull(message = "longitude参数缺失")
     @ApiModelProperty(value = "经度")
     private String longitude;
 
-    @NotNull(message = "latitude参数缺失")
     @ApiModelProperty(value = "纬度")
     private String latitude;
 

server/like-front/src/main/java/com/mdd/front/validate/AppCircleSearchValidate.java

@@ -27,7 +27,7 @@ public class AppCircleSearchValidate implements Serializable {
     private Integer typeInfo;
 
     @ApiModelProperty(value = "创建用户")
-    private Integer userInfo;
+    private Integer userId;
 
     @ApiModelProperty(value = "是否开启sos通知1是2否")
     private Integer isSos;

server/like-front/src/main/java/com/mdd/front/validate/AppCircleUpdateValidate.java

@@ -43,7 +43,7 @@ public class AppCircleUpdateValidate implements Serializable {
 
     @NotNull(message = "userInfo参数缺失")
     @ApiModelProperty(value = "创建用户")
-    private Integer userInfo;
+    private Integer userId;
 
     @NotNull(message = "isSos参数缺失")
     @ApiModelProperty(value = "是否开启sos通知1是2否")

server/like-front/src/main/java/com/mdd/front/vo/AppCircleDetailVo.java

@@ -31,7 +31,7 @@ public class AppCircleDetailVo implements Serializable {
     private Integer typeInfo;
 
     @ApiModelProperty(value = "创建用户")
-    private Integer userInfo;
+    private Integer userId;
 
     @ApiModelProperty(value = "是否开启sos通知1是2否")
     private Integer isSos;

server/like-front/src/main/java/com/mdd/front/vo/AppCircleListedVo.java

@@ -28,7 +28,7 @@ public class AppCircleListedVo implements Serializable {
     private Integer typeInfo;
 
     @ApiModelProperty(value = "创建用户")
-    private Integer userInfo;
+    private Integer userId;
 
     @ApiModelProperty(value = "是否开启sos通知1是2否")
     private Integer isSos;