修改生成代码自动配置swagger，添加我的发表

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

@@ -0,0 +1,157 @@
+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.app.domain.TbMyPublish;
+import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.service.ITbMyPublishService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 我的近况（我的发）Controller
+ * 
+ * @author Administrator
+ * @date 2020-10-02
+ */
+@Api(value = "我的近况（我的发）", tags = "我的近况（我的发）")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/publish" )
+public class TbMyPublishController extends BaseController {
+
+    private final ITbMyPublishService iTbMyPublishService;
+
+    /**
+     * 查询我的近况（我的发）列表
+     */
+    @ApiOperation("查询我的近况（我的发）列表")
+    @PreAuthorize("@ss.hasPermi('app:publish:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TbMyPublish tbMyPublish)
+    {
+        startPage();
+        LambdaQueryWrapper<TbMyPublish> lqw = new LambdaQueryWrapper<TbMyPublish>();
+        if (tbMyPublish.getAppUserId() != null){
+            lqw.eq(TbMyPublish::getAppUserId ,tbMyPublish.getAppUserId());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getContents())){
+            lqw.eq(TbMyPublish::getContents ,tbMyPublish.getContents());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl1())){
+            lqw.eq(TbMyPublish::getPicurl1 ,tbMyPublish.getPicurl1());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl2())){
+            lqw.eq(TbMyPublish::getPicurl2 ,tbMyPublish.getPicurl2());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl3())){
+            lqw.eq(TbMyPublish::getPicurl3 ,tbMyPublish.getPicurl3());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl4())){
+            lqw.eq(TbMyPublish::getPicurl4 ,tbMyPublish.getPicurl4());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl5())){
+            lqw.eq(TbMyPublish::getPicurl5 ,tbMyPublish.getPicurl5());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl6())){
+            lqw.eq(TbMyPublish::getPicurl6 ,tbMyPublish.getPicurl6());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl7())){
+            lqw.eq(TbMyPublish::getPicurl7 ,tbMyPublish.getPicurl7());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl8())){
+            lqw.eq(TbMyPublish::getPicurl8 ,tbMyPublish.getPicurl8());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getPicurl9())){
+            lqw.eq(TbMyPublish::getPicurl9 ,tbMyPublish.getPicurl9());
+        }
+        if (StringUtils.isNotBlank(tbMyPublish.getMessage())){
+            lqw.eq(TbMyPublish::getMessage ,tbMyPublish.getMessage());
+        }
+        if (tbMyPublish.getMessageUserId() != null){
+            lqw.eq(TbMyPublish::getMessageUserId ,tbMyPublish.getMessageUserId());
+        }
+        if (tbMyPublish.getThumbs() != null){
+            lqw.eq(TbMyPublish::getThumbs ,tbMyPublish.getThumbs());
+        }
+        List<TbMyPublish> list = iTbMyPublishService.list(lqw);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出我的近况（我的发）列表
+     */
+    @ApiOperation("导出我的近况（我的发）列表")
+    @PreAuthorize("@ss.hasPermi('app:publish:export')" )
+    @Log(title = "我的近况（我的发）" , businessType = BusinessType.EXPORT)
+    @GetMapping("/export" )
+    public AjaxResult export(TbMyPublish tbMyPublish) {
+        LambdaQueryWrapper<TbMyPublish> lqw = new LambdaQueryWrapper<TbMyPublish>(tbMyPublish);
+        List<TbMyPublish> list = iTbMyPublishService.list(lqw);
+        ExcelUtil<TbMyPublish> util = new ExcelUtil<TbMyPublish>(TbMyPublish. class);
+        return util.exportExcel(list, "publish" );
+    }
+
+    /**
+     * 获取我的近况（我的发）详细信息
+     */
+    @ApiOperation("获取我的近况（我的发）详细信息")
+    @PreAuthorize("@ss.hasPermi('app:publish:query')" )
+    @GetMapping(value = "/{id}" )
+    public AjaxResult getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iTbMyPublishService.getById(id));
+    }
+
+    /**
+     * 新增我的近况（我的发）
+     */
+    @ApiOperation("新增我的近况（我的发）")
+    @PreAuthorize("@ss.hasPermi('app:publish:add')" )
+    @Log(title = "我的近况（我的发）" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TbMyPublish tbMyPublish) {
+        return toAjax(iTbMyPublishService.save(tbMyPublish) ? 1 : 0);
+    }
+
+    /**
+     * 修改我的近况（我的发）
+     */
+    @ApiOperation("修改我的近况（我的发）")
+    @PreAuthorize("@ss.hasPermi('app:publish:edit')" )
+    @Log(title = "我的近况（我的发）" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TbMyPublish tbMyPublish) {
+        return toAjax(iTbMyPublishService.updateById(tbMyPublish) ? 1 : 0);
+    }
+
+    /**
+     * 删除我的近况（我的发）
+     */
+    @ApiOperation("删除我的近况（我的发）")
+    @PreAuthorize("@ss.hasPermi('app:publish:remove')" )
+    @Log(title = "我的近况（我的发）" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}" )
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(iTbMyPublishService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

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

@@ -1,3 +1,6 @@
+ruoyi:
+    profile: D:/lineage/AppUploadPath
+
 # 数据源配置
 spring:
     datasource:

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

@@ -1,3 +1,6 @@
+ruoyi:
+    profile: /usr/app/lineage/AppUploadPath
+
 # 数据源配置
 spring:
     datasource:

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

@@ -10,7 +10,7 @@ ruoyi:
   demoEnabled: true
   # 文件路径,使用jvm系统变量,兼容windows和linux;
 #  profile: /usr/app/lineage/uploadPath
-  profile: D:/lineage/uploadPath
+#  profile: D:/lineage/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

ruoyi-app/src/main/resources/application-dev.yml

@@ -1,3 +1,6 @@
+ruoyi:
+    profile: D:/lineage/AppUploadPath
+
 # 数据源配置
 spring:
     datasource:

ruoyi-app/src/main/resources/application-prop.yml

@@ -1,3 +1,6 @@
+ruoyi:
+    profile: /usr/app/lineage/AppUploadPath
+
 # 数据源配置
 spring:
     datasource:

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

@@ -9,8 +9,8 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径,使用jvm系统变量,兼容windows和linux;
-#    profile: /usr/app/lineage/AppUploadPath
-  profile: D:/lineage/AppUploadPath
+#  profile: /usr/app/lineage/AppUploadPath
+#  profile: D:/lineage/AppUploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.List;
 import java.util.Arrays;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,7 +32,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 #end
 
 /**
- * ${functionName}Controller
+ * ${functionName}
  * 
  * @author ${author}
  * @date ${datetime}

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -1,5 +1,7 @@
 package ${packageName}.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,7 +22,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
 #end
 
 /**
- * ${functionName}对象 ${tableName}
+ * ${functionName}
  * 
  * @author ${author}
  * @date ${datetime}
@@ -44,6 +46,7 @@ public class ${ClassName} implements Serializable {
 #foreach ($column in $columns)
 
     /** $column.columnComment */
+    @ApiModelProperty(value="$column.columnComment")
 #if($column.list)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
 #if($parentheseIndex != -1)
@@ -61,7 +64,6 @@ public class ${ClassName} implements Serializable {
 #end
 #end
 #if($column.isPk==1)
-    @ApiModelProperty(value="$column.columnName")
     @TableId(value = "$column.columnName")
     private $column.javaType $column.javaField;
 #else

ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -4,7 +4,7 @@ import ${packageName}.domain.${ClassName};
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * ${functionName}Mapper接口
+ * ${functionName}
  *
  * @author ${author}
  * @date ${datetime}

ruoyi-generator/src/main/resources/vm/java/service.java.vm

@@ -4,7 +4,7 @@ import ${packageName}.domain.${ClassName};
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * ${functionName}Service接口
+ * ${functionName}
  *
  * @author ${author}
  * @date ${datetime}

ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -7,7 +7,7 @@ import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
 
 /**
- * ${functionName}Service业务层处理
+ * ${functionName}
  *
  * @author ${author}
  * @date ${datetime}

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

@@ -0,0 +1,135 @@
+package com.ruoyi.app.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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;
+
+/**
+ * 我的近况（发表）
+ *
+ * @author Alex
+ * @date 2020-10-02
+ */
+@Data
+@ApiModel(value = "我的近况（我的发）")
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_my_publish")
+public class TbMyPublish implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+
+    /** 主键id */
+    @ApiModelProperty(value="主键id")
+    @TableId(value = "id")
+    private Long id;
+
+    /** 会员id */
+    @ApiModelProperty(value="会员id")
+    @Excel(name = "会员id")
+    private Long appUserId;
+
+    /** 发表内容 */
+    @ApiModelProperty(value="发表内容")
+    @Excel(name = "发表内容")
+    private String contents;
+
+    /** 图片1 */
+    @ApiModelProperty(value="图片1")
+    @Excel(name = "图片1")
+    private String picurl1;
+
+    /** 图片2 */
+    @ApiModelProperty(value="图片2")
+    @Excel(name = "图片2")
+    private String picurl2;
+
+    /** 图片3 */
+    @ApiModelProperty(value="图片3")
+    @Excel(name = "图片3")
+    private String picurl3;
+
+    /** 图片4 */
+    @ApiModelProperty(value="图片4")
+    @Excel(name = "图片4")
+    private String picurl4;
+
+    /** 图片5 */
+    @ApiModelProperty(value="图片5")
+    @Excel(name = "图片5")
+    private String picurl5;
+
+    /** 图片6 */
+    @ApiModelProperty(value="图片6")
+    @Excel(name = "图片6")
+    private String picurl6;
+
+    /** 图片7 */
+    @ApiModelProperty(value="图片7")
+    @Excel(name = "图片7")
+    private String picurl7;
+
+    /** 图片8 */
+    @ApiModelProperty(value="图片8")
+    @Excel(name = "图片8")
+    private String picurl8;
+
+    /** 图片9 */
+    @ApiModelProperty(value="图片9")
+    @Excel(name = "图片9")
+    private String picurl9;
+
+    /** 纪念留言 */
+    @ApiModelProperty(value="纪念留言")
+    @Excel(name = "纪念留言")
+    private String message;
+
+    /** 留念人 */
+    @ApiModelProperty(value="留念人")
+    @Excel(name = "留念人")
+    private Long messageUserId;
+
+    /** 点赞数 */
+    @ApiModelProperty(value="点赞数")
+    @Excel(name = "点赞数")
+    private Long thumbs;
+
+    /** 创建者 */
+    @ApiModelProperty(value="创建者")
+    private Long createBy;
+
+    /** 创建时间 */
+    @ApiModelProperty(value="创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty(value="更新者")
+    private Long updateBy;
+
+    /** 更新时间 */
+    @ApiModelProperty(value="更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @ApiModelProperty(value="备注")
+    @Excel(name = "备注")
+    private String remark;
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.app.domain.TbMyPublish;
+
+/**
+ * 我的近况（我的发）Mapper接口
+ *
+ * @author Administrator
+ * @date 2020-10-02
+ */
+public interface TbMyPublishMapper extends BaseMapper<TbMyPublish> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.app.domain.TbMyPublish;
+
+/**
+ * 我的近况（我的发）Service接口
+ *
+ * @author Administrator
+ * @date 2020-10-02
+ */
+public interface ITbMyPublishService extends IService<TbMyPublish> {
+
+}

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

@@ -71,9 +71,9 @@ public class TbAppUserServiceImpl extends ServiceImpl<TbAppUserMapper, TbAppUser
             appUser.setId(memberVo.getUserId());
             userService.updateById(appUser);
         }
+        member.setAppUserId(appUser.getId());
         // 新增成员
         if (memberVo.getMemberId() == null) {
-            member.setAppUserId(appUser.getId());
             member.setCreateBy(memberVo.getUserCreateBy());
             member.setCreateTime(date);
             memberService.save(member);

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

@@ -0,0 +1,18 @@
+package com.ruoyi.app.service.impl;
+
+import com.ruoyi.app.domain.TbMyPublish;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.app.mapper.TbMyPublishMapper;
+import com.ruoyi.app.service.ITbMyPublishService;
+
+/**
+ * 我的近况（我的发）Service业务层处理
+ *
+ * @author Administrator
+ * @date 2020-10-02
+ */
+@Service
+public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyPublish> implements ITbMyPublishService {
+
+}

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

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND enable = #{enable}
             </if>
             <if test="search != null and search != '' ">
-                and ( a.nick_name LIKE CONCAT('%',#{search},'%') or mobile LIKE CONCAT('%',#{search},'%') )
+                and ( a.nick_name LIKE CONCAT('%',#{search},'%') or mobile LIKE CONCAT('%',#{search},'%') or qrcode LIKE CONCAT('%',#{search},'%') )
             </if>
 
             <if test="type == 'user' ">

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

@@ -0,0 +1,31 @@
+<?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.app.mapper.TbMyPublishMapper">
+    
+    <resultMap type="TbMyPublish" id="TbMyPublishResult">
+        <result property="id"    column="id"    />
+        <result property="appUserId"    column="app_user_id"    />
+        <result property="contents"    column="contents"    />
+        <result property="picurl1"    column="picurl1"    />
+        <result property="picurl2"    column="picurl2"    />
+        <result property="picurl3"    column="picurl3"    />
+        <result property="picurl4"    column="picurl4"    />
+        <result property="picurl5"    column="picurl5"    />
+        <result property="picurl6"    column="picurl6"    />
+        <result property="picurl7"    column="picurl7"    />
+        <result property="picurl8"    column="picurl8"    />
+        <result property="picurl9"    column="picurl9"    />
+        <result property="message"    column="message"    />
+        <result property="messageUserId"    column="message_user_id"    />
+        <result property="thumbs"    column="thumbs"    />
+        <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>