diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java index 84aabcc..40e975a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java @@ -20,6 +20,7 @@ import cn.hutool.core.bean.BeanUtil; import io.swagger.annotations.ApiModelProperty; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; +import javax.validation.constraints.*; import javax.persistence.Entity; import javax.persistence.Table; import org.hibernate.annotations.*; @@ -54,11 +55,11 @@ public class AbMessage implements Serializable { private Timestamp gmtModified; @Column(name = "rec_id") - @ApiModelProperty(value = "记录id") + @ApiModelProperty(value = "记录ID") private Long recId; @Column(name = "uid") - @ApiModelProperty(value = "uid") + @ApiModelProperty(value = "UID") private String uid; @Column(name = "act_name") @@ -66,7 +67,7 @@ public class AbMessage implements Serializable { private String actName; @Column(name = "app_id") - @ApiModelProperty(value = "业务用户id") + @ApiModelProperty(value = "业务用户ID") private String appId; @Column(name = "start_time") @@ -74,7 +75,7 @@ public class AbMessage implements Serializable { private Timestamp startTime; @Column(name = "client_type") - @ApiModelProperty(value = "业务类别(1:A,2:B,3:C,4:D,5:E,6:F)") + @ApiModelProperty(value = "业务类别") private Integer clientType; @Column(name = "push_time") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageDto.java index ee73647..fc6cd73 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageDto.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageDto.java @@ -34,22 +34,22 @@ public class AbMessageDto implements Serializable { private Timestamp gmtModified; - /** 记录id */ + /** 记录ID */ private Long recId; - /** uid */ + /** UID */ private String uid; /** 业务名 */ private String actName; - /** 业务用户id */ + /** 业务用户ID */ private String appId; /** 业务开始时间 */ private Timestamp startTime; - /** 业务类别(1:A,2:B,3:C,4:D,5:E,6:F) */ + /** 业务类别 */ private Integer clientType; /** 上游推送时间 */ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java index c5993d8..06db750 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java @@ -37,7 +37,7 @@ public class AbMessageQueryCriteria{ private String actName; /** BETWEEN */ @Query(type = Query.Type.BETWEEN) - private List startTime; + private List createTime; /** BETWEEN */ @Query(type = Query.Type.BETWEEN) private List clientType; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java index 985d68b..8065a22 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/impl/AbMessageServiceImpl.java @@ -98,12 +98,12 @@ public class AbMessageServiceImpl implements AbMessageService { Map map = new LinkedHashMap<>(); map.put(" gmtCreate", abMessage.getGmtCreate()); map.put(" gmtModified", abMessage.getGmtModified()); - map.put("记录id", abMessage.getRecId()); - map.put("uid", abMessage.getUid()); + map.put("记录ID", abMessage.getRecId()); + map.put("UID", abMessage.getUid()); map.put("业务名", abMessage.getActName()); - map.put("业务用户id", abMessage.getAppId()); + map.put("业务用户ID", abMessage.getAppId()); map.put("业务开始时间", abMessage.getStartTime()); - map.put("业务类别(1:A,2:B,3:C,4:D,5:E,6:F)", abMessage.getClientType()); + map.put("业务类别", abMessage.getClientType()); map.put("上游推送时间", abMessage.getPushTime()); list.add(map); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java index e654f80..e0f0eef 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java @@ -59,7 +59,7 @@ public class FormMessage implements Serializable { private Long recId; @Column(name = "uid") - @ApiModelProperty(value = "uid") + @ApiModelProperty(value = "UID") private String uid; @Column(name = "act_name") @@ -91,11 +91,11 @@ public class FormMessage implements Serializable { private Integer cityCode; @Column(name = "device") - @ApiModelProperty(value = "听课设备(0.没有以上设备 1.平板电脑 2.笔记本电脑 3.台式设备+耳麦)") + @ApiModelProperty(value = "听课设备") private Integer device; @Column(name = "appointment_time") - @ApiModelProperty(value = "预约听课时间(0.近期没有学习安排 1.三天内 2.一周内 3.一周以后)") + @ApiModelProperty(value = "预约听课时间") private Integer appointmentTime; @Column(name = "start_time") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageDto.java index eeb617c..ffd7f1c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageDto.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageDto.java @@ -37,7 +37,7 @@ public class FormMessageDto implements Serializable { /** 记录id */ private Long recId; - /** uid */ + /** UID */ private String uid; /** 业务名 */ @@ -61,10 +61,10 @@ public class FormMessageDto implements Serializable { /** 所在城市编码 */ private Integer cityCode; - /** 听课设备(0.没有以上设备 1.平板电脑 2.笔记本电脑 3.台式设备+耳麦) */ + /** 听课设备 */ private Integer device; - /** 预约听课时间(0.近期没有学习安排 1.三天内 2.一周内 3.一周以后) */ + /** 预约听课时间 */ private Integer appointmentTime; /** 业务开始时间 */ diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java index 08f0a64..1563934 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java @@ -36,17 +36,19 @@ public class FormMessageQueryCriteria{ @Query(type = Query.Type.INNER_LIKE) private String actName; + /** 精确 */ + @Query + private Integer stuGrade; + + /** 精确 */ + @Query + private String city; + /** 精确 */ @Query private Integer device; /** BETWEEN */ @Query(type = Query.Type.BETWEEN) - private List stuGrade; - /** BETWEEN */ - @Query(type = Query.Type.BETWEEN) - private List city; - /** BETWEEN */ - @Query(type = Query.Type.BETWEEN) private List startTime; /** BETWEEN */ @Query(type = Query.Type.BETWEEN) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/impl/FormMessageServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/impl/FormMessageServiceImpl.java index 1d6ef9e..8b92360 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/impl/FormMessageServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/impl/FormMessageServiceImpl.java @@ -99,7 +99,7 @@ public class FormMessageServiceImpl implements FormMessageService { map.put(" gmtCreate", formMessage.getGmtCreate()); map.put(" gmtModified", formMessage.getGmtModified()); map.put("记录id", formMessage.getRecId()); - map.put("uid", formMessage.getUid()); + map.put("UID", formMessage.getUid()); map.put("业务名", formMessage.getActName()); map.put("报课学生名", formMessage.getStuName()); map.put("报课年级", formMessage.getStuGrade()); @@ -107,8 +107,8 @@ public class FormMessageServiceImpl implements FormMessageService { map.put("所在省份编码", formMessage.getProvinceCode()); map.put("所在城市", formMessage.getCity()); map.put("所在城市编码", formMessage.getCityCode()); - map.put("听课设备(0.没有以上设备 1.平板电脑 2.笔记本电脑 3.台式设备+耳麦)", formMessage.getDevice()); - map.put("预约听课时间(0.近期没有学习安排 1.三天内 2.一周内 3.一周以后)", formMessage.getAppointmentTime()); + map.put("听课设备", formMessage.getDevice()); + map.put("预约听课时间", formMessage.getAppointmentTime()); map.put("业务开始时间", formMessage.getStartTime()); map.put("最新推送时间", formMessage.getPushTime()); list.add(map); diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index 2e7d945..c297716 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://localhost:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://47.99.218.9:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: root - password: root + password: Yuyou@2020 # 初始连接数 initial-size: 5 # 最小连接数