接口修改

link-api/src/main/java/com/link/dao/IndiceDao.java

+package com.link.dao;
+
+import com.link.common.dao.BaseDao;
+import com.link.entity.IndiceEntity;
+import com.link.entity.IndiceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 指标集合表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Mapper
+public interface IndiceDao extends BaseDao<IndiceEntity> {
+	
+}
\ No newline at end of file

link-api/src/main/java/com/link/dao/IndiceDataDao.java

+package com.link.dao;
+
+import com.link.common.dao.BaseDao;
+import com.link.dto.IndiceDataDTO;
+import com.link.entity.IndiceDataEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指标数据表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Mapper
+public interface IndiceDataDao extends BaseDao<IndiceDataEntity> {
+
+    List<IndiceDataEntity> getJoinList(Map<String, Object> paramsMap);
+}
\ No newline at end of file

link-api/src/main/java/com/link/dto/IndiceDTO.java

+package com.link.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 指标集合表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Data
+@ApiModel(value = "指标集合表")
+public class IndiceDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "id")
+	private Long id;
+
+	@ApiModelProperty(value = "应用id")
+	private String jobId;
+
+	@ApiModelProperty(value = "指标编码")
+	private String indice;
+
+	@ApiModelProperty(value = "指标名称")
+	private String indiceName;
+
+	@ApiModelProperty(value = "指标解释")
+	private String indiceDesc;
+
+	@ApiModelProperty(value = "所属分类")
+	private String type;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+
+}
\ No newline at end of file

link-api/src/main/java/com/link/dto/IndiceDataDTO.java

+package com.link.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 指标数据表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Data
+@ApiModel(value = "指标数据表")
+public class IndiceDataDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "id")
+	private Long id;
+
+	@ApiModelProperty(value = "节点id")
+	private Long nodeId;
+
+	@ApiModelProperty(value = "单次任务id")
+	private String oozieJobId;
+
+	@ApiModelProperty(value = "指标id")
+	private Long indiceId;
+
+	@ApiModelProperty(value = "周期参数")
+	private String cycleIndex;
+
+	@ApiModelProperty(value = "周期类型")
+	private String cycleType;
+
+	@ApiModelProperty(value = "结果数据")
+	private String resultData;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+
+}
\ No newline at end of file

link-api/src/main/java/com/link/entity/IndiceDataEntity.java

+package com.link.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.link.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 指标数据表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("indice_data")
+public class IndiceDataEntity{
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	private Long id;
+    /**
+     * 节点id
+     */
+	private Long nodeId;
+    /**
+     * 单次任务id
+     */
+	private String oozieJobId;
+    /**
+     * 指标id
+     */
+	private Long indiceId;
+    /**
+     * 周期参数
+     */
+	private String cycleIndex;
+    /**
+     * 周期类型
+     */
+	private String cycleType;
+    /**
+     * 结果数据
+     */
+	private String resultData;
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+}
\ No newline at end of file

link-api/src/main/java/com/link/entity/IndiceEntity.java

+package com.link.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.link.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 指标集合表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("indice")
+public class IndiceEntity{
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	private Long id;
+    /**
+     * 应用id
+     */
+	private String jobId;
+    /**
+     * 指标编码
+     */
+	private String indice;
+    /**
+     * 指标名称
+     */
+	private String indiceName;
+    /**
+     * 指标解释
+     */
+	private String indiceDesc;
+    /**
+     * 所属分类
+     */
+	private String type;
+    /**
+     * 创建时间
+     */
+	private Date createTime;
+}
\ No newline at end of file

link-api/src/main/java/com/link/service/IndiceDataService.java

+package com.link.service;
+
+import com.link.common.service.CrudService;
+import com.link.dto.IndiceDataDTO;
+import com.link.entity.IndiceDataEntity;
+import com.link.dto.IndiceDataDTO;
+import com.link.entity.IndiceDataEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指标数据表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+public interface IndiceDataService extends CrudService<IndiceDataEntity, IndiceDataDTO> {
+
+    List<IndiceDataDTO> getJoinList(Map<String, Object> paramsMap);
+}
\ No newline at end of file

link-api/src/main/java/com/link/service/IndiceService.java

