Skip to content

O
operation-control-platform
Commit 87482a28 authored by 王锦盛's avatar 王锦盛
Browse files
Options

模型需求接口修改

parent 2ab6523c
Show whitespace changes
Inline Side-by-side
Showing with 370 additions and 281 deletions
src/main/java/com/pms/ocp/biz/BizModelDemandService.java → src/main/java/com/pms/ocp/biz/BizModelRequirementService.java
View file @ 87482a28
......@@ -13,7 +13,7 @@ import java.util.List;
* @Date: 2022/4/1 10:29
* @Description:
*/
public interface BizModelDemandService {
public interface BizModelRequirementService {
/**
* 创建模型需求
......@@ -21,7 +21,7 @@ public interface BizModelDemandService {
* @param modelVersionDemandDTO
* @return
*/
Integer createModelDemand(ModelVersionDemandDTO modelVersionDemandDTO);
Integer createModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO);
/**
......@@ -30,7 +30,7 @@ public interface BizModelDemandService {
* @param modelPropertyVersionDemandDTO
* @return
*/
Integer createModelPropertyDemand(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO);
Integer createModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO);
/**
* 修改模型需求
......@@ -38,7 +38,7 @@ public interface BizModelDemandService {
* @param modelVersionDemandDTO
* @return
*/
Integer updateModelDemand(ModelVersionDemandDTO modelVersionDemandDTO);
Integer updateModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO);
/**
* 修改模型属性需求
......@@ -46,7 +46,7 @@ public interface BizModelDemandService {
* @param modelPropertyVersionDemandDTO
* @return
*/
Integer updateModelPropertyDemand(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO);
Integer updateModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO);
/**
* 删除模型需求
......@@ -55,7 +55,7 @@ public interface BizModelDemandService {
* @param modelId
* @return
*/
Integer deleteModelDemand(String demandId, String modelId);
Integer deleteModelRequirement(String demandId, String modelId);
/**
* 删除模型属性需求
......@@ -65,7 +65,7 @@ public interface BizModelDemandService {
* @param proId
* @return
*/
Integer deleteModelPropertyDemand(String demandId, String modelId, String proId);
Integer deleteModelPropertyRequirement(String demandId, String modelId, String proId);
/**
* 获取模型需求
......@@ -73,7 +73,7 @@ public interface BizModelDemandService {
* @param
* @return
*/
List<ModelBaseVersion> getModelDemandList(String modelCode, String modelGroupCode, int currentPage, int pageSize);
List<ModelBaseVersion> getModelRequirementList(String modelCode, String modelGroupCode, int currentPage, int pageSize);
/**
* 获取模型属性需求
......@@ -81,7 +81,7 @@ public interface BizModelDemandService {
* @param
* @return
*/
List<ModelPropertyVersion> getModelPropertyDemandList(String propId, String modelCode, int currentPage, int pageSize);
List<ModelPropertyVersion> getModelPropertyRequirementList(String propId, String modelCode, int currentPage, int pageSize);
/**
* 获取模型需求
......@@ -90,7 +90,7 @@ public interface BizModelDemandService {
* @param modelGroupCode
* @return
*/
Model getModelDemand(String objId, String modelGroupCode);
Model getModelRequirement(String objId, String modelGroupCode);
/**
* 获取模型属性需求
......@@ -99,6 +99,6 @@ public interface BizModelDemandService {
* @param modelGroupCode
* @return
*/
Model getModelPropertyDemand(String objId, String modelGroupCode);
Model getModelPropertyRequirement(String objId, String modelGroupCode);
}
src/main/java/com/pms/ocp/biz/impl/BizModelDemandServiceImpl.java → src/main/java/com/pms/ocp/biz/impl/BizModelRequirementServiceImpl.java
View file @ 87482a28
package com.pms.ocp.biz.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.biz.BizModelDemandService;
import com.pms.ocp.biz.BizModelRequirementService;
import com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO;
import com.pms.ocp.model.entity.*;
import com.pms.ocp.model.dto.ModelVersionDemandDTO;
......@@ -26,7 +26,7 @@ import java.util.List;
*/
@Service
public class BizModelDemandServiceImpl implements BizModelDemandService {
public class BizModelRequirementServiceImpl implements BizModelRequirementService {
@Autowired
private ModelDemandService modelDemandService;
......@@ -40,70 +40,70 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
@Transactional
@Override
public Integer createModelDemand(ModelVersionDemandDTO modelVersionDemandDTO) {
public Integer createModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO) {
ModelDemand modelDemand = new ModelDemand();
BeanUtils.copyProperties(modelVersionDemandDTO, modelDemand);
modelDemand.setApplyCtime(LocalDateTime.now());
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelVersionDemandDTO, modelRequirement);
modelRequirement.setCtime(LocalDateTime.now());
ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionDemandDTO, modelBaseVersion);
modelBaseVersionService.createModelBaseVersion(modelBaseVersion);
modelDemandService.createModelDemand(modelDemand);
modelDemandService.createModelDemand(modelRequirement);
return 1;
}
@Override
public Integer createModelPropertyDemand(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
public Integer createModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
ModelDemand modelDemand = new ModelDemand();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelDemand);
modelDemand.setApplyCtime(LocalDateTime.now());
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelRequirement);
modelRequirement.setCtime(LocalDateTime.now());
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelPropertyVersion);
modelPropertyVersionService.createModelPropertyVersion(modelPropertyVersion);
modelDemandService.createModelDemand(modelDemand);
modelDemandService.createModelDemand(modelRequirement);
return 1;
}
@Transactional
@Override
public Integer updateModelDemand(ModelVersionDemandDTO modelVersionDemandDTO) {
ModelDemand modelDemand = new ModelDemand();
BeanUtils.copyProperties(modelVersionDemandDTO, modelDemand);
modelDemand.setApplyCtime(LocalDateTime.now());
public Integer updateModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelVersionDemandDTO, modelRequirement);
modelRequirement.setMtime(LocalDateTime.now());
ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionDemandDTO, modelBaseVersion);
modelBaseVersionService.updateModelBaseVersion(modelBaseVersion);
modelDemandService.updateModelDemand(modelDemand);
modelDemandService.updateModelDemand(modelRequirement);
return 1;
}
@Override
public Integer updateModelPropertyDemand(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
ModelDemand modelDemand = new ModelDemand();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelDemand);
modelDemand.setApplyCtime(LocalDateTime.now());
public Integer updateModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelRequirement);
modelRequirement.setMtime(LocalDateTime.now());
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelPropertyVersion);
modelPropertyVersionService.updateModelPropertyVersion(modelPropertyVersion);
modelDemandService.updateModelDemand(modelDemand);
modelDemandService.updateModelDemand(modelRequirement);
return 1;
}
@Transactional
@Override
public Integer deleteModelDemand(String demandId, String modelId) {
public Integer deleteModelRequirement(String demandId, String modelId) {
modelDemandService.deleteModelDemand(modelId, demandId);
......@@ -116,7 +116,7 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
}
@Override
public Integer deleteModelPropertyDemand(String demandId, String modelId, String proId) {
public Integer deleteModelPropertyRequirement(String demandId, String modelId, String proId) {
modelDemandService.deleteModelDemand(modelId, demandId);
if (StringUtils.isNotEmpty(proId)) {
......@@ -132,17 +132,17 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
private OcpModelGroupService ocpModelGroupService;
@Override
public Model getModelDemand(String objId, String modelGroupCode) {
public Model getModelRequirement(String objId, String modelGroupCode) {
return null;
}
@Override
public Model getModelPropertyDemand(String objId, String modelGroupCode) {
public Model getModelPropertyRequirement(String objId, String modelGroupCode) {
return null;
}
@Override
public List<ModelBaseVersion> getModelDemandList(String modelCode, String modelGroupCode, int currentPage, int pageSize) {
public List<ModelBaseVersion> getModelRequirementList(String modelCode, String modelGroupCode, int currentPage, int pageSize) {
List<String> modelGroupCodeList = new ArrayList<>();
......@@ -158,7 +158,7 @@ public class BizModelDemandServiceImpl implements BizModelDemandService {
}
@Override
public List<ModelPropertyVersion> getModelPropertyDemandList(String propId, String modelCode, int currentPage, int pageSize) {
public List<ModelPropertyVersion> getModelPropertyRequirementList(String propId, String modelCode, int currentPage, int pageSize) {
List<ModelPropertyVersion> modelPropertyVersionList = modelPropertyVersionService.getModelPropertyVersionList(propId, modelCode);
......
src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
View file @ 87482a28
package com.pms.ocp.controller;
import com.pms.ocp.biz.BizModelDemandService;
import com.pms.ocp.biz.BizModelRequirementService;
import com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO;
import com.pms.ocp.model.dto.ModelVersionDemandDTO;
import com.pms.ocp.model.vo.ResponseVO;
......@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public class ModelControlDemandController {
@Autowired
private BizModelDemandService bizModelDemandService;
private BizModelRequirementService bizModelRequirementService;
/**
* 模型需求-增加
......@@ -35,7 +35,7 @@ public class ModelControlDemandController {
@PostMapping("/create/modelDemand")
public ResponseVO createModelDemand(@RequestBody ModelVersionDemandDTO modelVersionDemandDTO) {
return ResponseVO.ok(bizModelDemandService.createModelDemand(modelVersionDemandDTO));
return ResponseVO.ok(bizModelRequirementService.createModelRequirement(modelVersionDemandDTO));
}
/**
......@@ -47,7 +47,7 @@ public class ModelControlDemandController {
@PostMapping("/create/modelPropertyDemand")
public ResponseVO createModelPropertyDemand(@RequestBody ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
return ResponseVO.ok(bizModelDemandService.createModelPropertyDemand(modelPropertyVersionDemandDTO));
return ResponseVO.ok(bizModelRequirementService.createModelPropertyRequirement(modelPropertyVersionDemandDTO));
}
/**
......@@ -59,7 +59,7 @@ public class ModelControlDemandController {
@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 ResponseVO.ok(bizModelRequirementService.deleteModelRequirement(objId, modelCode));
}
/**
......@@ -72,7 +72,7 @@ public class ModelControlDemandController {
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 ResponseVO.ok(bizModelRequirementService.deleteModelPropertyRequirement(objId, modelCode, propCode));
}
/**
......@@ -83,7 +83,7 @@ public class ModelControlDemandController {
@ApiOperation("模型需求-修改")
@PostMapping("/update/modelDemand")
public ResponseVO updateModelDemand(@RequestBody ModelVersionDemandDTO modelVersionDemandDTO) {
return ResponseVO.ok(bizModelDemandService.updateModelDemand(modelVersionDemandDTO));
return ResponseVO.ok(bizModelRequirementService.updateModelRequirement(modelVersionDemandDTO));
}
/**
......@@ -94,7 +94,7 @@ public class ModelControlDemandController {
@ApiOperation("模型属性需求-修改")
@PostMapping("/update/modelPropertyDemand")
public ResponseVO updateModelPropertyDemand(@RequestBody ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
return ResponseVO.ok(bizModelDemandService.updateModelPropertyDemand(modelPropertyVersionDemandDTO));
return ResponseVO.ok(bizModelRequirementService.updateModelPropertyRequirement(modelPropertyVersionDemandDTO));
}
/**
......@@ -109,7 +109,7 @@ public class ModelControlDemandController {
@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.getModelDemandList(belongLevel, modelGroupCode, currentPage, pageSize));
return ResponseVO.ok(bizModelRequirementService.getModelRequirementList(belongLevel, modelGroupCode, currentPage, pageSize));
}
......@@ -126,7 +126,7 @@ public class ModelControlDemandController {
@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));
return ResponseVO.ok(bizModelRequirementService.getModelPropertyRequirementList(belongLevel, modelCode, currentPage, pageSize));
}
......
src/main/java/com/pms/ocp/mapper/ModelDemandMapper.java → src/main/java/com/pms/ocp/mapper/ModelRequirementMapper.java
View file @ 87482a28
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.entity.ModelDemand;
import com.pms.ocp.model.entity.ModelRequirement;
import org.apache.ibatis.annotations.Mapper;
/**
......@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ModelDemandMapper extends BaseMapper<ModelDemand> {
public interface ModelRequirementMapper extends BaseMapper<ModelRequirement> {
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java
View file @ 87482a28
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/30 17:17
......@@ -12,14 +15,14 @@ import lombok.Data;
*/
@Data
@TableName("ocp_model_base_ver")
@TableName("ocp_model_version")
public class ModelBaseVersion {
/**
* 主键
*/
@TableId(value = "model_id", type = IdType.ASSIGN_ID)
private String modelId;
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型名称
......@@ -32,9 +35,21 @@ public class ModelBaseVersion {
private String modelCode;
/**
* 模型分类id
* 需求编码
*/
private String requirementCode;
/**
* 设备类型
*/
private String modelGroupId;
private String equipType;
/**
* 所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合
*/
private String professionalKind;
/**
* 模型分类编码
......@@ -42,46 +57,118 @@ public class ModelBaseVersion {
private String modelGroupCode;
/**
* 模型分类名称
* 模型表(表的英文名称)表的英文名称
*/
private String modelGroupName;
private String modelTable;
/**
* 模型表名称
* 公司编码
*/
private String modelTable;
private String ownerCompanyCode;
/**
* 模型关联关系
* 排列顺序
*/
private String modelRelation;
private Integer modelOrderNo;
/**
* 推广类型
* 提交人id
*/
private Integer modelPromotion;
private String modelUserId;
/**
* 省公司ID
* 提交人姓名
*/
private LocalDateTime modelUserName;
/**
* 创建时间
*/
private LocalDateTime modelCtime;
/**
* 修改时间
*/
private String companyId;
private Integer modelMtime;
/**
* 省公司名称
* 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区
*/
private Integer modelZone;
/**
* 所属层级 1:应用层 2:平台层3:网络层 4:感知层
*/
private Integer modelLayer;
/**
* 模型版本号
*/
private String modelVersion;
/**
* 设计厂商
*/
private String apiUnit;
/**
* 版本简述
*/
private String modelVersionDesc;
/**
* 省公司ID
*/
private String companyName;
@TableField("is_delete")
private Integer boolDelete;
}
// 字段名称 字段描述 字段类型 允许为NULL 备注
// model_id 主键 varchar(40) 否
// model_name 模型名称 varchar(50) 否
// model_code 模型编码 varchar(42) 否
// model_group_id 模型分类id varchar(42) 否
// model_group_name 模型分类名称 varchar(50) 否
// model_table 模型表名称 varchar(50) 否
// model_relation 模型关联关系 text 是 存储模型之间的关系json格式；例如[{ model_group_id : t_public_manage_model_group.group_id}]
// model_promotion 推广类型 int4 否 0:统推,1：自建
// company_id 省公司ID varchar(42) 是
// company_name 省公司名称 varchar(50) 是
// CREATE TABLE operating_platform.ocp_model_version (
// obj_id varchar(42) NOT NULL ,
// model_name varchar(50) NOT NULL ,
// model_code varchar(42) NOT NULL ,
// requirement_code varchar(42) NOT NULL ,
// equip_type varchar(42) ,
// professional_kind varchar(10) ,
// model_group_code varchar(42) ,
// model_table varchar(50) ,
// owner_company_code varchar(42) NOT NULL ,
// model_order_no int4 ,
// model_user_id varchar(42) ,
// model_user_name varchar(64) ,
// model_ctime timestamp(6) ,
// model_mtime timestamp(6) ,
// model_zone int2 ,
// model_layer int2 ,
// model_version varchar(10) ,
// api_unit varchar(50) ,
// model_version_desc varchar(200) ,
// is_delete Int ,
// PRIMARY KEY (obj_id)
// )
// ;
//
// COMMENT ON COLUMN operating_platform.ocp_model_version.obj_id IS '主键';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_name IS '模型名称';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_code IS '模型编码';
// COMMENT ON COLUMN operating_platform.ocp_model_version.requirement_code IS '需求编号';
// COMMENT ON COLUMN operating_platform.ocp_model_version.equip_type IS '设备类型';
// COMMENT ON COLUMN operating_platform.ocp_model_version.professional_kind IS '所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_group_code IS '模型分类编码';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_table IS '模型表(表的英文名称)表的英文名称';
// COMMENT ON COLUMN operating_platform.ocp_model_version.owner_company_code IS '公司code';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_order_no IS '排列顺序';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_user_id IS '提交人id';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_user_name IS '提交人姓名';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_ctime IS '创建时间';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_mtime IS '修改时间';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_zone IS '所属区域1:生成控制大区 2:信息关联大区3:互联网大区';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_layer IS '所属层级1:应用层 2:平台层3:网络层 4:感知层';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_version IS '模型版本号';
// COMMENT ON COLUMN operating_platform.ocp_model_version.api_unit IS '设计厂商';
// COMMENT ON COLUMN operating_platform.ocp_model_version.model_version_desc IS '版本简述';
// COMMENT ON COLUMN operating_platform.ocp_model_version.is_delete IS '是否已经删除0未删除 1已删除';
//
// COMMENT ON TABLE operating_platform.ocp_model_version IS '模型版本信息表';
src/main/java/com/pms/ocp/model/entity/ModelDemand.java deleted 100644 → 0
View file @ 2ab6523c
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/29 17:27
* @Description:模型需求对象
*/
@Data
@TableName("ocp_model_demand")
public class ModelDemand {
/**
* 主键
*/
@TableId("demand_id")
private String demandId;
/**
* 模型编号
*/
private String modelId;
/**
* 属性编号
*/
private String propId;
/**
* 版本
*/
private String demandVersion;
/**
* 省公司ID
*/
private String companyId;
/**
* 省公司名称
*/
private String companyName;
/**
* 提交人id
*/
private String applyUserId;
/**
* 提交人姓名
*/
private String applyUserName;
/**
* 创建时间
*/
private LocalDateTime applyCtime;
/**
* 流程类型
*/
private Integer flowType;
/**
* 需求描述
*/
private String flowMessage;
/**
* 需求审核状态
*/
private Integer flowStatus;
/**
* 审核意见
*/
private String flowComment;
/**
* 审核人id
*/
private String flowUserId;
/**
* 审核人姓名
*/
private String flowUserName;
/**
* 审核时间
*/
private LocalDateTime flowMtime;
}
// 字段名称 字段描述 字段类型 允许为NULL 备注
// demand_id 主键 varchar(42) 否
// model_id 模型编号 varchar(42) 否
// prop_id 属性编号 varchar(42) 是
// demand_version 版本 varchar(10) 是
// company_id 省公司ID varchar(42) 是
// company_name 省公司名称 varchar(50) 是
// apply_user_id 提交人id varchar(42) 否
// apply_user_name 提交人姓名 varchar(64) 否
// apply_ctime 创建时间 timestamp(6) 否
// flow_type 流程类型 int4 否 0:新增,1:迭代
// flow_message 需求描述 varchar(1000) 是
// flow_statu 需求审核状态 int4 是 0:不同意, 1：同意
// flow_comment 审核意见 varchar(100) 是
// flow_user_id 审核人id "varchar(42) " 是
// flow_user_name 审核人姓名 varchar(64) 是
// flow_mtime 审核时间 timestamp(6) 是
src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java
View file @ 87482a28
......@@ -13,19 +13,19 @@ import lombok.Data;
*/
@Data
@TableName("ocp_model_prop_ver")
@TableName("ocp_model_prop_version")
public class ModelPropertyVersion {
/**
* 主键
*/
@TableId(value = "prop_id", type = IdType.ASSIGN_ID)
private String propId;
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型id
* 模型编码
*/
private String modelId;
private String modelCode;
/**
* 属性名称
......@@ -33,14 +33,15 @@ public class ModelPropertyVersion {
private String columnName;
/**
* 属性编码
* 模型版本号
*/
private String columnCode;
private String modelVersion;
/**
* 模型编码
* 属性编码
*/
private String modelCode;
private String propCode;
/**
* 属性描述
......@@ -50,7 +51,7 @@ public class ModelPropertyVersion {
/**
* 数据类型
*/
private Integer dataType;
private String dataType;
/**
* 数据长度
......@@ -63,59 +64,80 @@ public class ModelPropertyVersion {
private Integer dataScale;
/**
* 是否主键
* 是否主键 0:否,1:是
*/
@TableField("is_pk")
private Integer boolPk;
/**
* 是否必填
* 是否必填 0:否,1:是
*/
@TableField("is_required")
private Integer boolRequired;
/**
* 推广类型
* 显示顺序
*/
private Integer propPromotion;
private Integer propOrderNo;
/**
* 是否启用
* 提交人id
*/
@TableField("is_use")
private Integer boolUse;
private String propUserId;
/**
* 省公司ID
* 提交人姓名
*/
private String companyId;
private String propUserName;
/**
* 省公司名称
* 创建时间
*/
private String companyName;
private Integer propCtime;
/**
* 显示顺序
* 修改时间
*/
private Integer propDispidx;
private Integer propMtime;
}
// t_public_manage_model_prop_ver
// 字段名称 字段描述 字段类型 允许为NULL 备注
// prop_id 主键 varchar(42) 否
// model_id 模型id varchar(42) 否
// column_name 属性名称 varchar(50) 否
// column_code 属性编码 varchar(42) 否
// column_comments 属性描述 varchar(50) 否
// data_type 数据类型 int4 否
// data_length 数据长度 int4 是
// data_scale 数据精度 int4 是
// is_pk 是否主键 int4 否 0:否,1:是
// is_required 是否必填 int4 是 0:否,1:是
// prop_promotion 推广类型 int4 是 0:统推,1：自建
// is_use 是否启用 int4 0:待启用,1：启用,2:废弃
// company_id 省公司ID varchar(42) 是
// company_name 省公司名称 varchar(50) 是
// prop_dispidx 显示顺序 int4 否
// CREATE TABLE operating_platform.ocp_model_prop_version (
// obj_id varchar(42) NOT NULL ,
// model_code varchar(42) NOT NULL ,
// column_name varchar(50) NOT NULL ,
// model_version varchar(10) ,
// prop_code varchar(42) NOT NULL ,
// column_comments varchar(50) ,
// data_type varchar(30) ,
// data_length int4 ,
// data_scale int4 ,
// is_pk int4 ,
// is_required int4 ,
// prop_order_no int4 ,
// prop_user_id varchar(42) ,
// prop_user_name varchar(64) ,
// prop_ctime timestamp(6) ,
// prop_mtime timestamp(6) ,
// PRIMARY KEY (obj_id)
// )
// ;
//
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.obj_id IS '主键';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.model_code IS '模型code';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.column_name IS '属性名称';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.model_version IS '模型版本号';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.prop_code IS '属性编码';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.column_comments IS '属性描述';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.data_type IS '数据类型';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.data_length IS '数据长度';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.data_scale IS '数据精度';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.is_pk IS '是否主键0:否,1:是';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.is_required IS '是否必填0:否,1:是';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.prop_order_no IS '显示顺序';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.prop_user_id IS '提交人id';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.prop_user_name IS '提交人姓名';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.prop_ctime IS '创建时间';
// COMMENT ON COLUMN operating_platform.ocp_model_prop_version.prop_mtime IS '修改时间';
//
// COMMENT ON TABLE operating_platform.ocp_model_prop_version IS '模型版本属性表';
src/main/java/com/pms/ocp/model/entity/ModelRequirement.java 0 → 100644
View file @ 87482a28
package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.models.auth.In;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/29 17:27
* @Description:模型需求表对象
*/
@Data
@TableName("ocp_model_requirement")
public class ModelRequirement {
/**
* 主键
*/
@TableId("obj_id")
private String objId;
/**
* 需求编码
*/
private String requirementCode;
/**
* 需求类型 0:新增，1:迭代，2下线
*/
private Integer requirementType;
/**
* 需求简述
*/
private String requirementDesc;
/**
* 需求提报公司
*/
private String companyCode;
/**
* 提交人id
*/
private String userId;
/**
* 提交人姓名
*/
private String userName;
/**
* 创建时间
*/
private LocalDateTime ctime;
/**
* 修改时间
*/
private LocalDateTime mtime;
/**
* 需求审核状态0:未通过1:通过
*/
private Integer requirementStatus;
}
// CREATE TABLE operating_platform.ocp_model_requirement (
// obj_id varchar(42) NOT NULL ,
// requirement_code varchar(42) NOT NULL ,
// requirement_type int2 NOT NULL ,
// requirement_desc varchar(200) NOT NULL ,
// company_code varchar(42) NOT NULL ,
// user_id varchar(42) ,
// user_name varchar(64) ,
// ctime timestamp(6) NOT NULL ,
// mtime timestamp(6) NOT NULL ,
// requirement_statu Int2 ,
// PRIMARY KEY (obj_id)
// )
// ;
//
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.obj_id IS '主键';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.requirement_code IS '需求编码';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.requirement_type IS '需求类型0:新增，1:迭代，2下线';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.requirement_desc IS '需求简述';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.company_code IS '需求提报公司';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.user_id IS '提交人id';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.user_name IS '提交人姓名';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.ctime IS '创建时间';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.mtime IS '修改时间 ';
// COMMENT ON COLUMN operating_platform.ocp_model_requirement.requirement_statu IS '需求审核状态0:未通过1:通过 ';
//
// COMMENT ON TABLE operating_platform.ocp_model_requirement IS '模型需求表';
src/main/java/com/pms/ocp/service/ModelDemandService.java
View file @ 87482a28
package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelDTO;
import com.pms.ocp.model.entity.ModelDemand;
import com.pms.ocp.model.entity.ModelRequirement;
import java.util.List;
......@@ -15,27 +14,27 @@ public interface ModelDemandService {
/**
* 创建模型需求
*
* @param modelDemand
* @param modelRequirement
* @return
*/
Integer createModelDemand(ModelDemand modelDemand);
Integer createModelDemand(ModelRequirement modelRequirement);
/**
* 删除模型需求
*
* @param demandId
* @param modelId
* @param objId
* @param requirementCode
* @return
*/
Integer deleteModelDemand(String demandId, String modelId);
Integer deleteModelDemand(String objId, String requirementCode);
/**
* 更新模型需求
*
* @param modelDemand
* @param modelRequirement
* @return
*/
Integer updateModelDemand(ModelDemand modelDemand);
Integer updateModelDemand(ModelRequirement modelRequirement);
/**
* 获取模型需求
......@@ -43,7 +42,7 @@ public interface ModelDemandService {
* @param
* @return
*/
List<ModelDemand> getModelDemandList(List<String> modelIds);
List<ModelRequirement> getModelDemandList(List<String> modelIds);
/**
* 获取模型需求列表
......@@ -52,6 +51,6 @@ public interface ModelDemandService {
* @param modelCode
* @return
*/
ModelDemand getModelDemand(String objId, String modelCode);
ModelRequirement getModelDemand(String objId, String modelCode);
}
src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
View file @ 87482a28
......@@ -23,11 +23,11 @@ public interface ModelPropertyVersionService {
/**
* 删除模型属性版本信息
*
* @param columnCode
* @param propCode
* @param propId
* @return
*/
Integer deleteModelPropertyVersion(String propId, String columnCode);
Integer deleteModelPropertyVersion(String propId, String propCode);
/**
* 更新模型属性版本信息
......
src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
View file @ 87482a28
......@@ -32,11 +32,11 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
}
@Override
public Integer deleteModelBaseVersion(String modelId, String modelCode) {
public Integer deleteModelBaseVersion(String objId, String modelCode) {
QueryWrapper<ModelBaseVersion> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(modelId)) {
queryWrapper.lambda().eq(ModelBaseVersion::getModelId, modelId);
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelBaseVersion::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
......@@ -51,7 +51,7 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
UpdateWrapper<ModelBaseVersion> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(ModelBaseVersion::getModelId, modelBaseVersion.getModelId());
updateWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelBaseVersion.getModelCode());
return modelBaseVersionMapper.update(modelBaseVersion, updateWrapper);
}
......
src/main/java/com/pms/ocp/service/impl/ModelDemandServiceImpl.java
View file @ 87482a28
......@@ -2,8 +2,8 @@ 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.ModelDemandMapper;
import com.pms.ocp.model.entity.ModelDemand;
import com.pms.ocp.mapper.ModelRequirementMapper;
import com.pms.ocp.model.entity.ModelRequirement;
import com.pms.ocp.service.ModelDemandService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -21,51 +21,51 @@ import java.util.List;
public class ModelDemandServiceImpl implements ModelDemandService {
@Autowired
private ModelDemandMapper modelDemandMapper;
private ModelRequirementMapper modelRequirementMapper;
@Override
public Integer createModelDemand(ModelDemand modelDemand) {
return modelDemandMapper.insert(modelDemand);
public Integer createModelDemand(ModelRequirement modelRequirement) {
return modelRequirementMapper.insert(modelRequirement);
}
@Override
public Integer deleteModelDemand(String demandId, String modelId) {
QueryWrapper<ModelDemand> queryWrapper = new QueryWrapper();
public Integer deleteModelDemand(String objId, String requirementCode) {
QueryWrapper<ModelRequirement> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(demandId)) {
queryWrapper.lambda().eq(ModelDemand::getDemandId, demandId);
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelRequirement::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelId)) {
queryWrapper.lambda().eq(ModelDemand::getModelId, modelId);
if (StringUtils.isNotEmpty(requirementCode)) {
queryWrapper.lambda().eq(ModelRequirement::getRequirementCode, requirementCode);
}
return modelDemandMapper.delete(queryWrapper);
return modelRequirementMapper.delete(queryWrapper);
}
@Override
public Integer updateModelDemand(ModelDemand modelDemand) {
UpdateWrapper<ModelDemand> updateWrapper = new UpdateWrapper<>();
public Integer updateModelDemand(ModelRequirement modelRequirement) {
UpdateWrapper<ModelRequirement> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(ModelDemand::getDemandId, modelDemand.getDemandId());
updateWrapper.lambda().eq(ModelRequirement::getRequirementCode, modelRequirement.getRequirementCode());
return modelDemandMapper.update(modelDemand, updateWrapper);
return modelRequirementMapper.update(modelRequirement, updateWrapper);
}
@Override
public List<ModelDemand> getModelDemandList(List<String> modelIds) {
public List<ModelRequirement> getModelDemandList(List<String> modelIds) {
QueryWrapper<ModelDemand> wrapper = new QueryWrapper<>();
QueryWrapper<ModelRequirement> wrapper = new QueryWrapper<>();
if (!modelIds.isEmpty()) {
wrapper.lambda().in(ModelDemand::getModelId, modelIds);
wrapper.lambda().in(ModelRequirement::getRequirementCode, modelIds);
}
return modelDemandMapper.selectList(wrapper);
return modelRequirementMapper.selectList(wrapper);
}
@Override
public ModelDemand getModelDemand(String objId, String modelCode) {
public ModelRequirement getModelDemand(String objId, String modelCode) {
return null;
}
}
src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
View file @ 87482a28
......@@ -32,15 +32,15 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
}
@Override
public Integer deleteModelPropertyVersion(String propId, String columnCode) {
public Integer deleteModelPropertyVersion(String propId, String propCode) {
QueryWrapper<ModelPropertyVersion> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(propId)) {
queryWrapper.lambda().eq(ModelPropertyVersion::getPropId, propId);
queryWrapper.lambda().eq(ModelPropertyVersion::getObjId, propId);
}
if (StringUtils.isNotEmpty(columnCode)) {
queryWrapper.lambda().eq(ModelPropertyVersion::getColumnCode, columnCode);
if (StringUtils.isNotEmpty(propCode)) {
queryWrapper.lambda().eq(ModelPropertyVersion::getPropCode, propCode);
}
return modelPropertyVersionMapper.delete(queryWrapper);
......@@ -50,7 +50,7 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
public Integer updateModelPropertyVersion(ModelPropertyVersion modelPropertyVersion) {
UpdateWrapper<ModelPropertyVersion> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(ModelPropertyVersion::getModelId, modelPropertyVersion.getModelId());
updateWrapper.lambda().eq(ModelPropertyVersion::getPropCode, modelPropertyVersion.getPropCode());
return modelPropertyVersionMapper.update(modelPropertyVersion, updateWrapper);
}
......@@ -60,7 +60,7 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
QueryWrapper<ModelPropertyVersion> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(propId)) {
queryWrapper.lambda().eq(ModelPropertyVersion::getPropId, propId);
queryWrapper.lambda().eq(ModelPropertyVersion::getObjId, propId);
}
if (StringUtils.isNotEmpty(modelCode)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment