消息中心推送代码

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/MceContentService.java

@@ -13,5 +13,5 @@ import com.usky.common.mybatis.core.CrudService;
  * @since 2024-04-19
  */
 public interface MceContentService extends CrudService<MceContent> {
-    void sendApp(JSONObject mceReceiveVO, String cids, Integer sendType);
+    void sendApp(JSONObject mceReceiveVO, String cids, Integer mceReceiveId, Integer sendType);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/MceContentServiceImpl.java

@@ -6,8 +6,11 @@ import com.usky.iot.domain.MceContent;
 import com.usky.iot.mapper.MceContentMapper;
 import com.usky.iot.service.MceContentService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.service.MceMbuserService;
 import com.usky.iot.service.config.HttpClientUtils;
+import com.usky.iot.service.vo.SendWeChatMessageRequestVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -22,9 +25,13 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper, MceContent> implements MceContentService {
+
+    @Autowired
+    private MceMbuserService mceMbuserService;
+
     //异步多线程调用
     @Async("asyncServiceExecutor")
-    public void sendApp(JSONObject mceReceiveVO, String cids, Integer sendType){
+    public void sendApp(JSONObject mceReceiveVO, String cids,Integer mceReceiveId, Integer sendType){
         if (sendType.equals(0)){
             String appUrl = "https://fc-mp-85a26092-1305-4bf1-998f-b609512c8f7b.next.bspapp.com/uniPushMessage";
             JsonObject jsonObject = new JsonObject();
@@ -33,7 +40,13 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             jsonObject.addProperty("content", mceReceiveVO.get("infoContent").toString());
             String resultString = HttpClientUtils.doPostJson(appUrl,jsonObject.toString());
         }else if (sendType.equals(1)){
-
+            SendWeChatMessageRequestVO sendWeChatMessageRequestVO = new SendWeChatMessageRequestVO();
+            sendWeChatMessageRequestVO.setInfoContent(mceReceiveVO.get("infoContent").toString());
+            sendWeChatMessageRequestVO.setInfoTitle(mceReceiveVO.get("infoTitle").toString());
+            sendWeChatMessageRequestVO.setInfoId(mceReceiveId);
+            sendWeChatMessageRequestVO.setOpenId(cids);
+            sendWeChatMessageRequestVO.setInfoType(mceReceiveVO.get("infoType").toString());
+            mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/MceReceiveServiceImpl.java

@@ -257,6 +257,7 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                 mceReceive1.setTenantId(list.get(i).getTenantId());
 //                mceReceive1.setDeptId(list.get(i).getDeptId().intValue());
                 this.save(mceReceive1);
+                Integer mceReceiveId = mceReceive1.getId();
                 LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
                 lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
                 List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
@@ -266,12 +267,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                     for (int j = 0; j < list3.size(); j++){
                         if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
                             if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
-                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0);
+                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0,0);
                             }
                         }
                         if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
-                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),1);
+                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getOpenid())){
+                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getOpenid(),mceReceiveId,1);
                             }
                         }
                     }