Merge remote-tracking branch 'origin/master'

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

@@ -4,8 +4,12 @@ import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.common.utils.FileExport;
 import com.pms.ocp.common.utils.FileUtil;
 
+import com.pms.ocp.model.QueryResponseResult;
+import com.pms.ocp.model.dto.ApiBaseDto;
+import com.pms.ocp.model.dto.ApiTreeGroupDto;
 import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 
@@ -182,4 +186,23 @@ public class ApiBasicManagementController {
 
     }
 
+    @ApiOperation("服务列表")
+    @GetMapping("/apiListQuery")
+    public QueryResponseResult apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) {
+            QueryResponseResult apiBaseList=  apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
+      return apiBaseList;
+    }
+    @ApiOperation("服务树一级")
+    @GetMapping("/apiBaseTree")
+    public ResponseVO<List<OcpApiGroup>> apiBaseTree(String apiGroupCompanyCode) {
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTree(apiGroupCompanyCode);
+        return ResponseVO.ok(apiTreeGroupDtos);
+    }
+    @ApiOperation("服务树次级")
+    @GetMapping("/apiBaseTreeOther")
+    public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode,String apiGroupPcode) {
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode);
+        return ResponseVO.ok(apiTreeGroupDtos);
+    }
+
 }

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

 package com.pms.ocp.controller;
 
+import com.pms.ocp.common.utils.ExcelUtils;
+import com.pms.ocp.model.dto.ModelDTO;
 import com.pms.ocp.model.dto.ModelIssueDTO;
 import com.pms.ocp.model.dto.ModelPropertyDTO;
 import com.pms.ocp.model.dto.ModelRelationDTO;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 
@@ -47,54 +50,18 @@ public class ModelBaseController {
 
     @Autowired
     private ModelRelationService modelRelationService;
-    /**
-     * 模型分类-查询
-     *
-     * @return
-     */
-//    @ApiOperation("模型分类-查询")
-//    @GetMapping("/get/model/type")
-//    public ResponseVO getModelType() {
-//        return modelGroupService.getModelType();
-//    }
-
-    /**
-     * 模型分类-增加
-     *
-     * @return
-     */
-//    @ApiOperation("模型分类-增加")
-//    @PostMapping("/create/model/type")
-//    public ResponseVO createModelType(ModelType modelType) {
-//        return modelGroupService.createModelType(modelType);
-//    }
 
     /**
-     * 模型分类-删除
+     * 模型-增加
      *
      * @return
      */
-//    @ApiOperation("模型分类-删除")
-//    @PostMapping("/delete/model/type")
-//    public ResponseVO deleteModelType(ModelType modelType) {
-//        String modelTypeId = modelType.getObjId();
-//        if (StringUtils.isNotBlank(modelTypeId)) {
-//            return modelGroupService.deleteModelType(modelTypeId);
-//        } else {
-//            return ResponseVO.error(CodeEnum.REQUIRED_PARAMETER_EMPTY);
-//        }
-//    }
+    @ApiOperation("模型-增加")
+    @PostMapping("/create/model")
+    public ResponseVO createModel(@RequestBody ModelDTO modelDTO) {
 
-    /**
-     * 模型分类-修改
-     *
-     * @return
-     */
-//    @ApiOperation("模型分类-修改")
-//    @PostMapping("/update/model/type")
-//    public ResponseVO updateModelType(ModelType modelType) {
-//        return modelGroupService.updateModelType(modelType);
-//    }
+        return ResponseVO.ok(modelService.createModel(modelDTO));
+    }
 
     /**
      * 模型-查询
@@ -103,19 +70,9 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-查询")
     @GetMapping("/get/model")
-    public ResponseVO getModel() {
-        return modelService.getModelList();
-    }
-
-    /**
-     * 模型-增加
-     *
-     * @return
-     */
-    @ApiOperation("模型-增加")
-    @PostMapping("/create/model")
-    public ResponseVO createModel(@RequestBody Model model) {
-        return modelService.createModel(model);
+    public ResponseVO getModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
+                               @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
+        return ResponseVO.ok(modelService.getModelList(objId, modelCode));
     }
 
     /**
@@ -125,13 +82,9 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-删除")
     @PostMapping("/delete/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);
-        }
+    public ResponseVO deleteModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
+                                  @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) {
+        return ResponseVO.ok(modelService.deleteModel(objId, modelCode));
     }
 
     /**
@@ -141,8 +94,8 @@ public class ModelBaseController {
      */
     @ApiOperation("模型-修改")
     @PostMapping("/update/model")
-    public ResponseVO updateModel(@RequestBody Model model) {
-        return modelService.updateModel(model);
+    public ResponseVO updateModel(@RequestBody ModelDTO modelDTO) {
+        return ResponseVO.ok(modelService.updateModel(modelDTO));
     }
 
     /**
@@ -239,6 +192,21 @@ public class ModelBaseController {
         return ResponseVO.ok();
     }
 
+    /**
+     * 模型事记-导出
+     *
+     * @return
+     */
+    @ApiOperation("模型事记-导出")
+    @PostMapping("export/model/note")
+    public ResponseVO exportModelNote(HttpServletResponse response,
+                                      @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode) throws IOException {
+//        查询要导出的数据
+        List<ModelNote> modelNoteList = modelNoteService.getModelNoteList(modelCode);
+        ExcelUtils.exportExcel(response, "测试导出模型事记", "测试导出模型事记", "测试导出模型事记.xlsx", modelNoteList, ModelNote.class);
+
+        return ResponseVO.ok();
+    }
 
     /**
      * 模型属性-增加

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.entity.OcpApiGroup;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OcpApiGroupMapper extends BaseMapper<OcpApiGroup> {
+
+    List<OcpApiGroup> selectTreeList(String apiGroupCompanyCode);
+
+    List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode);
+
+    List<OcpApiBase> selectByPcode(String code);
+
+}

src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java

 package com.pms.ocp.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,29 +14,121 @@ import java.sql.Timestamp;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@ApiModel("应用列表查询参数")
 public class ApiBaseDto implements Serializable {
-    /**
-     * 服务编码
-     */
-    private String ApiCode;
-    /**
-     * 建设单位
-     */
-    private String apiUnit;
-    /**
-     * 注册时段-开始
-     */
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("服务分类编码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("服务分类公司(建设单位)")
+    private String apiGroupCompanyCode;
+
+
+    @ApiModelProperty("注册时段-开始")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp startTime;
-    /**
-     * 注册时段-结束
-     */
+
+    @ApiModelProperty("注册时段-结束")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Timestamp endTime;
-    /**
-     * 关键字
-     */
+
+    @ApiModelProperty("注册开始")
+    private String startCTime;
+
+    @ApiModelProperty("注册结束")
+    private String endCTime;
+
+    @ApiModelProperty("关键字")
     private String keyword;
+
+    @ApiModelProperty("当前页")
+    private Integer pageNum;
+
+    @ApiModelProperty("每页条数")
+    private Integer pageSize;
+
+    public String getApiCode() {
+        return apiCode;
+    }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public Timestamp getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Timestamp startTime) {
+        this.startTime = startTime;
+    }
+
+    public Timestamp getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Timestamp endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getStartCTime() {
+        return startCTime;
+    }
+
+    public void setStartCTime(String startCTime) {
+        this.startCTime = startCTime;
+    }
+
+    public String getEndCTime() {
+        return endCTime;
+    }
+
+    public void setEndCTime(String endCTime) {
+        this.endCTime = endCTime;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getApiGroupCompanyCode() {
+        return apiGroupCompanyCode;
+    }
+
+    public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
+        this.apiGroupCompanyCode = apiGroupCompanyCode;
+    }
 }

src/main/java/com/pms/ocp/model/dto/ModelDTO.java

+package com.pms.ocp.model.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: wangjian
+ * @Date: 2022/2/22 16:56
+ * @Description:
+ */
+
+@Data
+@NoArgsConstructor
+//@AllArgsConstructor
+@ApiModel(value = "中台运营管控_模型表", description = "中台运营管控_模型表")
+public class ModelDTO {
+
+    /**
+     * 模型编号
+     * 主键
+     */
+    @Excel(name = "模型编号")
+    @ApiModelProperty(value = "模型编号")
+    private String objId;
+
+    /**
+     * 模型名称
+     */
+    @Excel(name = "模型名称")
+    @ApiModelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 模型编码
+     */
+    @Excel(name = "模型编码")
+    @ApiModelProperty(value = "模型编码")
+    private String modelCode;
+
+    /**
+     * 设备类型
+     */
+    @Excel(name = "设备类型")
+    @ApiModelProperty(value = "设备类型")
+    private String equipType;
+
+    /**
+     * 所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合
+     */
+    @Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"})
+    @ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合")
+    private String professional_kind;
+
+    /**
+     * 模型分类编码
+     */
+    @Excel(name = "模型分类编码")
+    @ApiModelProperty(value = "模型分类编码")
+    private String model_group_code;
+
+    /**
+     * 模型表名称
+     */
+    @Excel(name = "模型表名称")
+    @ApiModelProperty(value = "模型表名称")
+    private String model_table;
+
+    /**
+     * 是否启用 0:未启用,1：启用
+     */
+    @Excel(name = "是否启用", replace = {"未启用_0", "启用_1"})
+    @ApiModelProperty(value = "是否启用")
+    private Integer boolUse;
+
+
+    /**
+     * 推广类型 0:统推,1：自建
+     */
+    @Excel(name = "推广类型", replace = {"统推_0", "自建_1"})
+    @ApiModelProperty(value = "推广类型")
+    private Integer modelPromotion;
+
+    /**
+     * 公司编码
+     */
+    @Excel(name = "公司编码")
+    @ApiModelProperty(value = "公司编码")
+    private String ownerCompanyCode;
+
+    /**
+     * 排列顺序
+     */
+    @Excel(name = "排列顺序")
+    @ApiModelProperty(value = "排列顺序")
+    private Integer modelOrderNo;
+
+    /**
+     * 提交人编号
+     */
+    @Excel(name = "提交人编号")
+    @ApiModelProperty(value = "提交人编号")
+    private String modelUserId;
+
+
+    /**
+     * 提交人姓名
+     */
+    @Excel(name = "提交人姓名")
+    @ApiModelProperty(value = "提交人姓名")
+    private String modelUserName;
+
+    /**
+     * 模型创建时间
+     */
+    @Excel(name = "创建时间")
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "model_ctime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime modelCtime;
+
+    /**
+     * 模型修改时间
+     */
+    @Excel(name = "修改时间")
+    @ApiModelProperty(value = "修改时间")
+    @TableField(value = "model_mtime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime modelMtime;
+
+    /**
+     * 是否删除 0:未删除 1:已删除
+     */
+    @Excel(name = "是否删除", replace = {"未删除_1", "已删除_2"})
+    @ApiModelProperty(value = "是否删除")
+    private Integer boolDelete;
+
+    /**
+     * 所属区域 1:生成控制大区 2:信息关联大区 3:互联网大区
+     */
+    @Excel(name = "所属区域", replace = {"生成控制大区_1", "信息关联大区_2", "互联网大区_3"})
+    @ApiModelProperty(value = "所属区域")
+    private Integer modelZone;
+
+    /**
+     * 所属层级 1:应用层 2:平台层 3:网络层 4:感知层
+     */
+    @Excel(name = "方机构类型", replace = {"应用层_1", "平台层_2", "网络层_3", "感知层_4"})
+    @ApiModelProperty(value = "所属层级 1:应用层 2:平台层3:网络层 4:感知层")
+    private Integer modelLayer;
+
+    /**
+     * 模型版本（最新版本）
+     */
+    @Excel(name = "模型版本")
+    @ApiModelProperty(value = "模型版本")
+    private String modelVersion;
+
+    /**
+     * 建设厂商
+     */
+    @Excel(name = "建设厂商")
+    @ApiModelProperty(value = "建设厂商")
+    private String apiUnit;
+}

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

@@ -24,6 +24,7 @@ public class Model {
      * 模型关系编号
      * 主键
      */
+    @TableField("obj_id")
     private String objId;
 
     /**

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

 package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.QueryResponseResult;
 import com.pms.ocp.model.dto.ApiBaseDto;
+import com.pms.ocp.model.dto.ApiTreeGroupDto;
 import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiExtent;
+import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 
@@ -37,7 +40,6 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      * 条件查询
      * @param apiCode
      * @param keyword
-     * @param apiUnit
      * @param startTime
      * @param endTime
      * @return
@@ -56,5 +58,25 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      */
     ResponseVO apiIssue(String apiCodes);
 
+    /**
+     *  获取顶级服务树
+     * @param apiGroupCompanyCode
+     * @return
+     */
+    List<OcpApiGroup> apiBaseTree(String apiGroupCompanyCode);
+
+    /**
+     *  获取次级服务树
+     * @param apiGroupCompanyCode
+     * @param apiGroupPcode
+     * @return
+     */
+    List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode);
 
+    /**
+     * 根据分组code获取列表
+     * @param ApiBaseReq
+     * @return
+     */
+    QueryResponseResult getBaseByGroupCode(ApiBaseDto ApiBaseReq);
 }

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

@@ -51,4 +51,12 @@ public interface ModelNoteService {
      * @return
      */
     ModelNote getModelNote(String modelId);
+
+//    /**
+//     * 获取模型事记
+//     *
+//     * @param
+//     * @return
+//     */
+//    Boolean exportModelNote(String modelCode);
 }

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

 package com.pms.ocp.service;
 
+import com.pms.ocp.model.dto.ModelDTO;
 import com.pms.ocp.model.entity.Model;
-import com.pms.ocp.model.vo.ResponseVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @Auther: wangjian
@@ -16,26 +17,27 @@ public interface ModelService {
     /**
      * 创建模型
      *
-     * @param model
+     * @param modelDTO
      * @return
      */
-    ResponseVO createModel(Model model);
+    Integer createModel(ModelDTO modelDTO);
 
     /**
      * 删除模型
      *
-     * @param modelId
+     * @param objId
+     * @param modelCode
      * @return
      */
-    ResponseVO deleteModel(String modelId);
+    Integer deleteModel(String objId, String modelCode);
 
     /**
      * 更新模型
      *
-     * @param model
+     * @param modelDTO
      * @return
      */
-    ResponseVO updateModel(Model model);
+    Integer updateModel(ModelDTO modelDTO);
 
     /**
      * 导入模型
@@ -51,7 +53,7 @@ public interface ModelService {
      * @param
      * @return
      */
-    ResponseVO getModelList();
+    List<Model> getModelList(String objId, String modelCode);
 
     /**
      * 获取模型列表

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

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.common.constants.StringUtils;
+import com.pms.ocp.common.exception.BeagleException;
 import com.pms.ocp.mapper.ApiBasicManagementMapper;
 import com.pms.ocp.mapper.OcpApiExtentMapper;
+import com.pms.ocp.mapper.OcpApiGroupMapper;
 import com.pms.ocp.mapper.OcpApiSubsMapper;
+import com.pms.ocp.model.CommonCode;
+import com.pms.ocp.model.QueryResponseResult;
+import com.pms.ocp.model.dto.ApiBaseDto;
+import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiExtent;
+import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.OcpApiSubs;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -20,9 +32,11 @@ import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagementMapper, OcpApiBase>
@@ -35,7 +49,10 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
     private OcpApiExtentService ocpApiExtentService;
     @Autowired
     private OcpApiExtentMapper ocpApiExtentMapper;
+    @Autowired
+    private OcpApiGroupMapper ocpApiGroupMapper;
 
+    List<String> apiGroupCode = new ArrayList<>();
     /**
      * 导出查询
      *
@@ -157,4 +174,79 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         return ResponseVO.ok();
     }
 
+    @Override
+    public List<OcpApiGroup> apiBaseTree(String apiGroupCompanyCode) {
+        List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.selectTreeList(apiGroupCompanyCode);
+        return ocpApiGroups;
+    }
+
+    @Override
+    public List<OcpApiGroup> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode) {
+        List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode);
+        return ocpApiGroups;
+    }
+
+    @Override
+    public QueryResponseResult getBaseByGroupCode(ApiBaseDto apiBaseReq) {
+        QueryResponseResult queryResponseResult = new QueryResponseResult(CommonCode.SUCCESS, null);
+        if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) {
+            queryResponseResult.setMessage("分页参数不能为空");
+            return queryResponseResult;
+        }
+        apiGroupCode.add(apiBaseReq.getApiGroupCode());
+        setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode());
+        QueryWrapper qw = new QueryWrapper();
+        if (!StringUtils.isEmpty(apiBaseReq.getKeyword())) {
+            qw.like("api_name", apiBaseReq.getKeyword());
+        }
+        if (!StringUtils.isEmpty(apiBaseReq.getApiGroupCode())) {
+            qw.in("api_group_code", apiGroupCode.stream().collect(Collectors.toList()));
+        }
+        if (!StringUtils.isEmpty(apiBaseReq.getApiGroupCompanyCode())) {
+            qw.eq("api_unit", apiBaseReq.getApiGroupCompanyCode());
+        }
+        if (!StringUtils.isEmpty(apiBaseReq.getStartCTime())) {
+            qw.ge("api_ctime", apiBaseReq.getApiGroupCompanyCode());
+        }
+        if (!StringUtils.isEmpty(apiBaseReq.getStartCTime())) {
+            qw.le("api_ctime", apiBaseReq.getApiGroupCompanyCode());
+        }
+        IPage iPage = new Page(apiBaseReq.getPageNum(), apiBaseReq.getPageSize());
+        apiBasicManagementMapper.selectPage(iPage,qw);
+        apiGroupCode.clear();
+        if (iPage.getTotal() == 0) {
+            queryResponseResult.setData(iPage);
+            return queryResponseResult;
+        }
+        queryResponseResult.setData(iPage);
+        return queryResponseResult;
+    }
+
+    /**
+     * 分组权限分组使用in查询
+     *
+     * @param
+     * @param
+     */
+    private  void  setGroupIdValue(String apiGroupCompanyCode ,String code) {
+        List<String> codes = getIdsByPIdPub(apiGroupCompanyCode,code);
+        if(codes.size()>0){
+            for (String cod : codes ){
+                setGroupIdValue(apiGroupCompanyCode,cod);
+                apiGroupCode.add(cod);
+            };
+        }
+    }
+
+    /**
+     * pcode服务分组
+     * @param apiGroupCompanyCode
+     * @param code
+     * @return
+     */
+    public List<String> getIdsByPIdPub(String apiGroupCompanyCode,String code) {
+        List<OcpApiGroup> ocpApiGroups = ocpApiGroupMapper.apiBaseTreeOther(apiGroupCompanyCode, code);
+        return ocpApiGroups.stream().map(OcpApiGroup::getApiGroupCode).collect(Collectors.toList());
+    }
+
 }

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

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.mapper.ModelNoteMapper;
 import com.pms.ocp.model.entity.ModelNote;
 import com.pms.ocp.service.ModelNoteService;
@@ -48,4 +49,13 @@ public class ModelNoteServiceImpl implements ModelNoteService {
     public ModelNote getModelNote(String modelId) {
         return null;
     }
+
+//    @Override
+//    public Boolean exportModelNote(String modelCode) {
+//        List<ModelNote> modelNoteList = getModelNoteList(modelCode);
+//
+//        ExcelUtils.exportExcel(modelNoteList, "导出事记", "导出事记", ModelNote.class, "测试user.xls", re
+//
+//        return true;
+//    }
 }

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

 package com.pms.ocp.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pms.ocp.mapper.ModelRelationMapper;
 import com.pms.ocp.model.dto.ModelRelationDTO;
-import com.pms.ocp.model.entity.ModelIssue;
 import com.pms.ocp.model.entity.ModelRelation;
 import com.pms.ocp.model.vo.ModelRelationVO;
 import com.pms.ocp.service.ModelRelationService;

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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.mapper.ModelMapper;
+import com.pms.ocp.model.dto.ModelDTO;
 import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.entity.ModelProperty;
 import com.pms.ocp.model.vo.ModelVO;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelService;
@@ -36,51 +39,62 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
     /**
      * 创建模型
      *
-     * @param model
+     * @param modelDTO
      * @return
      */
     @Override
-    public ResponseVO createModel(Model model) {
+    public Integer createModel(ModelDTO modelDTO) {
+
+        Model model = new Model();
+
+        BeanUtils.copyProperties(modelDTO, model);
+
+        model.setModelCtime(LocalDateTime.now());
         int result = modelMapper.insert(model);
-        if (result > 0) {
-            return ResponseVO.ok(CodeEnum.SUCCESS);
-        } else {
-            return ResponseVO.error(CodeEnum.INSERT_FAIL);
-        }
+        return result;
     }
 
     /**
      * 删除模型
      *
-     * @param modelId
+     * @param objId
      * @return
      */
     @Override
-    public ResponseVO deleteModel(String modelId) {
-        QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("obj_id", modelId);
-        int result = modelMapper.delete(queryWrapper);
-        if (result > 0) {
-            return ResponseVO.ok(CodeEnum.SUCCESS);
-        } else {
-            return ResponseVO.error(CodeEnum.UNKNOWN);
+    public Integer deleteModel(String objId, String modelCode) {
+        QueryWrapper<Model> queryWrapper = new QueryWrapper();
+
+        if (StringUtils.isNotEmpty(objId)) {
+            queryWrapper.lambda().eq(Model::getObjId, objId);
+        }
+
+        if (StringUtils.isNotEmpty(modelCode)) {
+            queryWrapper.lambda().eq(Model::getModelCode, modelCode);
         }
+
+        return modelMapper.delete(queryWrapper);
+
     }
 
     /**
      * 更新模型
      *
-     * @param model
+     * @param modelDTO
      * @return
      */
     @Override
-    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);
-        }
+    public Integer updateModel(ModelDTO modelDTO) {
+        Model model = new Model();
+
+        BeanUtils.copyProperties(modelDTO, model);
+
+        model.setModelMtime(LocalDateTime.now());
+
+        UpdateWrapper<Model> updateWrapper = new UpdateWrapper<>();
+
+        updateWrapper.lambda().eq(Model::getObjId, model.getObjId());
+
+        return modelMapper.update(model, updateWrapper);
     }
 
     /**
@@ -119,24 +133,30 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
      * @return
      */
     @Override
-    public ResponseVO getModelList() {
-        List<Model> modelList = modelMapper.selectList(null);
-        if (CollectionUtils.isEmpty(modelList)) {
-            return ResponseVO.ok("查询列表为空");
+    public List<Model> getModelList(String objId, String modelCode) {
+        QueryWrapper<Model> queryWrapper = new QueryWrapper();
+
+        if (StringUtils.isNotEmpty(objId)) {
+            queryWrapper.lambda().eq(Model::getObjId, objId);
         }
-        return ResponseVO.ok(modelList);
+
+        if (StringUtils.isNotEmpty(modelCode)) {
+            queryWrapper.lambda().eq(Model::getModelCode, modelCode);
+        }
+
+        return modelMapper.selectList(queryWrapper);
     }
 
     /**
      * 获取模型
      *
-     * @param modelId
+     * @param objId
      * @return
      */
     @Override
-    public Model getModel(String modelId) {
+    public Model getModel(String objId) {
         QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("model_id", modelId);
+        queryWrapper.lambda().eq(Model::getObjId, objId);
         return modelMapper.selectOne(queryWrapper);
     }
 }

src/main/resources/mapper/ModelMapper.xml

@@ -12,7 +12,7 @@
          insert into user(username, password) values (?, ?), (?, ?), ...
      -->
     <insert id="insertBatchModel" useGeneratedKeys="true" keyProperty="id">
-        insert into user(username, password)
+        insert into ocp_model_base(username, password)
         values
         <foreach collection="users" item="user" separator=",">
             (#{user.username}, #{user.password})

src/main/resources/mapper/OcpApiGroupMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.OcpApiGroupMapper">
+    <resultMap id="oabMap" type="com.pms.ocp.model.entity.OcpApiGroup">
+        <result property="objId" column="obj_id"/>
+        <result property="apiGroupCode" column="api_group_code"/>
+        <result property="apiGroupName" column="api_group_name"/>
+        <result property="apiGroupPromotionType" column="api_group_promotion_type"/>
+        <result property="apiGroupCompanyCode" column="api_group_company_code"/>
+        <result property="apiGroupVersion" column="api_group_version"/>
+        <result property="apiGroupOrderNo" column="api_group_order_no"/>
+        <result property="apiGroupUserId" column="api_group_user_id"/>
+        <result property="apiGroupUserName" column="api_group_user_name"/>
+        <result property="apiGroupCtime" column="api_group_ctime"/>
+        <result property="apiGroupMtime" column="api_group_mtime"/>
+        <result property="apiGroupPcode" column="api_group_pcode"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="apiGroupLevel" column="api_group_level"/>
+    </resultMap>
+
+    <select id="selectTreeList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where api_group_pcode is null
+        <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
+            and api_group_company_code =#{apiGroupCompanyCode}
+        </if>
+
+    </select>
+    <select id="apiBaseTreeOther" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
+        <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
+            and api_group_company_code = #{apiGroupCompanyCode}
+        </if>
+        <if test="apiGroupPcode!=null and apiGroupPcode!=''">
+            and api_group_pcode = #{apiGroupPcode}
+        </if>
+
+    </select>
+    <select id="selectByPcode" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+        select  api_group_code,api_group_name from ocp_api_group where 1 = 1
+        <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
+            and api_group_company_code =#{apiGroupCompanyCode}
+        </if>
+
+    </select>
+
+</mapper>
\ No newline at end of file