[type:fix] fix db (#116)

* [type:fix] fix db

* [type:fix] fix db

Author: moremind

internal/core/openapi/dictionary.go

@@ -94,7 +94,8 @@ func (openapi *Openapi) createDictionary(ginCtx *gin.Context) {
 		dictionary := entity.Dictionary{
 			UserId:       dictParams.UserId,
 			ScopeSpaceId: dictParams.ScopeSpaceId,
-			DictKey:      dictParams.DictKey + "@" + dictParams.Version,
+			DictKey:      dictParams.DictKey,
+			Version:      dictParams.Version,
 			DictValue:    dictParams.DictValue,
 			State:        dictParams.State,
 			CreatedAt:    time.Now(),

internal/core/storage/xml/scopespace_mapper.xml

@@ -23,6 +23,7 @@
         SELECT <include refid="columns_id"> </include> FROM scopespace
         <where>
             <if test="{ScopeSpace.id} != nil and {ScopeSpace.id} != 0">AND id = #{ScopeSpace.id} </if>
+            <if test="{ScopeSpace.user_id} != nil and {ScopeSpace.user_id} != 0">AND user_id = #{ScopeSpace.user_id} </if>
             <if test="{ScopeSpace.name} != nil">AND name = #{ScopeSpace.name} </if>
             <if test="{ScopeSpace.note} != nil">AND note = #{ScopeSpace.note} </if>
             <if test="{ScopeSpace.state} != nil">AND state = #{ScopeSpace.state} </if>
@@ -35,6 +36,7 @@
         SELECT COUNT(*) FROM scopespace
         <where>
             <if test="{ScopeSpace.id} != nil and {ScopeSpace.id} != 0">AND id = #{ScopeSpace.id} </if>
+            <if test="{ScopeSpace.user_id} != nil and {ScopeSpace.user_id} != 0">AND user_id = #{ScopeSpace.user_id} </if>
             <if test="{ScopeSpace.name} != nil">AND name = #{ScopeSpace.name} </if>
             <if test="{ScopeSpace.note} != nil">AND note = #{ScopeSpace.note} </if>
             <if test="{ScopeSpace.state} != nil">AND state = #{ScopeSpace.state} </if>
@@ -44,9 +46,10 @@
     </select>
 
     <insert id="insertScopeSpace">
-        INSERT INTO scopespace (id,name,note,state,created_at,updated_at)
+        INSERT INTO scopespace (id,user_id,name,note,state,created_at,updated_at)
         VALUES(
         #{ScopeSpace.id},
+        #{ScopeSpace.user_id},
         #{ScopeSpace.name},
         #{ScopeSpace.note},
         #{ScopeSpace.state},
@@ -56,10 +59,10 @@
     </insert>
 
     <insert id="insertBatchScopeSpace">
-        INSERT INTO scopespace (id,name,note,state,created_at,updated_at)
+        INSERT INTO scopespace (id,user_id,name,note,state,created_at,updated_at)
         VALUES
         <foreach item="item" index="index" collection="{0}" open="" separator="," close="">
-            (#{item.ScopeSpace.id},#{item.ScopeSpace.name},#{item.ScopeSpace.note},#{item.ScopeSpace.state},#{item.ScopeSpace.created_at},#{item.ScopeSpace.updated_at})
+            (#{item.ScopeSpace.id},#{item.ScopeSpace.user_id},#{item.ScopeSpace.name},#{item.ScopeSpace.note},#{item.ScopeSpace.state},#{item.ScopeSpace.created_at},#{item.ScopeSpace.updated_at})
         </foreach>
     </insert>
 
@@ -95,6 +98,7 @@
         DELETE FROM scopespace
         <where>
             <if test="{ScopeSpace.id} != nil and {ScopeSpace.id} != 0">AND id = #{ScopeSpace.id} </if>
+            <if test="{ScopeSpace.user_id} != nil and {ScopeSpace.user_id} != 0">AND user_id = #{ScopeSpace.user_id} </if>
             <if test="{ScopeSpace.name} != nil">AND name = #{ScopeSpace.name} </if>
             <if test="{ScopeSpace.note} != nil">AND note = #{ScopeSpace.note} </if>
             <if test="{ScopeSpace.state} != nil">AND state = #{ScopeSpace.state} </if>

internal/pkg/entity/scopespace.go

@@ -23,10 +23,11 @@ import (
 
 type ScopeSpace struct {
 	//TableName gobatis.TableName `scopespace`
-	Id        int       `column:"id"`
-	Name      string    `column:"name"`
-	Note      string    `column:"note"`
-	State     string    `column:"state"`
-	CreatedAt time.Time `column:"created_at"`
-	UpdatedAt time.Time `column:"updated_at"`
+	Id        int       `column:"id" json:"id"`
+	UserId    int       `column:"user_id" json:"userId"`
+	Name      string    `column:"name" json:"name"`
+	Note      string    `column:"note" json:"note"`
+	State     string    `column:"state" json:"state"`
+	CreatedAt time.Time `column:"created_at" json:"createdAt"`
+	UpdatedAt time.Time `column:"updated_at" json:"updatedAt"`
 }