陶汉栋 / 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 53 List<String> keyList = new ArrayList<>();
54 54 for(Map.Entry<String, String> entity : map.entrySet()){
55 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 58 String key = entity.getKey();
58 59 String[] messageArray = key.split("_");
59 60 if(messageArray[2].contains("5")){
... ... @@ -107,19 +108,20 @@ public class KQJob {
107 108 //出入校 推班主任
108 109 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
109 110 for(KqTeacherDto teacher : list){
  111 + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName());
110 112 dingSchoolPush(templateId,teacher,key,appDto);
111 113 }
112 114 }else {
113 115 //出入寝 推班主任
114 116 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
115 117 for(KqTeacherDto teacher : list){
116   - logger.info("盯盯推送—————" + templateId + "--------" + teacher.getName());
  118 + logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName());
117 119 dingSchoolPush(templateId,teacher, key, appDto);
118 120 }
119 121 //推宿管
120 122 List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
121 123 for(KqTeacherDto teacher : chamberList){
122   - logger.info("企业号推送—————" + templateId + "--------" + teacher.getName());
  124 + logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName());
123 125 dingChamberPush(templateId,teacher, key, appDto);
124 126 }
125 127 }
... ... @@ -132,17 +134,20 @@ public class KQJob {
132 134 //出入校 推班主任
133 135 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
134 136 for (KqTeacherDto teacher : list) {
  137 + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName());
135 138 weChatSchoolPush(templateId,teacher, key, appDto);
136 139 }
137 140 }else {
138 141 //出入寝 推班主任
139 142 List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
140 143 for (KqTeacherDto teacher : list) {
  144 + logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName());
141 145 weChatSchoolPush(templateId,teacher, key, appDto);
142 146 }
143 147 //推宿管
144 148 List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
145 149 for(KqTeacherDto teacher : chamberList){
  150 + logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName());
146 151 weChatChamberPush(templateId,teacher, key, appDto);
147 152 }
148 153 }
... ... @@ -161,8 +166,9 @@ public class KQJob {
161 166 if(censusKqDtos != null &&censusKqDtos.size() > 0){
162 167 String message = "";
163 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 173 DingSms dingSms = new DingSms();
168 174 dingSms.setName(teacher.getName());
... ... @@ -170,9 +176,9 @@ public class KQJob {
170 176 dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
171 177 "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
172 178 "签到时间："+times[0]+"-"+ times[1] +" \n - "+
173   - "整体数据：" + message.substring(0,message.length()-1));
  179 + "整体数据：" + message);
174 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 182 "&data="+teacher.getDingUserId()+"&type=1&stype=4&mobile="+teacher.getMobile()+"&pass="+teacher.getPass()+
177 183 "&face=&sourcetype=16&soutype=3&timestamp="+ DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1) ;
178 184 dingSms.setSchoolId(teacher.getSchoolId());
... ... @@ -200,8 +206,9 @@ public class KQJob {
200 206 if(censusKqDtos != null &&censusKqDtos.size() > 0){
201 207 String message = "";
202 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 213 DingSms dingSms = new DingSms();
207 214 dingSms.setName(teacher.getName());
... ... @@ -209,9 +216,9 @@ public class KQJob {
209 216 dingSms.setMsg("报告类型："+KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - "+
210 217 "签到日期："+DateUtils.date2String(new Date(),DateUtils.format1)+ "("+DateUtils.getWeekName()+") \n - "+
211 218 "签到时间："+times[0]+"-"+ times[1] +" \n - "+
212   - "整体数据：" + message.substring(0,message.length()-1));
  219 + "整体数据：" + message);
213 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 222 "&pass=" + teacher.getPass() + "&type=4&soutype=3&time="+DateUtils.date2String(new Date(),DateUtils.format1);
216 223 dingSms.setSchoolId(teacher.getSchoolId());
217 224 dingSms.setDingUserId(teacher.getDingUserId());
... ... @@ -237,15 +244,16 @@ public class KQJob {
237 244 if (censusKqDtos != null && censusKqDtos.size() > 0) {
238 245 String message = "";
239 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 251 WeChatSms weChatSms = new WeChatSms();
244 252 weChatSms.setTableName("qyhSmsNew" + tableSuffix);
245 253 weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
246 254 "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
247 255 "签到时间：" + times[0] + "-" + times[1] + " \n - " +
248   - "整体数据：" + message.substring(0, message.length() - 1));
  256 + "整体数据：" + message);
249 257 weChatSms.setSchoolId(teacher.getSchoolId());
250 258 weChatSms.setName(teacher.getName());
251 259 weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId());
... ... @@ -253,7 +261,7 @@ public class KQJob {
253 261 weChatSms.setAppId(appDto.getAgentId());
254 262 weChatSms.setSecret(appDto.getAgentSecret());
255 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 265 "&data=" + teacher.getWeChatUserId() + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
258 266 "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2&timestamp=" + DateUtils.getDate()+"&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&";
259 267 weChatSms.setMsgUrl(msgUrl);
... ... @@ -277,15 +285,16 @@ public class KQJob {
277 285 if (censusKqDtos != null && censusKqDtos.size() > 0) {
278 286 String message = "";
279 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 292 WeChatSms weChatSms = new WeChatSms();
284 293 weChatSms.setTableName("qyhSmsNew" + tableSuffix);
285 294 weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
286 295 "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
287 296 "签到时间：" + times[0] + "-" + times[1] + " \n - " +
288   - "整体数据：" + message.substring(0, message.length() - 1));
  297 + "整体数据：" + message);
289 298 weChatSms.setSchoolId(teacher.getSchoolId());
290 299 weChatSms.setName(teacher.getName());
291 300 weChatSms.setQiYeHaoUserId(teacher.getWeChatUserId());
... ... @@ -293,7 +302,7 @@ public class KQJob {
293 302 weChatSms.setAppId(appDto.getAgentId());
294 303 weChatSms.setSecret(appDto.getAgentSecret());
295 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 306 "&pass=" + teacher.getPass() + "&type=4&soutype=2&time="+DateUtils.date2String(new Date(),DateUtils.format1)+"&";
298 307 weChatSms.setMsgUrl(msgUrl);
299 308 weChatSms.setTdType(TypeEnums.kaoqing.getType());
... ...