add Appuser model;add Family model

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbAppUserController.java

@@ -8,6 +8,7 @@ import java.util.Arrays;
 import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +33,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author Alex
  * @date 2020-09-24
  */
+@Api(value = "个人会员管理", tags = "个人会员管理")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/app/user" )
+@RequestMapping("/system/appUser" )
 public class TbAppUserController extends BaseController {
 
     private final ITbAppUserService iTbAppUserService;
@@ -42,7 +44,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 查询会员列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @PreAuthorize("@ss.hasPermi('system:appUser:list')")
     @GetMapping("/list")
     public TableDataInfo list(TbAppUser tbAppUser)
     {
@@ -82,7 +84,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 导出会员列表
      */
-    @PreAuthorize("@ss.hasPermi('system:user:export')" )
+    @PreAuthorize("@ss.hasPermi('system:appUser:export')" )
     @Log(title = "会员" , businessType = BusinessType.EXPORT)
     @GetMapping("/export" )
     public AjaxResult export(TbAppUser tbAppUser) {
@@ -95,7 +97,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 获取会员详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:user:query')" )
+    @PreAuthorize("@ss.hasPermi('system:appUser:query')" )
     @GetMapping(value = "/{id}" )
     public AjaxResult getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iTbAppUserService.getById(id));
@@ -104,7 +106,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 新增会员
      */
-    @PreAuthorize("@ss.hasPermi('system:user:add')" )
+    @PreAuthorize("@ss.hasPermi('system:appUser:add')" )
     @Log(title = "会员" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TbAppUser tbAppUser) {
@@ -114,7 +116,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 修改会员
      */
-    @PreAuthorize("@ss.hasPermi('system:user:edit')" )
+    @PreAuthorize("@ss.hasPermi('system:appUser:edit')" )
     @Log(title = "会员" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TbAppUser tbAppUser) {
@@ -124,7 +126,7 @@ public class TbAppUserController extends BaseController {
     /**
      * 删除会员
      */
-    @PreAuthorize("@ss.hasPermi('system:user:remove')" )
+    @PreAuthorize("@ss.hasPermi('system:appUser:remove')" )
     @Log(title = "会员" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}" )
     public AjaxResult remove(@PathVariable Long[] ids) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyController.java

@@ -0,0 +1,121 @@
+package com.ruoyi.web.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.ruoyi.common.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.app.domain.TbFamily;
+import com.ruoyi.app.service.ITbFamilyService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 家族Controller
+ * 
+ * @author Alex
+ * @date 2020-09-28
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/family" )
+public class TbFamilyController extends BaseController {
+
+    private final ITbFamilyService iTbFamilyService;
+
+    /**
+     * 查询家族列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:family:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbFamily tbFamily)
+    {
+        startPage();
+        LambdaQueryWrapper<TbFamily> lqw = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(tbFamily.getName())){
+            lqw.like(TbFamily::getName ,tbFamily.getName());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getAddress())){
+            lqw.eq(TbFamily::getAddress ,tbFamily.getAddress());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getContents())){
+            lqw.eq(TbFamily::getContents ,tbFamily.getContents());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getAvatar())){
+            lqw.eq(TbFamily::getAvatar ,tbFamily.getAvatar());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getCity())){
+            lqw.eq(TbFamily::getCity ,tbFamily.getCity());
+        }
+        List<TbFamily> list = iTbFamilyService.list(lqw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出家族列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:family:export')" )
+    @Log(title = "家族" , businessType = BusinessType.EXPORT)
+    @GetMapping("/export" )
+    public AjaxResult export(TbFamily tbFamily) {
+        LambdaQueryWrapper<TbFamily> lqw = new LambdaQueryWrapper<>(tbFamily);
+        List<TbFamily> list = iTbFamilyService.list(lqw);
+        ExcelUtil<TbFamily> util = new ExcelUtil<TbFamily>(TbFamily. class);
+        return util.exportExcel(list, "family" );
+    }
+
+    /**
+     * 获取家族详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:family:query')" )
+    @GetMapping(value = "/{id}" )
+    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTbFamilyService.getById(id));
+    }
+
+    /**
+     * 新增家族
+     */
+    @PreAuthorize("@ss.hasPermi('system:family:add')" )
+    @Log(title = "家族" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbFamily tbFamily) {
+        return toAjax(iTbFamilyService.save(tbFamily) ? 1 : 0);
+    }
+
+    /**
+     * 修改家族
+     */
+    @PreAuthorize("@ss.hasPermi('system:family:edit')" )
+    @Log(title = "家族" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbFamily tbFamily) {
+        return toAjax(iTbFamilyService.updateById(tbFamily) ? 1 : 0);
+    }
+
+    /**
+     * 删除家族
+     */
+    @PreAuthorize("@ss.hasPermi('system:family:remove')" )
+    @Log(title = "家族" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(iTbFamilyService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/resources/application.yml

@@ -47,7 +47,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: prop
+    active: dev
   # 文件上传
   servlet:
      multipart:

ruoyi-app/src/main/java/com/ruoyi/app/controller/AppLoginController.java

@@ -65,7 +65,6 @@ public class AppLoginController {
             Date date = new Date();
             appUser.setMobile(mobile);
             appUser.setNickName(mobile);
-            appUser.setRole("USER");
             appUser.setQrcode(DateUtils.getCurrentTimeRandom());
             appUser.setCreateTime(date);
             appUser.setUpdateTime(date);
@@ -144,13 +143,12 @@ public class AppLoginController {
     }
 
 
-    @ApiOperation(value = "getUser", notes = "getUser")
-//    @AuthToken
-    @GetMapping("/getLoginUser")
-    public AjaxResult getLoginUser(HttpServletRequest request){
-        AppLoginUser user = appTokenService.getLoginUser(request);
-        return AjaxResult.success(user);
-    }
+//    @ApiOperation(value = "getUser", notes = "getUser")
+//    @GetMapping("/getLoginUser")
+//    public AjaxResult getLoginUser(HttpServletRequest request){
+//        AppLoginUser user = appTokenService.getLoginUser(request);
+//        return AjaxResult.success(user);
+//    }
 
     public static void main(String[] args) {
 //        System.out.println(DateUtils.getCurrentTimeRandom());

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyController.java

@@ -0,0 +1,23 @@
+package com.ruoyi.app.controller;
+
+
+import com.ruoyi.app.controller.base.AppBaseController;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 家族管理
+ *
+ * @author Alex
+ * @date 2020-09-24
+ */
+@Api(value = "家族管理",tags = "家族管理")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/family" )
+public class FamilyController extends AppBaseController {
+
+}

ruoyi-generator/src/main/resources/generator.yml

@@ -1,9 +1,9 @@
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: Administrator
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.ruoyi.app
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbAppUser.java

@@ -33,6 +33,10 @@ public class TbAppUser implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    /** 是否已经加入家族 1是 0否 */
+    @Excel(name = "是否已经加入家族 1是 0否")
+    private String joins;
+
     /** 家族表id */
     @Excel(name = "家族表id")
     private Long familyId;

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbFamily.java

@@ -0,0 +1,74 @@
+package com.ruoyi.app.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.ruoyi.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 家族对象 tb_family
+ * 
+ * @author Alex
+ * @date 2020-09-28
+ */
+@Data
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_family")
+public class TbFamily implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** ID */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 家族名称 */
+    @Excel(name = "家族名称")
+    private String name;
+
+    /** 家族地址 */
+    @Excel(name = "家族地址")
+    private String address;
+
+    /** 家族描述 */
+    @Excel(name = "家族描述")
+    private String contents;
+
+    /** 家族头像url */
+    @Excel(name = "家族头像url")
+    private String avatar;
+
+    /** $column.columnComment */
+    @Excel(name = "家族头像url")
+    private String city;
+
+    /** 创建者 */
+    private Long createBy;
+
+    /** 创建时间 */
+    private Date createTime;
+
+    /** 更新者 */
+    private Long updateBy;
+
+    /** 更新时间 */
+    private Date updateTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+}

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.ruoyi.app.domain.TbFamily;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 家族Mapper接口
+ *
+ * @author ruoyi
+ * @date 2020-09-28
+ */
+public interface TbFamilyMapper extends BaseMapper<TbFamily> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyService.java

@@ -0,0 +1,14 @@
+package com.ruoyi.app.service;
+
+import com.ruoyi.app.domain.TbFamily;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 家族Service接口
+ *
+ * @author ruoyi
+ * @date 2020-09-28
+ */
+public interface ITbFamilyService extends IService<TbFamily> {
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyServiceImpl.java

@@ -0,0 +1,18 @@
+package com.ruoyi.app.service.impl;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbFamilyMapper;
+import com.ruoyi.app.domain.TbFamily;
+import com.ruoyi.app.service.ITbFamilyService;
+
+/**
+ * 家族Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2020-09-28
+ */
+@Service
+public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> implements ITbFamilyService {
+
+}

ruoyi-system/src/main/resources/mapper/app/TbAppUserMapper.xml

@@ -6,9 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TbAppUser" id="TbAppUserResult">
         <result property="id"    column="id"    />
+        <result property="joins"    column="joins"    />
         <result property="familyId"    column="family_id"    />
         <result property="templateId"    column="template_id"    />
-        <result property="role"    column="role"    />
         <result property="nickName"    column="nick_name"    />
         <result property="avatar"    column="avatar"    />
         <result property="qrcode"    column="qrcode"    />

ruoyi-system/src/main/resources/mapper/app/TbFamilyMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TbFamilyMapper">
+    
+    <resultMap type="TbFamily" id="TbFamilyResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="address"    column="address"    />
+        <result property="contents"    column="contents"    />
+        <result property="avatar"    column="avatar"    />
+        <result property="city"    column="city"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+
+</mapper>