Skip to content

O
operation-control-platform
Commit 6b5d2d3f authored by 王锦盛's avatar 王锦盛
Browse files
Options

修复

parent 28eaa6e6
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 57 deletions
pom.xml
View file @ 6b5d2d3f
......@@ -60,11 +60,7 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.4.1</version>
</dependency>
<!--<dependency>-->
<!--<groupId>com.github.pagehelper</groupId>-->
<!--<artifactId>pagehelper</artifactId>-->
<!--<version>5.2.0</version>-->
<!--</dependency>-->
<!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter -->
<dependency>
<groupId>com.github.pagehelper</groupId>
......@@ -122,18 +118,6 @@
<version>5.7.16</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-redis</artifactId>-->
<!-- <version>1.4.1.RELEASE</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>redis.clients</groupId>-->
<!-- <artifactId>jedis</artifactId>-->
<!-- <version>3.1.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
......
src/main/java/com/pms/ocp/controller/ModelBaseController.java
View file @ 6b5d2d3f
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<Model> 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<ModelProperty> modelPropertyVOList = modelPropertyService.listModelProperty(objId, modelCode, subsCompanyCode);
// PageInfo<ModelProperty> pageInfo = new PageInfo<>(modelPropertyVOList);
PageHelper.startPage(currentPage, pageSize);
List<ModelPropertyVO> pageInfo = modelPropertyService.listModelPropertyVO(currentPage, pageSize, modelCode, ownerCompanyCode, modelGroupCode);
PageInfo<ModelPropertyVO> pageInfo1 = new PageInfo<>(pageInfo);
return ResponseVO.ok(pageInfo1);
}
/**
......
src/main/java/com/pms/ocp/mapper/ModelPropertyMapper.java
View file @ 6b5d2d3f
......@@ -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<ModelProperty> {
List<ModelPropertyVO> listModelPropertyVO(@Param("modelCode") String modelCode,
@Param("ownerCompanyCode") String ownerCompanyCode,
@Param("modelGroupCode") String modelGroupCode);
}
src/main/java/com/pms/ocp/model/dto/ModelDTO.java
View file @ 6b5d2d3f
......@@ -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：启用
......
src/main/java/com/pms/ocp/model/dto/ModelPropertyDTO.java
View file @ 6b5d2d3f
......@@ -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;
/**
* 显示顺序
......
src/main/java/com/pms/ocp/model/entity/Model.java
View file @ 6b5d2d3f
......@@ -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：启用
......
src/main/java/com/pms/ocp/model/vo/ModelPropertyVO.java 0 → 100644
View file @ 6b5d2d3f
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;
}
src/main/java/com/pms/ocp/service/ModelPropertyService.java
View file @ 6b5d2d3f
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<ModelProperty> listModelProperty(String objId, String modelCode, String propCode);
/**
* 获取封装之后的模型属性列表
*
* @param
* @return
*/
List<ModelPropertyVO> listModelPropertyVO(Integer currentPage, Integer pageSize,
String modelCode, String ownerCompanyCode, String modelGroupCode);
/**
* 获取模型属性
*
......
src/main/java/com/pms/ocp/service/ModelService.java
View file @ 6b5d2d3f
......@@ -58,9 +58,10 @@ public interface ModelService {
/**
* 获取模型列表
*
* @param modelId
* @param objId
* @param modelCode
* @return
*/
Model getModel(String modelId);
Model getModel(String objId, String modelCode);
}
src/main/java/com/pms/ocp/service/impl/ModelPropertyServiceImpl.java
View file @ 6b5d2d3f
......@@ -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<ModelPropertyVO> listModelPropertyVO(Integer currentPage, Integer pageSize,
String modelCode, String ownerCompanyCode, String modelGroupCode) {
//// PageHelper.startPage(currentPage, pageSize);
//
// List<ModelProperty> modelPropertyList = listModelProperty(objId, modelCode, propCode);
//// List<ModelPropertyVO> modelPropertyVOList = modelPropertyService.listModelPropertyVO(objId, modelCode, subsCompanyCode);
// Model model = modelService.getModel(objId, modelCode);
//
// List<ModelPropertyVO> 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<ModelPropertyVO> pageInfo = new PageInfo<>(modelPropertyVOList);
return modelPropertyMapper.listModelPropertyVO(modelCode, ownerCompanyCode, modelGroupCode);
}
/**
* TODO
*
......
src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
View file @ 6b5d2d3f
......@@ -154,9 +154,17 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
* @return
*/
@Override
public Model getModel(String objId) {
public Model getModel(String objId, String modelCode) {
QueryWrapper<Model> 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);
}
}
src/main/resources/mapper/ModelMapperPropertyMapper.xml 0 → 100644
View file @ 6b5d2d3f
<?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.ModelPropertyMapper">
<!--
collection：表示遍历的数组或者集合，填写对应 key 的值
item：集合中被遍历的元素名，自己随意起的名字
separator：每次遍历元素后用于拼接字符串
open：遍历开始拼接的字符串
close：遍历结束拼接字符串
index：遍历索引
例如本条 SQL 语句,拼接后的结果为：
insert into user(username, password) values (?, ?), (?, ?), ...
-->
<!-- <insert id="insertBatchModel" useGeneratedKeys="true" keyProperty="id">-->
<!-- insert into ocp_model_base(username, password)-->
<!-- values-->
<!-- <foreach collection="users" item="user" separator=",">-->
<!-- (#{user.username}, #{user.password})-->
<!-- </foreach>-->
<!-- </insert>-->
<resultMap type="com.pms.ocp.model.vo.ModelPropertyVO" id="mpMap">
<!-- <result property="id" column="id" jdbcType="VARCHAR"/>-->
<result property="columnName" column="column_name" jdbcType="VARCHAR"/>
<result property="dataLength" column="data_length" jdbcType="VARCHAR"/>
<result property="dataScale" column="data_scale" jdbcType="VARCHAR"/>
<result property="dataType" column="data_type" jdbcType="VARCHAR"/>
<result property="boolPrimaryKey" column="is_pk" jdbcType="VARCHAR"/>
<result property="modelCode" column="model_code" jdbcType="INTEGER"/>
<!-- <result property="modelName" column="model_name" jdbcType="VARCHAR"/>-->
<result property="modelTableName" column="model_table" jdbcType="VARCHAR"/>
</resultMap>
<select id="listModelPropertyVO" resultMap="mpMap">
select omp.column_name, omp.data_length, omp.data_scale, omp.data_type, omp.is_pk,
omb.model_code, omb.model_name, omb.model_table
FROM ocp_model_prop omp
JOIN ocp_model_base omb on omp.model_code = omb.model_code
<where>
<if test="modelCode !=null and modelCode !='' ">
and omp.model_code = #{model_code}
</if>
<if test="ownerCompanyCode !=null and ownerCompanyCode !='' ">
and omb.owner_company_code = #{ownerCompanyCode}
</if>
<if test="modelGroupCode !=null and modelGroupCode !='' ">
and omb.model_group_code = #{modelGroupCode}
</if>
</where>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment