Bladeren bron

feat 相关结构生成

classic_blue 2 dagen geleden
bovenliggende
commit
52b1dab3d4
40 gewijzigde bestanden met toevoegingen van 1305 en 24 verwijderingen
  1. 8 0
      babyApplication-dao/src/main/java/edu/travel/mapper/BtBabyUserRelationMapper.java
  2. 8 0
      babyApplication-dao/src/main/java/edu/travel/mapper/BtBodyRecordMapper.java
  3. 8 0
      babyApplication-dao/src/main/java/edu/travel/mapper/BtFeedRecordMapper.java
  4. 8 0
      babyApplication-dao/src/main/java/edu/travel/mapper/BtMessageMapper.java
  5. 8 0
      babyApplication-dao/src/main/java/edu/travel/mapper/MtFavoriteSongsMapper.java
  6. 8 0
      babyApplication-dao/src/main/java/edu/travel/mapper/MtRelativeRolesMapper.java
  7. 34 0
      babyApplication-dao/src/main/resources/mapper/BtAccountInfoMapper.xml
  8. 24 0
      babyApplication-dao/src/main/resources/mapper/BtBabyUserRelationMapper.xml
  9. 24 0
      babyApplication-dao/src/main/resources/mapper/BtBodyRecordMapper.xml
  10. 31 0
      babyApplication-dao/src/main/resources/mapper/BtFeedRecordMapper.xml
  11. 22 0
      babyApplication-dao/src/main/resources/mapper/BtMessageMapper.xml
  12. 22 0
      babyApplication-dao/src/main/resources/mapper/MtFavoriteSongsMapper.xml
  13. 22 0
      babyApplication-dao/src/main/resources/mapper/MtRelativeRolesMapper.xml
  14. 0 8
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/dto/SendSmsDto.java
  15. 46 5
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtAccountInfo.java
  16. 88 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtBabyUserRelation.java
  17. 88 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtBodyRecord.java
  18. 124 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtFeedRecord.java
  19. 76 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtMessage.java
  20. 76 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/MtFavoriteSongs.java
  21. 76 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/MtRelativeRoles.java
  22. 88 0
      babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/vo/BtAccountInfoVo.java
  23. 2 1
      babyApplication-service/src/main/java/edu/travel/service/BtAccountInfoService.java
  24. 18 0
      babyApplication-service/src/main/java/edu/travel/service/BtBabyUserRelationService.java
  25. 18 0
      babyApplication-service/src/main/java/edu/travel/service/BtBodyRecordService.java
  26. 18 0
      babyApplication-service/src/main/java/edu/travel/service/BtFeedRecordService.java
  27. 18 0
      babyApplication-service/src/main/java/edu/travel/service/BtMessageService.java
  28. 18 0
      babyApplication-service/src/main/java/edu/travel/service/MtFavoriteSongsService.java
  29. 18 0
      babyApplication-service/src/main/java/edu/travel/service/MtRelativeRolesService.java
  30. 3 1
      babyApplication-service/src/main/java/edu/travel/service/impl/BtAccountInfoServiceImpl.java
  31. 47 0
      babyApplication-service/src/main/java/edu/travel/service/impl/BtBabyUserRelationServiceImpl.java
  32. 47 0
      babyApplication-service/src/main/java/edu/travel/service/impl/BtBodyRecordServiceImpl.java
  33. 47 0
      babyApplication-service/src/main/java/edu/travel/service/impl/BtFeedRecordServiceImpl.java
  34. 47 0
      babyApplication-service/src/main/java/edu/travel/service/impl/BtMessageServiceImpl.java
  35. 47 0
      babyApplication-service/src/main/java/edu/travel/service/impl/MtFavoriteSongsServiceImpl.java
  36. 47 0
      babyApplication-service/src/main/java/edu/travel/service/impl/MtRelativeRolesServiceImpl.java
  37. 2 3
      babyApplication-web/src/main/java/edu/travel/config/SecurityConfig.java
  38. 4 6
      babyApplication-web/src/main/java/edu/travel/controller/LoginController.java
  39. 9 0
      babyApplication-web/src/main/java/edu/travel/filter/LoginFilter.java
  40. 6 0
      babyApplication-web/src/main/java/edu/travel/filter/TokenAuthenticationFilter.java

