Merge remote-tracking branch 'origin/feature/0427-school' into feature/0427-school

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -417,6 +417,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     // 微信公众号secret
     String WECHAT_SECRET = "wechat_secret";
 
+    // 微信公众号secret
+    String SCHOOL_IM_GROUP_IMG = "school_im_group_img";
 
     static void checkActivityDate(String startTimeStr, String endTimeStr) {
         if(StringUtils.isEmpty(startTimeStr) || StringUtils.isEmpty(startTimeStr)){

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -377,6 +377,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setIntroduce(imGroup.getName());
             imGroup.setMemo(cooperationOrgan.getName());
             imGroup.setMemberNum(0);
+            imGroup.setImg(sysConfigService.findByParamName(SysConfigService.SCHOOL_IM_GROUP_IMG).getParanValue());
             imGroup.setType(ImGroup.GroupTypeEnum.SCHOOL.getCode());
             imGroup.setGroupType(ImGroup.GroupTypeEnum.SCHOOL);
             imGroup.setCreateTime(new Date());

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -59,7 +59,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
      * @param content 消息内容
      * @return json对象
      */
-    private JSONObject generateJson(String[] alias, String alert, String content, String url, String sound, String channelId, JSONObject androidIntent) {
+    private JSONObject generateJson(String[] alias, String alert, String content, String url, String sound, String channelId, JSONObject androidIntent,String type) {
         JSONObject json = new JSONObject();
         JSONArray platform = new JSONArray();// 平台
         platform.add("android");
@@ -90,6 +90,9 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
         android_extras.put("type", "infomation");
         android_extras.put("url", url);
         android_extras.put("memo", url);
+        if (StringUtils.isNotEmpty(type) && type.equals("SCHOOL")) {
+            android_extras.put("clientType", type);
+        }
         //2022年6月22日 增加 third_url_encode 参数，极光推送数据中带有＃号需要转译
         android_extras.put("third_url_encode", true);
         android.put("extras", android_extras);
@@ -104,6 +107,9 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
         ios_extras.put("type", "infomation");
         ios_extras.put("url", url);
         ios_extras.put("memo", url);
+        if (StringUtils.isNotEmpty(type) && type.equals("SCHOOL")) {
+            ios_extras.put("clientType", type);
+        }
         ios.put("extras", ios_extras);
         notification.put("android", android);
         notification.put("ios", ios);
@@ -155,7 +161,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
                 break;
         }
         String authorization = "Basic " + base64_auth_string;
-        JSONObject jsonObject = generateJson(alias, alert, content, url, sound, channelId, androidIntent);
+        JSONObject jsonObject = generateJson(alias, alert, content, url, sound, channelId, androidIntent,type);
         return sendPostRequest(jsonObject.toString(), authorization);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/SchoolMessageController.java

@@ -86,6 +86,6 @@ public class SchoolMessageController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(sysMessageService.queryCountOfUnread(null, sysUser.getId(),"SCHOOL", null));
+        return succeed(sysMessageService.queryCountOfUnread(MessageSendMode.PUSH, sysUser.getId(),"SCHOOL", null));
     }
 }