添加功能

db/初始化脚本/修改表名及表结构.sql

@@ -0,0 +1,99 @@
+-- 目标表改名
+ALTER TABLE assessuser RENAME  kc_assessuser;
+ALTER TABLE casusers RENAME  kc_casusers;
+ALTER TABLE errorreport RENAME  kc_errorreport;
+ALTER TABLE evaluation RENAME  kc_evaluation;
+ALTER TABLE evaluationans RENAME  kc_evaluationans;
+ALTER TABLE evaluationque RENAME  kc_evaluationque;
+ALTER TABLE evaluations RENAME  kc_evaluations;
+ALTER TABLE evaluationstudent RENAME  kc_evaluationstudent;
+ALTER TABLE gongkaike RENAME  kc_gongkaike;
+ALTER TABLE jieci RENAME  kc_jieci;
+ALTER TABLE kechengbiao RENAME  kc_kechengbiao;
+ALTER TABLE ketangbiao RENAME  kc_ketangbiao;
+ALTER TABLE kkdw RENAME  kc_kkdw;
+ALTER TABLE notice RENAME  kc_notice;
+ALTER TABLE suggestions RENAME  kc_suggestions;
+ALTER TABLE tingke RENAME  kc_tingke;
+ALTER TABLE yuyue RENAME  kc_yuyue;
+ALTER TABLE kechengtixingdingyue RENAME  kc_kechengtixingdingyue;
+ALTER TABLE synusers RENAME  kc_synusers;
+ALTER TABLE xuekeduiyingbiao RENAME  kc_xuekeduiyingbiao;
+ALTER TABLE bdgxbcopy RENAME  kc_bdgxbcopy;
+
+
+-- 拷贝数据表后执行修改数据类型语句
+ALTER TABLE kc_errorreport 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN kechengbiaoid varchar(32) NULL DEFAULT NULL COMMENT '课程表ID' AFTER reportstatus;
+
+ALTER TABLE kc_evaluation 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN upuserid varchar(32) NULL DEFAULT NULL COMMENT '上传人id' AFTER upuser,
+MODIFY COLUMN minkcid varchar(32) NULL DEFAULT NULL COMMENT '课程最小id' AFTER up_timestamp;
+
+ALTER TABLE kc_evaluationans 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN queid varchar(32) NOT NULL COMMENT '问题ID' AFTER id;
+
+ALTER TABLE kc_evaluationque 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST;
+
+ALTER TABLE kc_evaluations 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN upuserid varchar(32) NULL DEFAULT NULL COMMENT '上传人id' AFTER upuser,
+MODIFY COLUMN ketangbiaoid varchar(32) NULL DEFAULT NULL COMMENT '课堂表id' AFTER up_timestamp,
+MODIFY COLUMN queid varchar(32) NOT NULL COMMENT '问题id' AFTER ketangbiaoid,
+MODIFY COLUMN ansid varchar(32) NULL DEFAULT NULL COMMENT '答案id' AFTER queid;
+
+ALTER TABLE kc_evaluationstudent 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST;
+
+ALTER TABLE kc_gongkaike 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST;
+
+ALTER TABLE kc_notice 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST;
+
+ALTER TABLE kc_suggestions 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN userid varchar(32) NULL DEFAULT NULL COMMENT '提交人id' AFTER id,
+MODIFY COLUMN feedbackuserid varchar(32) NULL DEFAULT NULL COMMENT '反馈人id' AFTER feedback;
+
+ALTER TABLE kc_tingke 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN kechengbiaoid varchar(32) NULL DEFAULT NULL COMMENT '课堂表ID（不是课程表ID）' AFTER jianchatime;
+
+ALTER TABLE kc_yuyue 
+MODIFY COLUMN id varchar(32) NOT NULL FIRST,
+MODIFY COLUMN ketangbiaoid varchar(32) NULL DEFAULT NULL COMMENT '课堂表id' AFTER id,
+MODIFY COLUMN userid varchar(32) NULL DEFAULT NULL COMMENT '账号' AFTER ketangbiaoid;
+
+ALTER TABLE kc_errorreport 
+ADD COLUMN create_time datetime NULL AFTER sfcj;
+
+ALTER TABLE kc_notice
+MODIFY COLUMN ndate date NULL DEFAULT NULL COMMENT '发布日期' AFTER nlink;
+
+ALTER TABLE kc_kechengtixingdingyue
+MODIFY COLUMN userid varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '账号' FIRST;
+
+ALTER TABLE  kc_kechengbiao 
+ADD COLUMN jsbh varchar(255) NULL COMMENT '教室编号' AFTER zt,
+ADD COLUMN kcdl varchar(255) NULL COMMENT '课程大类' AFTER jsbh;
+
+ALTER TABLE kc_gongkaike 
+ADD COLUMN tpmc2 varchar(255) NULL COMMENT '图片名称2' AFTER hxrlb,
+ADD COLUMN tpmc3 varchar(255) NULL COMMENT '图片名称3' AFTER tpmc2;
+
+ALTER TABLE xxhbkckb 
+ADD COLUMN JSBH varchar(255) NULL COMMENT '教室编号' AFTER KCXZ;
+
+ALTER TABLE kc_kechengbiao 
+ADD COLUMN jsbh varchar(255) NULL COMMENT '教室编号' AFTER kcxz;
+
+ALTER TABLE kc_ketangbiao 
+ADD COLUMN jsbh varchar(255) NULL COMMENT '教室编号' AFTER kcxz;
+
+ALTER TABLE kc_ketangbiao 
+MODIFY COLUMN id varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL FIRST;

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java

