From 3560cf47494f2ab0c4c7bb5e53da9a359b27c045 Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Fri, 6 Dec 2019 11:20:00 +0800 Subject: [PATCH] 考勤推送 --- cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java b/cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java index a828716..282bdff 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java @@ -53,7 +53,8 @@ public class KQJob { List keyList = new ArrayList<>(); for(Map.Entry entity : map.entrySet()){ String endTime = entity.getValue().split("_")[1]; - if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>=2){ + if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>=2 + && DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m") < 5){ String key = entity.getKey(); String[] messageArray = key.split("_"); if(messageArray[2].contains("5")){ @@ -107,19 +108,20 @@ public class KQJob { //出入校 推班主任 List list = scFeign.getTeacherList(schoolId); for(KqTeacherDto teacher : list){ + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName()); dingSchoolPush(templateId,teacher,key,appDto); } }else { //出入寝 推班主任 List list = scFeign.getTeacherList(schoolId); for(KqTeacherDto teacher : list){ - logger.info("盯盯推送—————" + templateId + "--------" + teacher.getName()); + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName()); dingSchoolPush(templateId,teacher, key, appDto); } //推宿管 List chamberList = scFeign.selectChamberTeacher(schoolId); for(KqTeacherDto teacher : chamberList){ - logger.info("企业号推送—————" + templateId + "--------" + teacher.getName()); + logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName()); dingChamberPush(templateId,teacher, key, appDto); } } @@ -132,17 +134,20 @@ public class KQJob { //出入校 推班主任 List list = scFeign.getTeacherList(schoolId); for (KqTeacherDto teacher : list) { + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName()); weChatSchoolPush(templateId,teacher, key, appDto); } }else { //出入寝 推班主任 List list = scFeign.getTeacherList(schoolId); for (KqTeacherDto teacher : list) { + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName()); weChatSchoolPush(templateId,teacher, key, appDto); } //推宿管 List chamberList = scFeign.selectChamberTeacher(schoolId); for(KqTeacherDto teacher : chamberList){ + logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName()); weChatChamberPush(templateId,teacher, key, appDto); } } @@ -161,8 +166,9 @@ public class KQJob { if(censusKqDtos != null &&censusKqDtos.size() > 0){ String message = ""; for(CensusKqDto censusKqDto : censusKqDtos){ - int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ; + number = number < 0?0:number ; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；"; } DingSms dingSms = new DingSms(); dingSms.setName(teacher.getName()); @@ -170,9 +176,9 @@ public class KQJob { dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+ "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+ "签到时间："+times[0]+"-"+ times[1] +" \n - "+ - "整体数据：" + message.substring(0,message.length()-1)); + "整体数据：" + message); String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + - "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+ + "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+ "&TemplateId=" + templateId+ "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+ "&face=&sourcetype=16&soutype=3×tamp="+ DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1) ; dingSms.setSchoolId(teacher.getSchoolId()); @@ -200,8 +206,9 @@ public class KQJob { if(censusKqDtos != null &&censusKqDtos.size() > 0){ String message = ""; for(CensusKqDto censusKqDto : censusKqDtos){ - int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ; + number = number < 0?0:number ; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；"; } DingSms dingSms = new DingSms(); dingSms.setName(teacher.getName()); @@ -209,9 +216,9 @@ public class KQJob { dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+ "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+ "签到时间："+times[0]+"-"+ times[1] +" \n - "+ - "整体数据：" + message.substring(0,message.length()-1)); + "整体数据：" + message); String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + - "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +"&TemplateId=" + templateId+ "&pass=" + teacher.getPass() + "&type=4&soutype=3&time="+DateUtils.date2String(new Date(),DateUtils.format1); dingSms.setSchoolId(teacher.getSchoolId()); dingSms.setDingUserId(teacher.getDingUserId()); @@ -237,15 +244,16 @@ public class KQJob { if (censusKqDtos != null && censusKqDtos.size() > 0) { String message = ""; for (CensusKqDto censusKqDto : censusKqDtos) { - int number = censusKqDto.getAllT() - censusKqDto.getKqT(); - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ; + number = number < 0?0:number ; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；"; } WeChatSms weChatSms = new WeChatSms(); weChatSms.setTableName("qyhSmsNew" + tableSuffix); weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " + "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " + "签到时间：" + times[0] + "-" + times[1] + " \n - " + - "整体数据：" + message.substring(0, message.length() - 1)); + "整体数据：" + message); weChatSms.setSchoolId(teacher.getSchoolId()); weChatSms.setName(teacher.getName()); weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId()); @@ -253,7 +261,7 @@ public class KQJob { weChatSms.setAppId(appDto.getAgentId()); weChatSms.setSecret(appDto.getAgentSecret()); String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + - "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +"&TemplateId=" + templateId+ "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() + "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2×tamp=" + DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&"; weChatSms.setMsgUrl(msgUrl); @@ -277,15 +285,16 @@ public class KQJob { if (censusKqDtos != null && censusKqDtos.size() > 0) { String message = ""; for (CensusKqDto censusKqDto : censusKqDtos) { - int number = censusKqDto.getAllT() - censusKqDto.getKqT(); - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ; + number = number < 0?0:number ; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；"; } WeChatSms weChatSms = new WeChatSms(); weChatSms.setTableName("qyhSmsNew" + tableSuffix); weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " + "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " + "签到时间：" + times[0] + "-" + times[1] + " \n - " + - "整体数据：" + message.substring(0, message.length() - 1)); + "整体数据：" + message); weChatSms.setSchoolId(teacher.getSchoolId()); weChatSms.setName(teacher.getName()); weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId()); @@ -293,7 +302,7 @@ public class KQJob { weChatSms.setAppId(appDto.getAgentId()); weChatSms.setSecret(appDto.getAgentSecret()); String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + - "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +"&TemplateId=" + templateId+ "&pass=" + teacher.getPass() + "&type=4&soutype=2&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&"; weChatSms.setMsgUrl(msgUrl); weChatSms.setTdType(TypeEnums.kaoqing.getType()); -- libgit2 0.21.0