开发用户建议功能提交

src/main/java/com/rf/help/task/dao/model/TaskEntity.java

@@ -54,7 +54,10 @@ public class TaskEntity extends BaseEntity {
     @Column(name = "accept_user_id", columnDefinition = "varchar(36) comment '接单人ID'")
     private String acceptUserId;
 
-    @Column(name = "task_status", columnDefinition = "varchar(2) not null comment '任务状态(1:已发布，2：已接单，3：已完成)'")
+    @Column(name = "task_status", columnDefinition = "varchar(2) not null comment '任务状态(1:已发布，2：已接单，3：已完成，4：已取消)'")
     private String taskStatus;
 
+    @Column(name = "end_time", columnDefinition = "varchar(36) not null comment '结束时间'")
+    private String endTime;
+
 }

src/main/java/com/rf/help/task/rest/TaskController.java

@@ -52,7 +52,7 @@ public class TaskController extends BaseController {
     private UserService userService;
 
     @PostMapping("/publishTask")
-    @ApiOperation(value = "发布任务和修改完成状态", notes = "TaskEntity对象")
+    @ApiOperation(value = "发布任务和修改状态", notes = "TaskEntity对象")
     public Result publishTask(@RequestBody String json) {
         TaskEntity taskEntity = JSONObject.parseObject(json, TaskEntity.class);
         if (taskEntity.getId() == null || taskEntity.getId().equals("")) {
@@ -115,7 +115,7 @@ public class TaskController extends BaseController {
 
     @GetMapping("/findTaskList")
     @ApiOperation(value = "任务订单列表查询", notes = "参数包括：beginNum:页码，pageSize：每页条数，taskType：任务类型(1:取快递，2:带饭，3:跑腿，4：问答)，" +
-            "searchKey：搜索信息，publishUserId：发布人ID，acceptUserId：接单人ID，taskStatus：任务状态(1:已发布，2：已接单，3：已完成)")
+            "searchKey：搜索信息，publishUserId：发布人ID，acceptUserId：接单人ID，taskStatus：任务状态(1:已发布，2：已接单，3：已完成，4：已取消)")
     public Result findTaskList(String taskType, String searchKey, String publishUserId, String acceptUserId, String taskStatus, int beginNum, int pageSize) {
         Page<TaskEntity> taskEntities = this.taskService.findTaskList(taskType, searchKey, publishUserId, acceptUserId, taskStatus, beginNum, pageSize);
         return success(taskEntities);

src/main/java/com/rf/help/user/dao/model/SuggestEntity.java

@@ -0,0 +1,33 @@
+package com.rf.help.user.dao.model;
+
+import com.rf.help.base.model.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author zsy
+ * @description:系统建议信息表
+ * @date 2021/6/17 15:55
+ */
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "t_suggest_info")
+@EqualsAndHashCode(callSuper=true)
+@org.hibernate.annotations.Table(appliesTo = "t_suggest_info", comment = "系统建议信息表")
+public class SuggestEntity extends BaseEntity {
+
+    @Column(name = "user_id", columnDefinition = "varchar(36) not null comment '用户id'")
+    private String userId;
+
+    @Column(name = "suggest_content", columnDefinition = "varchar(200) not null comment '建议内容'")
+    private String suggestContent;
+
+}

src/main/java/com/rf/help/user/dao/model/UserEntity.java

@@ -36,6 +36,9 @@ public class UserEntity extends BaseEntity {
     @Column(name = "password", columnDefinition = "varchar(32) comment '密码'")
     private String password;
 
+    @Column(name = "intro", columnDefinition = "varchar(100) comment '用户简介'")
+    private String intro;
+
     @Column(name = "avatar", columnDefinition = "varchar(255) comment '头像URL'")
     private String avatar;
 

src/main/java/com/rf/help/user/dao/repository/SuggestRepository.java

@@ -0,0 +1,14 @@
+package com.rf.help.user.dao.repository;
+
+import com.rf.help.base.repository.BaseRepository;
+import com.rf.help.user.dao.model.SuggestEntity;
+import com.rf.help.user.dao.model.UserEntity;
+
+/**
+ * @Description: 用户注册登录等相关接口
+ * @Author: zsy
+ * @Date: 2024/12/4
+ */
+public interface SuggestRepository extends BaseRepository<SuggestEntity, String> {
+
+}

src/main/java/com/rf/help/user/rest/UserController.java

@@ -5,7 +5,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.rf.help.base.rest.BaseController;
 import com.rf.help.security.SafetyProcess;
+import com.rf.help.task.dao.model.TaskEntity;
+import com.rf.help.user.dao.model.SuggestEntity;
 import com.rf.help.user.dao.model.UserEntity;
+import com.rf.help.user.service.SuggestService;
 import com.rf.help.user.service.UserService;
 import com.rf.help.utils.Constant;
 import com.rf.help.utils.JWTUtil;
@@ -43,6 +46,9 @@ public class UserController extends BaseController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private SuggestService suggestService;
+
     @GetMapping("/code2openid/{code}")
     @ApiOperation(value = "code 换 opernid",notes = "code：临时code，获取openid")
     @SafetyProcess
@@ -182,4 +188,14 @@ public class UserController extends BaseController {
         }
     }
 
+    @PostMapping("/suggest")
+    @ApiOperation(value = "用户建议", notes = "suggestContent:建议内容,userId:用户id")
+    public Result suggest(@RequestBody String json) {
+        SuggestEntity suggestEntity = JSONObject.parseObject(json, SuggestEntity.class);
+        suggestEntity.setCreateTime(DateUtil.now());
+        suggestEntity.setUpdateTime(DateUtil.now());
+        suggestEntity = this.suggestService.save(suggestEntity);
+        return success(suggestEntity);
+    }
+
 }

src/main/java/com/rf/help/user/service/SuggestService.java

@@ -0,0 +1,13 @@
+package com.rf.help.user.service;
+
+import com.rf.help.user.dao.model.SuggestEntity;
+
+/**
+ * @Description: 用户建议相关接口
+ * @Author: zsy
+ * @Date: 2024/12/4
+ */
+public interface SuggestService {
+
+    SuggestEntity save(SuggestEntity suggestEntity);
+}

src/main/java/com/rf/help/user/service/impl/SuggestServiceImpl.java

@@ -0,0 +1,25 @@
+package com.rf.help.user.service.impl;
+
+import com.rf.help.user.dao.model.SuggestEntity;
+import com.rf.help.user.dao.repository.SuggestRepository;
+import com.rf.help.user.service.SuggestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @Description: 用户建议相关接口
+ * @Author: zsy
+ * @Date: 2024/12/4
+ */
+@Service
+public class SuggestServiceImpl implements SuggestService {
+
+    @Autowired
+    private SuggestRepository suggestRepository;
+
+    @Override
+    public SuggestEntity save(SuggestEntity suggestEntity) {
+        return this.suggestRepository.save(suggestEntity);
+    }
+}