Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetStrawberryPosterLineupService.java

+package com.liquidnet.service.sweet.service;
+
+import com.liquidnet.service.sweet.entity.SweetStrawberryPosterLineup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动选择阵容表 服务类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+public interface ISweetStrawberryPosterLineupService extends IService<SweetStrawberryPosterLineup> {
+
+}

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetStrawberryPosterService.java

+package com.liquidnet.service.sweet.service;
+
+import com.liquidnet.service.sweet.entity.SweetStrawberryPoster;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动表 服务类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+public interface ISweetStrawberryPosterService extends IService<SweetStrawberryPoster> {
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetStrawberryPoster.java

+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动表
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetStrawberryPoster implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * poster_id
+     */
+    private String posterId;
+
+    /**
+     * open_id
+     */
+    private String openId;
+
+    /**
+     * union_id
+     */
+    private String unionId;
+
+    /**
+     * 姓名
+     */
+    private String nickname;
+
+    /**
+     * 城市
+     */
+    private String cityName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetStrawberryPosterLineup.java

+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动选择阵容表
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetStrawberryPosterLineup implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * lineup_id
+     */
+    private String lineupId;
+
+    /**
+     * poster_id
+     */
+    private String posterId;
+
+    /**
+     * 阵容编号
+     */
+    private Integer lineupNum;
+
+    /**
+     * 音乐人id
+     */
+    private Integer musicianId;
+
+    /**
+     * 音乐人姓名
+     */
+    private String musicianName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetStrawberryPosterLineupMapper.java

+package com.liquidnet.service.sweet.mapper;
+
+import com.liquidnet.service.sweet.entity.SweetStrawberryPosterLineup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动选择阵容表 Mapper 接口
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+public interface SweetStrawberryPosterLineupMapper extends BaseMapper<SweetStrawberryPosterLineup> {
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetStrawberryPosterMapper.java

+package com.liquidnet.service.sweet.mapper;
+
+import com.liquidnet.service.sweet.entity.SweetStrawberryPoster;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动表 Mapper 接口
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+public interface SweetStrawberryPosterMapper extends BaseMapper<SweetStrawberryPoster> {
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetStrawberryPosterLineupMapper.xml

+<?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.liquidnet.service.sweet.mapper.SweetStrawberryPosterLineupMapper">
+
+</mapper>

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetStrawberryPosterMapper.xml

+<?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.liquidnet.service.sweet.mapper.SweetStrawberryPosterMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/docu/db_20211205.sql

+-- 2021草莓音乐节海报活动表
+drop TABLE if exists `sweet_strawberry_poster`;
+CREATE TABLE `sweet_strawberry_poster`
+(
+    `mid`        bigint unsigned NOT NULL AUTO_INCREMENT,
+    `poster_id`  varchar(255)    NOT NULL DEFAULT '' COMMENT 'poster_id',
+    `open_id`    varchar(255)    NOT NULL DEFAULT '' COMMENT 'open_id',
+    `union_id`   varchar(200)    NOT NULL DEFAULT '' COMMENT 'union_id',
+    `nickname`   varchar(255)    NOT NULL DEFAULT '' COMMENT '姓名',
+    `city_name`  varchar(255)    NOT NULL DEFAULT '' COMMENT '城市',
+    `created_at` datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at` datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_poster_id` (`poster_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '2021草莓音乐节海报活动表';
+
+-- 2021草莓音乐节海报活动选择阵容表
+drop TABLE if exists `sweet_strawberry_poster_lineup`;
+CREATE TABLE `sweet_strawberry_poster_lineup`
+(
+    `mid`           bigint unsigned NOT NULL AUTO_INCREMENT,
+    `lineup_id`     varchar(255)    NOT NULL DEFAULT '' COMMENT 'lineup_id',
+    `poster_id`     varchar(255)    NOT NULL DEFAULT '' COMMENT 'poster_id',
+    `lineup_num`    int             NOT NULL DEFAULT 0 COMMENT '阵容编号',
+    `musician_id`   int             NOT NULL DEFAULT 0 COMMENT '音乐人id',
+    `musician_name` varchar(255)    NOT NULL DEFAULT '' COMMENT '音乐人姓名',
+    `created_at`    datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`    datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_lineup_id` (`lineup_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '2021草莓音乐节海报活动选择阵容表';
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/JxlMybatisPlusCodeGenerator.java

@@ -89,13 +89,13 @@ public class JxlMybatisPlusCodeGenerator {
         DataSourceConfig dsc = new DataSourceConfig();
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUrl("jdbc:mysql://39.106.122.201:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
+        dsc.setUrl("jdbc:mysql://39.107.71.112:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
         dsc.setUsername("testmall");
         dsc.setPassword("zhengzai!mYT");
 
         String resourcePath = "/Users/jiangxiulong/Downloads/tmp";
         String directory = "com.liquidnet.service.sweet";
-        String[] dbTableArray = new String[]{"sweet_applet_user"};
+        String[] dbTableArray = new String[]{"sweet_strawberry_poster","sweet_strawberry_poster_lineup"};
 
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetStrawberryPosterController.java

+package com.liquidnet.service.sweet.controller;
+
+
+import com.liquidnet.service.sweet.service.ISweetStrawberryPosterService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动表 前端控制器
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+@Api(tags = "活动-2021草莓音乐节海报")
+@RestController
+@RequestMapping("/strawberryPoster")
+public class SweetStrawberryPosterController {
+
+    @Autowired
+    private ISweetStrawberryPosterService posterService;
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStrawberryPosterLineupServiceImpl.java

+package com.liquidnet.service.sweet.service.impl;
+
+import com.liquidnet.service.sweet.entity.SweetStrawberryPosterLineup;
+import com.liquidnet.service.sweet.mapper.SweetStrawberryPosterLineupMapper;
+import com.liquidnet.service.sweet.service.ISweetStrawberryPosterLineupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动选择阵容表 服务实现类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+@Service
+public class SweetStrawberryPosterLineupServiceImpl extends ServiceImpl<SweetStrawberryPosterLineupMapper, SweetStrawberryPosterLineup> implements ISweetStrawberryPosterLineupService {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStrawberryPosterServiceImpl.java

+package com.liquidnet.service.sweet.service.impl;
+
+import com.liquidnet.service.sweet.entity.SweetStrawberryPoster;
+import com.liquidnet.service.sweet.mapper.SweetStrawberryPosterMapper;
+import com.liquidnet.service.sweet.service.ISweetStrawberryPosterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 2021草莓音乐节海报活动表 服务实现类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-11-25
+ */
+@Service
+public class SweetStrawberryPosterServiceImpl extends ServiceImpl<SweetStrawberryPosterMapper, SweetStrawberryPoster> implements ISweetStrawberryPosterService {
+
+}