From a5ce0f809c55f0418ffb3e662556cf124688a26b Mon Sep 17 00:00:00 2001 From: huxiuwu Date: Fri, 4 Mar 2022 14:20:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=9E=8B=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/ModelBaseController.java | 21 +++++-- .../pms/ocp/model/entity/ModelProperty.java | 28 ++++----- .../com/pms/ocp/model/entity/ModelType.java | 61 ++++++++----------- .../pms/ocp/service/ModelGroupService.java | 4 ++ .../pms/ocp/service/ModelPropertyService.java | 2 +- .../com/pms/ocp/service/ModelService.java | 3 +- .../service/impl/ModelGroupServiceImpl.java | 20 ++++++ .../impl/ModelPropertyServiceImpl.java | 13 +++- .../ocp/service/impl/ModelServiceImpl.java | 3 +- 9 files changed, 92 insertions(+), 63 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index 2ebbb24..0c33a09 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,9 +1,11 @@ package com.pms.ocp.controller; +import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelGroupService; +import com.pms.ocp.service.ModelPropertyService; import com.pms.ocp.service.ModelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,6 +37,9 @@ public class ModelBaseController { @Autowired private ModelGroupService modelGroupService; + @Autowired + private ModelPropertyService modelPropertyService; + /** * 模型分类-查询 * @@ -65,8 +70,12 @@ public class ModelBaseController { @ApiOperation("模型分类-删除") @PostMapping("/delete/model/type") public ResponseVO deleteModelType(ModelType modelType) { -// return modelType.deleteModelType(); - return null; + String modelTypeId = modelType.getObjId(); + if (StringUtils.isNotBlank(modelTypeId)) { + return modelGroupService.deleteModelType(modelTypeId); + } else { + return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY); + } } /** @@ -76,8 +85,8 @@ public class ModelBaseController { */ @ApiOperation("模型分类-修改") @PostMapping("/update/model/type") - public ResponseVO updateModelType() { - return ResponseVO.ok(); + public ResponseVO updateModelType(ModelType modelType) { + return modelGroupService.updateModelType(modelType); } /** @@ -125,7 +134,7 @@ public class ModelBaseController { */ @ApiOperation("模型-修改") @PostMapping("/update/model") - public ResponseVO updateModel(Model model) { + public ResponseVO updateModel(@RequestBody Model model) { return modelService.updateModel(model); } @@ -215,7 +224,7 @@ public class ModelBaseController { @ApiOperation("模型属性-查询") @GetMapping("get/model/property") public ResponseVO getModelProperty() { - return ResponseVO.ok(); + return ResponseVO.ok(modelPropertyService.getModelProperty()); } /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java index 0288221..ab4323f 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelProperty.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelProperty.java @@ -2,6 +2,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** @@ -11,18 +12,19 @@ import lombok.Data; */ @Data +@TableName("ocp_model_prop") public class ModelProperty { /** * 模型属性编号 */ @TableId - private String propId; + private String objId; /** * 模型编号 */ - private String modelId; + private String modelCode; /** * 属性名称 @@ -32,7 +34,7 @@ public class ModelProperty { /** * 属性编码 */ - private String columnCode; + private String propCode; /** * 属性描述 @@ -69,43 +71,35 @@ public class ModelProperty { /** * 推广类型 */ - private String prop_promotion; + private String propPromotion; - /** - * 省公司ID - */ - private String company_id; - /** - * 省公司名称 - */ - private String company_name; /** * 显示顺序 */ - private String prop_dispidx; + private String propOrderNo; /** * 提交人id */ - private String prop_user_id; + private String propUserId; /** * 提交人姓名 */ - private String prop_user_name; + private String propUserName; /** * 创建时间 */ - @TableField(value = "is_required") + @TableField(value = "prop_ctime") private String prop_ctime; /** * 修改时间 */ - @TableField(value = "is_required") + @TableField(value = "prop_mtime") private String prop_mtime; } diff --git a/src/main/java/com/pms/ocp/model/entity/ModelType.java b/src/main/java/com/pms/ocp/model/entity/ModelType.java index b480101..364f93b 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelType.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelType.java @@ -1,9 +1,14 @@ package com.pms.ocp.model.entity; +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 lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; /** * @Auther: wangjian @@ -26,6 +31,11 @@ public class ModelType { */ private String modelGroupName; + /** + * 模型分类编码 + */ + private String modelGroupCode; + /** * 上级模型分类编码 */ @@ -39,55 +49,36 @@ public class ModelType { /** * 展示顺序 */ - private String group; + private Integer groupOrderNo; /** - * 模型分类编码 + * 所属公司code */ - private String modelGroupCode; + private String groupCompanyCode; /** - * 模型表 + * 提交人id */ - private String modelTable; + private String groupUserId; /** * 是否启用 */ - private String isUse; - - - /** - * 模型推广类型 - * 0:统推,1：自建 - */ - private String modelPromotion; - - - /** - * 公司code - */ - private String ownerCompanyCode; + private String groupUserName; /** - * 公司名称 + * 模型创建时间 */ - private String ownerCompanyName; + @TableField(value = "group_ctime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date groupCreateTime; /** - * 排列顺序 + * 模型修改时间 */ - private String modelOrderNo; - - /** - * 提交人id - */ - private String modelUserId; - - - /** - * 提交人姓名 - */ - private String modelUserName; - + @TableField(value = "group_mtime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date groupUpdateTime; } diff --git a/src/main/java/com/pms/ocp/service/ModelGroupService.java b/src/main/java/com/pms/ocp/service/ModelGroupService.java index f2ebc6e..e8b3acf 100644 --- a/src/main/java/com/pms/ocp/service/ModelGroupService.java +++ b/src/main/java/com/pms/ocp/service/ModelGroupService.java @@ -8,4 +8,8 @@ public interface ModelGroupService { ResponseVO getModelType(); ResponseVO createModelType(ModelType modelType); + + ResponseVO deleteModelType(String modelTypeId); + + ResponseVO updateModelType(ModelType modelType); } diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java index 2ac49e6..7f49f81 100644 --- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java +++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java @@ -50,5 +50,5 @@ public interface ModelPropertyService { * @param modelId * @return */ - ModelProperty getModelProperty(String modelId); + List getModelProperty(); } diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java index 66e028f..82ab6e6 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/pms/ocp/service/ModelService.java @@ -2,6 +2,7 @@ package com.pms.ocp.service; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.model.entity.Model; +import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import java.util.List; @@ -53,6 +54,4 @@ public interface ModelService { */ Model getModel(String modelId); - - } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java index 986f090..8e2413d 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java @@ -42,4 +42,24 @@ public class ModelGroupServiceImpl implements ModelGroupService { return ResponseVO.ok(CodeEnum.INSERT_FAIL); } } + + @Override + public ResponseVO deleteModelType(String modelTypeId) { + int result = modelTypeMapper.deleteById(modelTypeId); + if (result > 0) { + return ResponseVO.error(CodeEnum.SUCCESS); + } else { + return ResponseVO.ok(CodeEnum.UNKNOWN); + } + } + + @Override + public ResponseVO updateModelType(ModelType modelType) { + int result = modelTypeMapper.updateById(modelType); + if (result > 0) { + return ResponseVO.error(CodeEnum.SUCCESS); + } else { + return ResponseVO.ok(CodeEnum.UP_DATA_FAIL); + } + } } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java index 5d2c762..121449c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java @@ -1,7 +1,9 @@ package com.pms.ocp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.model.entity.ModelProperty; import com.pms.ocp.service.ModelPropertyService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -14,6 +16,9 @@ import java.util.List; @Service public class ModelPropertyServiceImpl implements ModelPropertyService { + + @Autowired + @Override public Integer createModelProperty(ModelProperty modelProperty) { return null; @@ -34,8 +39,14 @@ public class ModelPropertyServiceImpl implements ModelPropertyService { return null; } + /** + * todo + * @return + */ @Override - public ModelProperty getModelProperty(String modelId) { + public List getModelProperty() { + QueryWrapper wrapper = new QueryWrapper<>(); return null; } + } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java index 708c75b..cb9b551 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.mapper.ModelMapper; import com.pms.ocp.model.entity.Model; +import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelService; import org.springframework.beans.factory.annotation.Autowired; @@ -57,7 +58,7 @@ public class ModelServiceImpl implements ModelService { if (result > 0) { return ResponseVO.ok(CodeEnum.SUCCESS); } else { - return ResponseVO.error("删除角色失败！"); + return ResponseVO.error(CodeEnum.UNKNOWN); } } -- 2.26.0