diff --git a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java index 86ca9a10f0b7fded6ab891cc557490b4a490afd8..464252b200fff600ed3c49a7349a78177f45c813 100644 --- a/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java +++ b/src/main/java/com/pms/ocp/biz/BizModelRequirementInfoService.java @@ -4,8 +4,6 @@ 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; diff --git a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java index 8e59764439d0fa2859a9b3caebe3df2956cf006a..b15df89fa5160a683bc95f806642c2da291b5a3d 100644 --- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java +++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java @@ -9,10 +9,7 @@ import com.pms.ocp.model.entity.*; 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.ModelRequirementService; -import com.pms.ocp.service.ModelPropertyVersionService; -import com.pms.ocp.service.OcpModelGroupService; +import com.pms.ocp.service.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -45,21 +42,36 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn @Autowired private ModelPropertyVersionService modelPropertyVersionService; + @Autowired + private ModelRequirementApprovalService modelRequirementApprovalService; + @Transactional @Override public Integer createModelRequirementInfo(ModelVersionRequirementDTO modelVersionRequirementDTO) { + // 需求信息创建 ModelRequirement modelRequirement = new ModelRequirement(); BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement); modelRequirement.setCtime(LocalDateTime.now()); + // 需求审批信息创建 + ModelRequirementApproval modelRequirementApproval = new ModelRequirementApproval(); + modelRequirementApproval.setRequirementCode(modelVersionRequirementDTO.getRequirementCode()); + modelRequirementApproval.setApprovalStats(0); + + // 表版本信息创建 ModelBaseVersion modelBaseVersion = new ModelBaseVersion(); BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion); modelBaseVersion.setModelCtime(LocalDateTime.now()); + modelBaseVersion.setOwnerCompanyCode(modelVersionRequirementDTO.getCompanyCode()); + modelBaseVersion.setModelUserId(modelVersionRequirementDTO.getUserId()); + modelBaseVersion.setModelUserName(modelVersionRequirementDTO.getUserName()); modelRequirementService.createModelRequirement(modelRequirement); + modelRequirementApprovalService.createModelRequirementApproval(modelRequirementApproval); + modelBaseVersionService.createModelBaseVersion(modelBaseVersion); return 1; diff --git a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java index 1b56a716af515a85a816de857cc5dd0169eb2350..ac7271d9b24603ac688b5de9748d0f8d0ffd29b4 100644 --- a/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java +++ b/src/main/java/com/pms/ocp/controller/ModelControlDemandController.java @@ -32,8 +32,8 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型需求-增加") - @PostMapping("/create/modelDemand") - public ResponseVO createModelDemand(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) { + @PostMapping("/create/modelRequirement") + public ResponseVO createModelRequirement(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) { return ResponseVO.ok(bizModelRequirementInfoService.createModelRequirementInfo(modelVersionRequirementDTO)); } @@ -44,8 +44,8 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型属性需求-增加") - @PostMapping("/create/modelPropertyDemand") - public ResponseVO createModelPropertyDemand(@RequestBody ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) { + @PostMapping("/create/modelPropertyRequirement") + public ResponseVO createModelPropertyRequirement(@RequestBody ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) { return ResponseVO.ok(bizModelRequirementInfoService.createModelPropertyRequirementInfo(modelPropertyVersionRequirementDTO)); } @@ -56,9 +56,9 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型需求-删除") - @PostMapping("/delete/modelDemand") - public ResponseVO deleteModelDemand(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { + @PostMapping("/delete/modelRequirement") + public ResponseVO deleteModelRequirement(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, + @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) { return ResponseVO.ok(bizModelRequirementInfoService.deleteModelRequirementInfo(objId, modelCode)); } @@ -68,10 +68,10 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型属性需求-删除") - @PostMapping("/delete/modelPropertyDemand") - public ResponseVO deleteModelPropertyDemand(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId, - @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode, - @ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) { + @PostMapping("/delete/modelPropertyRequirement") + public ResponseVO deleteModelPropertyRequirement(@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(bizModelRequirementInfoService.deleteModelPropertyRequirementInfo(objId, modelCode, propCode)); } @@ -81,8 +81,8 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型需求-修改") - @PostMapping("/update/modelDemand") - public ResponseVO updateModelDemand(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) { + @PostMapping("/update/modelRequirement") + public ResponseVO updateModelRequirement(@RequestBody ModelVersionRequirementDTO modelVersionRequirementDTO) { return ResponseVO.ok(bizModelRequirementInfoService.updateModelRequirementInfo(modelVersionRequirementDTO)); } @@ -92,8 +92,8 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型属性需求-修改") - @PostMapping("/update/modelPropertyDemand") - public ResponseVO updateModelPropertyDemand(@RequestBody ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) { + @PostMapping("/update/modelPropertyRequirement") + public ResponseVO updateModelPropertyRequirement(@RequestBody ModelPropertyVersionRequirementDTO modelPropertyVersionRequirementDTO) { return ResponseVO.ok(bizModelRequirementInfoService.updateModelPropertyRequirementInfo(modelPropertyVersionRequirementDTO)); } @@ -103,13 +103,12 @@ public class ModelControlDemandController { * @return */ @ApiOperation("模型需求-查询列表") - @GetMapping("/get/modelDemand/list") - 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) { + @GetMapping("/get/modelRequirement/list") + public ResponseVO getModelRequirementList(@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) { return ResponseVO.ok(bizModelRequirementInfoService.getModelRequirementInfoList(modelName, modelCode, modelGroupCode, currentPage, pageSize)); } diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java index 0f3930718d5a33592300a343c12baf8b4c1f2ed0..61c8a119f16bc8a26e25bf6027c27e3d65e908ca 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java @@ -179,6 +179,12 @@ public class ModelPropertyVersionRequirementDTO { @ApiModelProperty(value = "需求审核状态0:未通过1:通过") private Integer requirementStatus; + /** + * 推广类型 0:统推, 1：自建 + */ + @ApiModelProperty(value = "推广类型 0:统推, 1：自建") + private Integer propPromotion; + } diff --git a/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java index fae4f84a59442e640c6954f7029c746e0a4c5195..25fc20ed681012dd4b040f025d655e7d3c653d6e 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java @@ -28,12 +28,6 @@ public class ModelVersionRequirementDTO { @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; - /** - * 模型编号 - */ - @ApiModelProperty(value = "模型编号") - private String modelId; - /** * 模型编码 */ @@ -119,13 +113,13 @@ public class ModelVersionRequirementDTO { /** * 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区 */ - @ApiModelProperty(value = "所属区域 1:生成控制大区 2:信息关联大区3:互联网大区") + @ApiModelProperty(value = "所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区") private Integer modelZone; /** * 所属层级 1:应用层 2:平台层3:网络层 4:感知层 */ - @ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层") + @ApiModelProperty(value = "所属层级 1:应用层, 2:平台层, 3:网络层, 4:感知层") private Integer modelLayer; /** @@ -147,9 +141,9 @@ public class ModelVersionRequirementDTO { private String modelVersionDesc; /** - * 是否已经删除 0未删除 1已删除 + * 是否已经删除 0未删除, 1已删除 */ - @ApiModelProperty(value = "是否已经删除 0未删除 1已删除") + @ApiModelProperty(value = "是否已经删除 0未删除, 1已删除") @TableField("is_delete") private Integer boolDelete; @@ -198,9 +192,15 @@ public class ModelVersionRequirementDTO { /** * 需求审核状态0:未通过1:通过 */ - @ApiModelProperty(value = "需求审核状态0:未通过1:通过") + @ApiModelProperty(value = "需求审核状态 0:未通过, 1:通过") private Integer requirementStatus; + /** + * 推广类型 0:统推, 1：自建 + */ + @ApiModelProperty(value = "推广类型 0:统推, 1：自建") + private Integer propPromotion; + } diff --git a/src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java b/src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java index 69023dcbc6ace132abbe8e14d8e16d20d913b8e9..816182cb2c3f01309e3464264d9de111dae0fbca 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelBaseVersion.java @@ -110,6 +110,11 @@ public class ModelBaseVersion { */ private String modelVersion; + /** + * 推广类型 0:统推, 1：自建 + */ + private Integer propPromotion; + /** * 设计厂商 */ diff --git a/src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java b/src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java index 331858ee86ed0df750a65d8e3723912750b3a592..94f1b277cf22e0c71ab624bd3532de765beb2f2d 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelPropertyVersion.java @@ -5,7 +5,6 @@ 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; @@ -68,6 +67,11 @@ public class ModelPropertyVersion { */ private Integer dataScale; + /** + * 推广类型 0:统推, 1：自建 + */ + private Integer propPromotion; + /** * 是否主键 0:否,1:是 */ diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java b/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java index 6c4d336c44413ffd5618434772fb8550566f6b28..a4077d51ff45b7ae64f03633f084f05cd46e2a2c 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelRequirement.java @@ -1,5 +1,6 @@ package com.pms.ocp.model.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -22,7 +23,7 @@ public class ModelRequirement { /** * 主键 */ - @TableId("obj_id") + @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java b/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java index 67e536fcf95c39611140b48426a116286dd7d3e8..4c955ddcc7eaab371d24226df4bb917114b601fa 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelRequirementApproval.java @@ -1,6 +1,8 @@ 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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -21,6 +23,7 @@ public class ModelRequirementApproval { /** * 主键 */ + @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; /** diff --git a/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java b/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java index 1e803a026a9f4486ae28d627f045faac64c54df6..495da68a5c88bf78c2732004af1bf68e83d25264 100644 --- a/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ModelVersionRequirementVO.java @@ -28,12 +28,6 @@ public class ModelVersionRequirementVO { @TableId(value = "obj_id", type = IdType.ASSIGN_ID) private String objId; - /** - * 模型编号 - */ - @ApiModelProperty(value = "模型编号") - private String modelId; - /** * 模型编码 */ @@ -202,9 +196,62 @@ public class ModelVersionRequirementVO { /** * 需求审核状态0:未通过1:通过 */ - @ApiModelProperty(value = "需求审核状态0:未通过1:通过") + @ApiModelProperty(value = "需求审核状态 0:未通过, 1:通过") private Integer requirementStatus; + + /** + * 审批状态 0:未审核 1：审核通过 2：审核拒绝 + */ + @ApiModelProperty(value = "审批状态 0:未审核 1：审核通过 2：审核拒绝") + private Integer approvalStats; + + /** + * 审核人单位 + */ + @ApiModelProperty(value = "审核人单位") + private String approvalCompanyCode; + + /** + * 审核人部门 + */ + @ApiModelProperty(value = "审核人部门") + private String approvalDepartment; + + /** + * 审核人id + */ + @ApiModelProperty(value = "审核人id") + private String approvalUserId; + + /** + * 审核人姓名 + */ + @ApiModelProperty(value = "审核人姓名") + private String approvalUserName; + + /** + * 审核时间 + */ + @ApiModelProperty(value = "审核时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime approvalCtime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime approvalMtime; + + /** + * 审核意见 + */ + @ApiModelProperty(value = "审核意见") + private String approvalComment; + } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java index ca6ddeb510611f75fc63ce237de207b94317b715..4b30974ee042172882bd9ed4f30eb0cc4a135576 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelRequirementApprovalServiceImpl.java @@ -1,9 +1,15 @@ 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.ModelRequirementApprovalMapper; import com.pms.ocp.model.entity.ModelRequirement; import com.pms.ocp.model.entity.ModelRequirementApproval; import com.pms.ocp.model.vo.ModelVersionRequirementVO; import com.pms.ocp.service.ModelRequirementApprovalService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; @@ -12,20 +18,42 @@ import java.util.List; * @Date: 2022/4/7 20:05 * @Description:模型需求审批业务层接口实现 */ + +@Service public class ModelRequirementApprovalServiceImpl implements ModelRequirementApprovalService { + + @Autowired + private ModelRequirementApprovalMapper modelRequirementApprovalMapper; + @Override public Integer createModelRequirementApproval(ModelRequirementApproval modelRequirementApproval) { - return null; + return modelRequirementApprovalMapper.insert(modelRequirementApproval); } @Override public Integer deleteModelRequirementApproval(String objId, String requirementCode) { - return null; + + QueryWrapper queryWrapper = new QueryWrapper(); + + if (StringUtils.isNotEmpty(objId)) { + queryWrapper.lambda().eq(ModelRequirementApproval::getObjId, objId); + } + + if (StringUtils.isNotEmpty(requirementCode)) { + queryWrapper.lambda().eq(ModelRequirementApproval::getRequirementCode, requirementCode); + } + + + return modelRequirementApprovalMapper.delete(queryWrapper); } @Override public Integer updateModelRequirementApproval(ModelRequirementApproval modelRequirementApproval) { - return null; + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + updateWrapper.lambda().eq(ModelRequirementApproval::getRequirementCode, modelRequirementApproval.getRequirementCode()); + + return modelRequirementApprovalMapper.update(modelRequirementApproval, updateWrapper); } @Override diff --git a/src/main/resources/mapper/ModelRequirementMapper.xml b/src/main/resources/mapper/ModelRequirementMapper.xml index 01ccaf55638be1eefec341df08ee865549dc397a..3f42c11dcdc4c90628d430b1001cd70d6af1eedc 100644 --- a/src/main/resources/mapper/ModelRequirementMapper.xml +++ b/src/main/resources/mapper/ModelRequirementMapper.xml @@ -22,7 +22,8 @@