跌倒通知 被分享人

src/main/java/com/pub/util/MqttUtil.java

@@ -5,6 +5,7 @@ import java.sql.Timestamp;
 import java.util.*;
 
 import com.wxxcx.index.wxSendMessage;
+import com.wxxcx.share.ShareVO;
 import com.wxxcx.user.WxRelatiion;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
@@ -236,13 +237,17 @@ public class MqttUtil {
                             devId= dev.getDev_id();
                         }
                         // 被分享者openid
-//						List<ShareVO> shares = baseDAO.queryAllByCondition(ShareVO.class, " and dev_id ='"+dev_id+"' ", null);
-//						if(shares !=null && shares.size()>0) {
-//							for(int i=0;i<shares.size();i++) {
-//								ShareVO share =shares.get(i);
-//								openids.add(share.getShared());
-//							}
-//						}
+						List<ShareVO> shares = baseDAO.queryAllByCondition(ShareVO.class, " and dev_id ='"+dev_id+"' and state = 1 ", null);
+                        System.out.println("当前设备共有被分享人{}" + (shares == null ?  0 : shares.size()));
+						if(shares !=null && shares.size()>0) {
+							for(int i=0;i<shares.size();i++) {
+								ShareVO share =shares.get(i);
+                                if (share.getShare_config() == 1) {
+                                    openids.add(share.getShared());
+                                    System.out.println("被分享人被设置为信息通知：" + share.getShared());
+                                }
+							}
+						}
 
                         if (openids.size() > 0) {
                             // 拥有者和被分享者phone

src/main/java/com/pub/util/MsgUtil.java

@@ -72,7 +72,8 @@ public class MsgUtil {
 			SendSmsRequest req = new SendSmsRequest();
 			SmsClient client = new SmsClient(cred, region);
 			req.setPhoneNumberSet(new String[] {mobile});
-			req.setSignName("雷能守护小程序");
+//			req.setSignName("雷能守护小程序");
+			req.setSignName("合肥雷能信息");
 			req.setTemplateId(loginId);
 			req.setTemplateParamSet(new String[]{captcha,"5"});
 			req.setSmsSdkAppId(sdkAppId);
@@ -91,7 +92,8 @@ public class MsgUtil {
 			SendSmsRequest req = new SendSmsRequest();
 			SmsClient client = new SmsClient(cred, region);
 			req.setPhoneNumberSet(new String[] {mobile});
-			req.setSignName("雷能守护小程序");
+//			req.setSignName("雷能守护小程序");
+			req.setSignName("合肥雷能信息");
 			req.setTemplateId(registerId);
 			req.setTemplateParamSet(new String[]{captcha});
 			req.setSmsSdkAppId(sdkAppId);
@@ -133,7 +135,7 @@ public class MsgUtil {
 	}
 
 	public static void main(String[] args) {
-		String res = sendNotifyMsg("13083062398", "卫生间001");
+		String res = sendNotifyMsg("19206441373", "测试短信");
 		System.out.println(res);
 	}
 }

src/main/java/com/wxxcx/share/ShareVO.java

@@ -33,6 +33,9 @@ public class ShareVO extends SuperVO{
 	private String shared_phone;
 	@ApiModelProperty(value = "状态")
 	private int state;
+
+	@ApiModelProperty(value = "分享配置 默认0 1被分享人可以接收短信，公众号")
+	private int share_config;
 	
 	@Override
 	public String getTableName() {