houweiyu 4 سال پیش
والد
کامیت
2a64535e0d

+ 6 - 0
dinner-application/src/main/resources/application.properties

@@ -20,3 +20,9 @@ spring.servlet.multipart.max-file-size= 50MB
 spring.servlet.multipart.max-request-size= 50MB
 
 
+spring.datasource.url=jdbc:mysql://120.25.146.52:3306/dinner-reservation?serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.username=root
+spring.datasource.password=4dkk2020test%
+spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+
+

+ 1 - 1
dinner-core/src/test/java/CodeAutoGenerator.java

@@ -9,6 +9,6 @@ public class CodeAutoGenerator {
 
     public static void main(String[] args) {
         MysqlAutoGenerator.doAutoGenerator("base" , "com.fdage"
-                ,"abner" , "");
+                ,"abner" , "tm_feedback");
     }
 }

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/dao/TmFeedbackDao.java

@@ -0,0 +1,16 @@
+package com.fdage.base.dao;
+
+import com.fdage.base.entity.TmFeedback;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 反馈信息表 Mapper 接口
+ * </p>
+ *
+ * @author abner
+ * @since 2021-03-01
+ */
+public interface TmFeedbackDao extends BaseMapper<TmFeedback> {
+
+}

+ 53 - 0
dinner-core/src/main/java/com/fdage/base/entity/TmFeedback.java

@@ -0,0 +1,53 @@
+package com.fdage.base.entity;
+
+import java.time.LocalDateTime;
+import java.sql.Blob;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 反馈信息表
+ * </p>
+ *
+ * @author abner
+ * @since 2021-03-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TmFeedback对象", description="反馈信息表")
+public class TmFeedback implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "唯一主键ID")
+    private String id;
+
+    @ApiModelProperty(value = "反馈类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "反馈类型描述")
+    private String typeDesc;
+
+    @ApiModelProperty(value = "反馈内容")
+    private String content;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最新更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "是否删除:0->未删除;1->;已删除")
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "手机号")
+    private String phoneNum;
+
+
+}

+ 11 - 0
dinner-core/src/main/java/com/fdage/base/entity/TmUser.java

@@ -1,5 +1,6 @@
 package com.fdage.base.entity;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -69,11 +70,21 @@ public class TmUser implements Serializable {
     private Integer isDelete;
 
     @ApiModelProperty(value = "注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime registerTime;
 
     @ApiModelProperty(value = "上次登录时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastLoginTime;
 
+
+    @ApiModelProperty(value = "出生年月日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDate birthday;
+
     @ApiModelProperty(value = "上次登录IP")
     private String lastLoginIp;
 

+ 1 - 0
dinner-core/src/main/java/com/fdage/base/enums/IdPreEnum.java

@@ -11,6 +11,7 @@ public enum IdPreEnum {
     DESK_PRE("DSK00001" , "餐桌ID前缀"),
     ORDER_PRE("ORD00001" , "订单ID前缀"),
     USER_PRE("USER0001" , "用户ID前缀"),
+    FEEDBACK_PRE("FEEDBACK" , "反馈ID前缀"),
     ;
 
     private String pre;

+ 16 - 0
dinner-core/src/main/java/com/fdage/base/service/ITmFeedbackService.java

@@ -0,0 +1,16 @@
+package com.fdage.base.service;
+
+import com.fdage.base.entity.TmFeedback;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 反馈信息表 服务类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-03-01
+ */
+public interface ITmFeedbackService extends IService<TmFeedback> {
+
+}

+ 36 - 0
dinner-core/src/main/java/com/fdage/base/service/impl/TmFeedbackServiceImpl.java

@@ -0,0 +1,36 @@
+package com.fdage.base.service.impl;
+
+import com.fdage.base.entity.TmFeedback;
+import com.fdage.base.dao.TmFeedbackDao;
+import com.fdage.base.enums.IdPreEnum;
+import com.fdage.base.service.ITmFeedbackService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import fdage.back.sdk.base.enums.IdStarterEnum;
+import fdage.back.sdk.base.uuid.SnowFlakeUUidUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 反馈信息表 服务实现类
+ * </p>
+ *
+ * @author abner
+ * @since 2021-03-01
+ */
+@Service
+public class TmFeedbackServiceImpl extends ServiceImpl<TmFeedbackDao, TmFeedback> implements ITmFeedbackService {
+
+
+    public int addNew(TmFeedback tmFeedback){
+        if(null == tmFeedback){
+            return -1;
+        }
+        tmFeedback.setId(SnowFlakeUUidUtils.generaUUid(null , null , IdPreEnum.FEEDBACK_PRE.getPre()));
+        tmFeedback.setCreateTime(LocalDateTime.now());
+        tmFeedback.setUpdateTime(LocalDateTime.now());
+        tmFeedback.setIsDelete(0);
+        return getBaseMapper().insert(tmFeedback);
+    }
+}

+ 17 - 0
dinner-core/src/main/java/com/fdage/controller/app/AppUserController.java

@@ -1,6 +1,8 @@
 package com.fdage.controller.app;
 
+import com.fdage.base.entity.TmFeedback;
 import com.fdage.base.entity.TmUser;
+import com.fdage.base.service.impl.TmFeedbackServiceImpl;
 import com.fdage.base.service.impl.TmUserServiceImpl;
 import com.fdage.controller.BaseController;
 import fdage.back.sdk.base.entity.Result;
@@ -29,6 +31,9 @@ public class AppUserController extends BaseController {
     @Autowired
     private TmUserServiceImpl tmUserService;
 
+    @Autowired
+    private TmFeedbackServiceImpl tmFeedbackService;
+
 
     @GetMapping("/detail")
     @ApiOperation(value = "获当前用户详情")
@@ -53,4 +58,16 @@ public class AppUserController extends BaseController {
         }
         return Result.success("修改成功");
     }
+
+    @PostMapping("/addFeedback")
+    @ApiOperation(value = "添加反馈")
+    public Result<TmUser> addFeedback(@RequestBody TmFeedback tmFeedback){
+
+        int add = tmFeedbackService.addNew(tmFeedback);
+        if(add != 1){
+            return Result.failure("新增反馈失败");
+        }
+        return Result.success("新增成功");
+
+    }
 }

+ 5 - 0
dinner-core/src/main/resources/mybatis/mappers/TmFeedbackMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdage.base.dao.TmFeedbackDao">
+
+</mapper>