(improvement)(launchers) Demo data initialization optimization (#1015)

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/DatabaseDO.java

@@ -1,11 +1,19 @@
 package com.tencent.supersonic.headless.server.persistence.dataobject;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.util.Date;
 
+@Data
+@TableName("s2_database")
 public class DatabaseDO {
     /**
      * 
      */
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/mapper/DatabaseDOMapper.java

@@ -1,71 +1,11 @@
 package com.tencent.supersonic.headless.server.persistence.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO;
-import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDOExample;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
-public interface DatabaseDOMapper {
-    /**
-     *
-     * @mbg.generated
-     */
-    long countByExample(DatabaseDOExample example);
+public interface DatabaseDOMapper extends BaseMapper<DatabaseDO> {
 
-    /**
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int insert(DatabaseDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int insertSelective(DatabaseDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    List<DatabaseDO> selectByExampleWithBLOBs(DatabaseDOExample example);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    List<DatabaseDO> selectByExample(DatabaseDOExample example);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    DatabaseDO selectByPrimaryKey(Long id);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(DatabaseDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeyWithBLOBs(DatabaseDO record);
-
-    /**
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(DatabaseDO record);
 }

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/DatabaseRepository.java

@@ -1,18 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.repository;
-
-import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO;
-
-import java.util.List;
-
-public interface DatabaseRepository {
-
-    void createDatabase(DatabaseDO databaseDO);
-
-    void updateDatabase(DatabaseDO databaseDO);
-
-    DatabaseDO getDatabase(Long id);
-
-    List<DatabaseDO> getDatabaseList();
-
-    void deleteDatabase(Long id);
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DatabaseRepositoryImpl.java

@@ -1,48 +0,0 @@
-package com.tencent.supersonic.headless.server.persistence.repository.impl;
-
-import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO;
-import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDOExample;
-import com.tencent.supersonic.headless.server.persistence.mapper.DatabaseDOMapper;
-import com.tencent.supersonic.headless.server.persistence.repository.DatabaseRepository;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-@Component
-public class DatabaseRepositoryImpl implements DatabaseRepository {
-
-
-    private DatabaseDOMapper databaseDOMapper;
-
-
-    public DatabaseRepositoryImpl(DatabaseDOMapper databaseDOMapper) {
-        this.databaseDOMapper = databaseDOMapper;
-    }
-
-    @Override
-    public void createDatabase(DatabaseDO databaseDO) {
-        databaseDOMapper.insert(databaseDO);
-    }
-
-    @Override
-    public void updateDatabase(DatabaseDO databaseDO) {
-        databaseDOMapper.updateByPrimaryKeyWithBLOBs(databaseDO);
-    }
-
-    @Override
-    public DatabaseDO getDatabase(Long id) {
-        return databaseDOMapper.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public List<DatabaseDO> getDatabaseList() {
-        return databaseDOMapper.selectByExampleWithBLOBs(new DatabaseDOExample());
-    }
-
-    @Override
-    public void deleteDatabase(Long id) {
-        databaseDOMapper.deleteByPrimaryKey(id);
-    }
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.headless.server.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq;
@@ -14,7 +15,7 @@ import com.tencent.supersonic.headless.core.utils.JdbcDataSourceUtils;
 import com.tencent.supersonic.headless.core.utils.SqlUtils;
 import com.tencent.supersonic.headless.core.utils.SqlVariableParseUtils;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO;
-import com.tencent.supersonic.headless.server.persistence.repository.DatabaseRepository;
+import com.tencent.supersonic.headless.server.persistence.mapper.DatabaseDOMapper;
 import com.tencent.supersonic.headless.server.pojo.DatabaseParameter;
 import com.tencent.supersonic.headless.server.pojo.DbParameterFactory;
 import com.tencent.supersonic.headless.server.pojo.ModelFilter;
@@ -22,6 +23,7 @@ import com.tencent.supersonic.headless.server.service.DatabaseService;
 import com.tencent.supersonic.headless.server.service.ModelService;
 import com.tencent.supersonic.headless.server.utils.DatabaseConverter;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -34,20 +36,16 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class DatabaseServiceImpl implements DatabaseService {
+public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseDO>
+        implements DatabaseService {
 
-    private final SqlUtils sqlUtils;
-    private DatabaseRepository databaseRepository;
+    @Autowired
+    private SqlUtils sqlUtils;
+
+    @Lazy
+    @Autowired
     private ModelService datasourceService;
 
-    public DatabaseServiceImpl(DatabaseRepository databaseRepository,
-            SqlUtils sqlUtils,
-            @Lazy ModelService datasourceService) {
-        this.databaseRepository = databaseRepository;
-        this.sqlUtils = sqlUtils;
-        this.datasourceService = datasourceService;
-    }
-
     @Override
     public boolean testConnect(DatabaseReq databaseReq, User user) {
         Database database = DatabaseConverter.convert(databaseReq);
@@ -61,21 +59,19 @@ public class DatabaseServiceImpl implements DatabaseService {
         if (databaseDO != null) {
             database.updatedBy(user.getName());
             DatabaseConverter.convert(database, databaseDO);
-            databaseRepository.updateDatabase(databaseDO);
+            updateById(databaseDO);
             return DatabaseConverter.convertWithPassword(databaseDO);
         }
         database.createdBy(user.getName());
         databaseDO = DatabaseConverter.convert(database);
-        databaseRepository.createDatabase(databaseDO);
+        save(databaseDO);
         return DatabaseConverter.convertWithPassword(databaseDO);
     }
 
     @Override
     public List<DatabaseResp> getDatabaseList(User user) {
-        List<DatabaseResp> databaseResps =
-                databaseRepository.getDatabaseList()
-                        .stream().map(DatabaseConverter::convert)
-                        .collect(Collectors.toList());
+        List<DatabaseResp> databaseResps = list().stream().map(DatabaseConverter::convert)
+                .collect(Collectors.toList());
         fillPermission(databaseResps, user);
         return databaseResps;
     }
@@ -107,12 +103,12 @@ public class DatabaseServiceImpl implements DatabaseService {
             String message = String.format("该数据库被模型%s使用，无法删除", datasourceNames);
             throw new RuntimeException(message);
         }
-        databaseRepository.deleteDatabase(databaseId);
+        removeById(databaseId);
     }
 
     @Override
     public DatabaseResp getDatabase(Long id) {
-        DatabaseDO databaseDO = databaseRepository.getDatabase(id);
+        DatabaseDO databaseDO = getById(id);
         return DatabaseConverter.convertWithPassword(databaseDO);
     }
 
@@ -156,7 +152,7 @@ public class DatabaseServiceImpl implements DatabaseService {
     }
 
     private DatabaseDO getDatabaseDO(Long id) {
-        return databaseRepository.getDatabase(id);
+        return getById(id);
     }
 
     @Override

headless/server/src/main/resources/mapper/DatabaseDOMapper.xml

@@ -1,266 +0,0 @@
-<?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.tencent.supersonic.headless.server.persistence.mapper.DatabaseDOMapper">
-  <resultMap id="BaseResultMap" type="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="version" jdbcType="VARCHAR" property="version" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
-    <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
-    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
-    <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
-    <result column="admin" jdbcType="VARCHAR" property="admin" />
-    <result column="viewer" jdbcType="VARCHAR" property="viewer" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    <result column="config" jdbcType="LONGVARCHAR" property="config" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, description, version, type, created_at, created_by, updated_at, updated_by,
-    admin, viewer
-  </sql>
-  <sql id="Blob_Column_List">
-    config
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDOExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from s2_database
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDOExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from s2_database
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-    <if test="limitStart != null and limitStart>=0">
-      limit #{limitStart} , #{limitEnd}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
-    select
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from s2_database
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from s2_database
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    insert into s2_database (id, name, description,
-                             version, type, created_at,
-                             created_by, updated_at, updated_by,
-                             admin, viewer, config
-    )
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR},
-            #{version,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
-            #{createdBy,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR},
-            #{admin,jdbcType=VARCHAR}, #{viewer,jdbcType=VARCHAR}, #{config,jdbcType=LONGVARCHAR}
-           )
-  </insert>
-  <insert id="insertSelective" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    insert into s2_database
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="version != null">
-        version,
-      </if>
-      <if test="type != null">
-        type,
-      </if>
-      <if test="createdAt != null">
-        created_at,
-      </if>
-      <if test="createdBy != null">
-        created_by,
-      </if>
-      <if test="updatedAt != null">
-        updated_at,
-      </if>
-      <if test="updatedBy != null">
-        updated_by,
-      </if>
-      <if test="admin != null">
-        admin,
-      </if>
-      <if test="viewer != null">
-        viewer,
-      </if>
-      <if test="config != null">
-        config,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="version != null">
-        #{version,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="createdAt != null">
-        #{createdAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdBy != null">
-        #{createdBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updatedAt != null">
-        #{updatedAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updatedBy != null">
-        #{updatedBy,jdbcType=VARCHAR},
-      </if>
-      <if test="admin != null">
-        #{admin,jdbcType=VARCHAR},
-      </if>
-      <if test="viewer != null">
-        #{viewer,jdbcType=VARCHAR},
-      </if>
-      <if test="config != null">
-        #{config,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDOExample" resultType="java.lang.Long">
-    select count(*) from s2_database
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    update s2_database
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="version != null">
-        version = #{version,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        type = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="createdAt != null">
-        created_at = #{createdAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="createdBy != null">
-        created_by = #{createdBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updatedAt != null">
-        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updatedBy != null">
-        updated_by = #{updatedBy,jdbcType=VARCHAR},
-      </if>
-      <if test="admin != null">
-        admin = #{admin,jdbcType=VARCHAR},
-      </if>
-      <if test="viewer != null">
-        viewer = #{viewer,jdbcType=VARCHAR},
-      </if>
-      <if test="config != null">
-        config = #{config,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    update s2_database
-    set name = #{name,jdbcType=VARCHAR},
-        description = #{description,jdbcType=VARCHAR},
-        version = #{version,jdbcType=VARCHAR},
-        type = #{type,jdbcType=VARCHAR},
-        created_at = #{createdAt,jdbcType=TIMESTAMP},
-        created_by = #{createdBy,jdbcType=VARCHAR},
-        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-        updated_by = #{updatedBy,jdbcType=VARCHAR},
-        admin = #{admin,jdbcType=VARCHAR},
-        viewer = #{viewer,jdbcType=VARCHAR},
-        config = #{config,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO">
-    update s2_database
-    set name = #{name,jdbcType=VARCHAR},
-        description = #{description,jdbcType=VARCHAR},
-        version = #{version,jdbcType=VARCHAR},
-        type = #{type,jdbcType=VARCHAR},
-        created_at = #{createdAt,jdbcType=TIMESTAMP},
-        created_by = #{createdBy,jdbcType=VARCHAR},
-        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-        updated_by = #{updatedBy,jdbcType=VARCHAR},
-        admin = #{admin,jdbcType=VARCHAR},
-        viewer = #{viewer,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>