Merge branches 'dev' and 'master' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxMeetingServiceImpl.java

@@ -49,11 +49,14 @@ public class WxMeetingServiceImpl implements WxMeetingService {
 	public String createMeeting(String jsonMeeting) throws Exception {
 		JSONObject json = JSONObject.parseObject(jsonMeeting);
 		MeetingDO meetingDO = new MeetingDO();
-		meetingDO.setMeetingName(json.getString("meetingName"));
-		meetingDO.setMeetingDetails(json.getString("meetingDetails"));
+		String meetingName = json.getString("meetingName");
+		meetingDO.setMeetingName(meetingName);
+		String meetingDetails = json.getString("meetingDetails");
+		meetingDO.setMeetingDetails(meetingDetails);
 		Long creator = json.getLong("meetingCreator");
 		meetingDO.setMeetingCreator(creator);
-		meetingDO.setMeetingAddress(json.getString("meetingAddress"));
+		String meetingAddress = json.getString("meetingAddress");
+		meetingDO.setMeetingAddress(meetingAddress);
 		meetingDO.setCreateDate(new Date());
 		Date startDate = DateFormatUtil.string2Date(json.getString("startDate"));
 		meetingDO.setStartDate(startDate);
@@ -98,7 +101,7 @@ public class WxMeetingServiceImpl implements WxMeetingService {
 							TemplateDO templateDO = wxTemplateMapper.getByAppid(schoolAppid);
 							if (ObjectUtils.isNotEmpty(templateDO)){
 								String temMeeting = templateDO.getTemMeeting();
-								wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知", meetingDO.getMeetingName(), simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情",  wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+l);
+								wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知", meetingName, simpleDateFormat.format(meetingDO.getStartDate()), meetingAddress, "-", "点击查看详情",  wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+l);
 
 							}
 

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxNotifyServiceImpl.java

@@ -102,6 +102,7 @@ public class WxNotifyServiceImpl implements WxNotifyService {
 					notifyrecordsMapper.save(notifyrecordsDO);
 					TeacherDO teacherDO = teacherMapper.get(l);
 					SchoolDO schoolDO = wxSchoolMapper.get(teacherDO.getSchoolId());
+					String schoolName = schoolDO.getSchoolName();
 					String teacherName = teacherMapper.get(notifyCreator).getTeacherName();
 					if (ObjectUtils.isNotEmpty(schoolDO)){
 						String schoolAppid = schoolDO.getSchoolAppid();
@@ -110,7 +111,7 @@ public class WxNotifyServiceImpl implements WxNotifyService {
 							if (ObjectUtils.isNotEmpty(templateDO)){
 								String temNotify = templateDO.getTemNotify();
 								try {
-									wxPushApi.wxPush(schoolDO.getSchoolAppid(),schoolDO.getSchoolSecret(),teacherDO.getOpenid(), temNotify, "您好，您有一条通知", schoolDO.getSchoolName(),teacherName,format.format(new Date()),notifyDetails, "点击查看详情", wechatUrl + "/notifyDetail/teacher/"+notifyDO.getNotifyId()+"?teacherId="+l);
+									wxPushApi.wxPush(schoolDO.getSchoolAppid(),schoolDO.getSchoolSecret(),teacherDO.getOpenid(), temNotify, "您好，您有一条通知",schoolName ,teacherName,format.format(new Date()),notifyDetails, "点击查看详情", wechatUrl + "/notifyDetail/teacher/"+notifyDO.getNotifyId()+"?teacherId="+l);
 								}catch (Exception e){
 									e.printStackTrace();
 								}

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxOaLeaveServiceImpl.java

@@ -41,6 +41,9 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
     @Autowired
     private WxTemplateMapper wxTemplateMapper;
 
+    @Autowired
+    private WxClazzMapper wxClazzMapper;
+
     @Value("${smartschool.domain.wechat}")
     private String wechatUrl;
 
@@ -87,7 +90,9 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
                 for (Long teacherId : longs) {
                     TeacherDO teacherDO = teacherMapper.get(teacherId);
                     SchoolDO schoolDO = wxSchoolMapper.get(teacherDO.getSchoolId());
-                    String stuName = studentMapper.get(lvProposer).getStuName();
+                    StudentDO studentDO = studentMapper.get(lvProposer);
+                    String stuName = studentDO.getStuName();
+                    String clazzName = wxClazzMapper.get(studentDO.getClazzId()).getClazzName();
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                     String date =format.format(leave.getStartDate())  + "至" + format.format(leave.getEndDate());
                     if (ObjectUtils.isNotEmpty(schoolDO)){
@@ -97,7 +102,7 @@ public class WxOaLeaveServiceImpl implements WxOaLeaveService {
                             if (ObjectUtils.isNotEmpty(templateDO)){
                                 String temLeave = templateDO.getTemLeave();
                                 try {
-                                    wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), temLeave,"您好，学生的请假申请", stuName+"；", date+"；", leave.getLvDetails()+"；", "-", "点击查看详情", wechatUrl + "/leavedetail/teacher/" + leave.getLvId());
+                                    wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(), teacherDO.getOpenid(), temLeave,"您好，学生的请假申请", format.format(new Date()),clazzName , stuName, lvDetails, "点击查看详情", wechatUrl + "/leavedetail/teacher/" + leave.getLvId());
                                 }catch (Exception e){
                                     e.printStackTrace();
                                 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxUserServiceImpl.java

@@ -352,6 +352,18 @@ public class WxUserServiceImpl implements WxUserService {
 		hashMap.put("openid",openid);
 		List<TeacherDO> teacherDOS = teacherMapper.list(hashMap);
 		if (ObjectUtils.isNotEmpty(teacherDOS)){
+			Long userId = teacherDOS.get(0).getUserId();
+			HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+			stringObjectHashMap.put("userId",userId);
+			List<ParentsDO> list = parentsMapper.list(stringObjectHashMap);
+			if (ObjectUtils.isNotEmpty(list)){
+				for (ParentsDO pt:list) {
+					if (ObjectUtils.isEmpty(pt.getOpenid())){
+						pt.setOpenid(openid);
+						parentsMapper.update(pt);
+					}
+				}
+			}
 			for (TeacherDO tc:teacherDOS) {
 				tc.setTeacherPhoto(headimgurl);
 				teacherMapper.update(tc);
@@ -368,6 +380,18 @@ public class WxUserServiceImpl implements WxUserService {
 		}
 		List<ParentsDO> parentsDOS = parentsMapper.list(hashMap);
 		if (ObjectUtils.isNotEmpty(parentsDOS)){
+			Long userId = parentsDOS.get(0).getUserId();
+			HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+			stringObjectHashMap.put("userId",userId);
+			List<TeacherDO> list = teacherMapper.list(stringObjectHashMap);
+			if (ObjectUtils.isNotEmpty(list)){
+				for (TeacherDO tc:list) {
+					if (ObjectUtils.isEmpty(tc.getOpenid())){
+						tc.setOpenid(openid);
+						teacherMapper.update(tc);
+					}
+				}
+			}
 			for (ParentsDO pt:parentsDOS) {
 				pt.setParentsPhoto(headimgurl);
 				parentsMapper.update(pt);

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/support/RemindTask.java

@@ -66,6 +66,7 @@ public class RemindTask extends TimerTask {
         String meetingNotifier = meetingDO.getMeetingNotifier();
         List<Long> longs = JSON.parseArray(meetingNotifier, Long.class);
         List<Long> list = removeDuplicate(longs);
+            String meetingName = meetingDO.getMeetingName();
         for (Long teacherId:list) {
             SchoolDO schoolDO = wxSchoolMapper.get(meetingDO.getSchoolId());
             String openid = teacherMapper.get(teacherId).getOpenid();
@@ -76,7 +77,7 @@ public class RemindTask extends TimerTask {
                     if (ObjectUtils.isNotEmpty(byAppid)){
                         String temMeeting = byAppid.getTemMeeting();
                         try {
-                            wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知", meetingDO.getMeetingName(), simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情", wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+teacherId);
+                            wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , temMeeting, "您好，您有一条新的会议通知",meetingName , simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情", wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+teacherId);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/WxPushController.java

@@ -3,10 +3,9 @@ package com.usoftchina.smartschool.wechat.controller;
 import com.usoftchina.smartschool.wechat.auth.annotation.IgnoreOpenApiAuth;
 import com.usoftchina.smartschool.wechat.dto.MessageInfoDTO;
 import com.usoftchina.smartschool.wechat.service.SendService;
-import com.usoftchina.smartschool.wechat.service.WxPushService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author: guq

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/service/impl/WxPushServiceImpl.java

@@ -2,14 +2,12 @@ package com.usoftchina.smartschool.wechat.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import com.usoftchina.smartschool.base.Result;
 import com.usoftchina.smartschool.wechat.po.MessageInfo;
 import com.usoftchina.smartschool.wechat.service.WxPushService;
 import com.usoftchina.smartschool.wechat.wxUtils.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -28,13 +26,12 @@ public class WxPushServiceImpl implements WxPushService{
      */
     @Override
     public String wxPush(String appId,String secret,String openid, String templateId, String title, String keyword1, String keyword2, String keyword3, String keyword4, String remark, String url) {
-            if (ObjectUtils.isNotEmpty(openid)){
+        if (ObjectUtils.isNotEmpty(openid)){
                 String json="{\"touser\":\""+openid+"\","
                         + "\"template_id\":\""+templateId+"\","
                         + "\"url\":\""+""+url+""+"\","
                         + "\"data\":{"
-                        + "\"first\":{\"value\":\""+title+"\","
-                        +"\"color\":\"#173177\"},"
+                        + "\"first\":{\"value\":\""+title+"\",\"color\":\"#173177\"},"
                         + "\"keyword1\":{\"value\":\""+keyword1+"\",\"color\":\"#173177\"},"
                         + "\"keyword2\":{\"value\":\""+keyword2+"\",\"color\":\"#173177\"},"
                         + "\"keyword3\":{\"value\":\""+keyword3+"\",\"color\":\"#173177\"},"