+ 8 - 0
babyApplication-dao/src/main/java/edu/travel/mapper/BtBabyUserRelationMapper.java

@@ -0,0 +1,8 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.BtBabyUserRelation;
+
+public interface BtBabyUserRelationMapper extends BaseMapper<BtBabyUserRelation> {
+
+}

+ 8 - 0
babyApplication-dao/src/main/java/edu/travel/mapper/BtBodyRecordMapper.java

@@ -0,0 +1,8 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.BtBodyRecord;
+
+public interface BtBodyRecordMapper extends BaseMapper<BtBodyRecord> {
+
+}

+ 8 - 0
babyApplication-dao/src/main/java/edu/travel/mapper/BtFeedRecordMapper.java

@@ -0,0 +1,8 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.BtFeedRecord;
+
+public interface BtFeedRecordMapper extends BaseMapper<BtFeedRecord> {
+
+}

+ 8 - 0
babyApplication-dao/src/main/java/edu/travel/mapper/BtMessageMapper.java

@@ -0,0 +1,8 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.BtMessage;
+
+public interface BtMessageMapper extends BaseMapper<BtMessage> {
+
+}

+ 8 - 0
babyApplication-dao/src/main/java/edu/travel/mapper/MtFavoriteSongsMapper.java

@@ -0,0 +1,8 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.MtFavoriteSongs;
+
+public interface MtFavoriteSongsMapper extends BaseMapper<MtFavoriteSongs> {
+
+}

+ 8 - 0
babyApplication-dao/src/main/java/edu/travel/mapper/MtRelativeRolesMapper.java

@@ -0,0 +1,8 @@
+package edu.travel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.entity.MtRelativeRoles;
+
+public interface MtRelativeRolesMapper extends BaseMapper<MtRelativeRoles> {
+
+}

+ 34 - 0
babyApplication-dao/src/main/resources/mapper/BtAccountInfoMapper.xml

@@ -0,0 +1,34 @@
+<?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="edu.travel.mapper.BtAccountInfoMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.BtAccountInfo">
+    <!--@mbg.generated-->
+    <!--@Table bt_account_info-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="surname" jdbcType="VARCHAR" property="surname" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="nickname" jdbcType="VARCHAR" property="nickname" />
+    <result column="sex" jdbcType="INTEGER" property="sex" />
+    <result column="avatar" jdbcType="VARCHAR" property="avatar" />
+    <result column="phone" jdbcType="VARCHAR" property="phone" />
+    <result column="area" jdbcType="VARCHAR" property="area" />
+    <result column="birthday" jdbcType="TIMESTAMP" property="birthday" />
+    <result column="user_status" jdbcType="INTEGER" property="userStatus" />
+    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="default_language_id" jdbcType="BIGINT" property="defaultLanguageId" />
+    <result column="tenant_open_id" jdbcType="VARCHAR" property="tenantOpenId" />
+    <result column="tenant_unionid" jdbcType="VARCHAR" property="tenantUnionid" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, surname, `name`, nickname, sex, avatar, phone, area, birthday, user_status, `password`, 
+    default_language_id, tenant_open_id, tenant_unionid, project, create_time, create_user_id, 
+    update_time, update_user_id, delete_flag
+  </sql>
+</mapper>

+ 24 - 0
babyApplication-dao/src/main/resources/mapper/BtBabyUserRelationMapper.xml

@@ -0,0 +1,24 @@
+<?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="edu.travel.mapper.BtBabyUserRelationMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.BtBabyUserRelation">
+    <!--@mbg.generated-->
+    <!--@Table bt_baby_user_relation-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="baby_id" jdbcType="VARCHAR" property="babyId" />
+    <result column="relative_role_id" jdbcType="VARCHAR" property="relativeRoleId" />
+    <result column="is_founder" jdbcType="TINYINT" property="isFounder" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, user_id, baby_id, relative_role_id, is_founder, project, create_time, create_user_id, 
+    update_time, update_user_id, delete_flag
+  </sql>
+</mapper>

