Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java
This commit is contained in:
commit
36057f3126
|
@ -52,7 +52,7 @@
|
||||||
INSERT INTO kc_messagelistcopy ( touser, template_id, tourl, firstdata, remarkdata,keyword1, keyword2, keyword3, scheduleddatetime ) SELECT
|
INSERT INTO kc_messagelistcopy ( touser, template_id, tourl, firstdata, remarkdata,keyword1, keyword2, keyword3, scheduleddatetime ) SELECT
|
||||||
bd.openid,
|
bd.openid,
|
||||||
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
||||||
'https://zxkccx.webvpn.nenu.edu.cn/index',
|
'https://smartedu.nenu.edu.cn',
|
||||||
CONCAT( kt.skjs, '老师,您有课程即将开始:' ),
|
CONCAT( kt.skjs, '老师,您有课程即将开始:' ),
|
||||||
'',
|
'',
|
||||||
kcmc,
|
kcmc,
|
||||||
|
@ -96,7 +96,7 @@
|
||||||
INSERT INTO kc_messagelistcopy ( touser, template_id, tourl, firstdata, remarkdata, keyword1, keyword2, keyword3, scheduleddatetime ) SELECT
|
INSERT INTO kc_messagelistcopy ( touser, template_id, tourl, firstdata, remarkdata, keyword1, keyword2, keyword3, scheduleddatetime ) SELECT
|
||||||
bd.openid,-- touser:oak6lwA02iVyBKrVSok4uUpzeBmY
|
bd.openid,-- touser:oak6lwA02iVyBKrVSok4uUpzeBmY
|
||||||
'PDS1hf6s8P5Ce-SFa9J95XvHhMIGlyhITAGq_CIoNMM',-- template_id:KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys
|
'PDS1hf6s8P5Ce-SFa9J95XvHhMIGlyhITAGq_CIoNMM',-- template_id:KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys
|
||||||
'https://zxkccx.webvpn.nenu.edu.cn/index',-- tourl:https://zxkccx.webvpn.nenu.edu.cn/index
|
'https://smartedu.nenu.edu.cn',-- tourl:https://smartedu.nenu.edu.cn
|
||||||
CONCAT( xk.xm, '同学,您明天的课程安排如下:' ),-- firstdata:吴一凡同学,您明天的课程安排如下:
|
CONCAT( xk.xm, '同学,您明天的课程安排如下:' ),-- firstdata:吴一凡同学,您明天的课程安排如下:
|
||||||
'',-- remarkdata:
|
'',-- remarkdata:
|
||||||
concat(-- keyword1:2022-12-20 星期二
|
concat(-- keyword1:2022-12-20 星期二
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
INSERT INTO kc_messagelistcopy ( touser, template_id, tourl, firstdata, remarkdata, keyword1, keyword2, keyword3, scheduleddatetime ) SELECT
|
INSERT INTO kc_messagelistcopy ( touser, template_id, tourl, firstdata, remarkdata, keyword1, keyword2, keyword3, scheduleddatetime ) SELECT
|
||||||
bd.openid,-- touser:oak6lwAa1epMAgwQziF2K9yBkiLE
|
bd.openid,-- touser:oak6lwAa1epMAgwQziF2K9yBkiLE
|
||||||
'PDS1hf6s8P5Ce-SFa9J95XvHhMIGlyhITAGq_CIoNMM',-- template_id:KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys
|
'PDS1hf6s8P5Ce-SFa9J95XvHhMIGlyhITAGq_CIoNMM',-- template_id:KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys
|
||||||
'https://zxkccx.webvpn.nenu.edu.cn/index',-- tourl:https://zxkccx.webvpn.nenu.edu.cn/index
|
'https://smartedu.nenu.edu.cn',-- tourl:https://smartedu.nenu.edu.cn
|
||||||
CONCAT( kt.skjs, '老师,您明天的课程安排如下:' ),-- firstdata:张靖波老师,您明天的课程安排如下:
|
CONCAT( kt.skjs, '老师,您明天的课程安排如下:' ),-- firstdata:张靖波老师,您明天的课程安排如下:
|
||||||
'',-- remarkdata:
|
'',-- remarkdata:
|
||||||
concat(-- keyword1:2022-12-20 星期二
|
concat(-- keyword1:2022-12-20 星期二
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class WechartSendmessageTask extends BaseSync {
|
||||||
// private static final String templateId = "KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys";//东师
|
// private static final String templateId = "KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys";//东师
|
||||||
private static final String templateId = "cFD7lyjpppIZUB9ipuGjkjZr9ED-BhJZ7bw3ILaFgbg";//测试
|
private static final String templateId = "cFD7lyjpppIZUB9ipuGjkjZr9ED-BhJZ7bw3ILaFgbg";//测试
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn/";
|
||||||
/**
|
/**
|
||||||
* 若参数变量名修改 QuartzJobController中也需对应修改
|
* 若参数变量名修改 QuartzJobController中也需对应修改
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
0,
|
0,
|
||||||
bd.openid,
|
bd.openid,
|
||||||
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
||||||
'https://zxkccx.webvpn.nenu.edu.cn',
|
'https://smartedu.nenu.edu.cn',
|
||||||
CONCAT( kt.skjs, '老师,您有课程即将开始:' ),
|
CONCAT( kt.skjs, '老师,您有课程即将开始:' ),
|
||||||
'',
|
'',
|
||||||
kcmc,
|
kcmc,
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
0,
|
0,
|
||||||
bd.openid,
|
bd.openid,
|
||||||
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
||||||
'https://zxkccx.webvpn.nenu.edu.cn',
|
'https://smartedu.nenu.edu.cn',
|
||||||
CONCAT( xk.xm, '同学,您明天的课程安排如下:' ),
|
CONCAT( xk.xm, '同学,您明天的课程安排如下:' ),
|
||||||
'',
|
'',
|
||||||
concat( '2022-12-20',
|
concat( '2022-12-20',
|
||||||
|
@ -110,7 +110,7 @@
|
||||||
0,
|
0,
|
||||||
bd.openid,
|
bd.openid,
|
||||||
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
'KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys',
|
||||||
'https://zxkccx.webvpn.nenu.edu.cn',
|
'https://smartedu.nenu.edu.cn',
|
||||||
CONCAT( kt.skjs, '老师,您明天的课程安排如下:' ),
|
CONCAT( kt.skjs, '老师,您明天的课程安排如下:' ),
|
||||||
'',
|
'',
|
||||||
concat( '2022-12-20',
|
concat( '2022-12-20',
|
||||||
|
|
|
@ -112,7 +112,7 @@ public class KcWechatSendLogController extends JeecgController<KcWechatSendLog,
|
||||||
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@ public class KcEvaluationServiceImpl extends ServiceImpl<KcEvaluationMapper, KcE
|
||||||
private static final String templateId = "KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys";//东师
|
private static final String templateId = "KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys";//东师
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发送微信通知
|
* 发送微信通知
|
||||||
|
|
|
@ -461,7 +461,7 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
|
||||||
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
||||||
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
||||||
|
|
|
@ -627,7 +627,7 @@ public class WjxWjxxServiceImpl extends ServiceImpl<WjxWjxxMapper, WjxWjxx> impl
|
||||||
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
||||||
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
||||||
|
|
|
@ -337,14 +337,14 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
zyDbtx.setFbr(user.getUsername());
|
zyDbtx.setFbr(user.getUsername());
|
||||||
zyDbtxService.save(zyDbtx);
|
zyDbtxService.save(zyDbtx);
|
||||||
|
|
||||||
// try {
|
try {
|
||||||
// KcWechatSendLog kcWechatSendLog = new KcWechatSendLog();
|
KcWechatSendLog kcWechatSendLog = new KcWechatSendLog();
|
||||||
// kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
kcWechatSendLog.setOpenid(xxhbbks.getXh());
|
||||||
// kcWechatSendLog.setYtkcs(zyDbtx.getContent());
|
kcWechatSendLog.setYtkcs(zyDbtx.getContent());
|
||||||
// sendWxmessage(kcWechatSendLog);
|
sendWxmessage(kcWechatSendLog);
|
||||||
// } catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// e.printStackTrace();
|
e.printStackTrace();
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -833,7 +833,7 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
||||||
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
||||||
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
||||||
|
|
|
@ -257,7 +257,7 @@ public class ZyInfoServiceImpl extends ServiceImpl<ZyInfoMapper, ZyInfo> impleme
|
||||||
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
private static final String appIdSecret = "6Qhnge3xfzAQMDX2TcjEyE0vUGP96hP9OTYUsYBze2Y";//东师
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
public void sendWxmessage(KcWechatSendLog kcWechatSendLog) {
|
||||||
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
String openId = kcWechatSendLog.getOpenid();//曹老师账号
|
||||||
|
|
|
@ -370,9 +370,9 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
||||||
|
|
||||||
|
|
||||||
//外网查重及提交检测
|
//外网查重及提交检测
|
||||||
if(StringUtils.equals(zyInfo.getWwcc(),"true")){
|
// if(StringUtils.equals(zyInfo.getWwcc(),"true")){
|
||||||
wwccSave(zyInfoStudent,response);
|
// wwccSave(zyInfoStudent,response);
|
||||||
}
|
// }
|
||||||
// //内网查重及提交检测
|
// //内网查重及提交检测
|
||||||
// if(StringUtils.equals(zyInfo.getNwcc(),"true")){
|
// if(StringUtils.equals(zyInfo.getNwcc(),"true")){
|
||||||
// nwccSave(zyInfoStudent,response);
|
// nwccSave(zyInfoStudent,response);
|
||||||
|
@ -453,12 +453,12 @@ public class ZyInfoStudentServiceImpl extends ServiceImpl<ZyInfoStudentMapper, Z
|
||||||
}
|
}
|
||||||
|
|
||||||
private void delSysweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response) {
|
private void delSysweipulunwen(ZyInfoStudent zyInfoStudent, HttpServletResponse response) {
|
||||||
zyInfoStudent.setQueryType("0");//外网查重数据
|
// zyInfoStudent.setQueryType("0");//外网查重数据
|
||||||
String paperids = baseMapper.getWpFile(zyInfoStudent);
|
// String paperids = baseMapper.getWpFile(zyInfoStudent);
|
||||||
if(StringUtils.isNotEmpty(paperids)){
|
// if(StringUtils.isNotEmpty(paperids)){
|
||||||
String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx";
|
// String url = "https://vims.fanyu.com/toole/jianceorgan/paperdel.aspx";
|
||||||
delWpFile(url,paperids, response);
|
// delWpFile(url,paperids, response);
|
||||||
}
|
// }
|
||||||
// zyInfoStudent.setQueryType("1");//内网查重数据-作业内查重
|
// zyInfoStudent.setQueryType("1");//内网查重数据-作业内查重
|
||||||
// Map<String,String> paperids1 = baseMapper.getXfwWpFile(zyInfoStudent);
|
// Map<String,String> paperids1 = baseMapper.getXfwWpFile(zyInfoStudent);
|
||||||
// if(paperids1 != null){
|
// if(paperids1 != null){
|
||||||
|
|
|
@ -38,12 +38,12 @@ public class WxgzhController {
|
||||||
private static final String templateId = "KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys";//东师
|
private static final String templateId = "KtWw0lwQ8FOgJdKgrmya0eoafGkMfMN8ECdZs8oSJys";//东师
|
||||||
|
|
||||||
// 微信申请的域名(提前准备)
|
// 微信申请的域名(提前准备)
|
||||||
private static final String domain = "https://zxkccx.webvpn.nenu.edu.cn/wxpay";
|
private static final String domain = "https://smartedu.nenu.edu.cn/wxpay";
|
||||||
// 自定义跳转方法
|
// 自定义跳转方法
|
||||||
private static final String redirectMethod = "/weixinoauth";
|
private static final String redirectMethod = "/weixinoauth";
|
||||||
|
|
||||||
//微信通知点击后跳转的页面
|
//微信通知点击后跳转的页面
|
||||||
private static final String domainTo = "https://zxkccx.webvpn.nenu.edu.cn";
|
private static final String domainTo = "https://smartedu.nenu.edu.cn";
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IKcBdgxbcopyService kcBdgxbcopyService;
|
private IKcBdgxbcopyService kcBdgxbcopyService;
|
||||||
|
|
Loading…
Reference in New Issue