Skip to content

G
gic-cloud
Commit 032c2970 by fudahua
Options

feat: 取数平台过滤项

parent 62e04b61
Showing with 294 additions and 17 deletions
gic-cloud-data-hook-api/.flattened-pom.xml
......@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gic</groupId>
<artifactId>gic-cloud-data-hook-api</artifactId>
<version>2.44</version>
<version>3.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-cloud-web-service-api</artifactId>
<version>3.80</version>
<version>3.0-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
......@@ -25,7 +25,7 @@
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-cloud-commons</artifactId>
<version>3.64</version>
<version>3.0-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-platform-config</artifactId>
<version>2.29</version>
<version>3.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
......@@ -50,5 +50,11 @@
<version>20.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.24</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/dto/QueryFilterInfoDTO.java 0 → 100644
package com.gic.cloud.data.hook.api.dto;
import java.io.Serializable;
import java.util.Date;
/**
* 过滤项
* @TableName dh_flat_query_filter
*/
public class QueryFilterInfoDTO implements Serializable {
/**
*
*/
private Integer filterId;
/**
* 过滤编号
*/
private String filterCode;
/**
* 过滤名称
*/
private String filterName;
/**
* 前端控件编号
*/
private String weightCode;
/**
* 搜索描述
*/
private String filterSearchTip;
/**
* 过滤类型 0 枚举 1调用接口
*/
private Integer filterType;
/**
* 是否删除
*/
private Integer delFlag;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
private static final long serialVersionUID = 1L;
/**
*
*/
public Integer getFilterId() {
return filterId;
}
/**
*
*/
public void setFilterId(Integer filterId) {
this.filterId = filterId;
}
/**
* 过滤编号
*/
public String getFilterCode() {
return filterCode;
}
/**
* 过滤编号
*/
public void setFilterCode(String filterCode) {
this.filterCode = filterCode;
}
/**
* 过滤名称
*/
public String getFilterName() {
return filterName;
}
/**
* 过滤名称
*/
public void setFilterName(String filterName) {
this.filterName = filterName;
}
/**
* 前端控件编号
*/
public String getWeightCode() {
return weightCode;
}
/**
* 前端控件编号
*/
public void setWeightCode(String weightCode) {
this.weightCode = weightCode;
}
/**
* 搜索描述
*/
public String getFilterSearchTip() {
return filterSearchTip;
}
/**
* 搜索描述
*/
public void setFilterSearchTip(String filterSearchTip) {
this.filterSearchTip = filterSearchTip;
}
/**
* 过滤类型 0 枚举 1调用接口
*/
public Integer getFilterType() {
return filterType;
}
/**
* 过滤类型 0 枚举 1调用接口
*/
public void setFilterType(Integer filterType) {
this.filterType = filterType;
}
/**
* 是否删除
*/
public Integer getDelFlag() {
return delFlag;
}
/**
* 是否删除
*/
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
/**
*
*/
public Date getCreateTime() {
return createTime;
}
/**
*
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
*
*/
public Date getUpdateTime() {
return updateTime;
}
/**
*
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", filterId=").append(filterId);
sb.append(", filterCode=").append(filterCode);
sb.append(", filterName=").append(filterName);
sb.append(", weightCode=").append(weightCode);
sb.append(", filterSearchTip=").append(filterSearchTip);
sb.append(", filterType=").append(filterType);
sb.append(", delFlag=").append(delFlag);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/service/IFlatQueryResultService.java
......@@ -5,6 +5,7 @@ import com.gic.api.base.commons.Page;
import com.gic.cloud.data.hook.api.dto.DownloadTask;
import com.gic.cloud.data.hook.api.dto.FilterQueryDataDTO;
import com.gic.cloud.data.hook.api.dto.FlatQueryResult;
import com.gic.cloud.data.hook.api.dto.QueryFilterInfoDTO;
import com.gic.cloud.data.hook.api.entity.FlatQueryCondition;
import java.util.List;
......@@ -79,6 +80,13 @@ public interface IFlatQueryResultService {
*/
public Page<FilterQueryDataDTO> pageFlatQueryFilterNew(String enterpriseId, String filterCode, String search, BasePageInfo pageInfo);
/**
* 获取过滤详情
* @param filterCode
* @return
*/
public QueryFilterInfoDTO getFlatQueryFilterInfo(String filterCode);
public void initTask();
......
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/entity/DhFlatQueryFilter.java
......@@ -24,6 +24,11 @@ public class DhFlatQueryFilter implements Serializable {
private String filterName;
/**
* 前端控件编号
*/
private String weightCode;
/**
* 搜索描述
*/
private String filterSearchTip;
......@@ -93,6 +98,20 @@ public class DhFlatQueryFilter implements Serializable {
}
/**
* 前端控件编号
*/
public String getWeightCode() {
return weightCode;
}
/**
* 前端控件编号
*/
public void setWeightCode(String weightCode) {
this.weightCode = weightCode;
}
/**
* 搜索描述
*/
public String getFilterSearchTip() {
......@@ -177,6 +196,7 @@ public class DhFlatQueryFilter implements Serializable {
return (this.getFilterId() == null ? other.getFilterId() == null : this.getFilterId().equals(other.getFilterId()))
&& (this.getFilterCode() == null ? other.getFilterCode() == null : this.getFilterCode().equals(other.getFilterCode()))
&& (this.getFilterName() == null ? other.getFilterName() == null : this.getFilterName().equals(other.getFilterName()))
&& (this.getWeightCode() == null ? other.getWeightCode() == null : this.getWeightCode().equals(other.getWeightCode()))
&& (this.getFilterSearchTip() == null ? other.getFilterSearchTip() == null : this.getFilterSearchTip().equals(other.getFilterSearchTip()))
&& (this.getFilterType() == null ? other.getFilterType() == null : this.getFilterType().equals(other.getFilterType()))
&& (this.getDelFlag() == null ? other.getDelFlag() == null : this.getDelFlag().equals(other.getDelFlag()))
......@@ -191,6 +211,7 @@ public class DhFlatQueryFilter implements Serializable {
result = prime * result + ((getFilterId() == null) ? 0 : getFilterId().hashCode());
result = prime * result + ((getFilterCode() == null) ? 0 : getFilterCode().hashCode());
result = prime * result + ((getFilterName() == null) ? 0 : getFilterName().hashCode());
result = prime * result + ((getWeightCode() == null) ? 0 : getWeightCode().hashCode());
result = prime * result + ((getFilterSearchTip() == null) ? 0 : getFilterSearchTip().hashCode());
result = prime * result + ((getFilterType() == null) ? 0 : getFilterType().hashCode());
result = prime * result + ((getDelFlag() == null) ? 0 : getDelFlag().hashCode());
......@@ -208,6 +229,7 @@ public class DhFlatQueryFilter implements Serializable {
sb.append(", filterId=").append(filterId);
sb.append(", filterCode=").append(filterCode);
sb.append(", filterName=").append(filterName);
sb.append(", weightCode=").append(weightCode);
sb.append(", filterSearchTip=").append(filterSearchTip);
sb.append(", filterType=").append(filterType);
sb.append(", delFlag=").append(delFlag);
......
gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java
......@@ -1554,4 +1554,14 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
BaseQueryFilter instance = queryFilterFactory.getInstance(queryFilterContext);
return instance.pageQueryData(queryFilterContext);
}
@Override
public QueryFilterInfoDTO getFlatQueryFilterInfo(String filterCode) {
DhFlatQueryFilter queryFilter = flatQueryFilterMapper.getFilterByCode(filterCode);
if (queryFilter == null) {
logger.info("不存在搜索code：{}",filterCode);
return null;
}
return EntityUtil.changeEntityByJSON(QueryFilterInfoDTO.class, queryFilter);
}
}
gic-cloud-data-hook-service/src/main/resources/applicationContext-conf.xml
......@@ -23,6 +23,7 @@
<!--<import resource="classpath:data-hook-free-query-source.xml"/>-->
<import resource="classpath*:redis-init.xml" />
<import resource="classpath*:data-hook-service-druid-prod.xml"/>
<!-- <import resource="classpath*:applicationContext-init.xml" />-->
<import resource="classpath:data-hook-init.xml"/>
<import resource="classpath*:dubbo-setting.xml"/>
<import resource="classpath:data-hook-service-dubbo-config.xml"/>
......
gic-cloud-data-hook-service/src/main/resources/mapper/DhFlatQueryFilterMapper.xml
......@@ -5,20 +5,21 @@
<mapper namespace="com.gic.cloud.data.hook.service.dao.DhFlatQueryFilterMapper">
<resultMap id="BaseResultMap" type="com.gic.cloud.data.hook.service.entity.DhFlatQueryFilter">
<id property="filterId" column="filter_id" jdbcType="INTEGER"/>
<result property="filterCode" column="filter_code" jdbcType="VARCHAR"/>
<result property="filterName" column="filter_name" jdbcType="VARCHAR"/>
<result property="filterSearchTip" column="filter_search_tip" jdbcType="VARCHAR"/>
<result property="filterType" column="filter_type" jdbcType="INTEGER"/>
<result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<id property="filterId" column="filter_id" jdbcType="INTEGER"/>
<result property="filterCode" column="filter_code" jdbcType="VARCHAR"/>
<result property="filterName" column="filter_name" jdbcType="VARCHAR"/>
<result property="weightCode" column="weight_code" jdbcType="VARCHAR"/>
<result property="filterSearchTip" column="filter_search_tip" jdbcType="VARCHAR"/>
<result property="filterType" column="filter_type" jdbcType="INTEGER"/>
<result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
filter_id,filter_code,filter_name,
filter_search_tip,filter_type,del_flag,
create_time,update_time
weight_code,filter_search_tip,filter_type,
del_flag,create_time,update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
......
gic-cloud-data-hook/pom.xml
......@@ -58,6 +58,12 @@
<artifactId>gic-webapp-common</artifactId>
<version>${gic-webapp-common}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-cloud-web-service-api</artifactId>
......
gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FlatQueryController.java
......@@ -41,7 +41,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
/** 自助取数相关 Controller
/** 自助取数相关
* @author Sam
*/
@Controller
......@@ -149,11 +149,29 @@ public class FlatQueryController {
return this.flatQueryTableService.queryFlatQueryTableDetailByTableId(userId, tableId);
}
/** 根据filterCode 查询列表数据
/** 根据filterCode 查询过滤详情
* @return
*/
@RequestMapping("/flat-query-filter-info")
public RestResponse flatQueryFilterInfo(@RequestBody FilterInfoQO filterInfoQO) {
public RestResponse<QueryFilterInfoDTO> flatQueryFilterInfo(String filterCode) {
if (StringUtils.isEmpty(filterCode)) {
return RestResponse.failure("5","filterCode没传");
}
String enterpriseId = SessionContextUtils.getLoginUserEnterpriseId();
if (StringUtils.isEmpty(enterpriseId)) {
return RestResponse.failure("4","企业不存在");
}
QueryFilterInfoDTO ret = flatQueryResultService.getFlatQueryFilterInfo(filterCode);
return RestResponse.successResult(ret);
}
/** 根据filterCode 查询列表数据
* @return
*/
@RequestMapping("/flat-query-filter-list")
public RestResponse<com.gic.api.base.commons.Page<FilterQueryDataDTO>> flatQueryFilterList(@RequestBody FilterInfoQO filterInfoQO) {
String enterpriseId = SessionContextUtils.getLoginUserEnterpriseId();
if (StringUtils.isEmpty(enterpriseId)) {
return RestResponse.failure("4","企业不存在");
......
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