Skip to content

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

需求修改test

parent 4f595fcc
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 30 deletions
src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
View file @ 1f235aae
......@@ -16,7 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
......@@ -45,12 +47,18 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
@Autowired
private ModelRequirementApprovalService modelRequirementApprovalService;
@Transactional
@Override
public Integer createModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO) {
modelVersionRequirementDTO.setRequirementCode("MR-" + ((Math.random() * 9 + 1) * 100000));
/**
* 根据时间戳生成唯一id
*/
// SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS");
// String id = sdf.format(System.currentTimeMillis());
//id:202010221400070793
modelVersionRequirementDTO.setRequirementCode("MR-" + System.currentTimeMillis());
// 需求信息创建
ModelRequirement modelRequirement = new ModelRequirement();
......@@ -63,6 +71,13 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode());
modelRequirementApproval.setApprovalStatus(0);
// 校验是否模型名称重复
ModelBaseVersion modelBaseVersion1 = modelBaseVersionService.getModelBaseVersion(modelVersionRequirementDTO.getObjId(), modelVersionRequirementDTO.getModelCode(), modelVersionRequirementDTO.getModelName());
if (modelBaseVersion1 != null) {
return -1;
}
// 表版本信息创建
ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion);
......@@ -80,6 +95,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
return 1;
}
@Transactional
@Override
public Integer createModelPropertyRequirementInfo(ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) {
......@@ -89,12 +105,12 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
modelPropertyVersion.setRequirementCode(modelPropertyVersionRequirementDTO.getRequirementCode());
modelPropertyVersion.setModelCode(modelPropertyVersionRequirementDTO.getModelCode());
modelPropertyVersion.setPropCtime(LocalDateTime.now());
modelPropertyVersionService.createModelPropertyVersion(modelPropertyVersion);
// modelRequirementService.createModelDemand(modelRequirement);
return 1;
}
......@@ -103,13 +119,19 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
public Integer updateModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO) {
ModelRequirement modelRequirement = new ModelRequirement();
BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement);
// DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// modelRequirement.setCtime(LocalDateTime.parse(modelVersionRequirementDTO.getCtime().toString(), df));
modelRequirement.setMtime(LocalDateTime.now());
ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion);
modelBaseVersionService.updateModelBaseVersion(modelBaseVersion);
modelRequirementService.updateModelRequirement(modelRequirement);
modelBaseVersionService.updateModelBaseVersion(modelBaseVersion);
return 1;
}
......
src/main/java/com/pms/ocp/common/constants/CodeEnum.java
View file @ 1f235aae
......@@ -43,7 +43,8 @@ public enum CodeEnum {
UP_DATA_FAIL("401005", "更新失败", false),
INSERT_FAIL("401006", "插入数据失败", false),
DELETE_FAIL("401007", "修改失败", false),
DATA_REPETITION("250", "分类编码或分类名称重复", false);
DATA_REPETITION("250", "分类编码或分类名称重复", false),
MODEL_NAME_REPETITION("251", "模型名称不能重复", false);
/**
* 构造函数
......
src/main/java/com/pms/ocp/controller/ModelControlDemandController.java
View file @ 1f235aae
package com.pms.ocp.controller;
import com.pms.ocp.biz.BizModelRequirementInfoService;
import com.pms.ocp.common.constants.CodeEnum;
import com.pms.ocp.model.dto.ModelPropertyVersionRequirementDTO;
import com.pms.ocp.model.dto.ModelVersionRequirementDTO;
import com.pms.ocp.model.vo.ResponseVO;
......@@ -35,7 +36,13 @@ public class ModelControlDemandController {
@PostMapping("/create/modelRequirement")
public ResponseVO createModelRequirement(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) {
return ResponseVO.ok(bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO));
Integer integer = bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO);
if (integer == -1) {
return ResponseVO.ok(CodeEnum.MODEL_NAME_REPETITION);
}
return ResponseVO.ok(integer);
}
/**
......
src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java
View file @ 1f235aae
......@@ -131,12 +131,6 @@ public class ModelPropertyVersionRequirementDTO {
@ApiModelProperty(value = "需求编码")
private String requirementCode;
/**
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "需求类型 0:新增，1:迭代，2下线")
private Integer requirementType;
/**
* 需求简述
*/
......@@ -165,12 +159,16 @@ public class ModelPropertyVersionRequirementDTO {
* 创建时间
*/
@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;
/**
......@@ -185,6 +183,18 @@ public class ModelPropertyVersionRequirementDTO {
@ApiModelProperty(value = "推广类型 0:统推, 1：自建")
private Integer propPromotion;
/**
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "属性需求类型 0:新增，1:迭代，2下线")
private Integer propRequirementType;
/**
* 属性需求描述
*/
@ApiModelProperty(value = "属性需求简述")
private String propRequirementDesc;
}
......
src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java
View file @ 1f235aae
......@@ -113,7 +113,7 @@ public class ModelBaseVersion {
/**
* 推广类型 0:统推, 1：自建
*/
private Integer propPromotion;
private Integer modelPromotion;
/**
* 设计厂商
......
src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java
View file @ 1f235aae
......@@ -118,6 +118,18 @@ public class ModelPropertyVersion {
*/
private String requirementCode;
/**
* 属性需求类型
*/
private Integer propRequirementType;
/**
* 属性需求描述
*/
private String propRequirementDesc;
}
// CREATE TABLE operating_platform.ocp_model_prop_version (
......
src/main/java/com/pms/ocp/model/vo/ModelPropertyVersionRequirementVO.java
View file @ 1f235aae
......@@ -128,7 +128,7 @@ public class ModelPropertyVersionRequirementVO {
* 属性推广类型 0:统推, 1：自建
*/
@ApiModelProperty(value = "属性推广类型 0:统推, 1：自建")
private Integer porpPromotion;
private Integer propPromotion;
/**
* 需求编码
......@@ -140,13 +140,13 @@ public class ModelPropertyVersionRequirementVO {
* 需求类型 0:新增，1:迭代，2下线
*/
@ApiModelProperty(value = "需求类型 0:新增，1:迭代，2下线")
private Integer requirementType;
private Integer propRequirementType;
/**
* 需求简述
* 属性需求描述
*/
@ApiModelProperty(value = "需求简述")
private String requirementDesc;
private String propRequirementDesc;
/**
* 需求提报公司
......
src/main/java/com/pms/ocp/service/ModelBaseVersionService.java
View file @ 1f235aae
package com.pms.ocp.service;
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.ResponseVO;
......@@ -39,11 +40,20 @@ public interface ModelBaseVersionService {
Integer updateModelBaseVersion(ModelBaseVersion modelBaseVersion);
/**
* 获取模型列表
* 获取模型基础版本信息列表
*
* @param modelCodeList
* @return
*/
List<ModelBaseVersion> getModelBaseVersionList(String modelCode, List<String> modelCodeList, Integer currentPage, Integer pageSize);
/**
* 获取模型基础版本信息
*
* @param objId
* @param modelCode
* @return
*/
ModelBaseVersion getModelBaseVersion(String objId, String modelCode, String modelName);
}
src/main/java/com/pms/ocp/service/impl/ModelBaseVersionServiceImpl.java
View file @ 1f235aae
package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -49,11 +48,17 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
@Override
public Integer updateModelBaseVersion(ModelBaseVersion modelBaseVersion) {
UpdateWrapper<ModelBaseVersion> updateWrapper = new UpdateWrapper<>();
// UpdateWrapper<ModelBaseVersion> updateWrapper = new UpdateWrapper<>();
//
// updateWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelBaseVersion.getModelCode());
updateWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelBaseVersion.getModelCode());
return modelBaseVersionMapper.update(modelBaseVersion, updateWrapper);
LambdaUpdateWrapper<ModelBaseVersion> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(ModelBaseVersion::getModelCode, modelBaseVersion.getModelCode()).
eq(ModelBaseVersion::getRequirementCode, modelBaseVersion.getRequirementCode());
return modelBaseVersionMapper.update(modelBaseVersion, lambdaUpdateWrapper);
}
@Override
......@@ -71,4 +76,23 @@ public class ModelBaseVersionServiceImpl implements ModelBaseVersionService {
return modelBaseVersionMapper.selectList(queryWrapper);
}
@Override
public ModelBaseVersion getModelBaseVersion(String objId, String modelCode, String modelName) {
QueryWrapper<ModelBaseVersion> queryWrapper = new QueryWrapper();
if (StringUtils.isNotEmpty(objId)) {
queryWrapper.lambda().eq(ModelBaseVersion::getObjId, objId);
}
if (StringUtils.isNotEmpty(modelCode)) {
queryWrapper.lambda().eq(ModelBaseVersion::getModelCode, modelCode);
}
if (StringUtils.isNotEmpty(modelName)) {
queryWrapper.lambda().eq(ModelBaseVersion::getModelName, modelName);
}
return modelBaseVersionMapper.selectOne(queryWrapper);
}
}
src/main/resources/mapper/ModelRequirementMapper.xml
View file @ 1f235aae
......@@ -22,8 +22,8 @@
<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
left join ocp_model_requirement_approval omra on omra.requirement_code = omr.requirement_code
left join ocp_model_requirement omr on omv.requirement_code = omr.requirement_code
left join ocp_model_requirement_approval omra on omra.requirement_code = omr.requirement_code
<where>
<if test="modelCode != null and modelCode != ''">
......@@ -31,21 +31,24 @@
</if>
<if test="modelName != null and modelName != ''">
and omv.model_name = #{modelName}
and omv.model_name like CONCAT('%', #{modelName}::text,'%')
</if>
<if test="modelGroupCodes.size > 0">
and omv.model_group_code in
<foreach item="modelGroupCode" collection="modelGroupCodes" index="index" open="(" close=")" separator=",">
<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 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_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 != ''">
......
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