Merge remote-tracking branch 'origin/master'

src/main/java/com/dlbridge/jadp/plugins/cmpt/bean/Func.java

@@ -43,6 +43,8 @@ public class Func {
     private String icon;
     // 小程序路径，图片路径，文档路径，短连接路径，页面路径
     private String path;
+    // 模块失效时间
+    private String deadTime;
 
 
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/mapper/CmptSettingMapper.xml

@@ -17,6 +17,7 @@
         update_date AS "updateDate",
         del_flag AS "delFlag",
         icon,
+        dead_time AS deadTime,
         open_type AS openType
         FROM gk_cmptsetting a
         WHERE a.id = #{id}
@@ -38,6 +39,7 @@
         update_date AS "updateDate",
         del_flag AS "delFlag",
         icon,
+        dead_time AS deadTime,
         open_type AS openType
         FROM `gk_cmptsetting`
         WHERE cmptid = #{cmptId} order by seq
@@ -71,7 +73,8 @@
         create_date,
         del_flag,
         icon,
-        open_type
+        open_type,
+        dead_time
         ) VALUES (
         #{id},
         #{cmptId},
@@ -85,7 +88,8 @@
         now(),
         0,
         #{icon},
-        #{openType}
+        #{openType},
+        #{deadTime}
         )
     </insert>
 
@@ -117,43 +121,45 @@
             <if test="func.icon != null">
                 icon = #{func.icon}
             </if>
+            <if test="func.deadTime != null">
+                dead_time = #{func.deadTime}
+            </if>
         </set>
         WHERE id = #{func.id}
     </update>
     <insert id="save">
-        INSERT INTO gk_cmptsetting(
-        id,
-        cmptid,
-        name,
-        name_web,
-        type,
-        status,
-        visibility,
-        style,
-        seq,
-        create_date,
-        del_flag,
-        app_id,
-        url,
-       open_type,
-       icon
-        ) VALUES (
-        #{func.id},
-        #{func.cmptId},
-        #{func.nameWeb},
-        #{func.nameWeb},
-        #{func.type},
-        #{func.status},
-        #{func.visibility},
-        #{func.style},
-        #{func.seq},
-        now(),
-        0,
-        #{func.appId},
-        #{func.url},
-        #{func.openType},
-        #{func.icon}
-        )
+        INSERT INTO gk_cmptsetting(id,
+                                   cmptid,
+                                   name,
+                                   name_web,
+                                   type,
+                                   status,
+                                   visibility,
+                                   style,
+                                   seq,
+                                   create_date,
+                                   del_flag,
+                                   app_id,
+                                   url,
+                                   open_type,
+                                   icon,
+                                   dead_time)
+        VALUES (#{func.id},
+                #{func.cmptId},
+                #{func.nameWeb},
+                #{func.nameWeb},
+                #{func.type},
+                #{func.status},
+                #{func.visibility},
+                #{func.style},
+                #{func.seq},
+                now(),
+                0,
+                #{func.appId},
+                #{func.url},
+                #{func.openType},
+                #{func.icon},
+                #{func.deadTime})
     </insert>
 
     <update id="updateById">
@@ -170,6 +176,9 @@
         <if test="openType != null">
             open_type = #{openType},
         </if>
+        <if test="deadTime != null">
+            dead_time = #{deadTime}
+        </if>
         create_by = #{createBy},
         create_date = #{createDate},
         update_by = #{updateBy},
@@ -192,12 +201,15 @@
         <if test="openType != null">
             open_type = #{openType},
         </if>
+        <if test="deadTime != null">
+            dead_time = #{deadTime}
+        </if>
         update_date = now()
         WHERE cmptId=#{setting.cmptId} and type = #{setting.type} and del_flag = 0
     </update>
 
     <select id="queryFuncs" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
-        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType
+        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType,dead_time deadTime
         from gk_cmptsetting
         where cmptid = #{cmptId} and visibility=1 and del_flag=0 and status>0
         order by seq
@@ -205,7 +217,7 @@
     </select>
 
     <select id="queryAllFuncs" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
-        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType
+        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,`status`,icon,open_type openType,dead_time deadTime
         from gk_cmptsetting
         where cmptid = #{cmptId} and visibility=1 and del_flag=0 and status=1
         order by seq
@@ -259,7 +271,7 @@
     </select>
 
     <select id="queryAllThirdMicros" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
-        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType
+        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType,dead_time deadTime
         from gk_cmptsetting
         where cmptid = #{cmptId} and type=19
     </select>
@@ -268,7 +280,7 @@
         delete from gk_cmptsetting where id = #{id}
     </delete>
     <select id="getFuncById" resultType="com.dlbridge.jadp.plugins.cmpt.bean.Func">
-        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType
+        select id,cmptid cmptId,name,type,visibility,seq,app_id appId,url,name_web nameWeb,icon,open_type openType,dead_time deadTime
         from gk_cmptsetting
         where id=#{id}
     </select>

src/main/java/com/dlbridge/jadp/plugins/cmpt/dao/model/CmptSetting.java

@@ -21,7 +21,16 @@ public class CmptSetting extends JaapRecord<CmptSetting> {
     private Integer openType;
     // 图标
     private String icon;
+    // 模块失效时间
+    private String deadTime;
 
+    public String getDeadTime() {
+        return deadTime;
+    }
+
+    public void setDeadTime(String deadTime) {
+        this.deadTime = deadTime;
+    }
 
     public Integer getOpenType() {
         return openType;