[task-1613] 日历日程表添加”数据来源“、”数据说明“字段

ibps-model-root/modules/org-model/src/main/java/com/lc/ibps/org/party/persistence/entity/PartyUserCalendarTbl.java

@@ -47,6 +47,26 @@ public class PartyUserCalendarTbl extends AbstractPo<String> {
     protected String emergencyState;
     @ApiModelProperty(value = "序号")
     protected String serialNum;
+    @ApiModelProperty(value = "数据来源ID")
+    protected String dataSourceId;
+    @ApiModelProperty(value = "s数据信息")
+    protected String dataInfo;
+
+    public String getDataSourceId() {
+        return dataSourceId;
+    }
+
+    public void setDataSourceId(String dataSourceId) {
+        this.dataSourceId = dataSourceId;
+    }
+
+    public String getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(String dataInfo) {
+        this.dataInfo = dataInfo;
+    }
 
     @Override
     public void setId(String id) {

ibps-model-root/modules/org-model/src/main/resources/com/lc/ibps/org/party/persistence/mapping/PartyUserCalendar.map.xml

@@ -18,20 +18,25 @@
         <result property="endTime" column="end_time_" jdbcType="VARCHAR"/>
         <result property="emergencyState" column="emergency_state_" jdbcType="VARCHAR"/>
         <result property="serialNum" column="serial_num_" jdbcType="VARCHAR"/>
+        <result property="dataSourceId" column="data_source_id_" jdbcType="VARCHAR"/>
+        <result property="dataInfo" column="data_info_" jdbcType="LONGVARCHAR"/>
     </resultMap>
 
     <sql id="columns">
-        id_,tenant_id_,ip_,create_by_,create_time_,update_by_,update_time_,user_id_,di_dian_,user_name_,title_,content_,start_time_,end_time_,emergency_state_,serial_num_
+        id_,tenant_id_,ip_,create_by_,create_time_,update_by_,update_time_,user_id_,di_dian_,user_name_,title_,content_,
+        start_time_,end_time_,emergency_state_,serial_num_,data_source_id_,data_info_
     </sql>
 
     <insert id="create" parameterType="com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo">
         INSERT INTO IBPS_PARTY_USER_CALENDAR
-        (ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,USER_ID_,DI_DIAN_,USER_NAME_,TITLE_,CONTENT_,START_TIME_,END_TIME_,EMERGENCY_STATE_,SERIAL_NUM_)
+        (ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,USER_ID_,DI_DIAN_,USER_NAME_,TITLE_,CONTENT_,
+         START_TIME_,END_TIME_,EMERGENCY_STATE_,SERIAL_NUM_,DATA_SOURCE_ID_,DATA_INFO_)
         VALUES
         (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},#{createBy,jdbcType=VARCHAR},
          #{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP},#{userId,jdbcType=VARCHAR},
          #{diDian,jdbcType=VARCHAR},#{userName,jdbcType=VARCHAR},#{title,jdbcType=VARCHAR},#{content,jdbcType=LONGVARCHAR},
-         #{startTime,jdbcType=VARCHAR},#{endTime,jdbcType=VARCHAR},#{emergencyState,jdbcType=VARCHAR},#{serialNum,jdbcType=VARCHAR})
+         #{startTime,jdbcType=VARCHAR},#{endTime,jdbcType=VARCHAR},#{emergencyState,jdbcType=VARCHAR},#{serialNum,jdbcType=VARCHAR},
+         #{dataSourceId,jdbcType=VARCHAR},#{dataInfo,jdbcType=LONGVARCHAR})
     </insert>
 
     <select id="get"  parameterType="java.lang.String" resultMap="PartyUserCalendar">
@@ -50,13 +55,33 @@
 
     <update id="update" parameterType="com.lc.ibps.org.party.persistence.entity.PartyUserCalendarPo">
         UPDATE IBPS_PARTY_USER_CALENDAR SET
-                                            UPDATE_BY_ = #{updateBy,jdbcType=VARCHAR},
-                                            UPDATE_TIME_ = #{updateTime,jdbcType=TIMESTAMP},
-                                            TITLE_ = #{title,jdbcType=VARCHAR},
-                                            CONTENT_ = #{content,jdbcType=LONGVARCHAR},
-                                            START_TIME_ = #{startTime,jdbcType=VARCHAR},
-                                            END_TIME_ = #{endTime,jdbcType=VARCHAR},
-                                            EMERGENCY_STATE_ = #{emergencyState,jdbcType=VARCHAR}
+            <if test=" updateBy !=null and updateBy !='' ">
+                UPDATE_BY_ = #{updateBy,jdbcType=VARCHAR}
+            </if>
+            <if test=" updateTime !=null ">
+                ,UPDATE_TIME_ = #{updateTime,jdbcType=TIMESTAMP}
+            </if>
+            <if test=" title !=null and title !='' ">
+                ,TITLE_ = #{title,jdbcType=VARCHAR}
+            </if>
+            <if test=" content !=null and content !='' ">
+                ,CONTENT_ = #{content,jdbcType=LONGVARCHAR}
+            </if>
+            <if test=" startTime !=null and startTime !='' ">
+                ,START_TIME_ = #{startTime,jdbcType=VARCHAR}
+            </if>
+            <if test=" endTime !=null and endTime !='' ">
+                ,END_TIME_ = #{endTime,jdbcType=VARCHAR}
+            </if>
+            <if test=" emergencyState !=null and emergencyState !='' ">
+                ,EMERGENCY_STATE_ = #{emergencyState,jdbcType=VARCHAR}
+            </if>
+            <if test=" dataSourceId !=null and dataSourceId !='' ">
+                ,DATA_SOURCE_ID_ = #{dataSourceId,jdbcType=VARCHAR}
+            </if>
+            <if test=" dataInfo !=null and dataInfo !='' ">
+                ,DATA_INFO_ = #{dataInfo,jdbcType=LONGVARCHAR}
+            </if>
         WHERE ID_=#{id}
     </update>
 

ibps-provider-root/modules/provider-platform/src/main/resources/conf/dataSource-dev.xml

@@ -7,14 +7,14 @@
     <!-- dev下使用该链接 -->
     <dbType>mysql</dbType>
     <driver>com.mysql.jdbc.Driver</driver>
-    <driverUrl>jdbc:mysql://127.0.0.1:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://dev1.local:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
     <password>test001</password>
 
     <!-- 金源   172.18.157.44      119.23.210.103  -->
-<!--    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
-<!--    <user>root</user>-->
-<!--    <password>!$%^QWER</password>-->
+    <!--    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
+    <!--    <user>root</user>-->
+    <!--    <password>!$%^QWER</password>-->
 
     <!-- 罗湖生产 -->
     <!--    <driverUrl>jdbc:mysql://172.16.40.182:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->