陶汉栋 / MyCloud

Download as
Browse Code »

Commit 3560cf47494f2ab0c4c7bb5e53da9a359b27c045

Authored by 陈杰
1 parent 3898e462
Exists in master

考勤推送

Showing 1 changed file with 28 additions and 19 deletions   Show diff stats
cloud/quartz/src/main/java/com/sincere/quartz/job/KQJob.java
  Diff comments   View file @3560cf4
@@ -53,7 +53,8 @@ public class KQJob { @@ -53,7 +53,8 @@ public class KQJob {
53 List<String> keyList = new ArrayList<>(); 53 List<String> keyList = new ArrayList<>();
54 for(Map.Entry<String, String> entity : map.entrySet()){ 54 for(Map.Entry<String, String> entity : map.entrySet()){
55 String endTime = entity.getValue().split("_")[1]; 55 String endTime = entity.getValue().split("_")[1];
56 - if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>=2){ 56 + if(DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m")>=2
  57 + && DateUtils.getDateDifference(new Date(),DateUtils.string2Date(now+" "+endTime+":00",DateUtils.format2),"m") < 5){
57 String key = entity.getKey(); 58 String key = entity.getKey();
58 String[] messageArray = key.split("_"); 59 String[] messageArray = key.split("_");
59 if(messageArray[2].contains("5")){ 60 if(messageArray[2].contains("5")){
@@ -107,19 +108,20 @@ public class KQJob { @@ -107,19 +108,20 @@ public class KQJob {
107 //出入校 推班主任 108 //出入校 推班主任
108 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId); 109 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
109 for(KqTeacherDto teacher : list){ 110 for(KqTeacherDto teacher : list){
  111 + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName());
110 dingSchoolPush(templateId,teacher,key,appDto); 112 dingSchoolPush(templateId,teacher,key,appDto);
111 } 113 }
112 }else { 114 }else {
113 //出入寝 推班主任 115 //出入寝 推班主任
114 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId); 116 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
115 for(KqTeacherDto teacher : list){ 117 for(KqTeacherDto teacher : list){
116 - logger.info("盯盯推送—————" + templateId + "--------" + teacher.getName()); 118 + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName());
117 dingSchoolPush(templateId,teacher, key, appDto); 119 dingSchoolPush(templateId,teacher, key, appDto);
118 } 120 }
119 //推宿管 121 //推宿管
120 List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId); 122 List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
121 for(KqTeacherDto teacher : chamberList){ 123 for(KqTeacherDto teacher : chamberList){
122 - logger.info("企业号推送—————" + templateId + "--------" + teacher.getName()); 124 + logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName());
123 dingChamberPush(templateId,teacher, key, appDto); 125 dingChamberPush(templateId,teacher, key, appDto);
124 } 126 }
125 } 127 }
@@ -132,17 +134,20 @@ public class KQJob { @@ -132,17 +134,20 @@ public class KQJob {
132 //出入校 推班主任 134 //出入校 推班主任
133 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId); 135 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
134 for (KqTeacherDto teacher : list) { 136 for (KqTeacherDto teacher : list) {
  137 + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName());
135 weChatSchoolPush(templateId,teacher, key, appDto); 138 weChatSchoolPush(templateId,teacher, key, appDto);
136 } 139 }
137 }else { 140 }else {
138 //出入寝 推班主任 141 //出入寝 推班主任
139 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId); 142 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
140 for (KqTeacherDto teacher : list) { 143 for (KqTeacherDto teacher : list) {
  144 + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName());
141 weChatSchoolPush(templateId,teacher, key, appDto); 145 weChatSchoolPush(templateId,teacher, key, appDto);
142 } 146 }
143 //推宿管 147 //推宿管
144 List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId); 148 List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
145 for(KqTeacherDto teacher : chamberList){ 149 for(KqTeacherDto teacher : chamberList){
  150 + logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName());
146 weChatChamberPush(templateId,teacher, key, appDto); 151 weChatChamberPush(templateId,teacher, key, appDto);
147 } 152 }
148 } 153 }
@@ -161,8 +166,9 @@ public class KQJob { @@ -161,8 +166,9 @@ public class KQJob {
161 if(censusKqDtos != null &&censusKqDtos.size() > 0){ 166 if(censusKqDtos != null &&censusKqDtos.size() > 0){
162 String message = ""; 167 String message = "";
163 for(CensusKqDto censusKqDto : censusKqDtos){ 168 for(CensusKqDto censusKqDto : censusKqDtos){
164 - int number = censusKqDto.getAllT() - censusKqDto.getKqT() ;  
165 - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; 169 + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ;
  170 + number = number < 0?0:number ;
  171 + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；";
166 } 172 }
167 DingSms dingSms = new DingSms(); 173 DingSms dingSms = new DingSms();
168 dingSms.setName(teacher.getName()); 174 dingSms.setName(teacher.getName());
@@ -170,9 +176,9 @@ public class KQJob { @@ -170,9 +176,9 @@ public class KQJob {
170 dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+ 176 dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
171 "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+ 177 "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
172 "签到时间："+times[0]+"-"+ times[1] +" \n - "+ 178 "签到时间："+times[0]+"-"+ times[1] +" \n - "+
173 - "整体数据：" + message.substring(0,message.length()-1)); 179 + "整体数据：" + message);
174 String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + 180 String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
175 - "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+ 181 + "schoolid="+teacher.getSchoolId()+"&userId="+teacher.getUserId()+"&name="+teacher.getName()+ "&TemplateId=" + templateId+
176 "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+ 182 "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+
177 "&face=&sourcetype=16&soutype=3&timestamp="+ DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1) ; 183 "&face=&sourcetype=16&soutype=3&timestamp="+ DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1) ;
178 dingSms.setSchoolId(teacher.getSchoolId()); 184 dingSms.setSchoolId(teacher.getSchoolId());
@@ -200,8 +206,9 @@ public class KQJob { @@ -200,8 +206,9 @@ public class KQJob {
200 if(censusKqDtos != null &&censusKqDtos.size() > 0){ 206 if(censusKqDtos != null &&censusKqDtos.size() > 0){
201 String message = ""; 207 String message = "";
202 for(CensusKqDto censusKqDto : censusKqDtos){ 208 for(CensusKqDto censusKqDto : censusKqDtos){
203 - int number = censusKqDto.getAllT() - censusKqDto.getKqT() ;  
204 - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; 209 + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ;
  210 + number = number < 0?0:number ;
  211 + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；";
205 } 212 }
206 DingSms dingSms = new DingSms(); 213 DingSms dingSms = new DingSms();
207 dingSms.setName(teacher.getName()); 214 dingSms.setName(teacher.getName());
@@ -209,9 +216,9 @@ public class KQJob { @@ -209,9 +216,9 @@ public class KQJob {
209 dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+ 216 dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
210 "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+ 217 "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
211 "签到时间："+times[0]+"-"+ times[1] +" \n - "+ 218 "签到时间："+times[0]+"-"+ times[1] +" \n - "+
212 - "整体数据：" + message.substring(0,message.length()-1)); 219 + "整体数据：" + message);
213 String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + 220 String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
214 - "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + 221 + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +"&TemplateId=" + templateId+
215 "&pass=" + teacher.getPass() + "&type=4&soutype=3&time="+DateUtils.date2String(new Date(),DateUtils.format1); 222 "&pass=" + teacher.getPass() + "&type=4&soutype=3&time="+DateUtils.date2String(new Date(),DateUtils.format1);
216 dingSms.setSchoolId(teacher.getSchoolId()); 223 dingSms.setSchoolId(teacher.getSchoolId());
217 dingSms.setDingUserId(teacher.getDingUserId()); 224 dingSms.setDingUserId(teacher.getDingUserId());
@@ -237,15 +244,16 @@ public class KQJob { @@ -237,15 +244,16 @@ public class KQJob {
237 if (censusKqDtos != null && censusKqDtos.size() > 0) { 244 if (censusKqDtos != null && censusKqDtos.size() > 0) {
238 String message = ""; 245 String message = "";
239 for (CensusKqDto censusKqDto : censusKqDtos) { 246 for (CensusKqDto censusKqDto : censusKqDtos) {
240 - int number = censusKqDto.getAllT() - censusKqDto.getKqT();  
241 - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; 247 + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ;
  248 + number = number < 0?0:number ;
  249 + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；";
242 } 250 }
243 WeChatSms weChatSms = new WeChatSms(); 251 WeChatSms weChatSms = new WeChatSms();
244 weChatSms.setTableName("qyhSmsNew" + tableSuffix); 252 weChatSms.setTableName("qyhSmsNew" + tableSuffix);
245 weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " + 253 weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
246 "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " + 254 "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
247 "签到时间：" + times[0] + "-" + times[1] + " \n - " + 255 "签到时间：" + times[0] + "-" + times[1] + " \n - " +
248 - "整体数据：" + message.substring(0, message.length() - 1)); 256 + "整体数据：" + message);
249 weChatSms.setSchoolId(teacher.getSchoolId()); 257 weChatSms.setSchoolId(teacher.getSchoolId());
250 weChatSms.setName(teacher.getName()); 258 weChatSms.setName(teacher.getName());
251 weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId()); 259 weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId());
@@ -253,7 +261,7 @@ public class KQJob { @@ -253,7 +261,7 @@ public class KQJob {
253 weChatSms.setAppId(appDto.getAgentId()); 261 weChatSms.setAppId(appDto.getAgentId());
254 weChatSms.setSecret(appDto.getAgentSecret()); 262 weChatSms.setSecret(appDto.getAgentSecret());
255 String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + 263 String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
256 - "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + 264 + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +"&TemplateId=" + templateId+
257 "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() + 265 "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
258 "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2&timestamp=" + DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&"; 266 "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2&timestamp=" + DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&";
259 weChatSms.setMsgUrl(msgUrl); 267 weChatSms.setMsgUrl(msgUrl);
@@ -277,15 +285,16 @@ public class KQJob { @@ -277,15 +285,16 @@ public class KQJob {
277 if (censusKqDtos != null && censusKqDtos.size() > 0) { 285 if (censusKqDtos != null && censusKqDtos.size() > 0) {
278 String message = ""; 286 String message = "";
279 for (CensusKqDto censusKqDto : censusKqDtos) { 287 for (CensusKqDto censusKqDto : censusKqDtos) {
280 - int number = censusKqDto.getAllT() - censusKqDto.getKqT();  
281 - message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人;请假"+censusKqDto.getQjT()+"人"; 288 + int number = censusKqDto.getAllT() - censusKqDto.getKqT()-censusKqDto.getQjT() ;
  289 + number = number < 0?0:number ;
  290 + message += "[" + censusKqDto.getClassName() + "]未考勤" + number + "人，请假"+censusKqDto.getQjT()+"人；";
282 } 291 }
283 WeChatSms weChatSms = new WeChatSms(); 292 WeChatSms weChatSms = new WeChatSms();
284 weChatSms.setTableName("qyhSmsNew" + tableSuffix); 293 weChatSms.setTableName("qyhSmsNew" + tableSuffix);
285 weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " + 294 weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
286 "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " + 295 "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
287 "签到时间：" + times[0] + "-" + times[1] + " \n - " + 296 "签到时间：" + times[0] + "-" + times[1] + " \n - " +
288 - "整体数据：" + message.substring(0, message.length() - 1)); 297 + "整体数据：" + message);
289 weChatSms.setSchoolId(teacher.getSchoolId()); 298 weChatSms.setSchoolId(teacher.getSchoolId());
290 weChatSms.setName(teacher.getName()); 299 weChatSms.setName(teacher.getName());
291 weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId()); 300 weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId());
@@ -293,7 +302,7 @@ public class KQJob { @@ -293,7 +302,7 @@ public class KQJob {
293 weChatSms.setAppId(appDto.getAgentId()); 302 weChatSms.setAppId(appDto.getAgentId());
294 weChatSms.setSecret(appDto.getAgentSecret()); 303 weChatSms.setSecret(appDto.getAgentSecret());
295 String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" + 304 String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
296 - "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + 305 + "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() +"&TemplateId=" + templateId+
297 "&pass=" + teacher.getPass() + "&type=4&soutype=2&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&"; 306 "&pass=" + teacher.getPass() + "&type=4&soutype=2&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&";
298 weChatSms.setMsgUrl(msgUrl); 307 weChatSms.setMsgUrl(msgUrl);
299 weChatSms.setTdType(TypeEnums.kaoqing.getType()); 308 weChatSms.setTdType(TypeEnums.kaoqing.getType());