From 16f6cb8bf7cb04137c446956fd5c0e57e29baf43 Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Fri, 29 Nov 2019 18:08:21 +0800 Subject: [PATCH] 考勤推送 --- cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java | 18 ++++++++++++++++++ cloud/quartz/src/main/resources/application.yaml | 4 +++- cloud/quartz/src/main/resources/mapper/SmsMapper.xml | 8 ++++---- cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml | 1 + cloud/search_xiaoan/src/main/resources/application.yml | 6 +++--- 6 files changed, 83 insertions(+), 60 deletions(-) diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java b/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java index 5228fbc..0ed75f5 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/job/QDService.java @@ -52,7 +52,8 @@ public class QDService { 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("_"); List list = scFeign.getTeacherList(Integer.valueOf(messageArray[1])); @@ -75,6 +76,7 @@ public class QDService { private void initMap(){ map = new HashMap<>(); List list = scFeign.getAllTemplate(); + System.out.println("------需要推送的考勤模板------"); for(TemplateDto templateDto : list){ String config = templateDto.getConfig(); String[] array = config.split(" censusKqDtos = scFeign.getCensusKq(teacher.getUserId(),Integer.valueOf(times[2])); - String message = ""; - for(CensusKqDto censusKqDto : censusKqDtos){ - int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; - } - DingSms dingSms = new DingSms(); - dingSms.setTableName("DingSmsNew"+tableSuffix); - 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)); - dingSms.setSchoolId(teacher.getSchoolId()); - dingSms.setDingUserId(teacher.getDingUserId()); - dingSms.setAgentId(appDto.getAgentId()); - String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + - "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+ - "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+ - "&face=&sourcetype=16&soutype=3×tamp="+ DateUtils.getDate() ; - dingSms.setWapUrl(wapUrl); - dingSms.setTdType(TypeEnums.kaoqing.getType()); - smsMapper.insertDing(dingSms); + if(StringUtils.isNotBlank(teacher.getDingUserId())){ + List censusKqDtos = scFeign.getCensusKq(teacher.getUserId(),Integer.valueOf(times[2])); + String message = ""; + for(CensusKqDto censusKqDto : censusKqDtos){ + int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; } + DingSms dingSms = new DingSms(); + dingSms.setName(teacher.getName()); + dingSms.setTableName("DingSmsNew"+tableSuffix); + 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)); + dingSms.setSchoolId(teacher.getSchoolId()); + dingSms.setDingUserId(teacher.getDingUserId()); + dingSms.setAgentId(appDto.getAgentId()); + String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + + "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+ + "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+ + "&face=&sourcetype=16&soutype=3×tamp="+ DateUtils.getDate() ; + dingSms.setWapUrl(wapUrl); + dingSms.setReceiveUserId(teacher.getUserId()); + dingSms.setTdType(TypeEnums.kaoqing.getType()); + smsMapper.insertDing(dingSms); } + } } @@ -136,34 +140,32 @@ public class QDService { String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format); AppDto appDto = scFeign.getApp(list.get(0).getSchoolId(),0); for(KqTeacherDto teacher : list){ - if(teacher.getName().equals("陶汉栋") || teacher.getName().equals("沈川")) { - if (StringUtils.isNotBlank(teacher.getOpenId())) { - List censusKqDtos = scFeign.getCensusKq(teacher.getUserId(),Integer.valueOf(times[2])); - String message = ""; - for(CensusKqDto censusKqDto : censusKqDtos){ - int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; - } - 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)); - weChatSms.setSchoolId(teacher.getSchoolId()); - weChatSms.setName(teacher.getName()); - weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId()); - weChatSms.setReceiveUserId(teacher.getUserId()); - 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() + - "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() + - "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2×tamp=" + DateUtils.getDate(); - weChatSms.setMsgUrl(msgUrl); - weChatSms.setTdType(TypeEnums.kaoqing.getType()); - smsMapper.insertWeChat(weChatSms); + if (StringUtils.isNotBlank(teacher.getOpenId())) { + List censusKqDtos = scFeign.getCensusKq(teacher.getUserId(),Integer.valueOf(times[2])); + String message = ""; + for(CensusKqDto censusKqDto : censusKqDtos){ + int number = censusKqDto.getAllT() - censusKqDto.getKqT() ; + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;"; } + 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)); + weChatSms.setSchoolId(teacher.getSchoolId()); + weChatSms.setName(teacher.getName()); + weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId()); + weChatSms.setReceiveUserId(teacher.getUserId()); + 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() + + "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() + + "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2×tamp=" + DateUtils.getDate(); + weChatSms.setMsgUrl(msgUrl); + weChatSms.setTdType(TypeEnums.kaoqing.getType()); + smsMapper.insertWeChat(weChatSms); } } } diff --git a/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java b/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java index 608b41c..20450f0 100644 --- a/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java +++ b/cloud/quartz/src/main/java/com/sincere/quartz/model/DingSms.java @@ -14,6 +14,8 @@ public class DingSms { private String wapUrl ; private String agentId ; private int tdType ; + private String receiveUserId ; + private String name ; public String getTableName() { return tableName; @@ -70,4 +72,20 @@ public class DingSms { public void setTdType(int tdType) { this.tdType = tdType; } + + public String getReceiveUserId() { + return receiveUserId; + } + + public void setReceiveUserId(String receiveUserId) { + this.receiveUserId = receiveUserId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/cloud/quartz/src/main/resources/application.yaml b/cloud/quartz/src/main/resources/application.yaml index 2526e5d..214ebf3 100644 --- a/cloud/quartz/src/main/resources/application.yaml +++ b/cloud/quartz/src/main/resources/application.yaml @@ -14,7 +14,9 @@ mybatis: mapper-locations: classpath:mapper/*.xml type-aliases-package: com.sincere.quartz.mapper check-config-location: true - +ribbon: + ReadTimeout: 50000 + ConnectTimeout: 5000 eureka: instance: hostname: localhost diff --git a/cloud/quartz/src/main/resources/mapper/SmsMapper.xml b/cloud/quartz/src/main/resources/mapper/SmsMapper.xml index af023b4..8cd5a99 100644 --- a/cloud/quartz/src/main/resources/mapper/SmsMapper.xml +++ b/cloud/quartz/src/main/resources/mapper/SmsMapper.xml @@ -3,12 +3,12 @@ - insert into ${tableName} (Msg,MsgID,SchoolID,Type,Status,intime,sendtime,DingUserId,WapUrl,agentid,tdtype) - values (#{msg},-1,#{schoolId},1,0,GETDATE(),GETDATE(),#{dingUserId},#{wapUrl},#{agentId},#{tdType}) + insert into ${tableName} (Msg,MsgID,SchoolID,Type,Status,intime,sendtime,DingUserId,WapUrl,agentid,tdtype,ReceiveUserID,Remark) + values (#{msg},-1,#{schoolId},1,0,GETDATE(),GETDATE(),#{dingUserId},#{wapUrl},#{agentId},#{tdType},#{receiveUserId},#{name}) - insert into ${tableName} (SchoolID,MsgID,Guid,WapUrl,Status,intime,sendTime,SendUserName,ReceiveUserID,QiYeHaoUserId,AppID,Secret,tdtype) - values (#{schoolId},-1,#{msg},#{msgUrl},0,GETDATE(),GETDATE(),'智能校卫',#{receiveUserId},#{qiYeHaoUserId},#{appId},#{secret},#{tdType}) + insert into ${tableName} (SchoolID,MsgID,Guid,WapUrl,Status,intime,sendTime,SendUserName,ReceiveUserID,QiYeHaoUserId,AppID,Secret,tdtype,Remark) + values (#{schoolId},-1,#{msg},#{msgUrl},0,GETDATE(),GETDATE(),'智能校卫',#{receiveUserId},#{qiYeHaoUserId},#{appId},#{secret},#{tdType},#{name}) diff --git a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml index 0f9c52d..50b57a5 100644 --- a/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml +++ b/cloud/search_smartCampus/src/main/resources/mapper/KqTemplateMapper.xml @@ -13,6 +13,7 @@ join SZ_School on XA_KqTemplate.SchoolId = SZ_School.school_id where XA_KqTemplate.State = 1 and XA_KqTemplate.ScenceType = 0 and XA_KqTemplate.TType = 1 and (SZ_School.MsgTypes like '%4%' or SZ_School.MsgTypes like '%5%') + and SZ_School.IsPush =1 diff --git a/cloud/search_xiaoan/src/main/resources/application.yml b/cloud/search_xiaoan/src/main/resources/application.yml index c9fcda4..55ab757 100644 --- a/cloud/search_xiaoan/src/main/resources/application.yml +++ b/cloud/search_xiaoan/src/main/resources/application.yml @@ -4,9 +4,9 @@ spring: application: name: xiaoanSearch datasource: - username: SZJXTUSER - password: xst200919 - url: jdbc:sqlserver://60.190.202.57:14333;database=xiaoanhxy + username: szjxtuser + password: RQminVCJota3H1u8bBYH + url: jdbc:sqlserver://116.62.241.27:33419;database=xiaoanhxy driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver ##mybatis mybatis: -- libgit2 0.21.0