From e468b65add38f0b47aae3ec188064273d9fd1768 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Mon, 27 Jul 2020 22:32:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E4=BD=93=E7=B1=BB=202.up=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/say/controller/BaseController.java | 50 +++++++++++++++++++ .../java/com/bsd/say/entities/AwardList.java | 43 ++++++++++++++++ .../java/com/bsd/say/entities/BaseEntity.java | 8 --- .../java/com/bsd/say/entities/Coupon.java | 23 +++++++++ .../java/com/bsd/say/entities/LoveLetter.java | 29 +++++++++++ .../java/com/bsd/say/entities/LoveType.java | 17 +++++++ src/main/java/com/bsd/say/entities/User.java | 21 ++++++++ src/main/resources/application.yml | 2 +- 8 files changed, 184 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/bsd/say/controller/BaseController.java create mode 100644 src/main/java/com/bsd/say/entities/AwardList.java create mode 100644 src/main/java/com/bsd/say/entities/Coupon.java create mode 100644 src/main/java/com/bsd/say/entities/LoveLetter.java create mode 100644 src/main/java/com/bsd/say/entities/LoveType.java create mode 100644 src/main/java/com/bsd/say/entities/User.java diff --git a/src/main/java/com/bsd/say/controller/BaseController.java b/src/main/java/com/bsd/say/controller/BaseController.java new file mode 100644 index 0000000..3538020 --- /dev/null +++ b/src/main/java/com/bsd/say/controller/BaseController.java @@ -0,0 +1,50 @@ +package com.bsd.say.controller; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.bsd.say.beans.AjaxRequest; +import com.bsd.say.beans.AjaxResult; +import com.bsd.say.entities.BaseEntity; +import com.bsd.say.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +public class BaseController { + + @Autowired + private B baseService; + + private Class entityClass; + + public B getBaseService() { + return this.baseService; + } + + public BaseController() { + + Type type = getClass().getGenericSuperclass(); + ParameterizedType ptype = (ParameterizedType) type; + Type[] types = ptype.getActualTypeArguments(); + entityClass = (Class) types[1]; + } + + public AjaxResult saveOrUpdate(AjaxRequest ajaxRequest) { + + JSONObject data = ajaxRequest.getData(); + T entityClass = data.toJavaObject(this.entityClass); + baseService.saveOrUpdate(entityClass, 12L); + return new AjaxResult(); + } + + + public AjaxResult page(AjaxRequest ajaxRequest) { + + AjaxResult ajaxResult = new AjaxResult(); + JSONObject jsonObject = ajaxRequest.getData(); + IPage page = baseService.page(jsonObject); + ajaxResult.setData(page); + return ajaxResult; + } +} \ No newline at end of file diff --git a/src/main/java/com/bsd/say/entities/AwardList.java b/src/main/java/com/bsd/say/entities/AwardList.java new file mode 100644 index 0000000..de4d0bf --- /dev/null +++ b/src/main/java/com/bsd/say/entities/AwardList.java @@ -0,0 +1,43 @@ +package com.bsd.say.entities; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@TableName("award_list") +@Data +public class AwardList extends BaseEntity{ + /** + * 中奖用户id + */ + private Integer userId; + + /** + * 中奖类型(1-一等奖 2-二等奖) + */ + private int awardType; + + /** + * 奖品名 + */ + private String awardName; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String area; + + /** + * 详细地藏 + */ + private String address; +} diff --git a/src/main/java/com/bsd/say/entities/BaseEntity.java b/src/main/java/com/bsd/say/entities/BaseEntity.java index 64f50dd..3e7db19 100644 --- a/src/main/java/com/bsd/say/entities/BaseEntity.java +++ b/src/main/java/com/bsd/say/entities/BaseEntity.java @@ -18,16 +18,8 @@ public class BaseEntity { @TableId(type = IdType.AUTO) private Long id; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss", - timezone = "GMT+8" - ) private Date createDateTime; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss", - timezone = "GMT+8" - ) private Date updateDateTime; private Long createBy; private Long updateBy; diff --git a/src/main/java/com/bsd/say/entities/Coupon.java b/src/main/java/com/bsd/say/entities/Coupon.java new file mode 100644 index 0000000..a263c76 --- /dev/null +++ b/src/main/java/com/bsd/say/entities/Coupon.java @@ -0,0 +1,23 @@ +package com.bsd.say.entities; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@TableName("coupon") +@Data +public class Coupon extends BaseEntity{ + /** + * 波司登返回的优惠券号 + */ + private String couponNo; + + /** + * 优惠券券面值 + */ + private Double couponValue; + + /** + * 绑定的userId + */ + private Integer userId; +} diff --git a/src/main/java/com/bsd/say/entities/LoveLetter.java b/src/main/java/com/bsd/say/entities/LoveLetter.java new file mode 100644 index 0000000..6626a8a --- /dev/null +++ b/src/main/java/com/bsd/say/entities/LoveLetter.java @@ -0,0 +1,29 @@ +package com.bsd.say.entities; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@TableName("love_letter") +@Data +public class LoveLetter extends BaseEntity{ + /** + * 用户id(谁写的爱意情书) + */ + private String userId; + /** + * 情书内容(有字数限制) + */ + private String content; + /** + * 情书类型 + */ + private Integer loveType; + /** + * 被送人手机号 + */ + private String receivePhone; + /** + * 接收人姓名 + */ + private String receiveName; +} diff --git a/src/main/java/com/bsd/say/entities/LoveType.java b/src/main/java/com/bsd/say/entities/LoveType.java new file mode 100644 index 0000000..1d3ed16 --- /dev/null +++ b/src/main/java/com/bsd/say/entities/LoveType.java @@ -0,0 +1,17 @@ +package com.bsd.say.entities; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@TableName("love_type") +@Data +public class LoveType extends BaseEntity{ + /** + * 绑定情书id + */ + private Integer letterId; + /** + * 爱意类型内容 + */ + private String content; +} diff --git a/src/main/java/com/bsd/say/entities/User.java b/src/main/java/com/bsd/say/entities/User.java new file mode 100644 index 0000000..d31de63 --- /dev/null +++ b/src/main/java/com/bsd/say/entities/User.java @@ -0,0 +1,21 @@ +package com.bsd.say.entities; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@TableName("user") +@Data +public class User extends BaseEntity{ + /** + * 用户手机号 + */ + private String phone; + /** + * 用户openId + */ + private String openId; + /** + * 0-白嫖客 1-寄信人 2-被送信人 3-既是寄信也是被送 + */ + private int userType; +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a92c2f5..9566dfc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,7 +12,7 @@ spring: # max-active: 8 # max-wait: -1 datasource: - url: jdbc:mysql://106.15.109.152:3306/ic2?characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true + url: jdbc:mysql://106.15.109.152:3306/bsd_asy?characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true username: root password: Bsd@2019 driver-class-name: com.mysql.jdbc.Driver