From e7df2a1057a444aaa004ee2345098ffe352a791b Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Thu, 12 Dec 2019 14:59:54 +0800 Subject: [PATCH] 考勤推送 --- cloud/quartz/src/main/java/com/sincere/quartz/job/BindPushJob.java | 1 - cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java | 36 +++++++++++++++++------------------- cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml | 2 +- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/job/BindPushJob.java b/cloud/quartz/src/main/java/com/sincere/quartz/job/BindPushJob.java index 9ca20b9..cf9b4f5 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/job/BindPushJob.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/job/BindPushJob.java @@ -58,7 +58,6 @@ public class BindPushJob { private void bindPush(BindPushDto bindPushDto , Date nowDate){ if(bindPushDto.getPushTime().equals(DateUtils.date2String(nowDate,DateUtils.format4))){ List unFollowList = scFeign.selectNotFollow(bindPushDto.getSchoolId()); - List unBindList =scFeign.selectNotBind(bindPushDto.getSchoolId(),getThirdType(bindPushDto.getType())); intervalDaysMap.put(bindPushDto.getSchoolId(),DateUtils.date2String(nowDate,DateUtils.format1)); 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 604788b..b387281 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 @@ -58,12 +58,12 @@ public class KQJob { 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 - ){ + && 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(PushTypeEnums.QIYEHAO.getType()+"")){ logger.info("企业号推送：" + messageArray[0] + "__" + messageArray[1]); - //weChatBatchPush(messageArray[0],Integer.valueOf(messageArray[1]),entity.getValue()); + weChatBatchPush(messageArray[0],Integer.valueOf(messageArray[1]),entity.getValue()); } if(messageArray[2].contains(PushTypeEnums.DING.getType()+"")){ logger.info(("盯盯推送：" + messageArray[0] + "__" + messageArray[1])); @@ -114,21 +114,18 @@ public class KQJob { //出入校 推班主任 List list = scFeign.getTeacherList(schoolId); for(KqTeacherDto teacher : list){ - logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName()); - dingSchoolPush(templateId,teacher,key,appDto); + dingSchoolPush(templateId,teacher,key,appDto,0); } }else { //出入寝 推班主任 List list = scFeign.getTeacherList(schoolId); for(KqTeacherDto teacher : list){ - logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName()); - //dingSchoolPush(templateId,teacher, key, appDto); + dingSchoolPush(templateId,teacher, key, appDto,1); } //推宿管 List chamberList = scFeign.selectChamberTeacher(schoolId); for(KqTeacherDto teacher : chamberList){ - logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName()); - //dingChamberPush(templateId,teacher, key, appDto); + dingChamberPush(templateId,teacher, key, appDto); } } } @@ -141,32 +138,29 @@ public class KQJob { //出入校 推班主任 List list = scFeign.getTeacherList(schoolId); for (KqTeacherDto teacher : list) { - logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName()); - weChatSchoolPush(templateId,teacher, key, appDto); + weChatSchoolPush(templateId,teacher, key, appDto,0); } }else { //出入寝 推班主任 List list = scFeign.getTeacherList(schoolId); for (KqTeacherDto teacher : list) { - logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName()); - weChatSchoolPush(templateId,teacher, key, appDto); + weChatSchoolPush(templateId,teacher, key, appDto,1); } //推宿管 List chamberList = scFeign.selectChamberTeacher(schoolId); for(KqTeacherDto teacher : chamberList){ - logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName()); weChatChamberPush(templateId,teacher, key, appDto); } } } //盯盯推送班主任 - private void dingSchoolPush(String templateId ,KqTeacherDto teacher , String key , AppDto appDto){ + private void dingSchoolPush(String templateId ,KqTeacherDto teacher , String key , AppDto appDto , int type){ String[] times = key.split("_"); String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format); String thirdOpenId = scFeign.getThirdId(teacher.getUserId(),0); if(StringUtils.isNotBlank(thirdOpenId)){ - List censusKqDtos = getCensus(Integer.valueOf(times[3]),templateId,teacher.getSchoolId(),teacher.getUserId(),1); + List censusKqDtos = getCensus(Integer.valueOf(times[3]),templateId,teacher.getSchoolId(),teacher.getUserId(),type); if(censusKqDtos != null &&censusKqDtos.size() > 0){ String message = ""; for(CensusKqDto censusKqDto : censusKqDtos){ @@ -190,6 +184,7 @@ public class KQJob { dingSms.setReceiveUserId(teacher.getUserId()); dingSms.setTdType(TypeEnums.kaoqing.getType()); this.insertDing(dingSms); + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName()); } } } @@ -223,17 +218,18 @@ public class KQJob { dingSms.setReceiveUserId(teacher.getUserId()); dingSms.setTdType(TypeEnums.kaoqing.getType()); this.insertDing(dingSms); + logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName()); } } } //企业号推送班主任 - private void weChatSchoolPush(String templateId, KqTeacherDto teacher , String key , AppDto appDto){ + private void weChatSchoolPush(String templateId, KqTeacherDto teacher , String key , AppDto appDto , int type){ String[] times = key.split("_"); String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format); String thirdOpenId = scFeign.getThirdId(teacher.getUserId(),1); if (StringUtils.isNotBlank(thirdOpenId)) { - List censusKqDtos = getCensus(Integer.valueOf(times[3]),templateId,teacher.getSchoolId(),teacher.getUserId(),1); + List censusKqDtos = getCensus(Integer.valueOf(times[3]),templateId,teacher.getSchoolId(),teacher.getUserId(),type); if (censusKqDtos != null && censusKqDtos.size() > 0) { String message = ""; for (CensusKqDto censusKqDto : censusKqDtos) { @@ -258,6 +254,7 @@ public class KQJob { weChatSms.setMsgUrl(msgUrl); weChatSms.setTdType(TypeEnums.kaoqing.getType()); this.insertQYH(weChatSms); + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName()); } } } @@ -292,6 +289,7 @@ public class KQJob { weChatSms.setMsgUrl(msgUrl); weChatSms.setTdType(TypeEnums.kaoqing.getType()); this.insertQYH(weChatSms); + logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName()); } } } @@ -299,19 +297,19 @@ public class KQJob { //type 0 出入校 1 出入寝 private List getCensus(int id , String templateId ,int schoolId , String userId ,int type){ List list = new ArrayList<>(); - CensusKqDto censusKqDto = new CensusKqDto(); String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetailNew?schoolId="+schoolId+ "&id="+id+"&templateID="+templateId+"&type="+type+"&userId="+userId+"&time=" + DateUtils.date2String(new Date(),DateUtils.format1); JSONObject jsonObject = HttpClientUtils.httpGet(url); try{ JSONArray data = (JSONArray)jsonObject.get("data"); for(int i = 0 ; i < data.size() ; i++){ + CensusKqDto censusKqDto = new CensusKqDto(); JSONObject object = data.getJSONObject(i); censusKqDto.setLeaveCount((Integer) object.get("leaveCount")); censusKqDto.setNotAttendCount((Integer) object.get("noAttendCount")); censusKqDto.setTargetName((String)object.get("name")); + list.add(censusKqDto); } - list.add(censusKqDto); }catch (Exception e){ } diff --git a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml index 0ea3b64..e6381fc 100644 --- a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml +++ b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml @@ -53,6 +53,6 @@ -- libgit2 0.21.0