@@ -52,4 +52,9 @@ public class Xxhbsynclog implements Serializable {
 	@Excel(name = "同步行数量", width = 15)
     @ApiModelProperty(value = "同步行数量")
     private java.lang.String syncRowNum;
+
+    /**同步行数量*/
+    @Excel(name = "同步行数量", width = 15)
+    @ApiModelProperty(value = "同步行数量")
+    private java.lang.String errormessage;
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java

@@ -241,5 +241,11 @@ public class KcKechengbiao implements Serializable {
     @TableField(exist = false)
     private java.lang.String searchInput;
 
+    @TableField(exist = false)
+    private java.lang.String startTime;
+    @TableField(exist = false)
+    private java.lang.String endTime;
+    @TableField(exist = false)
+    private java.lang.String ts;
 
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java

@@ -265,5 +265,7 @@ public class KcKetangbiao implements Serializable {
     private String xjkssj;
     @TableField(exist = false)
     private String stars;
+    @TableField(exist = false)
+    private String ts;
 
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java

@@ -14,4 +14,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KcKechengbiaoMapper extends BaseMapper<KcKechengbiao> {
 
+    int syncKechengbiao(KcKechengbiao kcKechengbiao);
+
+    List<KcKechengbiao> selectSyncList(KcKechengbiao kcKechengbiao);
+
+    void saveHis(KcKechengbiao kcKechengbiaohis);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java

@@ -27,4 +27,8 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
     List<Map<String, Object>> getIndexYkktstj(KcKetangbiao kcKetangbiao);
 
     IPage<KcKetangbiao> getStudentKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao);
+
+    List<KcKetangbiao> selectSyncList(KcKetangbiao kcKetangbiao);
+
+    void saveHis(KcKetangbiao kcKetangbiaohis);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml

@@ -2,4 +2,47 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.kc.ktgl.mapper.KcKechengbiaoMapper">
 
+    <insert id="syncKechengbiao">
+        insert into  kc_kechengbiao (
+        kcbh,kcmc,skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,hhks,hhjs,dsz,
+        wwks,wwjs,zbfs,hyh,hymm,kclj,beizhu,zbpx,kkdwid,
+        jrfs,ewmwj,qmc,qlx,leixing,isqzyz,jkzc1,xf,xq,jgh,xnxq,jzglb,sfcj,skxs,sfzc,bz,zt,kcdl
+        ) select
+        kcbh,kcmc,xm as skjs,zc,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,
+        substring(jkzc,2,length(jkzc)-2) as jkzc,concat(substring(sksj,2,2),'、',substring(sksj,4,2))  as hh,substring(sksj,1,1) as week,
+        jc.hhks as hhks,jc.hhjs as hhjs,
+        '' as dsz,'' as wwks, '' as wwjs,'腾讯会议' as zbfs,'' as hyh,'' as hymm,'' as kclj,'' as beizhu,'' as zbpx,kkdwid,
+        '' as jrfs,'' as ewmwj,'' as qmc, '' as qlx,'' as leixing,'' as isqzyz,substring(jkzc,2,length(jkzc)-2) as jkzc1,xf,
+        case when xqbh = 'B' then '本部'
+        when xqbh = 'J' then '净月'
+        when xqbh = 'U' then '全部'
+        ELSE '' END  as xq,
+        jgh,xnxq,jzglb,1 as sfcj,sfxsk as skxs,'' as sfzc,'' as bz,'' as zt,kcdl
+        from xxhbkckb t,kc_jieci jc where concat(substring(sksj,2,2),'、',substring(sksj,4,2)) = jc.jieci
+<!--        <if test="startTime != null and startTime != ''">-->
+<!--            and sksj > #{startTime}-->
+<!--        </if>-->
+<!--        <if test="endTime != null and endTime != ''">-->
+<!--            and sksj &lt; #{endTime}-->
+<!--        </if>-->
+    </insert>
+
+    <select id="selectSyncList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKechengbiao">
+        select
+        id,kcbh,kcmc,xf,skjs,zc,jzglb,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,hhks,hhjs,dsz,wwks,wwjs,'' as zbfs,'' as hyid,hyh,hymm,kclj,beizhu,zbpx,kkdwid,
+        'AA' as skrq,
+        id as kechengbiaoid,
+        '0' as tingkecishu,
+        jkzc as kkzc,
+        'AA' as dijizhou,
+        jkzc as jkzc1,'停课信息表每天更新' as sftk,'' as tkyy,'' as bkjh,sfcj,skxs,
+        id as kechengbiao1,
+        '' as sfxsk,jgh,bz,zt,jsbh,kcdl
+        from kc_kechengbiao where 1 = 0
+    </select>
+
+    <insert id="saveHis">
+        insert into kc_kechengbiao_his select * ,#{ts} from kc_kechengbiao
+    </insert>
+
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml

@@ -111,4 +111,22 @@
         skrq asc,
         hh asc
     </select>
+
+    <select id="selectSyncList" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
+        select
+        id,kcbh,kcmc,xf,skjs,zc,jzglb,xkrs,pkrs,rwbh,kkdw,kcxz,skdd,sksj,jkzc,hh,week,hhks,hhjs,dsz,wwks,wwjs,'' as zbfs,'' as hyid,hyh,hymm,kclj,beizhu,zbpx,kkdwid,
+        'AA' as skrq,
+        id as kechengbiaoid,
+        '0' as tingkecishu,
+        jkzc as kkzc,
+        jkzc as jkzc1, '' as tkyy,'' as bkjh,sfcj,skxs,
+        id as kechengbiao1,
+        '' as sfxsk,jgh,bz,zt,jsbh,kcdl
+        from kc_kechengbiao
+    </select>
+
+    <insert id="saveHis">
+        insert into kc_ketangbiao_his select *,#{ts} from kc_ketangbiao
+    </insert>
+
 </mapper>

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.kc.ktgl.service;
 import org.jeecg.modules.kc.ktgl.entity.KcKechengbiao;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 课程管理-主表
  * @Author: jeecg-boot
@@ -11,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKcKechengbiaoService extends IService<KcKechengbiao> {
 
+    int syncKechengbiao(KcKechengbiao kcKechengbiao);
+
+    List<KcKechengbiao> selectSyncList(KcKechengbiao kcKechengbiao);
+
+    void saveHis(KcKechengbiao kcKechengbiaohis);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java

@@ -24,4 +24,12 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
     List<Map<String, Object>> getIndexYkktstj(KcKetangbiao kcKetangbiao);
 
     IPage<KcKetangbiao> getStudentKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao);
+
+    List<KcKetangbiao> selectSyncList(KcKetangbiao kcKetangbiao);
+
+    /**
+     * 像历史表插入数据
+     * @param kcKetangbiaohis
+     */
+    void saveHis(KcKetangbiao kcKetangbiaohis);
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 课程管理-主表
  * @Author: jeecg-boot
@@ -16,4 +18,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class KcKechengbiaoServiceImpl extends ServiceImpl<KcKechengbiaoMapper, KcKechengbiao> implements IKcKechengbiaoService {
 
+    @Override
+    public int syncKechengbiao(KcKechengbiao kcKechengbiao) {
+        return baseMapper.syncKechengbiao(kcKechengbiao);
+    }
+
+    @Override
+    public List<KcKechengbiao> selectSyncList(KcKechengbiao kcKechengbiao) {
+        return baseMapper.selectSyncList(kcKechengbiao);
+    }
+
+    @Override
+    public void saveHis(KcKechengbiao kcKechengbiaohis) {
+        baseMapper.saveHis(kcKechengbiaohis);
+    }
 }

jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java

@@ -41,4 +41,14 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
     public IPage<KcKetangbiao> getStudentKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao) {
         return baseMapper.getStudentKclblist(page,kcKetangbiao);
     }
+
+    @Override
+    public List<KcKetangbiao> selectSyncList(KcKetangbiao kcKetangbiao) {
+        return baseMapper.selectSyncList(kcKetangbiao);
+    }
+
+    @Override
+    public void saveHis(KcKetangbiao kcKetangbiaohis) {
+        baseMapper.saveHis(kcKetangbiaohis);
+    }
 }

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -133,6 +133,7 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3307/course_information_center_jeecg_db?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
+#          password: ABCabc@123
           password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置