修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -299,6 +299,15 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                         BeanUtils.copyProperties(waterResourcePool, waterResourceDto);
                     }
                     break;
+
+                case "industryPool":
+                    WaterResourcePool waterResourceindustryPool =
+                            waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
+                                    sequenceNbr));
+                    if (null != waterResourceindustryPool) {
+                        BeanUtils.copyProperties(waterResourceindustryPool, waterResourceDto);
+                    }
+                    break;
             }
         }
         waterResourceDto.setSequenceNbr(sequenceNbr);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MessageServiceImpl.java

@@ -65,6 +65,7 @@ import com.yeejoin.amos.patrol.email.IEmailService;
 import com.yeejoin.amos.patrol.feign.PushFeignServer;
 import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import com.yeejoin.amos.patrol.jpush.AppMessagePushService;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
 
@@ -325,6 +326,16 @@ public class MessageServiceImpl implements IMessageService {
 	@Override
 	public Msg pushMsgAndSave(String toke,String product,String appKey,Msg msg) {
 //		List<PushMsgParam> pmps = new ArrayList<PushMsgParam>();
+
+
+		if(toke!=null){
+			RequestContext.setToken(toke);
+			RequestContext.setProduct(product);
+			RequestContext.setAppKey(appKey);
+		}
+
+
+
 		PushMsgParam pushMsg = new PushMsgParam();
 		pushMsg.setRecivers(Arrays.asList(msg.getUserId()));
 		pushMsg.setContent(ObjectUtils.isEmpty(msg.getPushBody()) ? msg.getBody() : msg.getPushBody());