diff --git a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java index d1c5eac..9754444 100644 --- a/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java +++ b/cloud/common/src/main/java/com/sincere/common/dto/smartCampus/CensusKqDto.java @@ -10,6 +10,7 @@ public class CensusKqDto { private String className ; private int allT ; private int kqT ; + private int qjT ; public int getClassId() { return classId; @@ -42,4 +43,12 @@ public class CensusKqDto { public void setKqT(int kqT) { this.kqT = kqT; } + + public int getQjT() { + return qjT; + } + + public void setQjT(int qjT) { + this.qjT = qjT; + } } 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 7564b37..a828716 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,8 +53,7 @@ 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 - && DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m") < 5 ){ + if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>=2){ String key = entity.getKey(); String[] messageArray = key.split("_"); if(messageArray[2].contains("5")){ @@ -91,7 +90,7 @@ public class KQJob { type = type.replace("\"",""); int nowWeek = DateUtils.getWeek() ; if(Week.contains(nowWeek+"")){ - logger.info((templateId+"_"+templateDto.getSchoolId()+templateDto.getType()+"------"+beginTime+"_"+endTime)); + logger.info((templateId+"_"+templateDto.getSchoolId()+"_"+templateDto.getType()+"------"+beginTime+"_"+endTime)); map.put(templateId+"_"+templateDto.getSchoolId()+"_"+templateDto.getType() , beginTime+"_"+endTime+"_"+type); } }catch (Exception e){ @@ -108,24 +107,20 @@ public class KQJob { //出入校 推班主任 List list = scFeign.getTeacherList(schoolId); for(KqTeacherDto teacher : list){ - if(teacher.getName().equals("倪任佳")){ - dingSchoolPush(templateId,teacher,key,appDto); - } + dingSchoolPush(templateId,teacher,key,appDto); } }else { //出入寝 推班主任 List list = scFeign.getTeacherList(schoolId); for(KqTeacherDto teacher : list){ - if(teacher.getName().equals("倪任佳")) { - dingSchoolPush(templateId,teacher, key, appDto); - } + logger.info("盯盯推送—————" + templateId + "--------" + teacher.getName()); + dingSchoolPush(templateId,teacher, key, appDto); } //推宿管 List chamberList = scFeign.selectChamberTeacher(schoolId); for(KqTeacherDto teacher : chamberList){ - if(teacher.getName().equals("倪任佳")) { - dingChamberPush(templateId,teacher, key, appDto); - } + logger.info("企业号推送—————" + templateId + "--------" + teacher.getName()); + dingChamberPush(templateId,teacher, key, appDto); } } } @@ -137,7 +132,7 @@ public class KQJob { //出入校 推班主任 List list = scFeign.getTeacherList(schoolId); for (KqTeacherDto teacher : list) { - weChatSchoolPush(templateId,teacher, key, appDto); + weChatSchoolPush(templateId,teacher, key, appDto); } }else { //出入寝 推班主任 @@ -167,7 +162,7 @@ public class KQJob { String message = ""; for(CensusKqDto censusKqDto : censusKqDtos){ int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; } DingSms dingSms = new DingSms(); dingSms.setName(teacher.getName()); @@ -206,7 +201,7 @@ public class KQJob { String message = ""; for(CensusKqDto censusKqDto : censusKqDtos){ int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; } DingSms dingSms = new DingSms(); dingSms.setName(teacher.getName()); @@ -243,7 +238,7 @@ public class KQJob { String message = ""; for (CensusKqDto censusKqDto : censusKqDtos) { int number = censusKqDto.getAllT() - censusKqDto.getKqT(); - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; } WeChatSms weChatSms = new WeChatSms(); weChatSms.setTableName("qyhSmsNew" + tableSuffix); @@ -260,7 +255,7 @@ public class KQJob { String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&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); + "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2×tamp=" + DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&"; weChatSms.setMsgUrl(msgUrl); weChatSms.setTdType(TypeEnums.kaoqing.getType()); smsMapper.insertWeChat(weChatSms); @@ -283,7 +278,7 @@ public class KQJob { String message = ""; for (CensusKqDto censusKqDto : censusKqDtos) { int number = censusKqDto.getAllT() - censusKqDto.getKqT(); - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; } WeChatSms weChatSms = new WeChatSms(); weChatSms.setTableName("qyhSmsNew" + tableSuffix); @@ -299,7 +294,7 @@ public class KQJob { weChatSms.setSecret(appDto.getAgentSecret()); String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + - "&pass=" + teacher.getPass() + "&type=4&soutype=2&time="+DateUtils.date2String(new Date(),DateUtils.format1); + "&pass=" + teacher.getPass() + "&type=4&soutype=2&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&"; weChatSms.setMsgUrl(msgUrl); weChatSms.setTdType(TypeEnums.kaoqing.getType()); smsMapper.insertWeChat(weChatSms); diff --git a/cloud/quartz/src/main/resources/logback.xml b/cloud/quartz/src/main/resources/logback.xml index 6944199..1d0ebec 100644 --- a/cloud/quartz/src/main/resources/logback.xml +++ b/cloud/quartz/src/main/resources/logback.xml @@ -21,7 +21,7 @@                             -             ${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd HH}.%i.log +             ${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd}.%i.log                         30             diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java index f5351ed..3121ce7 100644 --- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/mapper/KqTemplateMapper.java @@ -32,11 +32,17 @@ public interface KqTemplateMapper { int selectChamberTrueKq(Map map); - int selectClassDealDate(Map map); + int selectClassDealDateCHUQIN(Map map); + + int selectClassDealDateQINGJIA(Map map); int selectClassLeave(Map map); - int selectChamberDealDate(Map map); + int selectChamberDealDateCHUQIN(Map map); + + int selectChamberDealDateQINGJIA(Map map); int selectChamberLeave(Map map); + + int selectClassChamberNumber(int classId); } diff --git a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java index 7003788..122ccdf 100644 --- a/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java +++ b/cloud/search_smartCampus/src/main/java/com/sincere/smartSearch/service/impl/KqServiceImpl.java @@ -54,14 +54,21 @@ public class KqServiceImpl implements KqService { map.put("type",kqDto.getType()); List list = kqTemplateMapper.selectCensusKq(map); for(CensusKqDto censusKqDto : list){ + if(Integer.valueOf(kqDto.getType()) >= 7){ + //出入寝 + int classNumber = kqTemplateMapper.selectClassChamberNumber(censusKqDto.getClassId()); + censusKqDto.setAllT(classNumber); + } Map sqlMap = new HashMap<>(); sqlMap.put("templateId",kqDto.getTemplateId()); sqlMap.put("classId",censusKqDto.getClassId()+""); - int i = kqTemplateMapper.selectClassDealDate(sqlMap); + int chuqin = kqTemplateMapper.selectClassDealDateCHUQIN(sqlMap); + int qingjia = kqTemplateMapper.selectClassDealDateQINGJIA(sqlMap); String date = DateUtils.date2String(new Date(),DateUtils.format1); sqlMap.put("endTime",date+" " + kqDto.getEndTime() +":00"); - i = i + kqTemplateMapper.selectClassLeave(sqlMap); - censusKqDto.setKqT(censusKqDto.getKqT()+i); + qingjia = qingjia + kqTemplateMapper.selectClassLeave(sqlMap); + censusKqDto.setKqT(censusKqDto.getKqT()+chuqin); + censusKqDto.setQjT(qingjia); } return list ; } @@ -86,11 +93,13 @@ public class KqServiceImpl implements KqService { sqlMap.put("templateId",kqDto.getTemplateId()); sqlMap.put("userId",kqDto.getUserId()); sqlMap.put("id",chamber.getId()+""); - int i = kqTemplateMapper.selectClassDealDate(sqlMap); + int chuqin = kqTemplateMapper.selectChamberDealDateCHUQIN(sqlMap); + int qingjia = kqTemplateMapper.selectChamberDealDateQINGJIA(sqlMap); String date = DateUtils.date2String(new Date(),DateUtils.format1); sqlMap.put("endTime",date+" " + kqDto.getEndTime() +":00"); - i = i + kqTemplateMapper.selectChamberLeave(sqlMap); - censusKqDto.setKqT(trueKq+i); + qingjia = qingjia + kqTemplateMapper.selectChamberLeave(sqlMap); + censusKqDto.setKqT(trueKq+chuqin); + censusKqDto.setKqT(qingjia); list.add(censusKqDto); } return list; diff --git a/cloud/search_smartCampus/src/main/resources/application.yml b/cloud/search_smartCampus/src/main/resources/application.yml index 7cb1aa3..9243d91 100644 --- a/cloud/search_smartCampus/src/main/resources/application.yml +++ b/cloud/search_smartCampus/src/main/resources/application.yml @@ -22,6 +22,6 @@ eureka: client: service-url: # defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ - defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ + defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ diff --git a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml index 5aadc19..27c21ea 100644 --- a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml +++ b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml @@ -11,7 +11,7 @@ @@ -52,6 +52,10 @@ and ApplyName = '智能校卫' + + @@ -69,16 +73,23 @@ where a.role_state=1 and a.user_id=#{userId} - select count(0) from EQ_DealData join SZ_V_School_Student on EQ_DealData.UserId = SZ_V_School_Student.user_id - where EQ_DealData.DealState in ('出勤','请假') + where EQ_DealData.DealState ='出勤' + and EQ_DealData.TemplateId = #{templateId} and DealDate = CONVERT ( VARCHAR ( 10 ), getdate(), 120 ) + and SZ_V_School_Student.class_id = #{classId} + + + @@ -114,9 +125,22 @@ ) - + select count(0) from EQ_DealData join SZ_V_School_Student on EQ_DealData.UserId = SZ_V_School_Student.user_id + where EQ_DealData.DealState ='出勤' + and EQ_DealData.TemplateId = #{templateId} and DealDate = CONVERT ( VARCHAR ( 10 ), getdate(), 120 ) + and SZ_V_School_Student.student_id in ( + select SS_RoomNumber.StudentId from SS_Room join SS_RoomNumber on SS_Room.Id = SS_RoomNumber.Pid + where SS_Room.Pid in ( + select SS_Room.ID from SS_RoomManager join SS_Room on SS_Room.Id = SS_RoomManager.RoomId + where SS_RoomManager.ManagerId = #{userId} and SS_Room.Id = ${id} + ) and SS_RoomNumber.StudentId != 0 + ) + + +