From e2bbf8791406793c9a8ade77bc73b841a966a70c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 25 Apr 2023 22:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/初始化脚本/修改表名及表结构.sql | 99 +++++++++++++++++++ .../kc/grab/imports/entity/Xxhbsynclog.java | 5 + .../modules/kc/ktgl/entity/KcKechengbiao.java | 6 ++ .../modules/kc/ktgl/entity/KcKetangbiao.java | 2 + .../kc/ktgl/mapper/KcKechengbiaoMapper.java | 5 + .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 4 + .../ktgl/mapper/xml/KcKechengbiaoMapper.xml | 43 ++++++++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 18 ++++ .../ktgl/service/IKcKechengbiaoService.java | 7 ++ .../kc/ktgl/service/IKcKetangbiaoService.java | 8 ++ .../impl/KcKechengbiaoServiceImpl.java | 16 +++ .../service/impl/KcKetangbiaoServiceImpl.java | 10 ++ .../src/main/resources/application-prod.yml | 1 + 13 files changed, 224 insertions(+) create mode 100644 db/初始化脚本/修改表名及表结构.sql diff --git a/db/初始化脚本/修改表名及表结构.sql b/db/初始化脚本/修改表名及表结构.sql new file mode 100644 index 00000000..8de4c1bd --- /dev/null +++ b/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; \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java index 84eb613f..d2aa4f3a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbsynclog.java +++ b/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; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java index 1272b28a..8fb88d57 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKechengbiao.java +++ b/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; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index fbf142df..bd7bd3a4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/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; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java index 6b8613e7..c84ace2f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKechengbiaoMapper.java +++ b/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 { + int syncKechengbiao(KcKechengbiao kcKechengbiao); + + List selectSyncList(KcKechengbiao kcKechengbiao); + + void saveHis(KcKechengbiao kcKechengbiaohis); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 9fba82fe..82142bf9 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -27,4 +27,8 @@ public interface KcKetangbiaoMapper extends BaseMapper { List> getIndexYkktstj(KcKetangbiao kcKetangbiao); IPage getStudentKclblist(Page page, KcKetangbiao kcKetangbiao); + + List selectSyncList(KcKetangbiao kcKetangbiao); + + void saveHis(KcKetangbiao kcKetangbiaohis); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml index dde2c9c2..1928ae3a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKechengbiaoMapper.xml @@ -2,4 +2,47 @@ + + 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 + + + + + + + + + + + + insert into kc_kechengbiao_his select * ,#{ts} from kc_kechengbiao + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index e015eb76..308f65e3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -111,4 +111,22 @@ skrq asc, hh asc + + + + + insert into kc_ketangbiao_his select *,#{ts} from kc_ketangbiao + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java index da0ca5b9..c5285e7a 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKechengbiaoService.java +++ b/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 { + int syncKechengbiao(KcKechengbiao kcKechengbiao); + + List selectSyncList(KcKechengbiao kcKechengbiao); + + void saveHis(KcKechengbiao kcKechengbiaohis); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index a37d9f27..d7ef8854 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -24,4 +24,12 @@ public interface IKcKetangbiaoService extends IService { List> getIndexYkktstj(KcKetangbiao kcKetangbiao); IPage getStudentKclblist(Page page, KcKetangbiao kcKetangbiao); + + List selectSyncList(KcKetangbiao kcKetangbiao); + + /** + * 像历史表插入数据 + * @param kcKetangbiaohis + */ + void saveHis(KcKetangbiao kcKetangbiaohis); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java index 88c5296e..f6db09f4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKechengbiaoServiceImpl.java +++ b/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 implements IKcKechengbiaoService { + @Override + public int syncKechengbiao(KcKechengbiao kcKechengbiao) { + return baseMapper.syncKechengbiao(kcKechengbiao); + } + + @Override + public List selectSyncList(KcKechengbiao kcKechengbiao) { + return baseMapper.selectSyncList(kcKechengbiao); + } + + @Override + public void saveHis(KcKechengbiao kcKechengbiaohis) { + baseMapper.saveHis(kcKechengbiaohis); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index 01b7e01e..24fd7502 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -41,4 +41,14 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl getStudentKclblist(Page page, KcKetangbiao kcKetangbiao) { return baseMapper.getStudentKclblist(page,kcKetangbiao); } + + @Override + public List selectSyncList(KcKetangbiao kcKetangbiao) { + return baseMapper.selectSyncList(kcKetangbiao); + } + + @Override + public void saveHis(KcKetangbiao kcKetangbiaohis) { + baseMapper.saveHis(kcKetangbiaohis); + } } diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 118a62a7..217f75a3 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/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 # 多数据源配置