+ 24 - 0
babyApplication-dao/src/main/resources/mapper/BtBodyRecordMapper.xml

@@ -0,0 +1,24 @@
+<?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="edu.travel.mapper.BtBodyRecordMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.BtBodyRecord">
+    <!--@mbg.generated-->
+    <!--@Table bt_body_record-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="height" jdbcType="INTEGER" property="height" />
+    <result column="weight" jdbcType="INTEGER" property="weight" />
+    <result column="head_circumference" jdbcType="DECIMAL" property="headCircumference" />
+    <result column="record_time" jdbcType="DATE" property="recordTime" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, height, weight, head_circumference, record_time, project, create_time, create_user_id, 
+    update_time, update_user_id, delete_flag
+  </sql>
+</mapper>

+ 31 - 0
babyApplication-dao/src/main/resources/mapper/BtFeedRecordMapper.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="edu.travel.mapper.BtFeedRecordMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.BtFeedRecord">
+    <!--@mbg.generated-->
+    <!--@Table bt_feed_record-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="nurse_method" jdbcType="INTEGER" property="nurseMethod" />
+    <result column="nurse_amount" jdbcType="INTEGER" property="nurseAmount" />
+    <result column="complementary_name" jdbcType="VARCHAR" property="complementaryName" />
+    <result column="has_stool" jdbcType="TINYINT" property="hasStool" />
+    <result column="milk_output" jdbcType="INTEGER" property="milkOutput" />
+    <result column="start_time" jdbcType="DATE" property="startTime" />
+    <result column="end_time" jdbcType="DATE" property="endTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="images" jdbcType="VARCHAR" property="images" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `type`, nurse_method, nurse_amount, complementary_name, has_stool, milk_output, 
+    start_time, end_time, remark, images, project, create_time, create_user_id, update_time, 
+    update_user_id, delete_flag
+  </sql>
+</mapper>

+ 22 - 0
babyApplication-dao/src/main/resources/mapper/BtMessageMapper.xml

@@ -0,0 +1,22 @@
+<?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="edu.travel.mapper.BtMessageMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.BtMessage">
+    <!--@mbg.generated-->
+    <!--@Table bt_message-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, content, `type`, project, create_time, create_user_id, update_time, update_user_id, 
+    delete_flag
+  </sql>
+</mapper>

+ 22 - 0
babyApplication-dao/src/main/resources/mapper/MtFavoriteSongsMapper.xml

@@ -0,0 +1,22 @@
+<?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="edu.travel.mapper.MtFavoriteSongsMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.MtFavoriteSongs">
+    <!--@mbg.generated-->
+    <!--@Table mt_favorite_songs-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="user_id" jdbcType="VARCHAR" property="userId" />
+    <result column="song_id" jdbcType="VARCHAR" property="songId" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, user_id, song_id, project, create_time, create_user_id, update_time, update_user_id, 
+    delete_flag
+  </sql>
+</mapper>

+ 22 - 0
babyApplication-dao/src/main/resources/mapper/MtRelativeRolesMapper.xml

@@ -0,0 +1,22 @@
+<?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="edu.travel.mapper.MtRelativeRolesMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.entity.MtRelativeRoles">
+    <!--@mbg.generated-->
+    <!--@Table mt_relative_roles-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="role_name" jdbcType="VARCHAR" property="roleName" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="BIGINT" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, role_name, description, project, create_time, create_user_id, update_time, update_user_id, 
+    delete_flag
+  </sql>
+</mapper>

+ 0 - 8
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/dto/SendSmsDto.java

