增加按指标分类ID查询

jjt-biz/src/main/java/com/jjt/biz/domain/MetricsDef.java

@@ -58,6 +58,9 @@ public class MetricsDef extends BaseEntity {
     @ApiModelProperty("指标分类")
     @Excel(name = "指标分类")
     private List<MetricsType> metricsTypes;
+
+    @ApiModelProperty("分类ID")
+    private Long category;
     @ApiModelProperty("告警-低")
     private String alarmLow;
     @ApiModelProperty("告警-中")

jjt-biz/src/main/java/com/jjt/biz/domain/MetricsType.java

@@ -1,12 +1,11 @@
 package com.jjt.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.jjt.common.annotation.Excel;
 import com.jjt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 指标分类对象 metrics_type
@@ -14,65 +13,29 @@ import com.jjt.common.core.domain.BaseEntity;
  * @author jjt
  * @date 2024-08-08
  */
+@Data
 @ApiModel(value = "MetricsType", description = "指标分类")
-public class MetricsType extends BaseEntity
-{
+public class MetricsType extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 指标分类ID */
+    /**
+     * 指标分类ID
+     */
     @ApiModelProperty("指标分类ID")
     @TableId
     private Long typeId;
 
-    /** 指标分类编码 */
+    /**
+     * 指标分类编码
+     */
     @ApiModelProperty("指标分类编码")
     @Excel(name = "指标分类编码")
     private String typeCode;
 
-    /** 指标分类名称 */
+    /**
+     * 指标分类名称
+     */
     @ApiModelProperty("指标分类名称")
     @Excel(name = "指标分类名称")
     private String typeName;
-
-    public void setTypeId(Long typeId)
-    {
-        this.typeId = typeId;
-    }
-
-    public Long getTypeId()
-    {
-        return typeId;
-    }
-    public void setTypeCode(String typeCode)
-    {
-        this.typeCode = typeCode;
-    }
-
-    public String getTypeCode()
-    {
-        return typeCode;
-    }
-    public void setTypeName(String typeName)
-    {
-        this.typeName = typeName;
-    }
-
-    public String getTypeName()
-    {
-        return typeName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("typeId", getTypeId())
-            .append("typeCode", getTypeCode())
-            .append("typeName", getTypeName())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

jjt-biz/src/main/resources/mapper/metrics/MetricsDefMapper.xml

@@ -49,6 +49,9 @@
             <if test="metricsType != null  and metricsType != ''">
                 and METRICS_TYPE = #{metricsType}
             </if>
+            <if test="category != null  and category != ''">
+                and METRICS_ID in (select metrics_id from METRICS_TYPE_DEF where type_id=#{category})
+            </if>
             <if test="createBy != null  and createBy != ''">
                 and CREATE_BY = #{createBy}
             </if>