From cd94d86a88013b6372935fa4987753d76cc6b96d Mon Sep 17 00:00:00 2001 From: wangjingsheng Date: Thu, 10 Mar 2022 19:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/ModelBaseController.java | 3 --- .../controller/ModelClassifyController.java | 6 +++--- .../com/pms/ocp/mapper/ModelTypeMapper.java | 5 ++--- .../pms/ocp/mapper/OcpModelGroupMapper.java | 4 ++-- .../com/pms/ocp/model/dto/ModelIssueDTO.java | 1 - .../{ModelType.java => ModelClassify.java} | 2 +- .../pms/ocp/service/ModelClassifyService.java | 6 +++--- .../com/pms/ocp/service/ModelGroupService.java | 6 +++--- .../com/pms/ocp/service/ModelIssueService.java | 1 - .../java/com/pms/ocp/service/ModelService.java | 4 ---- .../com/pms/ocp/service/ModelTypeService.java | 14 +++++++------- .../pms/ocp/service/OcpModelGroupService.java | 4 ++-- .../service/impl/ModelClassifyServiceImpl.java | 6 +++--- .../service/impl/ModelGroupServiceImpl.java | 18 +++++++++--------- .../pms/ocp/service/impl/ModelServiceImpl.java | 5 ----- .../ocp/service/impl/ModelTypeServiceImpl.java | 10 +++++----- .../service/impl/OcpModelGroupServiceImpl.java | 4 ++-- 17 files changed, 42 insertions(+), 57 deletions(-) rename src/main/java/com/pms/ocp/model/entity/{ModelType.java => ModelClassify.java} (98%) diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java index d5cba4a..1bcd7b9 100644 --- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java +++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java @@ -1,12 +1,9 @@ package com.pms.ocp.controller; -import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.model.dto.ModelIssueDTO; import com.pms.ocp.model.dto.ModelPropertyDTO; import com.pms.ocp.model.entity.Model; import com.pms.ocp.model.entity.ModelNote; -import com.pms.ocp.model.entity.ModelProperty; -import com.pms.ocp.model.entity.ModelType; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.*; import io.swagger.annotations.Api; diff --git a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java index 126c214..1eec46e 100644 --- a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java +++ b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java @@ -1,7 +1,7 @@ package com.pms.ocp.controller; import com.github.pagehelper.PageInfo; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelClassifyService; @@ -68,7 +68,7 @@ public class ModelClassifyController { **/ @ApiOperation("新增") @PostMapping("/insert") - public ResponseVO insert(@RequestBody List list) { + public ResponseVO insert(@RequestBody List list) { return modelClassifyService.insert(list); } @@ -82,7 +82,7 @@ public class ModelClassifyController { **/ @ApiOperation("修改") @PostMapping("/update") - public ResponseVO update(@RequestBody List list) { + public ResponseVO update(@RequestBody List list) { return modelClassifyService.update(list); } } diff --git a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java b/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java index b7ea2b0..6d16d81 100644 --- a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java @@ -1,8 +1,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.Model; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import org.apache.ibatis.annotations.Mapper; /** @@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper -public interface ModelTypeMapper extends BaseMapper { +public interface ModelTypeMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java index 8cb9498..b73521d 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java @@ -1,7 +1,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import org.apache.ibatis.annotations.Mapper; /** @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022/3/9 9:47 */ @Mapper -public interface OcpModelGroupMapper extends BaseMapper { +public interface OcpModelGroupMapper extends BaseMapper { } diff --git a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java index feaaff4..3e50e51 100644 --- a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java +++ b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.sql.Date; import java.time.LocalDateTime; /** diff --git a/src/main/java/com/pms/ocp/model/entity/ModelType.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java similarity index 98% rename from src/main/java/com/pms/ocp/model/entity/ModelType.java rename to src/main/java/com/pms/ocp/model/entity/ModelClassify.java index 364f93b..888534c 100644 --- a/src/main/java/com/pms/ocp/model/entity/ModelType.java +++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java @@ -18,7 +18,7 @@ import java.util.Date; @Data @Accessors(chain = true) @TableName("ocp_model_group") -public class ModelType { +public class ModelClassify { /** * 模型分类编号 diff --git a/src/main/java/com/pms/ocp/service/ModelClassifyService.java b/src/main/java/com/pms/ocp/service/ModelClassifyService.java index e895d0b..7975b41 100644 --- a/src/main/java/com/pms/ocp/service/ModelClassifyService.java +++ b/src/main/java/com/pms/ocp/service/ModelClassifyService.java @@ -1,6 +1,6 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; @@ -14,9 +14,9 @@ import java.util.List; public interface ModelClassifyService { ResponseVO> getModelNavigation(); - ResponseVO insert(List list); + ResponseVO insert(List list); ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName); - ResponseVO update(List list); + ResponseVO update(List list); } diff --git a/src/main/java/com/pms/ocp/service/ModelGroupService.java b/src/main/java/com/pms/ocp/service/ModelGroupService.java index e8b3acf..2f0ed05 100644 --- a/src/main/java/com/pms/ocp/service/ModelGroupService.java +++ b/src/main/java/com/pms/ocp/service/ModelGroupService.java @@ -1,15 +1,15 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.ResponseVO; public interface ModelGroupService { ResponseVO getModelType(); - ResponseVO createModelType(ModelType modelType); + ResponseVO createModelType(ModelClassify modelClassify); ResponseVO deleteModelType(String modelTypeId); - ResponseVO updateModelType(ModelType modelType); + ResponseVO updateModelType(ModelClassify modelClassify); } diff --git a/src/main/java/com/pms/ocp/service/ModelIssueService.java b/src/main/java/com/pms/ocp/service/ModelIssueService.java index 65e50b6..250f29f 100644 --- a/src/main/java/com/pms/ocp/service/ModelIssueService.java +++ b/src/main/java/com/pms/ocp/service/ModelIssueService.java @@ -2,7 +2,6 @@ package com.pms.ocp.service; import com.pms.ocp.model.dto.ModelIssueDTO; import com.pms.ocp.model.entity.ModelIssue; -import com.pms.ocp.model.entity.ModelType; import java.util.List; diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java index 82ab6e6..6eab59f 100644 --- a/src/main/java/com/pms/ocp/service/ModelService.java +++ b/src/main/java/com/pms/ocp/service/ModelService.java @@ -1,12 +1,8 @@ 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; - /** * @Auther: wangjian * @Date: 2022/2/22 16:03 diff --git a/src/main/java/com/pms/ocp/service/ModelTypeService.java b/src/main/java/com/pms/ocp/service/ModelTypeService.java index 1424e71..26a5968 100644 --- a/src/main/java/com/pms/ocp/service/ModelTypeService.java +++ b/src/main/java/com/pms/ocp/service/ModelTypeService.java @@ -1,6 +1,6 @@ package com.pms.ocp.service; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import java.util.List; @@ -14,10 +14,10 @@ public interface ModelTypeService { /** * 创建模型分类 * - * @param modelType + * @param modelClassify * @return */ - Integer createModelType(ModelType modelType); + Integer createModelType(ModelClassify modelClassify); /** * 删除模型分类 @@ -30,10 +30,10 @@ public interface ModelTypeService { /** * 更新模型分类 * - * @param modelType + * @param modelClassify * @return */ - Integer updateModelType(ModelType modelType); + Integer updateModelType(ModelClassify modelClassify); /** * 获取模型分类 @@ -41,7 +41,7 @@ public interface ModelTypeService { * @param * @return */ - List getModelTypeList(); + List getModelTypeList(); /** * 获取模型分类列表 @@ -49,5 +49,5 @@ public interface ModelTypeService { * @param modelId * @return */ - ModelType getModelType(String modelId); + ModelClassify getModelType(String modelId); } diff --git a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java b/src/main/java/com/pms/ocp/service/OcpModelGroupService.java index 8a8677d..05de174 100644 --- a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java +++ b/src/main/java/com/pms/ocp/service/OcpModelGroupService.java @@ -1,12 +1,12 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; /** * @author huxiuwu * @version 1.0 * @date 2022/3/9 9:44 */ -public interface OcpModelGroupService extends IService { +public interface OcpModelGroupService extends IService { } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index 386fab6..f4be2d5 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.mapper.ModelClassifyMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.OcpModelGroupVO; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelClassifyService; @@ -88,7 +88,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * @date 2022/3/9 **/ @Override - public ResponseVO update(List list) { + public ResponseVO update(List list) { boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list); if (!isUpdateSucceed) { ResponseVO.error(CodeEnum.UP_DATA_FAIL); @@ -105,7 +105,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { * @date 2022/3/9 **/ @Override - public ResponseVO insert(List list) { + public ResponseVO insert(List list) { boolean result = ocpService.saveBatch(list); if (!result) { return ResponseVO.error(CodeEnum.INSERT_FAIL); 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 8e2413d..030d8d3 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java @@ -3,7 +3,7 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pms.ocp.common.constants.CodeEnum; import com.pms.ocp.mapper.ModelTypeMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.ModelGroupService; import org.springframework.beans.factory.annotation.Autowired; @@ -24,18 +24,18 @@ public class ModelGroupServiceImpl implements ModelGroupService { */ @Override public ResponseVO getModelType() { - QueryWrapper wrapper = new QueryWrapper<>(); - List modelTypeList = modelTypeMapper.selectList(wrapper); - if(CollectionUtils.isEmpty(modelTypeList)){ + QueryWrapper wrapper = new QueryWrapper<>(); + List modelClassifyList = modelTypeMapper.selectList(wrapper); + if(CollectionUtils.isEmpty(modelClassifyList)){ return ResponseVO.error("查询列表为空"); }else{ - return ResponseVO.ok(modelTypeList); + return ResponseVO.ok(modelClassifyList); } } @Override - public ResponseVO createModelType(ModelType modelType) { - int result = modelTypeMapper.insert(modelType); + public ResponseVO createModelType(ModelClassify modelClassify) { + int result = modelTypeMapper.insert(modelClassify); if(result>0){ return ResponseVO.error(CodeEnum.SUCCESS); }else{ @@ -54,8 +54,8 @@ public class ModelGroupServiceImpl implements ModelGroupService { } @Override - public ResponseVO updateModelType(ModelType modelType) { - int result = modelTypeMapper.updateById(modelType); + public ResponseVO updateModelType(ModelClassify modelClassify) { + int result = modelTypeMapper.updateById(modelClassify); if (result > 0) { return ResponseVO.error(CodeEnum.SUCCESS); } else { 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 cb9b551..4ef894c 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java @@ -4,18 +4,13 @@ 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; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; - -import static com.pms.ocp.common.constants.CodeEnum.NO_DATA; /** * @Auther: wangjian diff --git a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java index 2ea908f..7b82ed9 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java @@ -1,6 +1,6 @@ package com.pms.ocp.service.impl; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.service.ModelTypeService; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; public class ModelTypeServiceImpl implements ModelTypeService { @Override - public Integer createModelType(ModelType modelType) { + public Integer createModelType(ModelClassify modelClassify) { return null; } @@ -26,17 +26,17 @@ public class ModelTypeServiceImpl implements ModelTypeService { } @Override - public Integer updateModelType(ModelType modelType) { + public Integer updateModelType(ModelClassify modelClassify) { return null; } @Override - public List getModelTypeList() { + public List getModelTypeList() { return null; } @Override - public ModelType getModelType(String modelId) { + public ModelClassify getModelType(String modelId) { return null; } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java index 6f379f6..4c71e2c 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java @@ -2,7 +2,7 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpModelGroupMapper; -import com.pms.ocp.model.entity.ModelType; +import com.pms.ocp.model.entity.ModelClassify; import com.pms.ocp.service.OcpModelGroupService; import org.springframework.stereotype.Service; @@ -12,5 +12,5 @@ import org.springframework.stereotype.Service; * @date 2022/3/9 9:45 */ @Service -public class OcpModelGroupServiceImpl extends ServiceImplimplements OcpModelGroupService { +public class OcpModelGroupServiceImpl extends ServiceImplimplements OcpModelGroupService { } -- 2.26.0