@@ -4,14 +4,6 @@ import lombok.Data;
 @Data
 public class SendSmsDto {
     /**
-     * 验证码标识
-     */
-    private String uuid;
-    /**
-     * 验证码
-     */
-    private String code;
-    /**
      * 手机号
      */
     private String phoneNumber;

+ 46 - 5
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtAccountInfo.java

@@ -4,20 +4,24 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
+import java.io.Serializable;
 import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 用户表
  */
 @Data
-@TableName(value = "baby.bt_account_info")
-public class BtAccountInfo extends BaseEntity {
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "bt_account_info")
+public class BtAccountInfo implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**
@@ -98,4 +102,41 @@ public class BtAccountInfo extends BaseEntity {
     @TableField(value = "tenant_unionid")
     private String tenantUnionid;
 
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
 }

+ 88 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtBabyUserRelation.java

@@ -0,0 +1,88 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户-宝宝-亲属角色-关系表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "bt_baby_user_relation")
+public class BtBabyUserRelation implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 宝宝id
+     */
+    @TableField(value = "baby_id")
+    private String babyId;
+
+    /**
+     * 亲属角色id
+     */
+    @TableField(value = "relative_role_id")
+    private String relativeRoleId;
+
+    /**
+     * 是否是创建人 0否 1是 (只有创建人有权修改宝宝基本信息和宝宝的亲属列表)
+     */
+    @TableField(value = "is_founder")
+    private Byte isFounder;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}

+ 88 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtBodyRecord.java

@@ -0,0 +1,88 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 宝宝身体记录表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "bt_body_record")
+public class BtBodyRecord implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 身高
+     */
+    @TableField(value = "height")
+    private Integer height;
+
+    /**
+     * 体重
+     */
+    @TableField(value = "weight")
+    private Integer weight;
+
+    /**
+     * 头围
+     */
+    @TableField(value = "head_circumference")
+    private Long headCircumference;
+
+    /**
+     * 记录时间
+     */
+    @TableField(value = "record_time")
+    private Date recordTime;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}

+ 124 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtFeedRecord.java

@@ -0,0 +1,124 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 喂养记录表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "bt_feed_record")
+public class BtFeedRecord implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 行为类型 1喂奶 2辅食 3尿布 4睡眠 5吸奶 6洗澡 7游泳
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 喂奶类型 1母乳喂养 2母乳瓶喂养 3配方奶喂养
+     */
+    @TableField(value = "nurse_method")
+    private Integer nurseMethod;
+
+    /**
+     * 喂奶量(ml) type==1&&nurse_method==2 或type==1&&nurse_method==3 时使用
+     */
+    @TableField(value = "nurse_amount")
+    private Integer nurseAmount;
+
+    /**
+     * 辅食名称 type==2 时使用
+     */
+    @TableField(value = "complementary_name")
+    private String complementaryName;
+
+    /**
+     * 是否有粪便 0没有 1有 type==3 时使用
+     */
+    @TableField(value = "has_stool")
+    private Byte hasStool;
+
+    /**
+     * 吸奶量 type==5 时使用
+     */
+    @TableField(value = "milk_output")
+    private Integer milkOutput;
+
+    /**
+     * 开始时间
+     */
+    @TableField(value = "start_time")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @TableField(value = "end_time")
+    private Date endTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+    /**
+     * 相关图片 限制6张
+     */
+    @TableField(value = "images")
+    private String images;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}

+ 76 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/BtMessage.java

@@ -0,0 +1,76 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户消息表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "bt_message")
+public class BtMessage implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 消息内容
+     */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+     * 消息类型
+     */
+    @TableField(value = "`type`")
+    private Integer type;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}

+ 76 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/MtFavoriteSongs.java

@@ -0,0 +1,76 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 歌曲收藏列表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "mt_favorite_songs")
+public class MtFavoriteSongs implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
+    /**
+     * 歌曲id
+     */
+    @TableField(value = "song_id")
+    private String songId;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}

+ 76 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/entity/MtRelativeRoles.java

