1.新增模型基础入库查询处理

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

 package com.pms.ocp.controller;
 
+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.ModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
+import static com.pms.ocp.common.constants.CodeEnum.REQUIRED_PARAMETER_EMPTY;
+import static com.pms.ocp.common.constants.CodeEnum.SUCCESS;
+
 /**
  * @Auther: wangjian
  * @Date: 2022/2/21 16:17
@@ -18,6 +29,12 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "模型库管理接口")
 public class ModelBaseController {
 
+    @Autowired
+    private ModelService modelService;
+
+    @Autowired
+    private ModelGroupService modelGroupService;
+
     /**
      * 模型分类-查询
      *
@@ -26,7 +43,7 @@ public class ModelBaseController {
     @ApiOperation("模型分类-查询")
     @GetMapping("/model/type")
     public ResponseVO getModelType() {
-        return ResponseVO.ok();
+        return modelGroupService.getModelType();
     }
 
     /**
@@ -36,8 +53,8 @@ public class ModelBaseController {
      */
     @ApiOperation("模型分类-增加")
     @PostMapping("/model/type")
-    public ResponseVO createModelType() {
-        return ResponseVO.ok();
+    public ResponseVO createModelType(ModelType modelType) {
+        return modelGroupService.createModelType(modelType);
     }
 
     /**
@@ -46,9 +63,10 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型分类-删除")
-    @DeleteMapping("/model/type")
-    public ResponseVO deleteModelType() {
-        return ResponseVO.ok();
+    @PostMapping("/model/type")
+    public ResponseVO deleteModelType(ModelType modelType) {
+//        return modelType.deleteModelType();
+        return null;
     }
 
     /**
@@ -57,7 +75,7 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型分类-修改")
-    @PutMapping("/model/type")
+    @PostMapping("/model/type")
     public ResponseVO updateModelType() {
         return ResponseVO.ok();
     }
@@ -70,7 +88,7 @@ public class ModelBaseController {
     @ApiOperation("模型-查询")
     @GetMapping("/model")
     public ResponseVO getModel() {
-        return ResponseVO.ok();
+        return modelService.getModelList();
     }
 
     /**
@@ -80,8 +98,8 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-增加")
     @PostMapping("/model")
-    public ResponseVO createModel() {
-        return ResponseVO.ok();
+    public ResponseVO createModel(@RequestBody Model model) {
+        return modelService.createModel(model);
     }
 
     /**
@@ -90,9 +108,14 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型-删除")
-    @DeleteMapping("/model")
-    public ResponseVO deleteModel() {
-        return ResponseVO.ok();
+    @PostMapping("/model")
+    public ResponseVO deleteModel(@RequestBody Model model) {
+        String modelId = model.getObjId();
+        if (StringUtils.isNotBlank(modelId)) {
+            return modelService.deleteModel(modelId);
+        } else {
+            return ResponseVO.error(REQUIRED_PARAMETER_EMPTY);
+        }
     }
 
     /**
@@ -101,9 +124,9 @@ public class ModelBaseController {
      * @return
      */
     @ApiOperation("模型-修改")
-    @PutMapping("/model")
-    public ResponseVO updateModel() {
-        return ResponseVO.ok();
+    @PostMapping("/model")
+    public ResponseVO updateModel(Model model) {
+        return modelService.updateModel(model);
     }
 
     /**

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

@@ -2,6 +2,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 org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 
 @Mapper
-public interface ModelTypeMapper extends BaseMapper<Model> {
+public interface ModelTypeMapper extends BaseMapper<ModelType> {
 }

src/main/java/com/pms/ocp/model/entity/Model.java

@@ -3,10 +3,13 @@ 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.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @Auther: wangjian
@@ -16,14 +19,14 @@ import java.time.LocalDateTime;
 
 @Data
 @Accessors(chain = true)
-@TableName("t_public_manage_model_base")
+@TableName("ocp_model_base")
 public class Model {
 
     /**
      * 模型编号
      */
     @TableId
-    private String modelId;
+    private String objId;
 
     /**
      * 模型名称
@@ -42,19 +45,13 @@ public class Model {
 
     /**
      * 所属专业
-     * 0:输电,1:变电,2:配电,3:直流,4:计划,5:技术
      */
-    private String domainType;
+    private String professionalKind;
 
     /**
-     * 模型分类编号
+     * 模型分类编码
      */
-    private String modelGroupId;
-
-    /**
-     * 模型分类名称
-     */
-    private String modelGroupName;
+    private String modelGroupCode;
 
     /**
      * 模型表
@@ -62,17 +59,10 @@ public class Model {
     private String modelTable;
 
     /**
-     * 模型关联关系
-     * 存储模型之间的关系json格式；例如[{ model_group_id : t_public_manage_model_group.group_id}]
+     * 是否启用
      */
-    private String modelRelation;
+    private String isUse;
 
-    /**
-     * 模型是否启用
-     * 0:不启用,1：启用
-     */
-    @TableField(value = "is_use")
-    private String boolUse;
 
     /**
      * 模型推广类型
@@ -80,27 +70,28 @@ public class Model {
      */
     private String modelPromotion;
 
+
     /**
-     * 省公司编号
+     * 公司code
      */
-    private String companyId;
+    private String ownerCompanyCode;
 
     /**
-     * 省公司名称
+     * 公司名称
      */
-    private String companyName;
+    private String ownerCompanyName;
 
     /**
-     * 模型显示顺序
+     * 排列顺序
      */
-    @TableField(value = "model_dispidx")
-    private String modelDisplayOrder;
+    private String modelOrderNo;
 
     /**
-     * 模型提交人编号
+     * 提交人id
      */
     private String modelUserId;
 
+
     /**
      * 提交人姓名
      */
@@ -110,13 +101,17 @@ public class Model {
      * 模型创建时间
      */
     @TableField(value = "model_ctime")
-    private LocalDateTime modelCreateTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date modelCreateTime;
 
     /**
      * 模型修改时间
      */
     @TableField(value = "model_mtime")
-    private LocalDateTime modelUpdateTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date modelUpdateTime;
 }
 
 //      字段名称	    字段描述	    字段类型	允许为NULL	备注

src/main/java/com/pms/ocp/model/entity/ModelType.java

 package com.pms.ocp.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 /**
  * @Auther: wangjian
  * @Date: 2022/2/22 16:52
  * @Description:模型类型对象
  */
+@Data
+@Accessors(chain = true)
+@TableName("ocp_model_group")
 public class ModelType {
+
+    /**
+     * 模型分类编号
+     */
+    @TableId
+    private String objId;
+
+    /**
+     * 模型分类名称
+     */
+    private String modelGroupName;
+
+    /**
+     * 上级模型分类编码
+     */
+    private String modelGroupPcode;
+
+    /**
+     * 分类版本
+     */
+    private String groupVersion;
+
+    /**
+     * 展示顺序
+     */
+    private String group;
+
+    /**
+     * 模型分类编码
+     */
+    private String modelGroupCode;
+
+    /**
+     * 模型表
+     */
+    private String modelTable;
+
+    /**
+     * 是否启用
+     */
+    private String isUse;
+
+
+    /**
+     * 模型推广类型
+     * 0:统推,1：自建
+     */
+    private String modelPromotion;
+
+
+    /**
+     * 公司code
+     */
+    private String ownerCompanyCode;
+
+    /**
+     * 公司名称
+     */
+    private String ownerCompanyName;
+
+    /**
+     * 排列顺序
+     */
+    private String modelOrderNo;
+
+    /**
+     * 提交人id
+     */
+    private String modelUserId;
+
+
+    /**
+     * 提交人姓名
+     */
+    private String modelUserName;
+
 }

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.vo.ResponseVO;
+
+public interface ModelGroupService {
+
+    ResponseVO getModelType();
+
+    ResponseVO createModelType(ModelType modelType);
+}

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.vo.ResponseVO;
 
 import java.util.List;
 
@@ -17,7 +19,7 @@ public interface ModelService {
      * @param model
      * @return
      */
-    Integer createModel(Model model);
+    ResponseVO createModel(Model model);
 
     /**
      * 删除模型
@@ -25,7 +27,7 @@ public interface ModelService {
      * @param modelId
      * @return
      */
-    Integer deleteModel(String modelId);
+    ResponseVO deleteModel(String modelId);
 
     /**
      * 更新模型
@@ -33,7 +35,7 @@ public interface ModelService {
      * @param model
      * @return
      */
-    Integer updateModel(Model model);
+    ResponseVO updateModel(Model model);
 
     /**
      * 获取模型
@@ -41,7 +43,7 @@ public interface ModelService {
      * @param
      * @return
      */
-    List<Model> getModelList();
+    ResponseVO getModelList();
 
     /**
      * 获取模型列表
@@ -50,4 +52,7 @@ public interface ModelService {
      * @return
      */
     Model getModel(String modelId);
+
+
+
 }

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

+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.vo.ResponseVO;
+import com.pms.ocp.service.ModelGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+@Service
+public class ModelGroupServiceImpl implements ModelGroupService {
+
+    @Autowired
+    private ModelTypeMapper modelTypeMapper;
+
+    /**
+     * 获取模型类型
+     * @return
+     */
+    @Override
+    public ResponseVO getModelType() {
+        QueryWrapper<ModelType> wrapper = new QueryWrapper<>();
+        List<ModelType> modelTypeList = modelTypeMapper.selectList(wrapper);
+        if(CollectionUtils.isEmpty(modelTypeList)){
+            return ResponseVO.error("查询列表为空");
+        }else{
+            return ResponseVO.ok(modelTypeList);
+        }
+    }
+
+    @Override
+    public ResponseVO createModelType(ModelType modelType) {
+        int result = modelTypeMapper.insert(modelType);
+        if(result>0){
+            return ResponseVO.error(CodeEnum.SUCCESS);
+        }else{
+            return ResponseVO.ok(CodeEnum.INSERT_FAIL);
+        }
+    }
+}

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

 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.ModelMapper;
 import com.pms.ocp.model.entity.Model;
+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
@@ -17,8 +24,6 @@ import java.util.List;
 
 @Service
 public class ModelServiceImpl implements ModelService {
-
-
     @Autowired
     private ModelMapper modelMapper;
 
@@ -29,8 +34,13 @@ public class ModelServiceImpl implements ModelService {
      * @return
      */
     @Override
-    public Integer createModel(Model model) {
-        return modelMapper.insert(model);
+    public ResponseVO createModel(Model model) {
+        int result = modelMapper.insert(model);
+        if (result > 0) {
+            return ResponseVO.ok(CodeEnum.SUCCESS);
+        } else {
+            return ResponseVO.error(CodeEnum.INSERT_FAIL);
+        }
     }
 
     /**
@@ -40,10 +50,15 @@ public class ModelServiceImpl implements ModelService {
      * @return
      */
     @Override
-    public Integer deleteModel(String modelId) {
+    public ResponseVO deleteModel(String modelId) {
         QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("model_id", modelId);
-        return modelMapper.delete(queryWrapper);
+        queryWrapper.eq("obj_id", modelId);
+        int result = modelMapper.delete(queryWrapper);
+        if (result > 0) {
+            return ResponseVO.ok(CodeEnum.SUCCESS);
+        } else {
+            return ResponseVO.error("删除角色失败！");
+        }
     }
 
     /**
@@ -53,8 +68,13 @@ public class ModelServiceImpl implements ModelService {
      * @return
      */
     @Override
-    public Integer updateModel(Model model) {
-        return modelMapper.updateById(model);
+    public ResponseVO updateModel(Model model) {
+        int result = modelMapper.updateById(model);
+        if (result > 0) {
+            return ResponseVO.ok(CodeEnum.SUCCESS);
+        } else {
+            return ResponseVO.error(CodeEnum.UP_DATA_FAIL);
+        }
     }
 
     /**
@@ -64,8 +84,12 @@ public class ModelServiceImpl implements ModelService {
      * @return
      */
     @Override
-    public List<Model> getModelList() {
-        return modelMapper.selectList(null);
+    public ResponseVO getModelList() {
+        List<Model> modelList = modelMapper.selectList(null);
+        if (CollectionUtils.isEmpty(modelList)) {
+            return ResponseVO.ok("查询列表为空");
+        }
+        return ResponseVO.ok(modelList);
     }
 
     /**