Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
lmp_server
Project
Project
Details
Activity
Releases
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
lmp
lmp_server
Commits
ea371e58
Commit
ea371e58
authored
Mar 22, 2024
by
pengxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增更新接口。
parent
d9667a8a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
48 additions
and
5 deletions
+48
-5
DatasetConstant.java
.../java/com/yice/webadmin/app/constant/DatasetConstant.java
+12
-2
DatasetDataController.java
...m/yice/webadmin/app/controller/DatasetDataController.java
+9
-1
DatasetManageMapper.xml
.../com/yice/webadmin/app/dao/mapper/DatasetManageMapper.xml
+8
-1
DatasetDataDto.java
...c/main/java/com/yice/webadmin/app/dto/DatasetDataDto.java
+1
-1
DatasetManageDto.java
...main/java/com/yice/webadmin/app/dto/DatasetManageDto.java
+6
-0
DatasetManage.java
.../main/java/com/yice/webadmin/app/model/DatasetManage.java
+6
-0
DatasetManageVo.java
...c/main/java/com/yice/webadmin/app/vo/DatasetManageVo.java
+6
-0
No files found.
application-webadmin/src/main/java/com/yice/webadmin/app/constant/DatasetConstant.java
View file @
ea371e58
...
@@ -45,10 +45,20 @@ public class DatasetConstant {
...
@@ -45,10 +45,20 @@ public class DatasetConstant {
/**
/**
* 导出位置
* 导出位置
*/
*/
public
static
final
String
OUTPUT_POSTION
=
"导出至本地"
;
public
static
final
String
OUTPUT_POSTION
=
"导出至本地"
;
/**
/**
* 导出内容
* 导出内容
*/
*/
public
static
final
String
OUTPUT_CONTENT
=
"全部数据"
;
public
static
final
String
OUTPUT_CONTENT
=
"全部数据"
;
/**
* output数据
*/
public
static
final
String
OUTPUT
=
"output"
;
/**
* 已标记
*/
public
static
final
Integer
MARK
=
1
;
}
}
application-webadmin/src/main/java/com/yice/webadmin/app/controller/DatasetDataController.java
View file @
ea371e58
package
com
.
yice
.
webadmin
.
app
.
controller
;
package
com
.
yice
.
webadmin
.
app
.
controller
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.github.pagehelper.page.PageMethod
;
import
com.github.pagehelper.page.PageMethod
;
import
com.yice.common.core.annotation.MyRequestBody
;
import
com.yice.common.core.annotation.MyRequestBody
;
import
com.yice.common.core.constant.ErrorCodeEnum
;
import
com.yice.common.core.constant.ErrorCodeEnum
;
...
@@ -18,6 +20,7 @@ import com.yice.webadmin.app.dto.DatasetDataSummaryDto;
...
@@ -18,6 +20,7 @@ import com.yice.webadmin.app.dto.DatasetDataSummaryDto;
import
com.yice.webadmin.app.service.DatasetDataService
;
import
com.yice.webadmin.app.service.DatasetDataService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -46,16 +49,21 @@ public class DatasetDataController {
...
@@ -46,16 +49,21 @@ public class DatasetDataController {
*/
*/
@OperationLog
(
type
=
SysOperationLogType
.
UPDATE
)
@OperationLog
(
type
=
SysOperationLogType
.
UPDATE
)
@PostMapping
(
"/update"
)
@PostMapping
(
"/update"
)
public
ResponseResult
<
Void
>
update
(
@MyRequestBody
DatasetDataDto
datasetMongoDto
)
{
public
ResponseResult
<
Void
>
update
(
@MyRequestBody
DatasetDataDto
datasetMongoDto
)
throws
Exception
{
String
errorMessage
=
MyCommonUtil
.
getModelValidationError
(
datasetMongoDto
,
true
);
String
errorMessage
=
MyCommonUtil
.
getModelValidationError
(
datasetMongoDto
,
true
);
if
(
errorMessage
!=
null
)
{
if
(
errorMessage
!=
null
)
{
return
ResponseResult
.
error
(
ErrorCodeEnum
.
DATA_VALIDATED_FAILED
,
errorMessage
);
return
ResponseResult
.
error
(
ErrorCodeEnum
.
DATA_VALIDATED_FAILED
,
errorMessage
);
}
}
ObjectMapper
objectMapper
=
new
ObjectMapper
();
JsonNode
rootNode
=
objectMapper
.
readTree
(
datasetMongoDto
.
getData
());
String
output
=
rootNode
.
get
(
DatasetConstant
.
OUTPUT
).
textValue
();
DatasetData
datasetData
=
MyModelUtil
.
copyTo
(
datasetMongoDto
,
DatasetData
.
class
);
DatasetData
datasetData
=
MyModelUtil
.
copyTo
(
datasetMongoDto
,
DatasetData
.
class
);
datasetData
.
setMarkStatus
(
StringUtils
.
isNotBlank
(
output
)
?
DatasetConstant
.
MARK
:
DatasetConstant
.
UNMARK
);
datasetDataService
.
update
(
datasetData
);
datasetDataService
.
update
(
datasetData
);
return
ResponseResult
.
success
();
return
ResponseResult
.
success
();
}
}
/**
/**
* 删除数据集版本数据。
* 删除数据集版本数据。
*
*
...
...
application-webadmin/src/main/java/com/yice/webadmin/app/dao/mapper/DatasetManageMapper.xml
View file @
ea371e58
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
<result
column=
"data_volume"
jdbcType=
"TINYINT"
property=
"dataVolume"
/>
<result
column=
"data_volume"
jdbcType=
"TINYINT"
property=
"dataVolume"
/>
<result
column=
"release_status"
jdbcType=
"TINYINT"
property=
"releaseStatus"
/>
<result
column=
"release_status"
jdbcType=
"TINYINT"
property=
"releaseStatus"
/>
<result
column=
"input_status"
jdbcType=
"TINYINT"
property=
"inputStatus"
/>
<result
column=
"input_status"
jdbcType=
"TINYINT"
property=
"inputStatus"
/>
<result
column=
"version_id"
jdbcType=
"BIGINT"
property=
"versionId"
/>
<result
column=
"dataset_version"
jdbcType=
"TINYINT"
property=
"datasetVersion"
/>
<result
column=
"dataset_version"
jdbcType=
"TINYINT"
property=
"datasetVersion"
/>
</resultMap>
</resultMap>
...
@@ -101,7 +102,13 @@
...
@@ -101,7 +102,13 @@
</select>
</select>
<select
id=
"getDatasetManageGroupList"
resultMap=
"BaseResultMap"
parameterType=
"com.yice.webadmin.app.model.DatasetManage"
>
<select
id=
"getDatasetManageGroupList"
resultMap=
"BaseResultMap"
parameterType=
"com.yice.webadmin.app.model.DatasetManage"
>
SELECT lmp_dataset_manage.*, version.release_status, version.input_status, version.data_volume, version.dataset_version
SELECT
lmp_dataset_manage.*,
version.release_status,
version.input_status,
version.data_volume,
version.dataset_version,
version.version_id
FROM
FROM
lmp_dataset_manage lmp_dataset_manage
lmp_dataset_manage lmp_dataset_manage
JOIN (
JOIN (
...
...
application-webadmin/src/main/java/com/yice/webadmin/app/dto/DatasetDataDto.java
View file @
ea371e58
...
@@ -12,7 +12,7 @@ import java.util.Date;
...
@@ -12,7 +12,7 @@ import java.util.Date;
* @author linking
* @author linking
* @date 2023-04-13
* @date 2023-04-13
*/
*/
@ApiModel
(
"Dataset
Mongo
Dto视图对象"
)
@ApiModel
(
"Dataset
Data
Dto视图对象"
)
@Data
@Data
public
class
DatasetDataDto
{
public
class
DatasetDataDto
{
...
...
application-webadmin/src/main/java/com/yice/webadmin/app/dto/DatasetManageDto.java
View file @
ea371e58
...
@@ -72,6 +72,12 @@ public class DatasetManageDto {
...
@@ -72,6 +72,12 @@ public class DatasetManageDto {
@ApiModelProperty
(
value
=
"版本"
)
@ApiModelProperty
(
value
=
"版本"
)
private
Integer
datasetVersion
;
private
Integer
datasetVersion
;
/**
* 版本ID。
*/
@ApiModelProperty
(
value
=
"版本ID"
)
private
Long
versionId
;
/**
/**
* dataset_name LIKE搜索字符串。
* dataset_name LIKE搜索字符串。
*/
*/
...
...
application-webadmin/src/main/java/com/yice/webadmin/app/model/DatasetManage.java
View file @
ea371e58
...
@@ -86,6 +86,12 @@ public class DatasetManage extends BaseModel {
...
@@ -86,6 +86,12 @@ public class DatasetManage extends BaseModel {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
searchString
;
private
String
searchString
;
/**
* 版本ID。
*/
@TableField
(
exist
=
false
)
private
Long
versionId
;
/**
/**
* 创建人名称字典。
* 创建人名称字典。
*/
*/
...
...
application-webadmin/src/main/java/com/yice/webadmin/app/vo/DatasetManageVo.java
View file @
ea371e58
...
@@ -74,6 +74,12 @@ public class DatasetManageVo extends BaseVo {
...
@@ -74,6 +74,12 @@ public class DatasetManageVo extends BaseVo {
@ApiModelProperty
(
value
=
"版本"
)
@ApiModelProperty
(
value
=
"版本"
)
private
Integer
datasetVersion
;
private
Integer
datasetVersion
;
/**
* 版本ID。
*/
@ApiModelProperty
(
value
=
"版本ID"
)
private
Long
versionId
;
/**
/**
* DatasetVersion 的一对多关联表数据对象。数据对应类型为DatasetVersion。
* DatasetVersion 的一对多关联表数据对象。数据对应类型为DatasetVersion。
*/
*/
...
...
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