@@ -0,0 +1,76 @@
+package edu.travel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 亲属角色表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "mt_relative_roles")
+public class MtRelativeRoles implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 亲属角色名称
+     */
+    @TableField(value = "role_name")
+    private String roleName;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建用户id
+     */
+    @TableField(value = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新用户id
+     */
+    @TableField(value = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 逻辑删除标记
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}

+ 88 - 0
babyApplication-model/babyApplication-model-entity/src/main/java/edu/travel/vo/BtAccountInfoVo.java

@@ -0,0 +1,88 @@
+package edu.travel.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import edu.travel.entity.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户表
+ */
+@Data
+@TableName(value = "baby.bt_account_info")
+public class BtAccountInfoVo extends BaseEntity {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 姓
+     */
+    private String surname;
+
+    /**
+     * 名
+     */
+    private String name;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 性别 0男 1女
+     */
+    private Integer sex;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 地区区号
+     */
+    private String area;
+
+    /**
+     * 生日日期
+     */
+    private Date birthday;
+
+    /**
+     * 用户状态:0-禁用,1-启用(默认启用)
+     */
+    private Integer userStatus;
+
+    /**
+     * 用户密码
+     */
+    private String password;
+
+    /**
+     * 默认语言
+     */
+    private Long defaultLanguageId;
+
+    /**
+     * 微信小程序openid
+     */
+    private String tenantOpenId;
+
+    /**
+     * 微信小程序unionid
+     */
+    private String tenantUnionid;
+
+}

+ 2 - 1
babyApplication-service/src/main/java/edu/travel/service/BtAccountInfoService.java

@@ -5,11 +5,12 @@ import edu.travel.dto.LoginDto;
 import edu.travel.dto.SendSmsDto;
 import edu.travel.entity.AccountInfo;
 import edu.travel.entity.BtAccountInfo;
+import edu.travel.vo.BtAccountInfoVo;
 
 public interface BtAccountInfoService extends IService<BtAccountInfo> {
     AccountInfo findByPhone(String phone);
 
-    BtAccountInfo doLogin(LoginDto loginDto);
+    BtAccountInfoVo doLogin(LoginDto loginDto);
 
     void sendSms(SendSmsDto sendSmsDto);
 }

+ 18 - 0
babyApplication-service/src/main/java/edu/travel/service/BtBabyUserRelationService.java

@@ -0,0 +1,18 @@
+package edu.travel.service;
+
+import edu.travel.entity.BtBabyUserRelation;
+public interface BtBabyUserRelationService{
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(BtBabyUserRelation record);
+
+    int insertSelective(BtBabyUserRelation record);
+
+    BtBabyUserRelation selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(BtBabyUserRelation record);
+
+    int updateByPrimaryKey(BtBabyUserRelation record);
+
+}

+ 18 - 0
babyApplication-service/src/main/java/edu/travel/service/BtBodyRecordService.java

@@ -0,0 +1,18 @@
+package edu.travel.service;
+
+import edu.travel.entity.BtBodyRecord;
+public interface BtBodyRecordService{
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(BtBodyRecord record);
+
+    int insertSelective(BtBodyRecord record);
+
+    BtBodyRecord selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(BtBodyRecord record);
+
+    int updateByPrimaryKey(BtBodyRecord record);
+
+}

+ 18 - 0
babyApplication-service/src/main/java/edu/travel/service/BtFeedRecordService.java

@@ -0,0 +1,18 @@
+package edu.travel.service;
+
+import edu.travel.entity.BtFeedRecord;
+public interface BtFeedRecordService{
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(BtFeedRecord record);
+
+    int insertSelective(BtFeedRecord record);
+
+    BtFeedRecord selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(BtFeedRecord record);
+
+    int updateByPrimaryKey(BtFeedRecord record);
+
+}

+ 18 - 0
babyApplication-service/src/main/java/edu/travel/service/BtMessageService.java

@@ -0,0 +1,18 @@
+package edu.travel.service;
+
+import edu.travel.entity.BtMessage;
+public interface BtMessageService{
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(BtMessage record);
+
+    int insertSelective(BtMessage record);
+
+    BtMessage selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(BtMessage record);
+
+    int updateByPrimaryKey(BtMessage record);
+
+}

+ 18 - 0
babyApplication-service/src/main/java/edu/travel/service/MtFavoriteSongsService.java

@@ -0,0 +1,18 @@
+package edu.travel.service;
+
+import edu.travel.entity.MtFavoriteSongs;
+public interface MtFavoriteSongsService{
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MtFavoriteSongs record);
+
+    int insertSelective(MtFavoriteSongs record);
+
+    MtFavoriteSongs selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MtFavoriteSongs record);
+
+    int updateByPrimaryKey(MtFavoriteSongs record);
+
+}

