Skip to content

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

模型需求接口添加分页

parent 87482a28
Show whitespace changes
Inline Side-by-side
Showing with 1162 additions and 149 deletions
src/main/java/com/pms/ocp/biz/BizModelRequirementService.java → src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java
View file @ bff89908
package com.pms.ocp.biz;
import com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO;
import com.pms.ocp.model.dto.ModelVersionDemandDTO;
import com.github.pagehelper.PageInfo;
import com.pms.ocp.model.dto.ModelPropertyVersionRequirementDTO;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelBaseVersion;
import com.pms.ocp.model.entity.ModelPropertyVersion;
import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
import com.pms.ocp.model.vo.ModelVersionRequirementVO;
import java.util.List;
......@@ -13,40 +16,40 @@ import java.util.List;
* @Date: 2022/4/1 10:29
* @Description:
*/
public interface BizModelRequirementService {
public interface BizModelRequirementInfoService {
/**
* 创建模型需求
*
* @param modelVersionDemandDTO
* @param modelVersionRequirementDTO
* @return
*/
Integer createModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO);
Integer createModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO);
/**
* 创建模型属性
*
* @param modelPropertyVersionDemandDTO
* @param modelPropertyVersionRequirementDTO
* @return
*/
Integer createModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO);
Integer createModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO);
/**
* 修改模型需求
*
* @param modelVersionDemandDTO
* @param modelVersionRequirementDTO
* @return
*/
Integer updateModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO);
Integer updateModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO);
/**
* 修改模型属性需求
*
* @param modelPropertyVersionDemandDTO
* @param modelPropertyVersionRequirementDTO
* @return
*/
Integer updateModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO);
Integer updateModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO);
/**
* 删除模型需求
......@@ -55,7 +58,7 @@ public interface BizModelRequirementService {
* @param modelId
* @return
*/
Integer deleteModelRequirement(String demandId, String modelId);
Integer deleteModelRequirementInfo(String demandId, String modelId);
/**
* 删除模型属性需求
......@@ -65,7 +68,7 @@ public interface BizModelRequirementService {
* @param proId
* @return
*/
Integer deleteModelPropertyRequirement(String demandId, String modelId, String proId);
Integer deleteModelPropertyRequirementInfo(String demandId, String modelId, String proId);
/**
* 获取模型需求
......@@ -73,7 +76,7 @@ public interface BizModelRequirementService {
* @param
* @return
*/
List<ModelBaseVersion> getModelRequirementList(String modelCode, String modelGroupCode, int currentPage, int pageSize);
PageInfo<ModelVersionRequirementVO> getModelRequirementInfoList(String modelName, String modelCode, String modelGroupCode, int currentPage, int pageSize);
/**
* 获取模型属性需求
......@@ -81,7 +84,7 @@ public interface BizModelRequirementService {
* @param
* @return
*/
List<ModelPropertyVersion> getModelPropertyRequirementList(String propId, String modelCode, int currentPage, int pageSize);
PageInfo<ModelPropertyVersionRequirementVO> getModelPropertyRequirementInfoList(String requirementCode, String modelCode, int currentPage, int pageSize);
/**
* 获取模型需求
......@@ -90,7 +93,7 @@ public interface BizModelRequirementService {
* @param modelGroupCode
* @return
*/
Model getModelRequirement(String objId, String modelGroupCode);
Model getModelRequirementInfo(String objId, String modelGroupCode);
/**
* 获取模型属性需求
......@@ -99,6 +102,6 @@ public interface BizModelRequirementService {
* @param modelGroupCode
* @return
*/
Model getModelPropertyRequirement(String objId, String modelGroupCode);
Model getModelPropertyRequirementInfo(String objId, String modelGroupCode);
}
src/main/java/com/pms/ocp/biz/impl/BizModelRequirementServiceImpl.java → src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
View file @ bff89908
package com.pms.ocp.biz.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pms.ocp.biz.BizModelRequirementService;
import com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.pms.ocp.biz.BizModelRequirementInfoService;
import com.pms.ocp.model.dto.ModelPropertyVersionRequirementDTO;
import com.pms.ocp.model.entity.*;
import com.pms.ocp.model.dto.ModelVersionDemandDTO;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
import com.pms.ocp.model.vo.ModelVersionRequirementVO;
import com.pms.ocp.service.ModelBaseVersionService;
import com.pms.ocp.service.ModelDemandService;
import com.pms.ocp.service.ModelRequirementService;
import com.pms.ocp.service.ModelPropertyVersionService;
import com.pms.ocp.service.OcpModelGroupService;
import org.apache.commons.lang3.StringUtils;
......@@ -18,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Auther: wangjian
......@@ -26,10 +31,13 @@ import java.util.List;
*/
@Service
public class BizModelRequirementServiceImpl implements BizModelRequirementService {
public class BizModelRequirementInfoServiceImpl implements BizModelRequirementInfoService {
@Autowired
private ModelDemandService modelDemandService;
private OcpModelGroupService ocpModelGroupService;
@Autowired
private ModelRequirementService modelRequirementService;
@Autowired
private ModelBaseVersionService modelBaseVersionService;
......@@ -40,72 +48,76 @@ public class BizModelRequirementServiceImpl implements BizModelRequirementServic
@Transactional
@Override
public Integer createModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO) {
public Integer createModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelVersionDemandDTO, modelRequirement);
BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement);
modelRequirement.setCtime(LocalDateTime.now());
ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionDemandDTO, modelBaseVersion);
modelBaseVersionService.createModelBaseVersion(modelBaseVersion);
BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion);
modelBaseVersion.setModelCtime(LocalDateTime.now());
modelDemandService.createModelDemand(modelRequirement);
modelRequirementService.createModelRequirement(modelRequirement);
modelBaseVersionService.createModelBaseVersion(modelBaseVersion);
return 1;
}
@Override
public Integer createModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
public Integer createModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelRequirement);
modelRequirement.setCtime(LocalDateTime.now());
// ModelRequirement modelRequirement = new ModelRequirement();
// BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelRequirement);
// modelRequirement.setCtime(LocalDateTime.now());
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelPropertyVersion);
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
modelPropertyVersion.setPropCtime(LocalDateTime.now());
modelPropertyVersionService.createModelPropertyVersion(modelPropertyVersion);
modelDemandService.createModelDemand(modelRequirement);
// modelRequirementService.createModelDemand(modelRequirement);
return 1;
}
@Transactional
@Override
public Integer updateModelRequirement(ModelVersionDemandDTO modelVersionDemandDTO) {
public Integer updateModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelVersionDemandDTO, modelRequirement);
BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement);
modelRequirement.setMtime(LocalDateTime.now());
ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionDemandDTO, modelBaseVersion);
BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion);
modelBaseVersionService.updateModelBaseVersion(modelBaseVersion);
modelDemandService.updateModelDemand(modelRequirement);
modelRequirementService.updateModelRequirement(modelRequirement);
return 1;
}
@Override
public Integer updateModelPropertyRequirement(ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
public Integer updateModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelRequirement);
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelRequirement);
modelRequirement.setMtime(LocalDateTime.now());
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionDemandDTO, modelPropertyVersion);
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
modelPropertyVersionService.updateModelPropertyVersion(modelPropertyVersion);
modelDemandService.updateModelDemand(modelRequirement);
modelRequirementService.updateModelRequirement(modelRequirement);
return 1;
}
@Transactional
@Override
public Integer deleteModelRequirement(String demandId, String modelId) {
public Integer deleteModelRequirementInfo(String demandId, String modelId) {
modelDemandService.deleteModelDemand(modelId, demandId);
modelRequirementService.deleteModelRequirement(modelId, demandId);
if (StringUtils.isNotEmpty(modelId)) {
......@@ -116,8 +128,8 @@ public class BizModelRequirementServiceImpl implements BizModelRequirementServic
}
@Override
public Integer deleteModelPropertyRequirement(String demandId, String modelId, String proId) {
modelDemandService.deleteModelDemand(modelId, demandId);
public Integer deleteModelPropertyRequirementInfo(String demandId, String modelId, String proId) {
modelRequirementService.deleteModelRequirement(modelId, demandId);
if (StringUtils.isNotEmpty(proId)) {
......@@ -127,22 +139,18 @@ public class BizModelRequirementServiceImpl implements BizModelRequirementServic
return 1;
}
@Autowired
private OcpModelGroupService ocpModelGroupService;
@Override
public Model getModelRequirement(String objId, String modelGroupCode) {
public Model getModelRequirementInfo(String objId, String modelGroupCode) {
return null;
}
@Override
public Model getModelPropertyRequirement(String objId, String modelGroupCode) {
public Model getModelPropertyRequirementInfo(String objId, String modelGroupCode) {
return null;
}
@Override
public List<ModelBaseVersion> getModelRequirementList(String modelCode, String modelGroupCode, int currentPage, int pageSize) {
public PageInfo<ModelVersionRequirementVO> getModelRequirementInfoList(String modelName, String modelCode, String modelGroupCode, int currentPage, int pageSize) {
List<String> modelGroupCodeList = new ArrayList<>();
......@@ -152,17 +160,21 @@ public class BizModelRequirementServiceImpl implements BizModelRequirementServic
getParentNode(modelGroupCodeList, modelClassifyList, modelGroupCode);
modelGroupCodeList.add(modelGroupCode);
List<ModelBaseVersion> modelBaseVersionList = modelBaseVersionService.getModelBaseVersionList(modelCode, modelGroupCodeList, currentPage, pageSize);
PageHelper.startPage(currentPage, pageSize);
List<ModelVersionRequirementVO> modelRequirementVOList = modelRequirementService.getModelRequirementList(modelName, modelCode, modelGroupCodeList);
PageInfo<ModelVersionRequirementVO> pageInfo = new PageInfo<>(modelRequirementVOList);
return modelBaseVersionList;
return pageInfo;
}
@Override
public List<ModelPropertyVersion> getModelPropertyRequirementList(String propId, String modelCode, int currentPage, int pageSize) {
public PageInfo<ModelPropertyVersionRequirementVO> getModelPropertyRequirementInfoList(String requirementCode, String modelCode, int currentPage, int pageSize) {
List<ModelPropertyVersion> modelPropertyVersionList = modelPropertyVersionService.getModelPropertyVersionList(propId, modelCode);
PageHelper.startPage(currentPage, pageSize);
List<ModelPropertyVersionRequirementVO> modelPropertyVersionRequirementVOList = modelRequirementService.getModelPropertyRequirementList(requirementCode, modelCode);
PageInfo<ModelPropertyVersionRequirementVO> pageInfo = new PageInfo<>(modelPropertyVersionRequirementVOList);
return modelPropertyVersionList;
return pageInfo;
}
/**
......
src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
View file @ bff89908
package com.pms.ocp.controller;
import com.pms.ocp.biz.BizModelRequirementService;
import com.pms.ocp.model.dto.ModelPropertyVersionDemandDTO;
import com.pms.ocp.model.dto.ModelVersionDemandDTO;
import com.pms.ocp.biz.BizModelRequirementInfoService;
import com.pms.ocp.model.dto.ModelPropertyVersionRequirementDTO;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.vo.ResponseVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
public class ModelControlDemandController {
@Autowired
private BizModelRequirementService bizModelRequirementService;
private BizModelRequirementInfoService bizModelRequirementInfoService;
/**
* 模型需求-增加
......@@ -33,9 +33,9 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型需求-增加")
@PostMapping("/create/modelDemand")
public ResponseVO createModelDemand(@RequestBody ModelVersionDemandDTO modelVersionDemandDTO) {
public ResponseVO createModelDemand(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) {
return ResponseVO.ok(bizModelRequirementService.createModelRequirement(modelVersionDemandDTO));
return ResponseVO.ok(bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO));
}
/**
......@@ -45,9 +45,9 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型属性需求-增加")
@PostMapping("/create/modelPropertyDemand")
public ResponseVO createModelPropertyDemand(@RequestBody ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
public ResponseVO createModelPropertyDemand(@RequestBody ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
return ResponseVO.ok(bizModelRequirementService.createModelPropertyRequirement(modelPropertyVersionDemandDTO));
return ResponseVO.ok(bizModelRequirementInfoService.createModelPropertyRequirementInfo(modelPropertyVersionRequirementDTO));
}
/**
......@@ -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(bizModelRequirementService.deleteModelRequirement(objId, modelCode));
return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(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(bizModelRequirementService.deleteModelPropertyRequirement(objId, modelCode, propCode));
return ResponseVO.ok(bizModelRequirementInfoService.deleteModelPropertyRequirementInfo(objId, modelCode, propCode));
}
/**
......@@ -82,8 +82,8 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型需求-修改")
@PostMapping("/update/modelDemand")
public ResponseVO updateModelDemand(@RequestBody ModelVersionDemandDTO modelVersionDemandDTO) {
return ResponseVO.ok(bizModelRequirementService.updateModelRequirement(modelVersionDemandDTO));
public ResponseVO updateModelDemand(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) {
return ResponseVO.ok(bizModelRequirementInfoService.updateModelRequirementInfo(modelVersionRequirementDTO));
}
/**
......@@ -93,8 +93,8 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型属性需求-修改")
@PostMapping("/update/modelPropertyDemand")
public ResponseVO updateModelPropertyDemand(@RequestBody ModelPropertyVersionDemandDTO modelPropertyVersionDemandDTO) {
return ResponseVO.ok(bizModelRequirementService.updateModelPropertyRequirement(modelPropertyVersionDemandDTO));
public ResponseVO updateModelPropertyDemand(@RequestBody ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
return ResponseVO.ok(bizModelRequirementInfoService.updateModelPropertyRequirementInfo(modelPropertyVersionRequirementDTO));
}
/**
......@@ -104,16 +104,16 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型需求-查询列表")
@GetMapping("/get/modelDemand/list")
public ResponseVO getModelDemandList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", defaultValue = "0") String belongLevel,
public ResponseVO getModelDemandList(
@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
@ApiParam(value = "模型名称") @RequestParam(value = "modelName", required = false) String modelName,
@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) {
return ResponseVO.ok(bizModelRequirementService.getModelRequirementList(belongLevel, modelGroupCode, currentPage, pageSize));
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize) {
return ResponseVO.ok(bizModelRequirementInfoService.getModelRequirementInfoList(modelName, modelCode, modelGroupCode, currentPage, pageSize));
}
/**
* 模型属性需求-查询列表
*
......@@ -121,12 +121,11 @@ public class ModelControlDemandController {
*/
@ApiOperation("模型属性需求-查询列表")
@GetMapping("/get/modelPropertyDemand/list")
public ResponseVO getModelPropertyDemandList(@ApiParam(value = "所属级别") @RequestParam(value = "belongLevel", defaultValue = "0") String belongLevel,
public ResponseVO getModelPropertyDemandList(@ApiParam(value = "需求编码") @RequestParam(value = "requirementCode", required = false) String requirementCode,
@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(bizModelRequirementService.getModelPropertyRequirementList(belongLevel, modelCode, currentPage, pageSize));
@ApiParam(value = "每页数量") @RequestParam(value = "pageSize") Integer pageSize) {
return ResponseVO.ok(bizModelRequirementInfoService.getModelPropertyRequirementInfoList(requirementCode, modelCode, currentPage, pageSize));
}
......
src/main/java/com/pms/ocp/mapper/ModelRequirementMapper.java
View file @ bff89908
package com.pms.ocp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.entity.ModelRequirement;
import com.pms.ocp.model.vo.ModelPropertyVO;
import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
import com.pms.ocp.model.vo.ModelVersionRequirementVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Auther: wangjian
......@@ -12,4 +19,13 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ModelRequirementMapper extends BaseMapper<ModelRequirement> {
List<ModelVersionRequirementVO> listModelRequirementVO(@Param("modelName") String modelName,
@Param("modelCode") String modelCode,
@Param("modelGroupCodes") List<String> modelGroupCodes);
List<ModelPropertyVersionRequirementVO> listModelPropertyVersionRequirementVO(@Param("requirementCode") String requirementCode,
@Param("modelCode") String modelCode);
}
\ No newline at end of file
src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionDemandDTO.java → src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java
View file @ bff89908
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
......@@ -12,13 +19,21 @@ import lombok.Data;
@ApiModel("模型属性需求传输对象")
@Data
public class ModelPropertyVersionDemandDTO {
public class ModelPropertyVersionRequirementDTO {
/**
* 主键
*/
@ApiModelProperty(value = "主键")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型编号
* 模型编码
*/
@ApiModelProperty(value = "模型编号")
private String modelId;
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 属性名称
......@@ -26,6 +41,12 @@ public class ModelPropertyVersionDemandDTO {
@ApiModelProperty(value = "属性名称")
private String columnName;
/**
* 模型版本号
*/
@ApiModelProperty(value = "模型版本号")
private String modelVersion;
/**
* 属性编码
*/
......@@ -42,7 +63,7 @@ public class ModelPropertyVersionDemandDTO {
* 数据类型
*/
@ApiModelProperty(value = "数据类型")
private Integer dataType;
private String dataType;
/**
* 数据长度
......@@ -57,106 +78,106 @@ public class ModelPropertyVersionDemandDTO {
private Integer dataScale;
/**
* 是否主键
* 是否主键 0:否,1:是
*/
@ApiModelProperty(value = "是否主键")
@ApiModelProperty(value = "是否主键 0:否,1:是")
@TableField("is_pk")
private Integer boolPk;
/**
* 是否必填
* 是否必填 0:否,1:是
*/
@ApiModelProperty(value = "是否必填")
@ApiModelProperty(value = "是否必填 0:否,1:是")
@TableField("is_required")
private Integer boolRequired;
/**
* 推广类型
*/
@ApiModelProperty(value = "推广类型")
private Integer propPromotion;
/**
* 是否启用
* 显示顺序
*/
@ApiModelProperty(value = "是否启用")
private Integer boolUse;
@ApiModelProperty(value = "显示顺序")
private Integer propOrderNo;
/**
* 省公司ID
* 提交人id
*/
@ApiModelProperty(value = "省公司ID")
private String companyId;
@ApiModelProperty(value = "提交人id")
private String propUserId;
/**
* 省公司名称
* 提交人姓名
*/
@ApiModelProperty(value = "省公司名称")
private String companyName;
@ApiModelProperty(value = "提交人姓名")
private String propUserName;
/**
* 显示顺序
* 创建时间
*/
@ApiModelProperty(value = "显示顺序")
private Integer propDispidx;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private LocalDateTime propCtime;
/**
* 模型编码
* 修改时间
*/
@ApiModelProperty(value = "模型编码")
private String model_code;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间")
private LocalDateTime propMtime;
/**
* 版本
* 需求编码
*/
@ApiModelProperty(value = "版本")
private String demandVersion;
@ApiModelProperty(value = "需求编码")
private String requirementCode;
/**
* 提交人id
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "提交人id")
private String applyUserId;
@ApiModelProperty(value = "需求类型 0:新增，1:迭代，2下线")
private Integer requirementType;
/**
* 提交人姓名
* 需求简述
*/
@ApiModelProperty(value = "提交人姓名")
private String applyUserName;
@ApiModelProperty(value = "需求简述")
private String requirementDesc;
/**
* 流程类型
* 需求提报公司
*/
@ApiModelProperty(value = "流程类型")
private Integer flowType;
@ApiModelProperty(value = "需求提报公司")
private String companyCode;
/**
* 需求描述
* 提交人id
*/
@ApiModelProperty(value = "需求描述")
private String flowMessage;
@ApiModelProperty(value = "提交人id")
private String userId;
/**
* 需求审核状态
* 提交人姓名
*/
@ApiModelProperty(value = "需求审核状态")
private Integer flowStatus;
@ApiModelProperty(value = "提交人姓名")
private String userName;
/**
* 审核意见
* 创建时间
*/
@ApiModelProperty(value = "审核意见")
private String flowComment;
@ApiModelProperty(value = "创建时间")
private LocalDateTime ctime;
/**
* 审核人id
* 修改时间
*/
@ApiModelProperty(value = "审核人id")
private String flowUserId;
@ApiModelProperty(value = "修改时间")
private LocalDateTime mtime;
/**
* 审核人姓名
* 需求审核状态0:未通过1:通过
*/
@ApiModelProperty(value = "审核人姓名")
private String flowUserName;
@ApiModelProperty(value = "需求审核状态0:未通过1:通过")
private Integer requirementStatus;
}
......
src/main/java/com/pms/ocp/model/dto/ModelVersionDemandDTO.java → src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java
View file @ bff89908
package com.pms.ocp.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
......@@ -12,7 +19,14 @@ import lombok.Data;
@ApiModel("模型需求传输对象")
@Data
public class ModelVersionDemandDTO {
public class ModelVersionRequirementDTO {
/**
* 主键
*/
@ApiModelProperty(value = "主键")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型编号
......@@ -26,6 +40,12 @@ public class ModelVersionDemandDTO {
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 模型名称
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 模型表名称
*/
......@@ -33,95 +53,153 @@ public class ModelVersionDemandDTO {
private String modelTable;
/**
* 推广类型
* 需求编码
*/
@ApiModelProperty(value = "推广类型")
private Integer propPromotion;
@ApiModelProperty(value = "需求编码")
private String requirementCode;
/**
* 是否启用
* 设备类型
*/
@ApiModelProperty(value = "是否启用")
private Integer boolUse;
@ApiModelProperty(value = "设备类型")
private String equipType;
/**
* 省公司ID
* 所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合
*/
@ApiModelProperty(value = "省公司ID")
private String companyId;
@ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合")
private String professionalKind;
/**
* 省公司名称
* 模型分类编码
*/
@ApiModelProperty(value = "省公司名称")
private String companyName;
@ApiModelProperty(value = "模型分类编码")
private String modelGroupCode;
/**
* 显示顺序
* 公司编码
*/
@ApiModelProperty(value = "显示顺序")
private Integer propDispidx;
@ApiModelProperty(value = "公司编码")
private String ownerCompanyCode;
/**
* 版本
* 排列顺序
*/
@ApiModelProperty(value = "版本")
private String demandVersion;
@ApiModelProperty(value = "排列顺序")
private Integer modelOrderNo;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人id")
private String applyUserId;
private String modelUserId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String applyUserName;
private String modelUserName;
/**
* 流程类型
* 创建时间
*/
@ApiModelProperty(value = "流程类型")
private Integer flowType;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private LocalDateTime modelCtime;
/**
* 需求描述
* 修改时间
*/
@ApiModelProperty(value = "需求描述")
private String flowMessage;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间")
private LocalDateTime modelMtime;
/**
* 需求审核状态
* 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区
*/
@ApiModelProperty(value = "需求审核状态")
private Integer flowStatus;
@ApiModelProperty(value = "所属区域 1:生成控制大区 2:信息关联大区3:互联网大区")
private Integer modelZone;
/**
* 审核意见
* 所属层级 1:应用层 2:平台层3:网络层 4:感知层
*/
@ApiModelProperty(value = "审核意见")
private String flowComment;
@ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层")
private Integer modelLayer;
/**
* 审核人id
* 模型版本号
*/
@ApiModelProperty(value = "审核人id")
private String flowUserId;
@ApiModelProperty(value = "模型版本号")
private String modelVersion;
/**
* 审核人姓名
* 设计厂商
*/
@ApiModelProperty(value = "审核人姓名")
private String flowUserName;
@ApiModelProperty(value = "设计厂商")
private String apiUnit;
/**
* 模型名称
* 版本简述
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
@ApiModelProperty(value = "版本简述")
private String modelVersionDesc;
/**
* 是否已经删除 0未删除 1已删除
*/
@ApiModelProperty(value = "是否已经删除 0未删除 1已删除")
@TableField("is_delete")
private Integer boolDelete;
/**
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "需求类型 0:新增，1:迭代，2下线")
private Integer requirementType;
/**
* 需求简述
*/
@ApiModelProperty(value = "需求简述")
private String requirementDesc;
/**
* 需求提报公司
*/
@ApiModelProperty(value = "需求提报公司")
private String companyCode;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人id")
private String userId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String userName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private LocalDateTime ctime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private LocalDateTime mtime;
/**
* 需求审核状态0:未通过1:通过
*/
@ApiModelProperty(value = "需求审核状态0:未通过1:通过")
private Integer requirementStatus;
}
......
src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java
View file @ bff89908
......@@ -4,7 +4,9 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
......@@ -39,7 +41,6 @@ public class ModelBaseVersion {
*/
private String requirementCode;
/**
* 设备类型
*/
......@@ -50,7 +51,6 @@ public class ModelBaseVersion {
*/
private String professionalKind;
/**
* 模型分类编码
*/
......@@ -79,17 +79,21 @@ public class ModelBaseVersion {
/**
* 提交人姓名
*/
private LocalDateTime modelUserName;
private String modelUserName;
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelCtime;
/**
* 修改时间
*/
private Integer modelMtime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelMtime;
/**
* 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区
......@@ -117,7 +121,7 @@ public class ModelBaseVersion {
private String modelVersionDesc;
/**
* 省公司ID
* 是否已经删除 0未删除 1已删除
*/
@TableField("is_delete")
private Integer boolDelete;
......
src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java
View file @ bff89908
......@@ -4,7 +4,12 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
......@@ -93,12 +98,21 @@ public class ModelPropertyVersion {
/**
* 创建时间
*/
private Integer propCtime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime propCtime;
/**
* 修改时间
*/
private Integer propMtime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime propMtime;
/**
* 需求编码
*/
private String requirementCode;
}
......
src/main/java/com/pms/ocp/model/entity/ModelRequirement.java
View file @ bff89908
......@@ -2,8 +2,10 @@ package com.pms.ocp.model.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
......@@ -56,11 +58,15 @@ public class ModelRequirement {
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime ctime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime mtime;
/**
......
src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java 0 → 100644
View file @ bff89908
package com.pms.ocp.model.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/29 17:27
* @Description:模型属性需求展示对象
*/
@ApiModel("模型属性需求展示对象")
@Data
public class ModelPropertyVersionRequirementVO {
/**
* 主键
*/
@ApiModelProperty(value = "主键")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型编码
*/
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 属性名称
*/
@ApiModelProperty(value = "属性名称")
private String columnName;
/**
* 模型版本号
*/
@ApiModelProperty(value = "模型版本号")
private String modelVersion;
/**
* 属性编码
*/
@ApiModelProperty(value = "属性编码")
private String propCode;
/**
* 属性描述
*/
@ApiModelProperty(value = "属性描述")
private String columnComments;
/**
* 数据类型
*/
@ApiModelProperty(value = "数据类型")
private String dataType;
/**
* 数据长度
*/
@ApiModelProperty(value = "数据长度")
private Integer dataLength;
/**
* 数据精度
*/
@ApiModelProperty(value = "数据精度")
private Integer dataScale;
/**
* 是否主键 0:否,1:是
*/
@ApiModelProperty(value = "是否主键 0:否,1:是")
@TableField("is_pk")
private Integer boolPk;
/**
* 是否必填 0:否,1:是
*/
@ApiModelProperty(value = "是否必填 0:否,1:是")
@TableField("is_required")
private Integer boolRequired;
/**
* 显示顺序
*/
@ApiModelProperty(value = "显示顺序")
private Integer propOrderNo;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人id")
private String propUserId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String propUserName;
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private LocalDateTime propCtime;
/**
* 修改时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间")
private LocalDateTime propMtime;
/**
* 需求编码
*/
@ApiModelProperty(value = "需求编码")
private String requirementCode;
/**
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "需求类型 0:新增，1:迭代，2下线")
private Integer requirementType;
/**
* 需求简述
*/
@ApiModelProperty(value = "需求简述")
private String requirementDesc;
/**
* 需求提报公司
*/
@ApiModelProperty(value = "需求提报公司")
private String companyCode;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人id")
private String userId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String userName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private LocalDateTime ctime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private LocalDateTime mtime;
/**
* 需求审核状态0:未通过1:通过
*/
@ApiModelProperty(value = "需求审核状态0:未通过1:通过")
private Integer requirementStatus;
}
// 字段名称 字段描述 字段类型 允许为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) 是
// "applyUserId": "",
// "applyUserName": "",
// "companyId": "",
// "companyName": "",
// "demandVersion": "",
// "flowComment": "",
// "flowMessage": "",
// "flowStatu": 0,
// "flowType": 0,
// "flowUserId": "",
// "flowUserName": "",
// "model_code": "",
// "model_name": "",
// "model_table": ""
src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java 0 → 100644
View file @ bff89908
package com.pms.ocp.model.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
/**
* @Auther: wangjian
* @Date: 2022/3/29 17:27
* @Description:模型需求展示对象
*/
@ApiModel("模型需求展示对象")
@Data
public class ModelVersionRequirementVO {
/**
* 主键
*/
@ApiModelProperty(value = "主键")
@TableId(value = "obj_id", type = IdType.ASSIGN_ID)
private String objId;
/**
* 模型编号
*/
@ApiModelProperty(value = "模型编号")
private String modelId;
/**
* 模型编码
*/
@ApiModelProperty(value = "模型编码")
private String modelCode;
/**
* 模型名称
*/
@ApiModelProperty(value = "模型名称")
private String modelName;
/**
* 模型表名称
*/
@ApiModelProperty(value = "模型表名称")
private String modelTable;
/**
* 需求编码
*/
@ApiModelProperty(value = "需求编码")
private String requirementCode;
/**
* 设备类型
*/
@ApiModelProperty(value = "设备类型")
private String equipType;
/**
* 所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合
*/
@ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合")
private String professionalKind;
/**
* 模型分类编码
*/
@ApiModelProperty(value = "模型分类编码")
private String modelGroupCode;
/**
* 公司编码
*/
@ApiModelProperty(value = "公司编码")
private String ownerCompanyCode;
/**
* 排列顺序
*/
@ApiModelProperty(value = "排列顺序")
private Integer modelOrderNo;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人id")
private String modelUserId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String modelUserName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelCtime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime modelMtime;
/**
* 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区
*/
@ApiModelProperty(value = "所属区域 1:生成控制大区 2:信息关联大区3:互联网大区")
private Integer modelZone;
/**
* 所属层级 1:应用层 2:平台层3:网络层 4:感知层
*/
@ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层")
private Integer modelLayer;
/**
* 模型版本号
*/
@ApiModelProperty(value = "模型版本号")
private String modelVersion;
/**
* 设计厂商
*/
@ApiModelProperty(value = "设计厂商")
private String apiUnit;
/**
* 版本简述
*/
@ApiModelProperty(value = "版本简述")
private String modelVersionDesc;
/**
* 是否已经删除 0未删除 1已删除
*/
@ApiModelProperty(value = "是否已经删除 0未删除 1已删除")
@TableField("is_delete")
private Integer boolDelete;
/**
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "需求类型 0:新增，1:迭代，2下线")
private Integer requirementType;
/**
* 需求简述
*/
@ApiModelProperty(value = "需求简述")
private String requirementDesc;
/**
* 需求提报公司
*/
@ApiModelProperty(value = "需求提报公司")
private String companyCode;
/**
* 提交人id
*/
@ApiModelProperty(value = "提交人id")
private String userId;
/**
* 提交人姓名
*/
@ApiModelProperty(value = "提交人姓名")
private String userName;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime ctime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime mtime;
/**
* 需求审核状态0:未通过1:通过
*/
@ApiModelProperty(value = "需求审核状态0:未通过1:通过")
private Integer requirementStatus;
}
// 字段名称 字段描述 字段类型 允许为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) 是
// "applyUserId": "",
// "applyUserName": "",
// "companyId": "",
// "companyName": "",
// "demandVersion": "",
// "flowComment": "",
// "flowMessage": "",
// "flowStatu": 0,
// "flowType": 0,
// "flowUserId": "",
// "flowUserName": "",
// "model_code": "",
// "model_name": "",
// "model_table": ""
src/main/java/com/pms/ocp/service/ModelPropertyVersionService.java
View file @ bff89908
......@@ -43,6 +43,6 @@ public interface ModelPropertyVersionService {
* @param
* @return
*/
List<ModelPropertyVersion> getModelPropertyVersionList(String propId, String modelCode);
List<ModelPropertyVersion> getModelPropertyVersionList(String requirementCode, String modelCode);
}
src/main/java/com/pms/ocp/service/ModelDemandService.java → src/main/java/com/pms/ocp/service/ModelRequirementService.java
View file @ bff89908
package com.pms.ocp.service;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.entity.ModelRequirement;
import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
import com.pms.ocp.model.vo.ModelVersionRequirementVO;
import java.util.List;
......@@ -9,7 +12,7 @@ import java.util.List;
* @Date: 2022/3/29 17:43
* @Description:模型需求业务层接口
*/
public interface ModelDemandService {
public interface ModelRequirementService {
/**
* 创建模型需求
......@@ -17,7 +20,7 @@ public interface ModelDemandService {
* @param modelRequirement
* @return
*/
Integer createModelDemand(ModelRequirement modelRequirement);
Integer createModelRequirement(ModelRequirement modelRequirement);
/**
* 删除模型需求
......@@ -26,7 +29,7 @@ public interface ModelDemandService {
* @param requirementCode
* @return
*/
Integer deleteModelDemand(String objId, String requirementCode);
Integer deleteModelRequirement(String objId, String requirementCode);
/**
* 更新模型需求
......@@ -34,7 +37,7 @@ public interface ModelDemandService {
* @param modelRequirement
* @return
*/
Integer updateModelDemand(ModelRequirement modelRequirement);
Integer updateModelRequirement(ModelRequirement modelRequirement);
/**
* 获取模型需求
......@@ -42,7 +45,15 @@ public interface ModelDemandService {
* @param
* @return
*/
List<ModelRequirement> getModelDemandList(List<String> modelIds);
List<ModelVersionRequirementVO> getModelRequirementList(String modelName, String modelCode, List<String> modelGroupCodes);
/**
* 获取模型属性需求
*
* @param
* @return
*/
List<ModelPropertyVersionRequirementVO> getModelPropertyRequirementList(String requirementCode, String modelCode);
/**
* 获取模型需求列表
......@@ -51,6 +62,6 @@ public interface ModelDemandService {
* @param modelCode
* @return
*/
ModelRequirement getModelDemand(String objId, String modelCode);
ModelRequirement getModelRequirement(String objId, String modelCode);
}
src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
View file @ bff89908
......@@ -65,11 +65,10 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
queryWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelCode);
}
if (!modelGroupCodeList.isEmpty()) {
queryWrapper.lambda().in(ModelBaseVersion::getModelGroupCode, modelGroupCodeList);
}
modelBaseVersionMapper.selectList(queryWrapper);
return null;
return modelBaseVersionMapper.selectList(queryWrapper);
}
}
src/main/java/com/pms/ocp/service/impl/ModelPropertyVersionServiceImpl.java
View file @ bff89908
......@@ -56,11 +56,11 @@ public class ModelPropertyVersionServiceImpl implements ModelPropertyVersionServ
}
@Override
public List<ModelPropertyVersion> getModelPropertyVersionList(String propId, String modelCode) {
public List<ModelPropertyVersion> getModelPropertyVersionList(String requirementCode, String modelCode) {
QueryWrapper<ModelPropertyVersion> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(propId)) {
queryWrapper.lambda().eq(ModelPropertyVersion::getObjId, propId);
if (StringUtils.isNotEmpty(requirementCode)) {
queryWrapper.lambda().eq(ModelPropertyVersion::getObjId, requirementCode);
}
if (StringUtils.isNotEmpty(modelCode)) {
......
src/main/java/com/pms/ocp/service/impl/ModelDemandServiceImpl.java → src/main/java/com/pms/ocp/service/impl/ModelRequirementServiceImpl.java
View file @ bff89908
......@@ -3,8 +3,11 @@ 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.ModelRequirementMapper;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.entity.ModelRequirement;
import com.pms.ocp.service.ModelDemandService;
import com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO;
import com.pms.ocp.model.vo.ModelVersionRequirementVO;
import com.pms.ocp.service.ModelRequirementService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -18,18 +21,18 @@ import java.util.List;
*/
@Service
public class ModelDemandServiceImpl implements ModelDemandService {
public class ModelRequirementServiceImpl implements ModelRequirementService {
@Autowired
private ModelRequirementMapper modelRequirementMapper;
@Override
public Integer createModelDemand(ModelRequirement modelRequirement) {
public Integer createModelRequirement(ModelRequirement modelRequirement) {
return modelRequirementMapper.insert(modelRequirement);
}
@Override
public Integer deleteModelDemand(String objId, String requirementCode) {
public Integer deleteModelRequirement(String objId, String requirementCode) {
QueryWrapper<ModelRequirement> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
......@@ -44,7 +47,7 @@ public class ModelDemandServiceImpl implements ModelDemandService {
}
@Override
public Integer updateModelDemand(ModelRequirement modelRequirement) {
public Integer updateModelRequirement(ModelRequirement modelRequirement) {
UpdateWrapper<ModelRequirement> updateWrapper = new UpdateWrapper<>();
updateWrapper.lambda().eq(ModelRequirement::getRequirementCode, modelRequirement.getRequirementCode());
......@@ -53,19 +56,24 @@ public class ModelDemandServiceImpl implements ModelDemandService {
}
@Override
public List<ModelRequirement> getModelDemandList(List<String> modelIds) {
public List<ModelVersionRequirementVO> getModelRequirementList(String modelName, String modelCode, List<String> modelGroupCodes) {
QueryWrapper<ModelRequirement> wrapper = new QueryWrapper<>();
// QueryWrapper<ModelRequirement> wrapper = new QueryWrapper<>();
//
// if (!requirementCodes.isEmpty()) {
// wrapper.lambda().in(ModelRequirement::getRequirementCode, requirementCodes);
// }
if (!modelIds.isEmpty()) {
wrapper.lambda().in(ModelRequirement::getRequirementCode, modelIds);
return modelRequirementMapper.listModelRequirementVO(modelName, modelCode, modelGroupCodes);
}
return modelRequirementMapper.selectList(wrapper);
@Override
public List<ModelPropertyVersionRequirementVO> getModelPropertyRequirementList(String requirementCode, String modelCode) {
return modelRequirementMapper.listModelPropertyVersionRequirementVO(requirementCode, modelCode);
}
@Override
public ModelRequirement getModelDemand(String objId, String modelCode) {
public ModelRequirement getModelRequirement(String objId, String modelCode) {
return null;
}
}
src/main/resources/mapper/ModelRequirementMapper.xml 0 → 100644
View file @ bff89908
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pms.ocp.mapper.ModelRequirementMapper">
<!--
collection：表示遍历的数组或者集合，填写对应 key 的值
item：集合中被遍历的元素名，自己随意起的名字
separator：每次遍历元素后用于拼接字符串
open：遍历开始拼接的字符串
close：遍历结束拼接字符串
index：遍历索引
例如本条 SQL 语句,拼接后的结果为：
insert into user(username, password) values (?, ?), (?, ?), ...
-->
<!-- <insert id="insertBatchModel" useGeneratedKeys="true" keyProperty="id">-->
<!-- insert into ocp_model_base(username, password)-->
<!-- values-->
<!-- <foreach collection="users" item="user" separator=",">-->
<!-- (#{user.username}, #{user.password})-->
<!-- </foreach>-->
<!-- </insert>-->
<select id="listModelRequirementVO" resultType="com.pms.ocp.model.vo.ModelVersionRequirementVO">
select * from ocp_model_version omv
left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
<where>
<if test="modelCode != null and modelCode != ''">
and omv.model_code = #{modelCode}
</if>
<if test="modelName != null and modelName != ''">
and omv.model_name = #{modelName}
</if>
<if test="modelGroupCodes.size > 0">
and omv.model_group_code in
<foreach item="modelGroupCode" collection="modelGroupCodes" index="index" open="(" close=")" separator=",">
#{modelGroupCode}
</foreach>
</if>
</where>
</select>
<select id="listModelPropertyVersionRequirementVO" resultType="com.pms.ocp.model.vo.ModelPropertyVersionRequirementVO">
select * from ocp_model_prop_version ompv
left join ocp_model_version omv on omv.model_code = ompv.model_code and omv.requirement_code = ompv.requirement_code
left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
<where>
<if test="modelCode != null and modelCode != ''">
and ompv.model_code = #{modelCode}
</if>
<if test="requirementCode != null and requirementCode != ''">
and ompv.requirement_code = #{requirementCode}
</if>
</where>
</select>
</mapper>
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