Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
2ab6523c
Commit
2ab6523c
authored
Apr 06, 2022
by
王锦盛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
模型需求接口上传
parent
58b21702
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
257 additions
and
152 deletions
+257
-152
src/main/java/com/pms/ocp/biz/BizModelDemandService.java
src/main/java/com/pms/ocp/biz/BizModelDemandService.java
+54
-11
src/main/java/com/pms/ocp/biz/impl/BizModelDemandServiceImpl.java
.../java/com/pms/ocp/biz/impl/BizModelDemandServiceImpl.java
+64
-69
src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
.../com/pms/ocp/controller/ModelControlDemandController.java
+81
-4
src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionDemandDTO.java
.../com/pms/ocp/model/dto/ModelPropertyVersionDemandDTO.java
+2
-3
src/main/java/com/pms/ocp/model/dto/ModelVersionDemandDTO.java
...ain/java/com/pms/ocp/model/dto/ModelVersionDemandDTO.java
+8
-62
src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java
...n/java/com/pms/ocp/model/entity/ModelPropertyVersion.java
+5
-0
src/main/java/com/pms/ocp/service/ModelBaseVersionService.java
...ain/java/com/pms/ocp/service/ModelBaseVersionService.java
+2
-1
src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
...java/com/pms/ocp/service/ModelPropertyVersionService.java
+11
-0
src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
...com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
+7
-1
src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
...pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
+18
-0
src/main/resources/application.yml
src/main/resources/application.yml
+5
-1
No files found.
src/main/java/com/pms/ocp/biz/BizModelDemandService.java
View file @
2ab6523c
package
com.pms.ocp.biz
;
import
com.pms.ocp.model.dto.ModelDemandDTO
;
import
com.pms.ocp.model.dto.Model
DemandAndPropertyVersion
DTO
;
import
com.pms.ocp.model.dto.Model
PropertyVersion
DemandDTO
;
import
com.pms.ocp.model.dto.Model
VersionDemand
DTO
;
import
com.pms.ocp.model.entity.Model
;
import
com.pms.ocp.model.entity.ModelBaseVersion
;
import
com.pms.ocp.model.entity.ModelPropertyVersion
;
import
java.util.List
;
...
...
@@ -15,31 +17,55 @@ public interface BizModelDemandService {
/**
* 创建模型需求
* 创建模型表或者模型属性
*
* @param modelDemandDTO
* @param model
Version
DemandDTO
* @return
*/
Integer
createModelDemand
(
ModelDemandDTO
modelDemandDTO
);
Integer
createModelDemand
(
ModelVersionDemandDTO
modelVersionDemandDTO
);
/**
* 创建模型属性
*
* @param modelPropertyVersionDemandDTO
* @return
*/
Integer
createModelPropertyDemand
(
ModelPropertyVersionDemandDTO
modelPropertyVersionDemandDTO
);
/**
* 修改模型需求
*
* @param modelVersionDemandDTO
* @return
*/
Integer
updateModelDemand
(
ModelVersionDemandDTO
modelVersionDemandDTO
);
/**
* 修改模型
需求与模型基础版本
* 修改模型
属性需求
*
* @param modelDemandDTO
* @param model
PropertyVersion
DemandDTO
* @return
*/
Integer
updateModel
Demand
(
ModelDemandDTO
model
DemandDTO
);
Integer
updateModel
PropertyDemand
(
ModelPropertyVersionDemandDTO
modelPropertyVersion
DemandDTO
);
/**
* 删除模型需求
*
* @param targetType
* @param demandId
* @param modelId
* @return
*/
Integer
deleteModelDemand
(
String
demandId
,
String
modelId
);
/**
* 删除模型属性需求
*
* @param demandId
* @param modelId
* @param proId
* @return
*/
Integer
deleteModel
Demand
(
String
targetType
,
String
demandId
,
String
modelId
,
String
proId
);
Integer
deleteModel
PropertyDemand
(
String
demandId
,
String
modelId
,
String
proId
);
/**
* 获取模型需求
...
...
@@ -47,7 +73,15 @@ public interface BizModelDemandService {
* @param
* @return
*/
List
<
Model
>
getModelDemandList
(
String
objId
,
String
modelGroupCode
,
int
currentPage
,
int
pageSize
);
List
<
ModelBaseVersion
>
getModelDemandList
(
String
modelCode
,
String
modelGroupCode
,
int
currentPage
,
int
pageSize
);
/**
* 获取模型属性需求
*
* @param
* @return
*/
List
<
ModelPropertyVersion
>
getModelPropertyDemandList
(
String
propId
,
String
modelCode
,
int
currentPage
,
int
pageSize
);
/**
* 获取模型需求
...
...
@@ -58,4 +92,13 @@ public interface BizModelDemandService {
*/
Model
getModelDemand
(
String
objId
,
String
modelGroupCode
);
/**
* 获取模型属性需求
*
* @param objId
* @param modelGroupCode
* @return
*/
Model
getModelPropertyDemand
(
String
objId
,
String
modelGroupCode
);
}
src/main/java/com/pms/ocp/biz/impl/BizModelDemandServiceImpl.java
View file @
2ab6523c
...
...
@@ -2,8 +2,9 @@ package com.pms.ocp.biz.impl;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.pms.ocp.biz.BizModelDemandService
;
import
com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO
;
import
com.pms.ocp.model.entity.*
;
import
com.pms.ocp.model.dto.ModelDemandDTO
;
import
com.pms.ocp.model.dto.Model
Version
DemandDTO
;
import
com.pms.ocp.service.ModelBaseVersionService
;
import
com.pms.ocp.service.ModelDemandService
;
import
com.pms.ocp.service.ModelPropertyVersionService
;
...
...
@@ -16,8 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
/**
...
...
@@ -41,21 +40,31 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
@Transactional
@Override
public
Integer
createModelDemand
(
Model
DemandDTO
model
DemandDTO
)
{
public
Integer
createModelDemand
(
Model
VersionDemandDTO
modelVersion
DemandDTO
)
{
ModelDemand
modelDemand
=
new
ModelDemand
();
BeanUtils
.
copyProperties
(
modelDemandDTO
,
modelDemand
);
BeanUtils
.
copyProperties
(
model
Version
DemandDTO
,
modelDemand
);
modelDemand
.
setApplyCtime
(
LocalDateTime
.
now
());
if
(
modelDemandDTO
.
getTargetType
().
equals
(
"1"
))
{
ModelBaseVersion
modelBaseVersion
=
new
ModelBaseVersion
();
BeanUtils
.
copyProperties
(
model
DemandDTO
,
modelBaseVersion
);
BeanUtils
.
copyProperties
(
modelVersion
DemandDTO
,
modelBaseVersion
);
modelBaseVersionService
.
createModelBaseVersion
(
modelBaseVersion
);
}
else
{
modelDemandService
.
createModelDemand
(
modelDemand
);
return
1
;
}
@Override
public
Integer
createModelPropertyDemand
(
ModelPropertyVersionDemandDTO
modelPropertyVersionDemandDTO
)
{
ModelDemand
modelDemand
=
new
ModelDemand
();
BeanUtils
.
copyProperties
(
modelPropertyVersionDemandDTO
,
modelDemand
);
modelDemand
.
setApplyCtime
(
LocalDateTime
.
now
());
ModelPropertyVersion
modelPropertyVersion
=
new
ModelPropertyVersion
();
BeanUtils
.
copyProperties
(
model
DemandDTO
,
modelPropertyVersion
);
BeanUtils
.
copyProperties
(
modelPropertyVersion
DemandDTO
,
modelPropertyVersion
);
modelPropertyVersionService
.
createModelPropertyVersion
(
modelPropertyVersion
);
}
modelDemandService
.
createModelDemand
(
modelDemand
);
...
...
@@ -64,20 +73,29 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
@Transactional
@Override
public
Integer
updateModelDemand
(
Model
DemandDTO
model
DemandDTO
)
{
public
Integer
updateModelDemand
(
Model
VersionDemandDTO
modelVersion
DemandDTO
)
{
ModelDemand
modelDemand
=
new
ModelDemand
();
BeanUtils
.
copyProperties
(
modelDemandDTO
,
modelDemand
);
BeanUtils
.
copyProperties
(
model
Version
DemandDTO
,
modelDemand
);
modelDemand
.
setApplyCtime
(
LocalDateTime
.
now
());
if
(
modelDemandDTO
.
getTargetType
().
equals
(
"1"
))
{
ModelBaseVersion
modelBaseVersion
=
new
ModelBaseVersion
();
BeanUtils
.
copyProperties
(
model
DemandDTO
,
modelBaseVersion
);
BeanUtils
.
copyProperties
(
modelVersion
DemandDTO
,
modelBaseVersion
);
modelBaseVersionService
.
updateModelBaseVersion
(
modelBaseVersion
);
}
else
{
modelDemandService
.
updateModelDemand
(
modelDemand
);
return
1
;
}
@Override
public
Integer
updateModelPropertyDemand
(
ModelPropertyVersionDemandDTO
modelPropertyVersionDemandDTO
)
{
ModelDemand
modelDemand
=
new
ModelDemand
();
BeanUtils
.
copyProperties
(
modelPropertyVersionDemandDTO
,
modelDemand
);
modelDemand
.
setApplyCtime
(
LocalDateTime
.
now
());
ModelPropertyVersion
modelPropertyVersion
=
new
ModelPropertyVersion
();
BeanUtils
.
copyProperties
(
model
DemandDTO
,
modelPropertyVersion
);
BeanUtils
.
copyProperties
(
modelPropertyVersion
DemandDTO
,
modelPropertyVersion
);
modelPropertyVersionService
.
updateModelPropertyVersion
(
modelPropertyVersion
);
}
modelDemandService
.
updateModelDemand
(
modelDemand
);
return
1
;
...
...
@@ -85,7 +103,7 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
@Transactional
@Override
public
Integer
deleteModelDemand
(
String
targetType
,
String
demandId
,
String
modelId
,
String
pro
Id
)
{
public
Integer
deleteModelDemand
(
String
demandId
,
String
model
Id
)
{
modelDemandService
.
deleteModelDemand
(
modelId
,
demandId
);
...
...
@@ -94,6 +112,13 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
modelBaseVersionService
.
deleteModelBaseVersion
(
modelId
,
demandId
);
}
return
1
;
}
@Override
public
Integer
deleteModelPropertyDemand
(
String
demandId
,
String
modelId
,
String
proId
)
{
modelDemandService
.
deleteModelDemand
(
modelId
,
demandId
);
if
(
StringUtils
.
isNotEmpty
(
proId
))
{
modelPropertyVersionService
.
deleteModelPropertyVersion
(
demandId
,
proId
);
...
...
@@ -111,48 +136,13 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
return
null
;
}
// public List<String> getGroupCodeRecursion(String modelGroupCode) {
//
//
// List<String> modelGroupCodeList = new ArrayList<>();
// if (StringUtils.isNotEmpty(modelGroupCode)) {
//
// modelGroupCodeList.add(modelGroupCode);
//
// QueryWrapper<ModelClassify> queryWrapper = new QueryWrapper();
// if (StringUtils.isNotEmpty(modelGroupCode)) {
// queryWrapper.lambda().eq(ModelClassify::getModelGroupPcode, modelGroupCode);
// }
// List<ModelClassify> list = ocpModelGroupService.list(queryWrapper);
//
// if (!list.isEmpty()) {
// for (ModelClassify modelClassify : list) {
//
// String modelGroupCode1 = modelClassify.getModelGroupCode();
// modelGroupCodeList.add(modelGroupCode1);
//
// QueryWrapper<ModelClassify> queryWrapper1 = new QueryWrapper();
//
// if (StringUtils.isNotEmpty(modelGroupCode1)) {
// queryWrapper1.lambda().eq(ModelClassify::getModelGroupPcode, modelGroupCode1);
// }
// List<ModelClassify> list2 = ocpModelGroupService.list(queryWrapper1);
//
// if (!list2.isEmpty()) {
// getGroupCodeRecursion(modelGroupCode1);
// }
//
// }
// }
//
// }
//
// return modelGroupCodeList;
// }
@Override
public
Model
getModelPropertyDemand
(
String
objId
,
String
modelGroupCode
)
{
return
null
;
}
@Override
public
List
<
Model
>
getModelDemandList
(
String
objId
,
String
modelGroupCode
,
int
currentPage
,
int
pageSize
)
{
public
List
<
Model
BaseVersion
>
getModelDemandList
(
String
modelCode
,
String
modelGroupCode
,
int
currentPage
,
int
pageSize
)
{
List
<
String
>
modelGroupCodeList
=
new
ArrayList
<>();
...
...
@@ -161,13 +151,18 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
getParentNode
(
modelGroupCodeList
,
modelClassifyList
,
modelGroupCode
);
modelGroupCodeList
.
add
(
modelGroupCode
);
modelGroupCodeList
.
size
();
List
<
ModelBaseVersion
>
modelBaseVersionList
=
modelBaseVersionService
.
getModelBaseVersionList
(
modelCode
,
modelGroupCodeList
,
currentPage
,
pageSize
);
return
modelBaseVersionList
;
}
@Override
public
List
<
ModelPropertyVersion
>
getModelPropertyDemandList
(
String
propId
,
String
modelCode
,
int
currentPage
,
int
pageSize
)
{
// List<ModelBaseVersion> modelBaseVersionList = modelBaseVersionService.getModelBaseVersionList(modelGroupCodeList, currentPage, pageSiz
e);
List
<
ModelPropertyVersion
>
modelPropertyVersionList
=
modelPropertyVersionService
.
getModelPropertyVersionList
(
propId
,
modelCod
e
);
return
null
;
return
modelPropertyVersionList
;
}
/**
...
...
src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
View file @
2ab6523c
package
com.pms.ocp.controller
;
import
com.pms.ocp.biz.BizModelDemandService
;
import
com.pms.ocp.model.dto.ModelDemandDTO
;
import
com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO
;
import
com.pms.ocp.model.dto.ModelVersionDemandDTO
;
import
com.pms.ocp.model.vo.ResponseVO
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -32,9 +33,68 @@ public class ModelControlDemandController {
*/
@ApiOperation
(
"模型需求-增加"
)
@PostMapping
(
"/create/modelDemand"
)
public
ResponseVO
createModelDemand
(
@RequestBody
Model
DemandDTO
model
DemandDTO
)
{
public
ResponseVO
createModelDemand
(
@RequestBody
Model
VersionDemandDTO
modelVersion
DemandDTO
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
createModelDemand
(
modelDemandDTO
));
return
ResponseVO
.
ok
(
bizModelDemandService
.
createModelDemand
(
modelVersionDemandDTO
));
}
/**
* 模型属性需求-增加
*
* @return
*/
@ApiOperation
(
"模型属性需求-增加"
)
@PostMapping
(
"/create/modelPropertyDemand"
)
public
ResponseVO
createModelPropertyDemand
(
@RequestBody
ModelPropertyVersionDemandDTO
modelPropertyVersionDemandDTO
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
createModelPropertyDemand
(
modelPropertyVersionDemandDTO
));
}
/**
* 模型需求-删除
*
* @return
*/
@ApiOperation
(
"模型需求-删除"
)
@PostMapping
(
"/delete/modelDemand"
)
public
ResponseVO
deleteModelDemand
(
@ApiParam
(
value
=
"模型订阅编号"
)
@RequestParam
(
value
=
"objId"
,
required
=
false
)
String
objId
,
@ApiParam
(
value
=
"模型编码"
)
@RequestParam
(
value
=
"modelCode"
,
required
=
false
)
String
modelCode
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
deleteModelDemand
(
objId
,
modelCode
));
}
/**
* 模型属性需求-删除
*
* @return
*/
@ApiOperation
(
"模型属性需求-删除"
)
@PostMapping
(
"/delete/modelPropertyDemand"
)
public
ResponseVO
deleteModelPropertyDemand
(
@ApiParam
(
value
=
"模型订阅编号"
)
@RequestParam
(
value
=
"objId"
,
required
=
false
)
String
objId
,
@ApiParam
(
value
=
"模型编码"
)
@RequestParam
(
value
=
"modelCode"
,
required
=
false
)
String
modelCode
,
@ApiParam
(
value
=
"属性编码"
)
@RequestParam
(
value
=
"propCode"
,
required
=
false
)
String
propCode
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
deleteModelPropertyDemand
(
objId
,
modelCode
,
propCode
));
}
/**
* 模型需求-修改
*
* @return
*/
@ApiOperation
(
"模型需求-修改"
)
@PostMapping
(
"/update/modelDemand"
)
public
ResponseVO
updateModelDemand
(
@RequestBody
ModelVersionDemandDTO
modelVersionDemandDTO
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
updateModelDemand
(
modelVersionDemandDTO
));
}
/**
* 模型属性需求-修改
*
* @return
*/
@ApiOperation
(
"模型属性需求-修改"
)
@PostMapping
(
"/update/modelPropertyDemand"
)
public
ResponseVO
updateModelPropertyDemand
(
@RequestBody
ModelPropertyVersionDemandDTO
modelPropertyVersionDemandDTO
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
updateModelPropertyDemand
(
modelPropertyVersionDemandDTO
));
}
/**
...
...
@@ -45,7 +105,7 @@ public class ModelControlDemandController {
@ApiOperation
(
"模型需求-查询列表"
)
@GetMapping
(
"/get/modelDemand/list"
)
public
ResponseVO
getModelDemandList
(
@ApiParam
(
value
=
"所属级别"
)
@RequestParam
(
value
=
"belongLevel"
,
defaultValue
=
"0"
)
String
belongLevel
,
@ApiParam
(
value
=
"模型编码"
)
@RequestParam
(
value
=
"modelGroupCode"
,
required
=
false
)
String
modelGroupCode
,
@ApiParam
(
value
=
"模型
分类
编码"
)
@RequestParam
(
value
=
"modelGroupCode"
,
required
=
false
)
String
modelGroupCode
,
@ApiParam
(
value
=
"当前页"
)
@RequestParam
(
value
=
"currentPage"
)
Integer
currentPage
,
@ApiParam
(
value
=
"每页数量"
)
@RequestParam
(
value
=
"pageSize"
)
Integer
pageSize
,
@ApiParam
(
value
=
"模糊搜索条件"
)
@RequestParam
(
value
=
"searchCondition"
,
required
=
false
)
String
searchCondition
)
{
...
...
@@ -54,4 +114,21 @@ public class ModelControlDemandController {
}
/**
* 模型属性需求-查询列表
*
* @return
*/
@ApiOperation
(
"模型属性需求-查询列表"
)
@GetMapping
(
"/get/modelPropertyDemand/list"
)
public
ResponseVO
getModelPropertyDemandList
(
@ApiParam
(
value
=
"所属级别"
)
@RequestParam
(
value
=
"belongLevel"
,
defaultValue
=
"0"
)
String
belongLevel
,
@ApiParam
(
value
=
"模型编码"
)
@RequestParam
(
value
=
"modelCode"
,
required
=
false
)
String
modelCode
,
@ApiParam
(
value
=
"当前页"
)
@RequestParam
(
value
=
"currentPage"
)
Integer
currentPage
,
@ApiParam
(
value
=
"每页数量"
)
@RequestParam
(
value
=
"pageSize"
)
Integer
pageSize
,
@ApiParam
(
value
=
"模糊搜索条件"
)
@RequestParam
(
value
=
"searchCondition"
,
required
=
false
)
String
searchCondition
)
{
return
ResponseVO
.
ok
(
bizModelDemandService
.
getModelPropertyDemandList
(
belongLevel
,
modelCode
,
currentPage
,
pageSize
));
}
}
src/main/java/com/pms/ocp/model/dto/Model
DemandAndPropertyVersion
DTO.java
→
src/main/java/com/pms/ocp/model/dto/Model
PropertyVersionDemand
DTO.java
View file @
2ab6523c
...
...
@@ -10,10 +10,9 @@ import lombok.Data;
* @Description:模型属性需求传输对象
*/
@Deprecated
@ApiModel
(
"模型属性需求传输对象"
)
@Data
public
class
Model
DemandAndPropertyVersion
DTO
{
public
class
Model
PropertyVersionDemand
DTO
{
/**
* 模型编号
...
...
@@ -31,7 +30,7 @@ public class ModelDemandAndPropertyVersionDTO {
* 属性编码
*/
@ApiModelProperty
(
value
=
"属性编码"
)
private
String
column
Code
;
private
String
prop
Code
;
/**
* 属性描述
...
...
src/main/java/com/pms/ocp/model/dto/ModelDemandDTO.java
→
src/main/java/com/pms/ocp/model/dto/Model
Version
DemandDTO.java
View file @
2ab6523c
...
...
@@ -12,14 +12,7 @@ import lombok.Data;
@ApiModel
(
"模型需求传输对象"
)
@Data
public
class
ModelDemandDTO
{
/**
* 目标类型
*/
@ApiModelProperty
(
value
=
"目标类型(1=表;2=属性)"
)
private
String
targetType
;
public
class
ModelVersionDemandDTO
{
/**
* 模型编号
...
...
@@ -28,52 +21,16 @@ public class ModelDemandDTO {
private
String
modelId
;
/**
* 属性名称
*/
@ApiModelProperty
(
value
=
"属性名称"
)
private
String
columnName
;
/**
* 属性编码
*/
@ApiModelProperty
(
value
=
"属性编码"
)
private
String
columnCode
;
/**
* 属性描述
*/
@ApiModelProperty
(
value
=
"属性描述"
)
private
String
columnComments
;
/**
* 数据类型
*/
@ApiModelProperty
(
value
=
"数据类型"
)
private
Integer
dataType
;
/**
* 数据长度
*/
@ApiModelProperty
(
value
=
"数据长度"
)
private
Integer
dataLength
;
/**
* 数据精度
*/
@ApiModelProperty
(
value
=
"数据精度"
)
private
Integer
dataScale
;
/**
* 是否主键
* 模型编码
*/
@ApiModelProperty
(
value
=
"
是否主键
"
)
private
Integer
boolPk
;
@ApiModelProperty
(
value
=
"
模型编码
"
)
private
String
modelCode
;
/**
*
是否必填
*
模型表名称
*/
@ApiModelProperty
(
value
=
"
是否必填
"
)
private
Integer
boolRequired
;
@ApiModelProperty
(
value
=
"
模型表名称
"
)
private
String
modelTable
;
/**
* 推广类型
...
...
@@ -105,11 +62,6 @@ public class ModelDemandDTO {
@ApiModelProperty
(
value
=
"显示顺序"
)
private
Integer
propDispidx
;
/**
* 模型编码
*/
@ApiModelProperty
(
value
=
"模型编码"
)
private
String
model_code
;
/**
* 版本
...
...
@@ -169,13 +121,7 @@ public class ModelDemandDTO {
* 模型名称
*/
@ApiModelProperty
(
value
=
"模型名称"
)
private
String
model_name
;
/**
* 模型表名称
*/
@ApiModelProperty
(
value
=
"模型表名称"
)
private
String
model_table
;
private
String
modelName
;
}
...
...
src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java
View file @
2ab6523c
...
...
@@ -37,6 +37,11 @@ public class ModelPropertyVersion {
*/
private
String
columnCode
;
/**
* 模型编码
*/
private
String
modelCode
;
/**
* 属性描述
*/
...
...
src/main/java/com/pms/ocp/service/ModelBaseVersionService.java
View file @
2ab6523c
package
com.pms.ocp.service
;
import
com.pms.ocp.model.entity.ModelBaseVersion
;
import
com.pms.ocp.model.entity.ModelPropertyVersion
;
import
com.pms.ocp.model.vo.ResponseVO
;
import
java.util.List
;
...
...
@@ -43,6 +44,6 @@ public interface ModelBaseVersionService {
* @param modelCodeList
* @return
*/
ResponseVO
getModelBaseVersionList
(
List
<
String
>
modelCodeList
,
Integer
currentPage
,
Integer
pageSize
);
List
<
ModelBaseVersion
>
getModelBaseVersionList
(
String
modelCode
,
List
<
String
>
modelCodeList
,
Integer
currentPage
,
Integer
pageSize
);
}
src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
View file @
2ab6523c
package
com.pms.ocp.service
;
import
com.pms.ocp.model.entity.Model
;
import
com.pms.ocp.model.entity.ModelPropertyVersion
;
import
java.util.List
;
/**
* @Auther: wangjian
* @Date: 2022/4/1 09:47
...
...
@@ -34,4 +37,12 @@ public interface ModelPropertyVersionService {
*/
Integer
updateModelPropertyVersion
(
ModelPropertyVersion
modelPropertyVersion
);
/**
* 获取模型属性版本信息列表
*
* @param
* @return
*/
List
<
ModelPropertyVersion
>
getModelPropertyVersionList
(
String
propId
,
String
modelCode
);
}
src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
View file @
2ab6523c
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.pms.ocp.mapper.ModelBaseVersionMapper
;
import
com.pms.ocp.model.entity.ModelBaseVersion
;
import
com.pms.ocp.model.entity.ModelPropertyVersion
;
import
com.pms.ocp.model.vo.ResponseVO
;
import
com.pms.ocp.service.ModelBaseVersionService
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -56,10 +57,15 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
}
@Override
public
ResponseVO
getModelBaseVersionList
(
List
<
String
>
modelGroupCodeList
,
Integer
currentPage
,
Integer
pageSize
)
{
public
List
<
ModelBaseVersion
>
getModelBaseVersionList
(
String
modelCode
,
List
<
String
>
modelGroupCodeList
,
Integer
currentPage
,
Integer
pageSize
)
{
QueryWrapper
<
ModelBaseVersion
>
queryWrapper
=
new
QueryWrapper
();
if
(
StringUtils
.
isNotEmpty
(
modelCode
))
{
queryWrapper
.
lambda
().
eq
(
ModelBaseVersion:
:
getModelCode
,
modelCode
);
}
if
(!
modelGroupCodeList
.
isEmpty
())
{
queryWrapper
.
lambda
().
in
(
ModelBaseVersion:
:
getModelGroupCode
,
modelGroupCodeList
);
}
...
...
src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
View file @
2ab6523c
...
...
@@ -3,12 +3,16 @@ package com.pms.ocp.service.impl;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.pms.ocp.mapper.ModelPropertyVersionMapper
;
import
com.pms.ocp.model.entity.Model
;
import
com.pms.ocp.model.entity.ModelPropertyVersion
;
import
com.pms.ocp.service.ModelPropertyVersionService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
* @Auther: wangjian
* @Date: 2022/4/1 14:57
...
...
@@ -50,4 +54,18 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
return
modelPropertyVersionMapper
.
update
(
modelPropertyVersion
,
updateWrapper
);
}
@Override
public
List
<
ModelPropertyVersion
>
getModelPropertyVersionList
(
String
propId
,
String
modelCode
)
{
QueryWrapper
<
ModelPropertyVersion
>
queryWrapper
=
new
QueryWrapper
();
if
(
StringUtils
.
isNotEmpty
(
propId
))
{
queryWrapper
.
lambda
().
eq
(
ModelPropertyVersion:
:
getPropId
,
propId
);
}
if
(
StringUtils
.
isNotEmpty
(
modelCode
))
{
queryWrapper
.
lambda
().
eq
(
ModelPropertyVersion:
:
getModelCode
,
modelCode
);
}
return
modelPropertyVersionMapper
.
selectList
(
queryWrapper
);
}
}
src/main/resources/application.yml
View file @
2ab6523c
server
:
port
:
9999
port
:
8020
# servlet:
# context-path: ${context-path:/pms-ocp}
...
...
@@ -9,6 +9,10 @@ spring:
profiles
:
active
:
${profiles-active:local}
jackson
:
date-format
:
yyyy-MM-dd HH:mm:ss
#jackson对响应回去的日期参数进行格式化
time-zone
:
GMT+8
knife4j
:
enable
:
true
...
...
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