标签规则设置，增加是否强拉字段标签

yijia-label/src/main/java/com/yijia/label/controller/LabelRuleController.java

@@ -171,7 +171,7 @@ public class LabelRuleController extends BaseController
             }
             if(requsetSysDept.getDelArr()!=null &&requsetSysDept.getDelArr().size()>0){
                 List<Integer> idlist =requsetSysDept.getDelArr();
-                Integer[] ints = idlist.toArray(new Integer[0]);
+                //Integer[] ints = idlist.toArray(new Integer[0]);
                 for(Integer ids :idlist){
                     LabelRule labelRule =new LabelRule();
                     labelRule.setId(ids);

yijia-label/src/main/java/com/yijia/label/domain/LabelRule.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 标签规则
 对象 label_rule
- * 
+ *
  * @author yijia
  * @date 2021-06-15
  */
@@ -29,6 +29,8 @@ public class LabelRule extends BaseEntity
     /** 删除标识1 是 0 否 */
     private String delFlag;
 
+    private String isAddLabel;
+
     private List<LabelRuleDetail> labelRuleDetailList;
 
     public List<LabelRuleDetail> getLabelRuleDetailList() {
@@ -44,16 +46,16 @@ public class LabelRule extends BaseEntity
         this.id = id;
     }
 
-    public Integer getId() 
+    public Integer getId()
     {
         return id;
     }
-    public void setLabelName(String labelName) 
+    public void setLabelName(String labelName)
     {
         this.labelName = labelName;
     }
 
-    public String getLabelName() 
+    public String getLabelName()
     {
         return labelName;
     }
@@ -71,11 +73,19 @@ public class LabelRule extends BaseEntity
         this.delFlag = delFlag;
     }
 
-    public String getDelFlag() 
+    public String getDelFlag()
     {
         return delFlag;
     }
 
+    public String getIsAddLabel() {
+        return isAddLabel;
+    }
+
+    public void setIsAddLabel(String isAddLabel) {
+        this.isAddLabel = isAddLabel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -83,6 +93,7 @@ public class LabelRule extends BaseEntity
             .append("labelName", getLabelName())
             .append("stationId", getStationId())
             .append("delFlag", getDelFlag())
+            .append("isAddLabel", getIsAddLabel())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

yijia-label/src/main/resources/mapper/label/LabelRuleMapper.xml

@@ -3,12 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yijia.label.mapper.LabelRuleMapper">
-    
+
     <resultMap type="LabelRule" id="LabelRuleResult">
         <result property="id"    column="id"    />
         <result property="labelName"    column="label_name"    />
         <result property="stationId"    column="station_id"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="isAddLabel"    column="is_add_label"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -16,31 +17,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLabelRuleVo">
-        select id, label_name, station_id, del_flag, create_by, create_time, update_by, update_time
+        select id, label_name, station_id, del_flag,is_add_label, create_by, create_time, update_by, update_time
         from label_rule
     </sql>
 
     <select id="selectLabelRuleList" parameterType="LabelRule" resultMap="LabelRuleResult">
         <include refid="selectLabelRuleVo"/>
-        <where>  
+        <where>
             <if test="labelName != null  and labelName != ''"> and label_name like concat('%', #{labelName}, '%')</if>
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="delFlag != null "> and del_flag = #{delFlag}</if>
         </where>
         order by create_time
     </select>
-    
+
     <select id="selectLabelRuleById" parameterType="Integer" resultMap="LabelRuleResult">
         <include refid="selectLabelRuleVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertLabelRule" parameterType="LabelRule" useGeneratedKeys="true" keyProperty="id">
         insert into label_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="labelName != null">label_name,</if>
             <if test="stationId != null">station_id,</if>
             <if test="delFlag != null">del_flag,</if>
+            <if test="isAddLabel != null">is_add_label,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="labelName != null">#{labelName},</if>
             <if test="stationId != null">#{stationId},</if>
             <if test="delFlag != null">#{delFlag},</if>
+            <if test="isAddLabel != null">#{isAddLabel},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="labelName != null">label_name = #{labelName},</if>
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="isAddLabel != null">is_add_label = #{isAddLabel},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -76,10 +80,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteLabelRuleByIds" parameterType="String">
-        delete from label_rule where id in 
+        delete from label_rule where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>