+package com.link.service;
+
+import com.link.common.service.CrudService;
+import com.link.dto.IndiceDTO;
+import com.link.entity.IndiceEntity;
+import com.link.dto.IndiceDTO;
+import com.link.entity.IndiceEntity;
+
+/**
+ * 指标集合表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+public interface IndiceService extends CrudService<IndiceEntity, IndiceDTO> {
+
+}
\ No newline at end of file

link-api/src/main/java/com/link/service/impl/IndiceDataServiceImpl.java

+package com.link.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.link.common.service.impl.CrudServiceImpl;
+import com.link.common.utils.ConvertUtils;
+import com.link.dao.IndiceDataDao;
+import com.link.dto.IndiceDataDTO;
+import com.link.entity.IndiceDataEntity;
+import com.link.dao.IndiceDataDao;
+import com.link.dto.IndiceDataDTO;
+import com.link.entity.IndiceDataEntity;
+import com.link.entity.IndiceEntity;
+import com.link.service.IndiceDataService;
+import com.link.service.IndiceDataService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 指标数据表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Service
+public class IndiceDataServiceImpl extends CrudServiceImpl<IndiceDataDao, IndiceDataEntity, IndiceDataDTO> implements IndiceDataService {
+
+    @Override
+    public QueryWrapper<IndiceDataEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<IndiceDataEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+    @Override
+    public List<IndiceDataDTO> getJoinList(Map<String, Object> paramsMap) {
+        return ConvertUtils.sourceToTarget(baseDao.getJoinList(paramsMap), IndiceDataDTO.class);
+    }
+}
\ No newline at end of file

link-api/src/main/java/com/link/service/impl/IndiceServiceImpl.java

+package com.link.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.link.common.service.impl.CrudServiceImpl;
+import com.link.dao.IndiceDao;
+import com.link.dto.IndiceDTO;
+import com.link.entity.IndiceEntity;
+import com.link.dao.IndiceDao;
+import com.link.dto.IndiceDTO;
+import com.link.entity.IndiceEntity;
+import com.link.service.IndiceService;
+import com.link.service.IndiceService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 指标集合表
+ *
+ * @author Mr.Feng zhijian.feng@hrtuoyu.com
+ * @since 1.0.0 2020-05-15
+ */
+@Service
+public class IndiceServiceImpl extends CrudServiceImpl<IndiceDao, IndiceEntity, IndiceDTO> implements IndiceService {
+
+    @Override
+    public QueryWrapper<IndiceEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+        String indice = (String)params.get("indice");
+        String indiceName = (String)params.get("indiceName");
+        String indiceDesc = (String)params.get("indiceDesc");
+        String type = (String)params.get("type");
+        String[] indiceArr = (String[])params.get("indiceArr");
+        String indices = Convert.toStr(params.get("indices"));
+
+        QueryWrapper<IndiceEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.eq(StringUtils.isNotBlank(indice), "indice", indice);
+        wrapper.eq(StringUtils.isNotBlank(indiceName), "indice_name", indiceName);
+        wrapper.eq(StringUtils.isNotBlank(indiceDesc), "indice_desc", indiceDesc);
+        wrapper.eq(StringUtils.isNotBlank(type), "type", type);
+        if(ArrayUtil.isNotEmpty(indiceArr)){
+            wrapper.in("indice",indiceArr);
+        }
+        wrapper.inSql(StrUtil.isNotBlank(indices),"indice",indices);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file

link-api/src/main/resources/mapper/IndiceDao.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.link.dao.IndiceDao">
+
+
+
+</mapper>
\ No newline at end of file

link-api/src/main/resources/mapper/IndiceDataDao.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.link.dao.IndiceDataDao">
+
+    <select id="getJoinList" resultType="com.link.entity.IndiceDataEntity">
+
+        select t.*
+        from indice_data t
+        <where>
+            <if test="nodeId != null and nodeId != ''">
+                and t.node_id = #{nodeId}
+            </if>
+            <if test="indiceIds != null and indiceIds != ''">
+                and t.indice_id in (${indiceIds})
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                and t.create_time &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and t.create_time &lt;= #{endTime}
+            </if>
+            <if test="nodeIds != null and nodeIds != ''">
+                and t.node_id in (${nodeIds})
+            </if>
+        </where>
+
+        <if test="orderBy != null and orderBy != ''">
+            order by ${orderBy}
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file

pom.xml

@@ -45,7 +45,7 @@
         <hutool.version>5.1.2</hutool.version>
         <gson.version>2.8.6</gson.version>
         <jsoup.version>1.11.3</jsoup.version>
-        <knife4j.version>2.0.2</knife4j.version>
+        <knife4j.version>2.0.1</knife4j.version>
         <lombok.version>1.18.4</lombok.version>
         <docker.plugin.version>1.1.1</docker.plugin.version>
     </properties>