添加模型订阅增删查

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.ModelGroupService;
-import com.pms.ocp.service.ModelNoteService;
-import com.pms.ocp.service.ModelPropertyService;
-import com.pms.ocp.service.ModelService;
+import com.pms.ocp.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,56 +46,56 @@ public class ModelBaseController {
     private ModelNoteService modelNoteService;
 
     @Autowired
-    private ModelPropertyService propertyService;
+    private ModelIssueService modelIssueService;
 
     /**
      * 模型分类-查询
      *
      * @return
      */
-    @ApiOperation("模型分类-查询")
-    @GetMapping("/get/model/type")
-    public ResponseVO getModelType() {
-        return modelGroupService.getModelType();
-    }
+//    @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);
-    }
+//    @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("/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);
+//        }
+//    }
 
     /**
      * 模型分类-修改
      *
      * @return
      */
-    @ApiOperation("模型分类-修改")
-    @PostMapping("/update/model/type")
-    public ResponseVO updateModelType(ModelType modelType) {
-        return modelGroupService.updateModelType(modelType);
-    }
+//    @ApiOperation("模型分类-修改")
+//    @PostMapping("/update/model/type")
+//    public ResponseVO updateModelType(ModelType modelType) {
+//        return modelGroupService.updateModelType(modelType);
+//    }
 
     /**
      * 模型-查询
@@ -178,8 +176,19 @@ public class ModelBaseController {
      */
     @ApiOperation("模型订阅-增加")
     @PostMapping("/create/model/subscribe")
-    public ResponseVO createModelSubscribe() {
-        return ResponseVO.ok();
+    public ResponseVO createModelSubscribe(@RequestBody ModelIssueDTO modelIssueDTO) {
+        return ResponseVO.ok(modelIssueService.createModelIssue(modelIssueDTO));
+    }
+
+    /**
+     * 模型属性-删除/批量删除
+     *
+     * @return
+     */
+    @ApiOperation("模型订阅-删除/批量删除")
+    @PostMapping("/delete/model/subscribe")
+    public ResponseVO deleteModelSubscribe(@ApiParam(value = "订阅编号集合") @RequestBody List<String> ids) {
+        return ResponseVO.ok(modelIssueService.deletePatchModelIssue(ids));
     }
 
     /**
@@ -189,8 +198,10 @@ public class ModelBaseController {
      */
     @ApiOperation("模型订阅-查询")
     @GetMapping("/get/model/subscribe")
-    public ResponseVO getModelSubscribe() {
-        return ResponseVO.ok();
+    public ResponseVO getModelSubscribe(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
+                                        @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+                                        @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) {
+        return ResponseVO.ok(modelIssueService.getModelIssueList(objId, modelCode, subsCompanyCode));
     }
 
     /**
@@ -218,6 +229,7 @@ public class ModelBaseController {
         return ResponseVO.ok();
     }
 
+
     /**
      * 模型属性-增加
      *
@@ -240,8 +252,8 @@ public class ModelBaseController {
     @GetMapping("get/model/property")
     public ResponseVO getModelProperty(@ApiParam(value = "模型属性编号") @RequestParam(value = "objId", required = false) String objId,
                                        @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
-                                       @ApiParam(value = "属性编码") @RequestParam(value = "propCode", required = false) String propCode) {
-        return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, propCode));
+                                       @ApiParam(value = "订阅公司编码") @RequestParam(value = "subsCompanyCode", required = false) String subsCompanyCode) {
+        return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode));
     }
 
     /**

src/main/java/com/pms/ocp/mapper/ModelIssueMapper.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.ModelIssue;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 
 @Mapper
-public interface ModelIssueMapper extends BaseMapper<Model> {
+public interface ModelIssueMapper extends BaseMapper<ModelIssue> {
 }

src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.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.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Date;
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: wangjian
+ * @Date: 2022/3/10 16:35
+ * @Description:模型订阅DTO对象
+ */
+
+@ApiModel(value = "模型订阅DTO对象")
+@Data
+public class ModelIssueDTO {
+
+    /**
+     * 模型属性编号
+     */
+    @ApiModelProperty(value = "模型属性编号")
+    private String objId;
+
+    /**
+     * 模型编号
+     */
+    @ApiModelProperty(value = "模型编号")
+    private String modelCode;
+
+    /**
+     * 订阅状态 0:订阅, 1:取消订阅
+     */
+    @ApiModelProperty(value = "订阅状态 0:订阅, 1:取消订阅")
+    private String subsStatus;
+
+    /**
+     * 订阅公司编码
+     */
+    @ApiModelProperty(value = "订阅公司编码")
+    private String subsCompanyCode;
+
+    /**
+     * 订阅人员编号
+     */
+    @ApiModelProperty(value = "订阅人员编号")
+    private String subsUserId;
+
+    /**
+     * 订阅人名称
+     */
+    @ApiModelProperty(value = "订阅人名称")
+    private String subsUserName;
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime subsCtime;
+
+    /**
+     * 修改时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime subsMtime;
+
+}

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

 package com.pms.ocp.model.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +7,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Date;
-import java.time.LocalDateTime;
 
 /**
  * @Auther: wangjian
@@ -54,7 +52,7 @@ public class ModelPropertyDTO {
      * 数据类型
      */
     @ApiModelProperty(value = "数据类型")
-    private Integer dataType;
+    private String dataType;
 
     /**
      * 数据长度
@@ -83,8 +81,8 @@ public class ModelPropertyDTO {
     /**
      * 推广类型 0:统推,1：自建
      */
-    @ApiModelProperty(value = "推广类型 0:统推,1：自建")
-    private String propPromotion;
+//    @ApiModelProperty(value = "推广类型 0:统推,1：自建")
+//    private String propPromotion;
 
     /**
      * 显示顺序

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

 package com.pms.ocp.model.entity;
 
+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
@@ -9,5 +17,78 @@ import lombok.Data;
  */
 
 @Data
+@Accessors(chain = true)
+@TableName("ocp_model_subs")
 public class ModelIssue {
+
+    /**
+     * 模型订阅编号
+     */
+    @TableId(value = "obj_id")
+    private String objId;
+
+    /**
+     * 模型编码
+     */
+    private String modelCode;
+
+    /**
+     * 订阅状态 0:订阅, 1:取消订阅
+     */
+    private int subsStatus;
+
+    /**
+     * 订阅公司编码
+     */
+    private String subsCompanyCode;
+
+    /**
+     * 订阅人员编号
+     */
+    private String subsUserId;
+
+    /**
+     * 订阅人名称
+     */
+    private String subsUserName;
+
+    /**
+     * 订阅时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime subsCtime;
+
+    /**
+     * 修改时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private LocalDateTime subsMtime;
 }
+
+//    create table ocp_model_subs
+//        (
+//                obj_id            varchar(42) not null
+//        constraint ocp_model_subs_pkey
+//        primary key,
+//        model_code        varchar(42) not null,
+//        subs_status       smallint,
+//        subs_company_code varchar(42) not null,
+//        subs_user_id      varchar(42),
+//        subs_user_name    varchar(64),
+//        subs_ctime        timestamp(6),
+//        subs_mtime        timestamp(6)
+//        );
+//
+//        comment on table ocp_model_subs is '模型订阅表';
+//        comment on column ocp_model_subs.obj_id is '主键是';
+//        comment on column ocp_model_subs.model_code is '模型code是';
+//        comment on column ocp_model_subs.subs_status is '订阅状态0:订阅,1:取消订阅';
+//        comment on column ocp_model_subs.subs_company_code is '订阅公司code';
+//        comment on column ocp_model_subs.subs_user_id is '订阅人员id';
+//        comment on column ocp_model_subs.subs_user_name is '订阅人';
+//        comment on column ocp_model_subs.subs_ctime is '订阅时间';
+//        comment on column ocp_model_subs.subs_mtime is '修改时间';
+//        alter table ocp_model_subs
+//        owner to postgres;
\ No newline at end of file

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

@@ -53,7 +53,7 @@ public class ModelProperty{
     /**
      * 数据类型
      */
-    private Integer dataType;
+    private String dataType;
 
     /**
      * 数据长度
@@ -80,7 +80,7 @@ public class ModelProperty{
     /**
      * 推广类型
      */
-    private String propPromotion;
+//    private String propPromotion;
 
     /**
      * 显示顺序
@@ -128,7 +128,6 @@ public class ModelProperty{
 //        data_scale	数据精度	int4	是
 //        is_pk	是否主键	int4	否	0:否,1:是
 //        is_required	是否必填	int4	是	0:否,1:是
-//        prop_promotion	推广类型	int4	是	0:统推,1：自建
 //        company_id	省公司ID	varchar(42)	是
 //        company_name	省公司名称	varchar(50)	是
 //        prop _dispidx	显示顺序	int4	否

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

 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;
 
@@ -15,10 +16,10 @@ public interface ModelIssueService {
     /**
      * 创建模型订阅
      *
-     * @param modelIssueo
+     * @param modelIssueDTO
      * @return
      */
-    Integer createModelIssue(ModelIssue modelIssueo);
+    Integer createModelIssue(ModelIssueDTO modelIssueDTO);
 
     /**
      * 删除模型订阅
@@ -28,13 +29,21 @@ public interface ModelIssueService {
      */
     Integer deleteModelIssue(String modelId);
 
+    /**
+     * 批量删除模型订阅
+     *
+     * @param ids
+     * @return
+     */
+    Integer deletePatchModelIssue(List<String> ids);
+
     /**
      * 更新模型订阅
      *
-     * @param modelIssueo
+     * @param modelIssue
      * @return
      */
-    Integer updateModelIssue(ModelIssue modelIssueo);
+    Integer updateModelIssue(ModelIssue modelIssue);
 
     /**
      * 获取模型订阅
@@ -42,7 +51,7 @@ public interface ModelIssueService {
      * @param
      * @return
      */
-    List<ModelType> getModelIssueList();
+    List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode);
 
     /**
      * 获取模型订阅列表
@@ -50,5 +59,5 @@ public interface ModelIssueService {
      * @param modelId
      * @return
      */
-    ModelType getModelIssue(String modelId);
+    ModelIssueDTO getModelIssue(String modelId);
 }

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

@@ -46,7 +46,7 @@ public interface ModelPropertyService {
     Integer updateModelProperty(ModelPropertyDTO modelPropertyDTO);
 
     /**
-     * 获取模型属性
+     * 获取模型属性列表
      *
      * @param
      * @return
@@ -54,7 +54,7 @@ public interface ModelPropertyService {
     List<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
 
     /**
-     * 获取模型属性列表
+     * 获取模型属性
      *
      * @param
      * @return

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

 package com.pms.ocp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pms.ocp.mapper.ModelIssueMapper;
+import com.pms.ocp.model.dto.ModelIssueDTO;
 import com.pms.ocp.model.entity.ModelIssue;
-import com.pms.ocp.model.entity.ModelType;
 import com.pms.ocp.service.ModelIssueService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -15,9 +21,20 @@ import java.util.List;
 
 @Service
 public class ModelIssueServiceImpl implements ModelIssueService {
+
+    @Autowired
+    private ModelIssueMapper modelIssueMapper;
+
     @Override
-    public Integer createModelIssue(ModelIssue modelIssueo) {
-        return null;
+    public Integer createModelIssue(ModelIssueDTO modelIssueDTO) {
+
+        ModelIssue modelIssue = new ModelIssue();
+
+        BeanUtils.copyProperties(modelIssueDTO, modelIssue);
+
+        modelIssue.setSubsCtime(LocalDateTime.now());
+
+        return modelIssueMapper.insert(modelIssue);
     }
 
     @Override
@@ -25,18 +42,43 @@ public class ModelIssueServiceImpl implements ModelIssueService {
         return null;
     }
 
+    /**
+     * 批量删除模型订阅
+     *
+     * @param ids
+     * @return
+     */
     @Override
-    public Integer updateModelIssue(ModelIssue modelIssueo) {
-        return null;
+    public Integer deletePatchModelIssue(List<String> ids) {
+        return modelIssueMapper.deleteBatchIds(ids);
     }
 
     @Override
-    public List<ModelType> getModelIssueList() {
+    public Integer updateModelIssue(ModelIssue modelIssue) {
         return null;
     }
 
     @Override
-    public ModelType getModelIssue(String modelId) {
+    public List<ModelIssue> getModelIssueList(String objId, String modelCode, String subsCompanyCode) {
+        QueryWrapper<ModelIssue> queryWrapper = new QueryWrapper();
+
+        if (StringUtils.isNotEmpty(objId)) {
+            queryWrapper.lambda().eq(ModelIssue::getObjId, objId);
+        }
+
+        if (StringUtils.isNotEmpty(modelCode)) {
+            queryWrapper.lambda().eq(ModelIssue::getModelCode, modelCode);
+        }
+
+        if (StringUtils.isNotEmpty(subsCompanyCode)) {
+            queryWrapper.lambda().eq(ModelIssue::getSubsCompanyCode, subsCompanyCode);
+        }
+
+        return modelIssueMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public ModelIssueDTO getModelIssue(String modelId) {
         return null;
     }
 }