+ 18 - 0
babyApplication-service/src/main/java/edu/travel/service/MtRelativeRolesService.java

@@ -0,0 +1,18 @@
+package edu.travel.service;
+
+import edu.travel.entity.MtRelativeRoles;
+public interface MtRelativeRolesService{
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MtRelativeRoles record);
+
+    int insertSelective(MtRelativeRoles record);
+
+    MtRelativeRoles selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MtRelativeRoles record);
+
+    int updateByPrimaryKey(MtRelativeRoles record);
+
+}

+ 3 - 1
babyApplication-service/src/main/java/edu/travel/service/impl/BtAccountInfoServiceImpl.java

@@ -12,6 +12,8 @@ import edu.travel.mapper.BtAccountInfoMapper;
 import edu.travel.service.BtAccountInfoService;
 import edu.travel.util.SMSUtils;
 import javax.servlet.http.HttpServletRequest;
+
+import edu.travel.vo.BtAccountInfoVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -34,7 +36,7 @@ public class BtAccountInfoServiceImpl extends ServiceImpl<BtAccountInfoMapper, B
     @Autowired
     private RedisTemplate redisTemplate;
     @Override
-    public BtAccountInfo doLogin(LoginDto loginDto) {
+    public BtAccountInfoVo doLogin(LoginDto loginDto) {
 //        BtAccountInfo accountInfoByPhone = getAccountInfoByPhone(accountInfo.getPhone());
 //        if (accountInfoByPhone != null){
 //            boolean passwordMatches = encoder.matches(accountInfo.getPassword(), accountInfoByPhone.getPassword());

+ 47 - 0
babyApplication-service/src/main/java/edu/travel/service/impl/BtBabyUserRelationServiceImpl.java

@@ -0,0 +1,47 @@
+package edu.travel.service.impl;
+
+import edu.travel.service.BtBabyUserRelationService;
+import org.springframework.stereotype.Service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import edu.travel.entity.BtBabyUserRelation;
+import edu.travel.mapper.BtBabyUserRelationMapper;
+
+@Service
+public class BtBabyUserRelationServiceImpl implements BtBabyUserRelationService {
+
+    @Autowired
+    private BtBabyUserRelationMapper btBabyUserRelationMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return btBabyUserRelationMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(BtBabyUserRelation record) {
+        return btBabyUserRelationMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(BtBabyUserRelation record) {
+        return btBabyUserRelationMapper.insertSelective(record);
+    }
+
+    @Override
+    public BtBabyUserRelation selectByPrimaryKey(Long id) {
+        return btBabyUserRelationMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(BtBabyUserRelation record) {
+        return btBabyUserRelationMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BtBabyUserRelation record) {
+        return btBabyUserRelationMapper.updateByPrimaryKey(record);
+    }
+
+}

+ 47 - 0
babyApplication-service/src/main/java/edu/travel/service/impl/BtBodyRecordServiceImpl.java

@@ -0,0 +1,47 @@
+package edu.travel.service.impl;
+
+import edu.travel.service.BtBodyRecordService;
+import org.springframework.stereotype.Service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import edu.travel.mapper.BtBodyRecordMapper;
+import edu.travel.entity.BtBodyRecord;
+
+@Service
+public class BtBodyRecordServiceImpl implements BtBodyRecordService {
+
+    @Autowired
+    private BtBodyRecordMapper btBodyRecordMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return btBodyRecordMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(BtBodyRecord record) {
+        return btBodyRecordMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(BtBodyRecord record) {
+        return btBodyRecordMapper.insertSelective(record);
+    }
+
+    @Override
+    public BtBodyRecord selectByPrimaryKey(Long id) {
+        return btBodyRecordMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(BtBodyRecord record) {
+        return btBodyRecordMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BtBodyRecord record) {
+        return btBodyRecordMapper.updateByPrimaryKey(record);
+    }
+
+}

+ 47 - 0
babyApplication-service/src/main/java/edu/travel/service/impl/BtFeedRecordServiceImpl.java

@@ -0,0 +1,47 @@
+package edu.travel.service.impl;
+
+import edu.travel.service.BtFeedRecordService;
+import org.springframework.stereotype.Service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import edu.travel.entity.BtFeedRecord;
+import edu.travel.mapper.BtFeedRecordMapper;
+
+@Service
+public class BtFeedRecordServiceImpl implements BtFeedRecordService {
+
+    @Autowired
+    private BtFeedRecordMapper btFeedRecordMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return btFeedRecordMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(BtFeedRecord record) {
+        return btFeedRecordMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(BtFeedRecord record) {
+        return btFeedRecordMapper.insertSelective(record);
+    }
+
+    @Override
+    public BtFeedRecord selectByPrimaryKey(Long id) {
+        return btFeedRecordMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(BtFeedRecord record) {
+        return btFeedRecordMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BtFeedRecord record) {
+        return btFeedRecordMapper.updateByPrimaryKey(record);
+    }
+
+}

+ 47 - 0
babyApplication-service/src/main/java/edu/travel/service/impl/BtMessageServiceImpl.java

@@ -0,0 +1,47 @@
+package edu.travel.service.impl;
+
+import edu.travel.service.BtMessageService;
+import org.springframework.stereotype.Service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import edu.travel.entity.BtMessage;
+import edu.travel.mapper.BtMessageMapper;
+
+@Service
+public class BtMessageServiceImpl implements BtMessageService {
+
+    @Autowired
+    private BtMessageMapper btMessageMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return btMessageMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(BtMessage record) {
+        return btMessageMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(BtMessage record) {
+        return btMessageMapper.insertSelective(record);
+    }
+
+    @Override
+    public BtMessage selectByPrimaryKey(Long id) {
+        return btMessageMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(BtMessage record) {
+        return btMessageMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BtMessage record) {
+        return btMessageMapper.updateByPrimaryKey(record);
+    }
+
+}

+ 47 - 0
babyApplication-service/src/main/java/edu/travel/service/impl/MtFavoriteSongsServiceImpl.java

@@ -0,0 +1,47 @@
+package edu.travel.service.impl;
+
+import edu.travel.service.MtFavoriteSongsService;
+import org.springframework.stereotype.Service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import edu.travel.mapper.MtFavoriteSongsMapper;
+import edu.travel.entity.MtFavoriteSongs;
+
+@Service
+public class MtFavoriteSongsServiceImpl implements MtFavoriteSongsService {
+
+    @Autowired
+    private MtFavoriteSongsMapper mtFavoriteSongsMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return mtFavoriteSongsMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(MtFavoriteSongs record) {
+        return mtFavoriteSongsMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(MtFavoriteSongs record) {
+        return mtFavoriteSongsMapper.insertSelective(record);
+    }
+
+    @Override
+    public MtFavoriteSongs selectByPrimaryKey(Long id) {
+        return mtFavoriteSongsMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(MtFavoriteSongs record) {
+        return mtFavoriteSongsMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(MtFavoriteSongs record) {
+        return mtFavoriteSongsMapper.updateByPrimaryKey(record);
+    }
+
+}

+ 47 - 0
babyApplication-service/src/main/java/edu/travel/service/impl/MtRelativeRolesServiceImpl.java

@@ -0,0 +1,47 @@
+package edu.travel.service.impl;
+
+import edu.travel.service.MtRelativeRolesService;
+import org.springframework.stereotype.Service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import edu.travel.mapper.MtRelativeRolesMapper;
+import edu.travel.entity.MtRelativeRoles;
+
+@Service
+public class MtRelativeRolesServiceImpl implements MtRelativeRolesService {
+
+    @Autowired
+    private MtRelativeRolesMapper mtRelativeRolesMapper;
+
+    @Override
+    public int deleteByPrimaryKey(Long id) {
+        return mtRelativeRolesMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public int insert(MtRelativeRoles record) {
+        return mtRelativeRolesMapper.insert(record);
+    }
+
+    @Override
+    public int insertSelective(MtRelativeRoles record) {
+        return mtRelativeRolesMapper.insertSelective(record);
+    }
+
+    @Override
+    public MtRelativeRoles selectByPrimaryKey(Long id) {
+        return mtRelativeRolesMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(MtRelativeRoles record) {
+        return mtRelativeRolesMapper.updateByPrimaryKeySelective(record);
+    }
+
+    @Override
+    public int updateByPrimaryKey(MtRelativeRoles record) {
+        return mtRelativeRolesMapper.updateByPrimaryKey(record);
+    }
+
+}

+ 2 - 3
babyApplication-web/src/main/java/edu/travel/config/SecurityConfig.java

@@ -57,9 +57,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .authorizeRequests()
                 // 允许匿名访问
                 .antMatchers(
-                        "/happyEntry/**",
-                        "/uploadFile/**"
-                        ).anonymous()
+                        "/baby/login/**"
+                        ).permitAll()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

+ 4 - 6
babyApplication-web/src/main/java/edu/travel/controller/LoginController.java

@@ -2,11 +2,9 @@ package edu.travel.controller;
 
 import edu.travel.dto.LoginDto;
 import edu.travel.dto.SendSmsDto;
-import edu.travel.entity.AccountInfo;
-import edu.travel.entity.BtAccountInfo;
 import edu.travel.resp.BaseResponse;
 import edu.travel.service.BtAccountInfoService;
-import org.springframework.security.core.userdetails.UserDetailsService;
+import edu.travel.vo.BtAccountInfoVo;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -31,15 +29,15 @@ public class LoginController {
      * @return
      */
     @PostMapping("/doLogin")
-    public BaseResponse<BtAccountInfo> doLogin(LoginDto loginDto) {
+    public BaseResponse<BtAccountInfoVo> doLogin(@RequestBody LoginDto loginDto) {
         return new BaseResponse<>(200,"登陆成功",btAccountInfoService.doLogin(loginDto)) ;
     }
 
     /**
      * 发送手机验证码
      */
-    @GetMapping("/sendSms")
-    public BaseResponse<String> sendSms(SendSmsDto sendSmsDto) {
+    @PostMapping("/sendSms")
+    public BaseResponse<String> sendSms(@RequestBody SendSmsDto sendSmsDto) {
         btAccountInfoService.sendSms(sendSmsDto);
         return new BaseResponse<>(200,"发送成功",null) ;
     }

+ 9 - 0
babyApplication-web/src/main/java/edu/travel/filter/LoginFilter.java

@@ -40,6 +40,15 @@ public class LoginFilter implements Filter {
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         HttpServletResponse response = (HttpServletResponse) servletResponse;
 
+        // 获取请求路径
+        String requestURI = request.getRequestURI();
+
+        // **放行登录相关接口**
+        if (requestURI.startsWith("/baby/login")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
         // 获取 token
         String token = request.getHeader("Authorization");
 

+ 6 - 0
babyApplication-web/src/main/java/edu/travel/filter/TokenAuthenticationFilter.java

@@ -38,6 +38,12 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
+
+        String uri = request.getRequestURI();
+        if (uri.startsWith("/baby/login")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
         // 从请求头获取 token
         String token = request.getHeader("Authorization");