diff --git a/pom.xml b/pom.xml
index 0b1aef01970aa1f670d499daa7a3260417dd8498..46173d6f8923f0eea4ef02111bd8e5d6bd81d782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,11 +60,7 @@
mybatis-plus-boot-starter
3.4.1
-
-
-
-
-
+
com.github.pagehelper
@@ -122,18 +118,6 @@
5.7.16
-
-
-
-
-
-
-
-
-
-
-
-
com.google.code.gson
gson
diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index 48218e3af45c5740dd7fa52c49693de840663733..169c91154ba17aa1c0a07baeabe314b4f71f2717 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -1,5 +1,6 @@
package com.pms.ocp.controller;
+import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.pms.ocp.common.utils.ExcelUtils;
@@ -8,9 +9,11 @@ import com.pms.ocp.model.dto.ModelSubscribeDTO;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.dto.ModelRelationDTO;
import com.pms.ocp.model.entity.Model;
+import com.pms.ocp.model.entity.ModelProperty;
import com.pms.ocp.model.entity.ModelSubscribe;
import com.pms.ocp.model.entity.ModelAudit;
import com.pms.ocp.model.vo.ModelAuditVO;
+import com.pms.ocp.model.vo.ModelPropertyVO;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.*;
import io.swagger.annotations.Api;
@@ -53,16 +56,6 @@ public class ModelBaseController {
@Autowired
private ModelRelationService modelRelationService;
- /**
- * 模型分类-查询
- *
- * @return
- */
-// @ApiOperation("模型分类-查询")
-// @GetMapping("/get/model/type")
-// public ResponseVO getModelType() {
-// return modelGroupService.getModelType();
-// }
/**
* 模型-增加
@@ -77,16 +70,16 @@ public class ModelBaseController {
}
/**
- * 模型-查询
+ * 模型-查询列表
*
* @return
*/
- @ApiOperation("模型-查询")
- @GetMapping("/get/model")
- public ResponseVO getModel(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
- @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
- @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
- @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+ @ApiOperation("模型-查询列表")
+ @GetMapping("/get/model/list")
+ public ResponseVO getModelList(@ApiParam(value = "模型订阅编号") @RequestParam(value = "objId", required = false) String objId,
+ @ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+ @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
+ @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
List modelList = modelService.getModelList(objId, modelCode);
@@ -257,16 +250,28 @@ public class ModelBaseController {
}
/**
- * 模型属性-查询
+ * 模型属性-查询列表
*
* @return
*/
- @ApiOperation("模型属性-查询")
- @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 = "subsCompanyCode", required = false) String subsCompanyCode) {
- return ResponseVO.ok(modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode));
+ @ApiOperation("模型属性-查询列表")
+ @GetMapping("get/model/property/list")
+ public ResponseVO getModelPropertyList(@ApiParam(value = "模型编码") @RequestParam(value = "modelCode", required = false) String modelCode,
+ @ApiParam(value = "模型所属类型编码") @RequestParam(value = "modelGroupCode", required = false) String modelGroupCode,
+ @ApiParam(value = "公司编码") @RequestParam(value = "ownerCompanyCode", required = false) String ownerCompanyCode,
+ @ApiParam(value = "当前页") @RequestParam(value = "currentPage", required = false) Integer currentPage,
+ @ApiParam(value = "每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+
+// PageHelper.startPage(currentPage, pageSize);
+// List modelPropertyVOList = modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode);
+// PageInfo pageInfo = new PageInfo<>(modelPropertyVOList);
+
+
+ PageHelper.startPage(currentPage, pageSize);
+ List pageInfo = modelPropertyService.listModelPropertyVO(currentPage, pageSize, modelCode, ownerCompanyCode, modelGroupCode);
+ PageInfo pageInfo1 = new PageInfo<>(pageInfo);
+
+ return ResponseVO.ok(pageInfo1);
}
/**
diff --git a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
index fcb91b2cfaf4d2acd4263d514584138712fd5eaa..b171a08f7a53ea73c60a459b49be2ba347553529 100644
--- a/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
@@ -3,7 +3,11 @@ 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.ModelProperty;
+import com.pms.ocp.model.vo.ModelPropertyVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @Auther: wangjian
@@ -13,4 +17,9 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ModelPropertyMapper extends BaseMapper {
+
+ List listModelPropertyVO(@Param("modelCode") String modelCode,
+ @Param("ownerCompanyCode") String ownerCompanyCode,
+ @Param("modelGroupCode") String modelGroupCode);
+
}
diff --git a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelDTO.java
index d1de7f7df0fd72e17ca4d8844b9d3f03607a980a..1b9cee81586982848df38e2c88497c647f1e0752 100644
--- a/src/main/java/com/pms/ocp/model/dto/ModelDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/ModelDTO.java
@@ -57,21 +57,21 @@ public class ModelDTO {
*/
@Excel(name = "所属专业", replace = {"输电_ts", "变电_t", "直流_ds", "配电_ds", "技术_tc", "计划_pl", "综合_im"})
@ApiModelProperty(value = "所属专业 ts:输电,t:变电, dc:直流，ds:配电，tc:技术，pl:计划 im:综合")
- private String professional_kind;
+ private String professionalKind;
/**
* 模型分类编码
*/
@Excel(name = "模型分类编码")
@ApiModelProperty(value = "模型分类编码")
- private String model_group_code;
+ private String modelGroupCode;
/**
* 模型表名称
*/
@Excel(name = "模型表名称")
@ApiModelProperty(value = "模型表名称")
- private String model_table;
+ private String modelTable;
/**
* 是否启用 0:未启用,1：启用
diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java
index 1ba3f5a6a2167f4522a236327b447c7c45e48106..485520c7600068653a35063b60f2d200b9364800 100644
--- a/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java
@@ -30,6 +30,12 @@ public class ModelPropertyDTO {
@ApiModelProperty(value = "模型编号")
private String modelCode;
+ /**
+ * 模型名称
+ */
+ @ApiModelProperty(value = "模型名称")
+ private String modelName;
+
/**
* 属性名称
*/
@@ -79,10 +85,10 @@ public class ModelPropertyDTO {
private Integer boolRequired;
/**
- * 推广类型 0:统推,1：自建
+ * 表名称
*/
-// @ApiModelProperty(value = "推广类型 0:统推,1：自建")
-// private String propPromotion;
+// @ApiModelProperty(value = "表名称")
+// private String modelTableName;
/**
* 显示顺序
diff --git a/src/main/java/com/pms/ocp/model/entity/Model.java b/src/main/java/com/pms/ocp/model/entity/Model.java
index e79793328f275bc5446b11ff599002b614d97511..5296b63672605172368cfb312f9e18a34bc4b23e 100644
--- a/src/main/java/com/pms/ocp/model/entity/Model.java
+++ b/src/main/java/com/pms/ocp/model/entity/Model.java
@@ -47,17 +47,17 @@ public class Model {
/**
* 所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合
*/
- private String professional_kind;
+ private String professionalKind;
/**
* 模型分类编码
*/
- private String model_group_code;
+ private String modelGroupCode;
/**
* 模型表名称
*/
- private String model_table;
+ private String modelTable;
/**
* 是否启用 0:未启用,1：启用
diff --git a/src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java b/src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java
new file mode 100644
index 0000000000000000000000000000000000000000..0deea2f4180274f4634d8186918203f4b7753c84
--- /dev/null
+++ b/src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java
@@ -0,0 +1,108 @@
+package com.pms.ocp.model.vo;
+
+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.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: wangjian
+ * @Date: 2022/2/22 16:40
+ * @Description:模型属性VO对象
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "模型属性VO对象")
+public class ModelPropertyVO {
+
+ /**
+ * 模型属性编号
+ */
+ @ApiModelProperty(value = "模型属性编号")
+ private String objId;
+
+ /**
+ * 模型编号
+ */
+ @ApiModelProperty(value = "模型编号")
+ private String modelCode;
+
+ /**
+ * 模型表名称
+ */
+ @ApiModelProperty(value = "模型表名称")
+ private String modelTableName;
+
+ /**
+ * 属性名称
+ */
+ @ApiModelProperty(value = "属性名称")
+ private String columnName;
+
+ /**
+ * 属性编码
+ */
+ @ApiModelProperty(value = "属性编码")
+ private String propCode;
+
+ /**
+ * 数据类型
+ */
+ @ApiModelProperty(value = "数据类型")
+ private String dataType;
+
+ /**
+ * 数据长度
+ */
+ @ApiModelProperty(value = "数据长度")
+ private Integer dataLength;
+
+ /**
+ * 数据精度
+ */
+ @ApiModelProperty(value = "数据精度")
+ private Integer dataScale;
+
+ /**
+ * 是否主键
+ */
+ @ApiModelProperty(value = "是否主键")
+ @TableField("is_pk")
+ private Integer boolPrimaryKey;
+
+ /**
+ * 显示顺序
+ */
+// private Integer propOrderNo;
+
+ /**
+ * 提交人id
+ */
+// private String propUserId;
+
+ /**
+ * 提交人姓名
+ */
+// private String propUserName;
+
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "模型关系编号")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime propCtime;
+
+ /**
+ * 修改时间
+ */
+ @ApiModelProperty(value = "模型关系编号")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime propMtime;
+}
diff --git a/src/main/java/com/pms/ocp/service/ModelPropertyService.java b/src/main/java/com/pms/ocp/service/ModelPropertyService.java
index 74bb63244f92646f51cfadea3a4ad77aaf19828c..84b3762ec9fcb170bf3fb46dde43a60a79a9b3c8 100644
--- a/src/main/java/com/pms/ocp/service/ModelPropertyService.java
+++ b/src/main/java/com/pms/ocp/service/ModelPropertyService.java
@@ -1,8 +1,9 @@
package com.pms.ocp.service;
+import com.github.pagehelper.PageInfo;
import com.pms.ocp.model.dto.ModelPropertyDTO;
import com.pms.ocp.model.entity.ModelProperty;
-import io.swagger.models.auth.In;
+import com.pms.ocp.model.vo.ModelPropertyVO;
import java.util.List;
@@ -53,6 +54,15 @@ public interface ModelPropertyService {
*/
List listModelProperty(String objId, String modelCode, String propCode);
+ /**
+ * 获取封装之后的模型属性列表
+ *
+ * @param
+ * @return
+ */
+ List listModelPropertyVO(Integer currentPage, Integer pageSize,
+ String modelCode, String ownerCompanyCode, String modelGroupCode);
+
/**
* 获取模型属性
*
diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java
index 64c84b95c9a2924dbfa393136073c6d9775a8e53..86b94244bdd79853747fc58748cb40ef8b4d8979 100644
--- a/src/main/java/com/pms/ocp/service/ModelService.java
+++ b/src/main/java/com/pms/ocp/service/ModelService.java
@@ -58,9 +58,10 @@ public interface ModelService {
/**
* 获取模型列表
*
- * @param modelId
+ * @param objId
+ * @param modelCode
* @return
*/
- Model getModel(String modelId);
+ Model getModel(String objId, String modelCode);
}
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
index 62a9b7e6b48ffbfb306b03794266bb14263a46cf..8f340340fa84e77485de079692ed7c8976babb0b 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
@@ -2,19 +2,24 @@ package com.pms.ocp.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.pms.ocp.mapper.ModelPropertyMapper;
import com.pms.ocp.model.dto.ModelPropertyDTO;
+import com.pms.ocp.model.entity.Model;
import com.pms.ocp.model.entity.ModelProperty;
+import com.pms.ocp.model.vo.ModelPropertyVO;
import com.pms.ocp.service.ModelPropertyService;
-import io.swagger.models.auth.In;
+import com.pms.ocp.service.ModelService;
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.sql.Date;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @Auther: wangjian
@@ -28,6 +33,9 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
@Autowired
private ModelPropertyMapper modelPropertyMapper;
+ @Autowired
+ private ModelService modelService;
+
@Override
public Integer createModelProperty(ModelPropertyDTO modelPropertyDTO) {
@@ -94,6 +102,35 @@ public class ModelPropertyServiceImpl implements ModelPropertyService {
return modelPropertyMapper.selectList(queryWrapper);
}
+ @Override
+ public List listModelPropertyVO(Integer currentPage, Integer pageSize,
+ String modelCode, String ownerCompanyCode, String modelGroupCode) {
+
+
+
+
+//// PageHelper.startPage(currentPage, pageSize);
+//
+// List modelPropertyList = listModelProperty(objId, modelCode, propCode);
+//// List modelPropertyVOList = modelPropertyService.listModelPropertyVO(objId, modelCode, subsCompanyCode);
+// Model model = modelService.getModel(objId, modelCode);
+//
+// List modelPropertyVOList = new ArrayList<>(modelPropertyList.size());
+//
+//// 组合模型与属性相关属性值
+// if (model != null && !modelPropertyList.isEmpty()) {
+// modelPropertyVOList = modelPropertyList.stream().map(modelProperty -> {
+// ModelPropertyVO modelPropertyVO = new ModelPropertyVO();
+// BeanUtils.copyProperties(modelProperty, modelPropertyVO);
+//// modelPropertyVO.setModelTableName(model.getModelTable());
+// return modelPropertyVO;
+// }).collect(Collectors.toList());
+// }
+
+// PageInfo pageInfo = new PageInfo<>(modelPropertyVOList);
+ return modelPropertyMapper.listModelPropertyVO(modelCode, ownerCompanyCode, modelGroupCode);
+ }
+
/**
* TODO
*
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 6fc3c03536b1fb97621ab18508c7b04d9cc847de..9c01612ea33914ab0328172f73a19f7e03ecbf03 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
@@ -154,9 +154,17 @@ public class ModelServiceImpl extends ServiceImpl implements
* @return
*/
@Override
- public Model getModel(String objId) {
+ public Model getModel(String objId, String modelCode) {
QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.lambda().eq(Model::getObjId, objId);
+
+ if (StringUtils.isNotEmpty(objId)) {
+ queryWrapper.lambda().eq(Model::getObjId, objId);
+ }
+
+ if (StringUtils.isNotEmpty(modelCode)) {
+ queryWrapper.lambda().eq(Model::getModelCode, modelCode);
+ }
+
return modelMapper.selectOne(queryWrapper);
}
}
diff --git a/src/main/resources/mapper/ModelMapperPropertyMapper.xml b/src/main/resources/mapper/ModelMapperPropertyMapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f76ac9e196f4283b2a7ce9b0dc523a2376631b14
--- /dev/null
+++ b/src/main/resources/mapper/ModelMapperPropertyMapper.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+