Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-store
Commits
0bc7a7b9
Commit
0bc7a7b9
authored
Feb 01, 2021
by
zhiwj
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/base_platform_enterprise/gic-store
into developer
parents
a0c22666
3a2fbd8e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
372 additions
and
31 deletions
+372
-31
StoreWidgetDTO.java
...e-api/src/main/java/com/gic/store/dto/StoreWidgetDTO.java
+121
-2
StoreWidgetLogDTO.java
...pi/src/main/java/com/gic/store/dto/StoreWidgetLogDTO.java
+32
-2
StoreWidgetLogSaveDTO.java
...rc/main/java/com/gic/store/dto/StoreWidgetLogSaveDTO.java
+32
-2
TabStoreWidget.java
...ce/src/main/java/com/gic/store/entity/TabStoreWidget.java
+57
-0
TabStoreWidgetLog.java
...src/main/java/com/gic/store/entity/TabStoreWidgetLog.java
+31
-2
StoreWidgetServiceImpl.java
...va/com/gic/store/service/impl/StoreWidgetServiceImpl.java
+4
-6
StoreWidgetApiServiceImpl.java
...c/store/service/outer/impl/StoreWidgetApiServiceImpl.java
+15
-5
StoreWidgetLogApiServiceImpl.java
...tore/service/outer/impl/StoreWidgetLogApiServiceImpl.java
+2
-1
StoreWidgetLogUtils.java
.../java/com/gic/store/utils/widget/StoreWidgetLogUtils.java
+0
-0
TabStoreWidgetLogMapper.xml
...ice/src/main/resources/mapper/TabStoreWidgetLogMapper.xml
+27
-7
TabStoreWidgetMapper.xml
...ervice/src/main/resources/mapper/TabStoreWidgetMapper.xml
+51
-4
No files found.
gic-store-api/src/main/java/com/gic/store/dto/StoreWidgetDTO.java
View file @
0bc7a7b9
...
...
@@ -19,19 +19,57 @@ public class StoreWidgetDTO implements Serializable {
private
Integer
storeWidgetId
;
/**
*
*
后端需要的条件筛选数据
*/
private
String
searchParam
;
/**
*
*
现在弃用
*/
private
String
writeBackParam
;
/**
* 后端需要的权限筛选数据
*/
private
String
authSearchParam
;
private
Integer
authMode
=
1
;
/**
* 前端需要字段(条件筛选)
*/
private
String
screenDetailData
;
/**
* 前端需要字段(条件筛选)
*/
private
String
screenSimpleData
;
/**
* 前端需要字段(权限筛选)
*/
private
String
authScreenDetailData
;
/**
* 前端需要字段(权限筛选)
*/
private
String
authScreenSimpleData
;
/**
* 新增选择器的场景,默认场景是1,表示storeWidgetId传过来,也是新增操作。
*/
private
Integer
saveScreen
=
1
;
/**
* 操作人ID
*/
private
Integer
userId
;
/**
* 操作类型:权限范围变更/条件筛选(走不同的接口)
*/
private
boolean
isAuthChangeType
;
public
Integer
getStoreWidgetId
()
{
return
storeWidgetId
;
}
...
...
@@ -72,6 +110,80 @@ public class StoreWidgetDTO implements Serializable {
this
.
authMode
=
authMode
;
}
public
String
getScreenDetailData
()
{
return
screenDetailData
;
}
public
StoreWidgetDTO
setScreenDetailData
(
String
screenDetailData
)
{
this
.
screenDetailData
=
screenDetailData
;
return
this
;
}
public
String
getScreenSimpleData
()
{
return
screenSimpleData
;
}
public
StoreWidgetDTO
setScreenSimpleData
(
String
screenSimpleData
)
{
this
.
screenSimpleData
=
screenSimpleData
;
return
this
;
}
public
String
getAuthScreenDetailData
()
{
return
authScreenDetailData
;
}
public
StoreWidgetDTO
setAuthScreenDetailData
(
String
authScreenDetailData
)
{
this
.
authScreenDetailData
=
authScreenDetailData
;
return
this
;
}
public
String
getAuthScreenSimpleData
()
{
return
authScreenSimpleData
;
}
public
StoreWidgetDTO
setAuthScreenSimpleData
(
String
authScreenSimpleData
)
{
this
.
authScreenSimpleData
=
authScreenSimpleData
;
return
this
;
}
public
Integer
getSaveScreen
()
{
return
saveScreen
;
}
public
StoreWidgetDTO
setSaveScreen
(
Integer
saveScreen
)
{
this
.
saveScreen
=
saveScreen
;
return
this
;
}
/**
* 总是新增操作场景
* @return
*/
public
boolean
isNewOperation
()
{
if
(
saveScreen
!=
null
&&
saveScreen
==
1
)
{
return
true
;
}
return
false
;
}
public
Integer
getUserId
()
{
return
userId
;
}
public
StoreWidgetDTO
setUserId
(
Integer
userId
)
{
this
.
userId
=
userId
;
return
this
;
}
public
boolean
isAuthChangeType
()
{
return
isAuthChangeType
;
}
public
StoreWidgetDTO
setAuthChangeType
(
boolean
authChangeType
)
{
isAuthChangeType
=
authChangeType
;
return
this
;
}
@Override
public
String
toString
()
{
return
"StoreWidgetDTO{"
+
...
...
@@ -80,6 +192,12 @@ public class StoreWidgetDTO implements Serializable {
", writeBackParam='"
+
writeBackParam
+
'\''
+
", authSearchParam='"
+
authSearchParam
+
'\''
+
", authMode="
+
authMode
+
", screenDetailData='"
+
screenDetailData
+
'\''
+
", screenSimpleData='"
+
screenSimpleData
+
'\''
+
", authScreenDetailData='"
+
authScreenDetailData
+
'\''
+
", authScreenSimpleData='"
+
authScreenSimpleData
+
'\''
+
", saveScreen="
+
saveScreen
+
", userId="
+
userId
+
'}'
;
}
}
\ No newline at end of file
gic-store-api/src/main/java/com/gic/store/dto/StoreWidgetLogDTO.java
View file @
0bc7a7b9
...
...
@@ -39,16 +39,26 @@ public class StoreWidgetLogDTO implements Serializable{
private
String
searchParamAfter
;
/**
* 更新前的筛选条件/权限范围 解析内容冗余
* 更新前的筛选条件/权限范围 解析内容冗余
。前端需要
*/
private
String
searchParamTextBefore
;
/**
* 更新后的筛选条件/权限范围 解析内容冗余
* 更新后的筛选条件/权限范围 解析内容冗余
。前端需要
*/
private
String
searchParamTextAfter
;
/**
* 新前的筛选范围/权限范围。前端需要
*/
private
String
searchParamSimpleBefore
;
/**
* 更新后的筛选范围/权限范围。前端需要
*/
private
String
searchParamSimpleAfter
;
/**
* 1:变更权限范围 2:编辑筛选条件
*/
private
Integer
logType
;
...
...
@@ -237,6 +247,24 @@ public class StoreWidgetLogDTO implements Serializable{
return
this
;
}
public
String
getSearchParamSimpleBefore
()
{
return
searchParamSimpleBefore
;
}
public
StoreWidgetLogDTO
setSearchParamSimpleBefore
(
String
searchParamSimpleBefore
)
{
this
.
searchParamSimpleBefore
=
searchParamSimpleBefore
;
return
this
;
}
public
String
getSearchParamSimpleAfter
()
{
return
searchParamSimpleAfter
;
}
public
StoreWidgetLogDTO
setSearchParamSimpleAfter
(
String
searchParamSimpleAfter
)
{
this
.
searchParamSimpleAfter
=
searchParamSimpleAfter
;
return
this
;
}
@Override
public
String
toString
()
{
return
"StoreWidgetLogDTO{"
+
...
...
@@ -247,6 +275,8 @@ public class StoreWidgetLogDTO implements Serializable{
", searchParamAfter='"
+
searchParamAfter
+
'\''
+
", searchParamTextBefore='"
+
searchParamTextBefore
+
'\''
+
", searchParamTextAfter='"
+
searchParamTextAfter
+
'\''
+
", searchParamSimpleBefore='"
+
searchParamSimpleBefore
+
'\''
+
", searchParamSimpleAfter='"
+
searchParamSimpleAfter
+
'\''
+
", logType="
+
logType
+
", operationType="
+
operationType
+
", operationId="
+
operationId
+
...
...
gic-store-api/src/main/java/com/gic/store/dto/StoreWidgetLogSaveDTO.java
View file @
0bc7a7b9
...
...
@@ -32,16 +32,26 @@ public class StoreWidgetLogSaveDTO implements Serializable{
private
String
searchParamAfter
;
/**
* 更新前的筛选条件/权限范围 解析内容冗余
* 更新前的筛选条件/权限范围 解析内容冗余
。前端需要
*/
private
String
searchParamTextBefore
;
/**
* 更新后的筛选条件/权限范围 解析内容冗余
* 更新后的筛选条件/权限范围 解析内容冗余
。前端需要
*/
private
String
searchParamTextAfter
;
/**
* 新前的筛选范围/权限范围。前端需要
*/
private
String
searchParamSimpleBefore
;
/**
* 更新后的筛选范围/权限范围。前端需要
*/
private
String
searchParamSimpleAfter
;
/**
* 1:变更权限范围 2:编辑筛选条件
*/
private
Integer
logType
;
...
...
@@ -137,6 +147,24 @@ public class StoreWidgetLogSaveDTO implements Serializable{
return
this
;
}
public
String
getSearchParamSimpleBefore
()
{
return
searchParamSimpleBefore
;
}
public
StoreWidgetLogSaveDTO
setSearchParamSimpleBefore
(
String
searchParamSimpleBefore
)
{
this
.
searchParamSimpleBefore
=
searchParamSimpleBefore
;
return
this
;
}
public
String
getSearchParamSimpleAfter
()
{
return
searchParamSimpleAfter
;
}
public
StoreWidgetLogSaveDTO
setSearchParamSimpleAfter
(
String
searchParamSimpleAfter
)
{
this
.
searchParamSimpleAfter
=
searchParamSimpleAfter
;
return
this
;
}
@Override
public
String
toString
()
{
return
"StoreWidgetLogSaveDTO{"
+
...
...
@@ -146,6 +174,8 @@ public class StoreWidgetLogSaveDTO implements Serializable{
", searchParamAfter='"
+
searchParamAfter
+
'\''
+
", searchParamTextBefore='"
+
searchParamTextBefore
+
'\''
+
", searchParamTextAfter='"
+
searchParamTextAfter
+
'\''
+
", searchParamSimpleBefore='"
+
searchParamSimpleBefore
+
'\''
+
", searchParamSimpleAfter='"
+
searchParamSimpleAfter
+
'\''
+
", logType="
+
logType
+
", operationId="
+
operationId
+
", operationType="
+
operationType
+
...
...
gic-store-service/src/main/java/com/gic/store/entity/TabStoreWidget.java
View file @
0bc7a7b9
...
...
@@ -50,6 +50,26 @@ public class TabStoreWidget {
*/
private
String
writeBackParam
;
/**
* 前端需要字段(条件筛选)
*/
private
String
screenDetailData
;
/**
* 前端需要字段(条件筛选)
*/
private
String
screenSimpleData
;
/**
* 前端需要字段(权限筛选)
*/
private
String
authScreenDetailData
;
/**
* 前端需要字段(权限筛选)
*/
private
String
authScreenSimpleData
;
public
Integer
getStoreWidgetId
()
{
return
storeWidgetId
;
}
...
...
@@ -113,4 +133,40 @@ public class TabStoreWidget {
public
void
setAuthMode
(
Integer
authMode
)
{
this
.
authMode
=
authMode
;
}
public
String
getScreenDetailData
()
{
return
screenDetailData
;
}
public
TabStoreWidget
setScreenDetailData
(
String
screenDetailData
)
{
this
.
screenDetailData
=
screenDetailData
;
return
this
;
}
public
String
getScreenSimpleData
()
{
return
screenSimpleData
;
}
public
TabStoreWidget
setScreenSimpleData
(
String
screenSimpleData
)
{
this
.
screenSimpleData
=
screenSimpleData
;
return
this
;
}
public
String
getAuthScreenDetailData
()
{
return
authScreenDetailData
;
}
public
TabStoreWidget
setAuthScreenDetailData
(
String
authScreenDetailData
)
{
this
.
authScreenDetailData
=
authScreenDetailData
;
return
this
;
}
public
String
getAuthScreenSimpleData
()
{
return
authScreenSimpleData
;
}
public
TabStoreWidget
setAuthScreenSimpleData
(
String
authScreenSimpleData
)
{
this
.
authScreenSimpleData
=
authScreenSimpleData
;
return
this
;
}
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/entity/TabStoreWidgetLog.java
View file @
0bc7a7b9
...
...
@@ -36,16 +36,26 @@ public class TabStoreWidgetLog {
private
String
searchParamAfter
;
/**
* 更新前的筛选条件/权限范围 解析内容冗余
* 更新前的筛选条件/权限范围 解析内容冗余
。前端需要
*/
private
String
searchParamTextBefore
;
/**
* 更新后的筛选条件/权限范围 解析内容冗余
* 更新后的筛选条件/权限范围 解析内容冗余
。前端需要
*/
private
String
searchParamTextAfter
;
/**
* 新前的筛选范围/权限范围。前端需要
*/
private
String
searchParamSimpleBefore
;
/**
* 更新后的筛选范围/权限范围。前端需要
*/
private
String
searchParamSimpleAfter
;
/**
* 1:变更权限范围 2:编辑筛选条件
*/
private
Integer
logType
;
...
...
@@ -233,4 +243,22 @@ public class TabStoreWidgetLog {
this
.
updateTime
=
updateTime
;
return
this
;
}
public
String
getSearchParamSimpleBefore
()
{
return
searchParamSimpleBefore
;
}
public
TabStoreWidgetLog
setSearchParamSimpleBefore
(
String
searchParamSimpleBefore
)
{
this
.
searchParamSimpleBefore
=
searchParamSimpleBefore
;
return
this
;
}
public
String
getSearchParamSimpleAfter
()
{
return
searchParamSimpleAfter
;
}
public
TabStoreWidgetLog
setSearchParamSimpleAfter
(
String
searchParamSimpleAfter
)
{
this
.
searchParamSimpleAfter
=
searchParamSimpleAfter
;
return
this
;
}
}
\ No newline at end of file
gic-store-service/src/main/java/com/gic/store/service/impl/StoreWidgetServiceImpl.java
View file @
0bc7a7b9
...
...
@@ -25,14 +25,11 @@ public class StoreWidgetServiceImpl implements StoreWidgetService {
@Override
public
Integer
saveStoreWidget
(
StoreWidgetDTO
storeWidgetDTO
)
{
TabStoreWidget
tabStoreWidget
=
new
TabStoreWidget
();
tabStoreWidget
.
setSearchParam
(
storeWidgetDTO
.
getSearchParam
());
tabStoreWidget
.
setAuthMode
(
storeWidgetDTO
.
getAuthMode
());
tabStoreWidget
.
setAuthSearchParam
(
storeWidgetDTO
.
getAuthSearchParam
());
tabStoreWidget
.
setWriteBackParam
(
storeWidgetDTO
.
getWriteBackParam
());
TabStoreWidget
tabStoreWidget
=
EntityUtil
.
changeEntityNew
(
TabStoreWidget
.
class
,
storeWidgetDTO
);
tabStoreWidget
.
setCreateTime
(
new
Date
());
tabStoreWidget
.
setUpdateTime
(
new
Date
());
tabStoreWidget
.
setDeleteFlag
(
0
);
tabStoreWidget
.
setStoreWidgetId
(
null
);
this
.
tabStoreWidgetMapper
.
insert
(
tabStoreWidget
);
return
tabStoreWidget
.
getStoreWidgetId
();
}
...
...
@@ -67,9 +64,10 @@ public class StoreWidgetServiceImpl implements StoreWidgetService {
@Override
public
int
updateAuth
(
StoreWidgetDTO
storeWidgetDTO
)
{
TabStoreWidget
storeWidget
=
new
TabStoreWidget
();
storeWidget
.
setAuthMode
(
storeWidgetDTO
.
getAuthMode
());
storeWidget
.
setAuthSearchParam
(
storeWidgetDTO
.
getAuthSearchParam
());
storeWidget
.
setStoreWidgetId
(
storeWidgetDTO
.
getStoreWidgetId
());
storeWidget
.
setAuthScreenDetailData
(
storeWidgetDTO
.
getAuthScreenDetailData
());
storeWidget
.
setAuthScreenSimpleData
(
storeWidgetDTO
.
getAuthScreenSimpleData
());
return
this
.
tabStoreWidgetMapper
.
updateByPrimaryKeySelective
(
storeWidget
);
}
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreWidgetApiServiceImpl.java
View file @
0bc7a7b9
...
...
@@ -12,6 +12,7 @@ import com.gic.store.service.StoreApiService;
import
com.gic.store.service.StoreBrandService
;
import
com.gic.store.service.StoreWidgetApiService
;
import
com.gic.store.service.StoreWidgetService
;
import
com.gic.store.utils.widget.StoreWidgetLogUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -36,13 +37,15 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
private
StoreApiService
storeApiService
;
@Autowired
private
StoreBrandService
storeBrandService
;
@Autowired
private
StoreWidgetLogUtils
storeWidgetLogUtils
;
@Override
public
ServiceResponse
<
Integer
>
saveStoreWidget
(
StoreWidgetDTO
storeWidgetDTO
)
{
Integer
id
=
storeWidgetDTO
.
getStoreWidgetId
();
if
(
id
==
null
)
{
if
(
id
==
null
)
{
id
=
this
.
storeWidgetService
.
saveStoreWidget
(
storeWidgetDTO
);
}
else
{
}
else
{
this
.
storeWidgetService
.
updateStoreWidget
(
storeWidgetDTO
);
}
if
(
id
!=
null
&&
id
>
0
){
...
...
@@ -54,12 +57,16 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
@Override
public
ServiceResponse
<
Integer
>
saveAuthStoreWidget
(
StoreWidgetDTO
storeWidgetDTO
)
{
Integer
id
=
storeWidgetDTO
.
getStoreWidgetId
();
if
(
id
==
null
){
//默认总是新增,门店选择器机制
if
(
id
==
null
||
storeWidgetDTO
.
isNewOperation
())
{
storeWidgetLogUtils
.
setAuthSearchParamDataFromOld
(
storeWidgetDTO
);
id
=
this
.
storeWidgetService
.
saveStoreWidget
(
storeWidgetDTO
);
}
else
{
}
else
{
this
.
storeWidgetService
.
updateAuthStoreWidget
(
storeWidgetDTO
);
}
if
(
id
!=
null
&&
id
>
0
){
//日志
storeWidgetLogUtils
.
saveStoreWidgetLog
(
storeWidgetDTO
,
id
);
return
ServiceResponse
.
success
(
id
);
}
return
EnterpriseServiceResponse
.
failure
(
ErrorCode
.
SYSTEM_ERROR
);
...
...
@@ -76,8 +83,11 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
@Override
public
ServiceResponse
<
Integer
>
updateAuth
(
StoreWidgetDTO
storeWidgetDTO
)
{
storeWidgetLogUtils
.
setLoginUserResource
(
storeWidgetDTO
.
getUserId
(),
storeWidgetDTO
);
int
i
=
this
.
storeWidgetService
.
updateAuth
(
storeWidgetDTO
);
if
(
i
>
0
){
if
(
i
>
0
)
{
//日志
storeWidgetLogUtils
.
saveStoreWidgetWhenEditAuth
(
storeWidgetDTO
.
getStoreWidgetId
(),
storeWidgetDTO
.
getUserId
());
return
ServiceResponse
.
success
(
i
);
}
return
EnterpriseServiceResponse
.
failure
(
ErrorCode
.
SYSTEM_ERROR
);
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreWidgetLogApiServiceImpl.java
View file @
0bc7a7b9
...
...
@@ -56,7 +56,8 @@ public class StoreWidgetLogApiServiceImpl implements StoreWidgetLogApiService{
UserDTO
userDTO
=
userResponse
.
getResult
();
storeWidgetLogDTO
.
setOperationName
(
userDTO
.
getUserName
())
.
setOperationPosition
(
userDTO
.
getUserPosition
())
.
setOperationPositionText
(
getUserPositionText
(
userDTO
.
getUserPosition
()));
.
setOperationPositionText
(
getUserPositionText
(
userDTO
.
getUserPosition
()))
.
setEnterpriseId
(
userDTO
.
getEnterpriseId
());
Integer
id
=
storeWidgetLogService
.
saveStoreWidgetLog
(
storeWidgetLogDTO
);
return
ServiceResponse
.
success
(
id
);
...
...
gic-store-service/src/main/java/com/gic/store/utils/widget/StoreWidgetLogUtils.java
0 → 100644
View file @
0bc7a7b9
This diff is collapsed.
Click to expand it.
gic-store-service/src/main/resources/mapper/TabStoreWidgetLogMapper.xml
View file @
0bc7a7b9
...
...
@@ -20,6 +20,8 @@
<resultMap
extends=
"BaseResultMap"
id=
"ResultMapWithBLOBs"
type=
"com.gic.store.entity.TabStoreWidgetLog"
>
<result
column=
"search_param_text_before"
jdbcType=
"LONGVARCHAR"
property=
"searchParamTextBefore"
/>
<result
column=
"search_param_text_after"
jdbcType=
"LONGVARCHAR"
property=
"searchParamTextAfter"
/>
<result
column=
"search_param_simple_before"
jdbcType=
"LONGVARCHAR"
property=
"searchParamSimpleBefore"
/>
<result
column=
"search_param_simple_after"
jdbcType=
"LONGVARCHAR"
property=
"searchParamSimpleAfter"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
store_widget_log_id, store_widget_id, enterprise_id, search_param_before, search_param_after,
...
...
@@ -27,7 +29,7 @@
delete_flag, create_time, update_time
</sql>
<sql
id=
"Blob_Column_List"
>
search_param_text_before, search_param_text_after
search_param_text_before, search_param_text_after
, search_param_simple_before, search_param_simple_after
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"ResultMapWithBLOBs"
>
select
...
...
@@ -43,14 +45,15 @@
log_type, operation_type, operation_id,
operation_name, operation_position, operation_position_text,
delete_flag, create_time, update_time,
search_param_text_before, search_param_text_after
search_param_text_before, search_param_text_after
, search_param_simple_before, search_param_simple_after
)
values (#{storeWidgetLogId,jdbcType=INTEGER}, #{storeWidgetId,jdbcType=INTEGER},
#{enterpriseId,jdbcType=INTEGER}, #{searchParamBefore,jdbcType=VARCHAR}, #{searchParamAfter,jdbcType=VARCHAR},
#{logType,jdbcType=INTEGER}, #{operationType,jdbcType=INTEGER}, #{operationId,jdbcType=INTEGER},
#{operationName,jdbcType=VARCHAR}, #{operationPosition,jdbcType=INTEGER}, #{operationPositionText,jdbcType=VARCHAR},
#{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{searchParamTextBefore,jdbcType=LONGVARCHAR}, #{searchParamTextAfter,jdbcType=LONGVARCHAR}
#{searchParamTextBefore,jdbcType=LONGVARCHAR}, #{searchParamTextAfter,jdbcType=LONGVARCHAR},
#{searchParamSimpleBefore,jdbcType=LONGVARCHAR}, #{searchParamSimpleAfter,jdbcType=LONGVARCHAR}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.gic.store.entity.TabStoreWidgetLog"
>
...
...
@@ -104,6 +107,12 @@
<if
test=
"searchParamTextAfter != null"
>
search_param_text_after,
</if>
<if
test=
"searchParamSimpleBefore != null"
>
search_param_simple_before,
</if>
<if
test=
"searchParamSimpleAfter != null"
>
search_param_simple_after,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"storeWidgetLogId != null"
>
...
...
@@ -154,6 +163,12 @@
<if
test=
"searchParamTextAfter != null"
>
#{searchParamTextAfter,jdbcType=LONGVARCHAR},
</if>
<if
test=
"searchParamSimpleBefore != null"
>
#{searchParamSimpleBefore,jdbcType=LONGVARCHAR},
</if>
<if
test=
"searchParamSimpleAfter != null"
>
#{searchParamSimpleAfter,jdbcType=LONGVARCHAR},
</if>
</trim>
</insert>
...
...
@@ -164,7 +179,7 @@
and delete_flag = 0
</update>
<select
id=
"pageStoreWidgetLog"
resultMap=
"
BaseResultMap
"
>
<select
id=
"pageStoreWidgetLog"
resultMap=
"
ResultMapWithBLOBs
"
>
select
<include
refid=
"Base_Column_List"
/>
,
...
...
@@ -176,7 +191,7 @@
order by create_time desc
</select>
<select
id=
"getLastOperationInfo"
resultMap=
"
BaseResultMap
"
>
<select
id=
"getLastOperationInfo"
resultMap=
"
ResultMapWithBLOBs
"
>
select
<include
refid=
"Base_Column_List"
/>
,
...
...
@@ -206,8 +221,11 @@
create_time,
update_time,
search_param_text_before,
search_param_text_after
search_param_text_after,
search_param_simple_before,
search_param_simple_after
)
values
<foreach
collection=
"list"
item=
"item"
index=
"index"
separator=
","
>
(
#{item.storeWidgetLogId},
...
...
@@ -225,7 +243,9 @@
#{item.createTime},
#{item.updateTime},
#{item.searchParamTextBefore},
#{item.searchParamTextAfter}
#{item.searchParamTextAfter},
#{item.searchParamSimpleBefore},
#{item.searchParamSimpleAfter}
)
</foreach>
</insert>
...
...
gic-store-service/src/main/resources/mapper/TabStoreWidgetMapper.xml
View file @
0bc7a7b9
...
...
@@ -12,12 +12,16 @@
</resultMap>
<resultMap
extends=
"BaseResultMap"
id=
"ResultMapWithBLOBs"
type=
"com.gic.store.entity.TabStoreWidget"
>
<result
column=
"write_back_param"
jdbcType=
"LONGVARCHAR"
property=
"writeBackParam"
/>
<result
column=
"screen_detail_data"
jdbcType=
"LONGVARCHAR"
property=
"screenDetailData"
/>
<result
column=
"screen_simple_data"
jdbcType=
"LONGVARCHAR"
property=
"screenSimpleData"
/>
<result
column=
"auth_screen_detail_data"
jdbcType=
"LONGVARCHAR"
property=
"authScreenDetailData"
/>
<result
column=
"auth_screen_simple_data"
jdbcType=
"LONGVARCHAR"
property=
"authScreenSimpleData"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
store_widget_id, search_param, auth_search_param, create_time, update_time, delete_flag, auth_mode
</sql>
<sql
id=
"Blob_Column_List"
>
write_back_param
write_back_param
, screen_detail_data, screen_simple_data, auth_screen_detail_data, auth_screen_simple_data
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"ResultMapWithBLOBs"
>
select
...
...
@@ -32,10 +36,13 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into tab_store_widget (store_widget_id, search_param, auth_search_param,
create_time, update_time, delete_flag, write_back_param, auth_mode)
create_time, update_time, delete_flag, write_back_param, auth_mode,
screen_detail_data, screen_simple_data, auth_screen_detail_data, auth_screen_simple_data)
values (#{storeWidgetId,jdbcType=INTEGER}, #{searchParam,jdbcType=VARCHAR}, #{authSearchParam,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=INTEGER},
#{writeBackParam,jdbcType=LONGVARCHAR}, #{authMode,jdbcType=INTEGER})
#{writeBackParam,jdbcType=LONGVARCHAR}, #{authMode,jdbcType=INTEGER},
#{screenDetailData,jdbcType=LONGVARCHAR},#{screenSimpleData,jdbcType=LONGVARCHAR},
#{authScreenDetailData,jdbcType=LONGVARCHAR},#{authScreenSimpleData,jdbcType=LONGVARCHAR})
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.gic.store.entity.TabStoreWidget"
>
<selectKey
keyProperty=
"storeWidgetId"
order=
"AFTER"
resultType=
"java.lang.Integer"
>
...
...
@@ -67,6 +74,18 @@
<if
test=
"authMode != null"
>
auth_mode,
</if>
<if
test=
"screenDetailData != null"
>
screen_detail_data,
</if>
<if
test=
"screenSimpleData != null"
>
screen_simple_data,
</if>
<if
test=
"authScreenDetailData != null"
>
auth_screen_detail_data,
</if>
<if
test=
"authScreenSimpleData != null"
>
auth_screen_simple_data,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"storeWidgetId != null"
>
...
...
@@ -93,6 +112,18 @@
<if
test=
"authMode != null"
>
#{authMode,jdbcType=INTEGER},
</if>
<if
test=
"screenDetailData != null"
>
#{screenDetailData,jdbcType=LONGVARCHAR},
</if>
<if
test=
"screenSimpleData != null"
>
#{screenSimpleData,jdbcType=LONGVARCHAR},
</if>
<if
test=
"authScreenDetailData != null"
>
#{authScreenDetailData,jdbcType=LONGVARCHAR},
</if>
<if
test=
"authScreenSimpleData != null"
>
#{authScreenSimpleData,jdbcType=LONGVARCHAR},
</if>
</trim>
</insert>
<update
id=
"updateByPrimaryKeySelective"
parameterType=
"com.gic.store.entity.TabStoreWidget"
>
...
...
@@ -119,6 +150,18 @@
<if
test=
"authMode != null"
>
auth_mode = #{authMode,jdbcType=INTEGER},
</if>
<if
test=
"screenDetailData != null"
>
screen_detail_data = #{screenDetailData,jdbcType=LONGVARCHAR},
</if>
<if
test=
"screenSimpleData != null"
>
screen_simple_data = #{screenSimpleData,jdbcType=LONGVARCHAR},
</if>
<if
test=
"authScreenDetailData != null"
>
auth_screen_detail_data = #{authScreenDetailData,jdbcType=LONGVARCHAR},
</if>
<if
test=
"authScreenSimpleData != null"
>
auth_screen_simple_data = #{authScreenSimpleData,jdbcType=LONGVARCHAR},
</if>
</set>
where store_widget_id = #{storeWidgetId,jdbcType=INTEGER}
</update>
...
...
@@ -130,7 +173,11 @@
update_time = #{updateTime,jdbcType=TIMESTAMP},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
write_back_param = #{writeBackParam,jdbcType=LONGVARCHAR},
auth_mode = #{authMode,jdbcType=INTEGER}
auth_mode = #{authMode,jdbcType=INTEGER},
screen_detail_data = #{screenDetailData,jdbcType=LONGVARCHAR},
screen_simple_data = #{screenSimpleData,jdbcType=LONGVARCHAR},
auth_screen_detail_data = #{authScreenDetailData,jdbcType=LONGVARCHAR},
auth_screen_simple_data = #{authScreenSimpleData,jdbcType=LONGVARCHAR}
where store_widget_id = #{storeWidgetId,jdbcType=INTEGER}
</update>
<update
id=
"updateByPrimaryKey"
parameterType=
"com.gic.store.entity.TabStoreWidget"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment