修改

src/main/java/com/pms/ocp/controller/ModelBaseController.java

 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;

src/main/java/com/pms/ocp/controller/ModelClassifyController.java

 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<ModelType> list) {
+    public ResponseVO insert(@RequestBody List<ModelClassify> list) {
         return modelClassifyService.insert(list);
     }
 
@@ -82,7 +82,7 @@ public class ModelClassifyController {
      **/
     @ApiOperation("修改")
     @PostMapping("/update")
-    public ResponseVO update(@RequestBody List<ModelType> list) {
+    public ResponseVO update(@RequestBody List<ModelClassify> list) {
         return modelClassifyService.update(list);
     }
 }

src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java

 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<ModelType> {
+public interface ModelTypeMapper extends BaseMapper<ModelClassify> {
 }

src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java

 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<ModelType> {
+public interface OcpModelGroupMapper extends BaseMapper<ModelClassify> {
 }

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;
 
 /**

src/main/java/com/pms/ocp/model/entity/ModelType.java → 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 {
 
     /**
      * 模型分类编号

src/main/java/com/pms/ocp/service/ModelClassifyService.java

 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<List<OcpModelGroupVO>> getModelNavigation();
 
-    ResponseVO insert(List<ModelType> list);
+    ResponseVO insert(List<ModelClassify> list);
 
     ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName);
 
-    ResponseVO update(List<ModelType> list);
+    ResponseVO update(List<ModelClassify> list);
 }

src/main/java/com/pms/ocp/service/ModelGroupService.java

 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);
 }

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;
 

src/main/java/com/pms/ocp/service/ModelService.java

 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

src/main/java/com/pms/ocp/service/ModelTypeService.java

 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<ModelType> getModelTypeList();
+    List<ModelClassify> getModelTypeList();
 
     /**
      * 获取模型分类列表
@@ -49,5 +49,5 @@ public interface ModelTypeService {
      * @param modelId
      * @return
      */
-    ModelType getModelType(String modelId);
+    ModelClassify getModelType(String modelId);
 }

src/main/java/com/pms/ocp/service/OcpModelGroupService.java

 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<ModelType> {
+public interface OcpModelGroupService extends IService<ModelClassify> {
 }

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<ModelType> list) {
+    public ResponseVO update(List<ModelClassify> 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<ModelType> list) {
+    public ResponseVO insert(List<ModelClassify> list) {
         boolean result = ocpService.saveBatch(list);
         if (!result) {
             return ResponseVO.error(CodeEnum.INSERT_FAIL);

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<ModelType> wrapper = new QueryWrapper<>();
-        List<ModelType> modelTypeList = modelTypeMapper.selectList(wrapper);
-        if(CollectionUtils.isEmpty(modelTypeList)){
+        QueryWrapper<ModelClassify> wrapper = new QueryWrapper<>();
+        List<ModelClassify> 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 {

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

src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java

 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<ModelType> getModelTypeList() {
+    public List<ModelClassify> getModelTypeList() {
         return null;
     }
 
     @Override
-    public ModelType getModelType(String modelId) {
+    public ModelClassify getModelType(String modelId) {
         return null;
     }
 }

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 ServiceImpl<OcpModelGroupMapper,ModelType>implements OcpModelGroupService {
+public class OcpModelGroupServiceImpl extends ServiceImpl<OcpModelGroupMapper, ModelClassify>implements OcpModelGroupService {
 }