Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

7 小时以前 3f1ef2fd6b9ded13d3e671619252c595bfb45839

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -13,6 +13,7 @@
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest;
import com.doumee.core.haikang.model.param.request.event.base.EventBaseInfoRequest;
import com.doumee.core.haikang.model.param.request.event.base.EventBaseParamRequest;
import com.doumee.core.haikang.model.param.request.event.base.EventBaseRequest;
import com.doumee.core.haikang.model.param.request.event.parks.*;
import com.doumee.core.haikang.model.param.request.event.visit.*;
@@ -33,6 +34,7 @@
import com.doumee.service.business.third.model.response.TmsOrderInfoResponse;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,7 @@
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.Date;
import java.util.stream.Collectors;
@@ -535,10 +538,21 @@
                                        );
                                    }
                                     if(Constants.equalsInteger(warningRule.getMemberNotice(),Constants.ONE)){
                                        //            Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
                                        //                    StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
                                        //                dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
//                            Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
//                                    StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
//                                dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
//                                  warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
                                        List<String> ddUserIdList = memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList());
                                        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ddUserIdList)){
                                            for (String ddUserId:ddUserIdList) {
                                                impl.getJDYData(warningEvent,ddUserId,
                                                        systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.API_KEY).getCode(),
                                                        systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.APPID).getCode(),
                                                        systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.ENTRY_ID).getCode()

                                                );
                                            }
                                        }
                                    }
                                    impl.sendDeviceNotice(warningRule);
                                    warningPushMapper.insert(warningPush);
@@ -570,6 +584,10 @@
        return  null;
    }





    /**
     * 通知电信接口（离岗事件）
     * @param list
@@ -580,6 +598,13 @@
            Thread t1=new Thread(new Runnable() {
                @Override
                public void run() {
//                  EventBaseRequest submitParam = new EventBaseRequest();
//                  submitParam.setMethod(param.getMethod());
//                  submitParam.setParams(new EventBaseParamRequest());
//                  submitParam.getParams().setAbility(param.getParams().getAbility());
//                  submitParam.getParams().setQuids(param.getParams().getQuids());
//                  submitParam.getParams().setSendTime(param.getParams().getSendTime());
//                  submitParam.getParams().setEvents(new ArrayList<>());
                    //定制key
                   param.getParams().setEvents(new ArrayList<>());
                   int key = Constants.WarningConfig.AF_RYLG_CUSTOM.getKey();
@@ -614,18 +639,26 @@
                        if(StringUtils.equals(t.getEventId(),request.getEventId())){
                            continue;
                        }
                       request.getData().put("url",StringUtils.defaultString(request.getData().getString("url"),"")+","+StringUtils.defaultString(t.getData().getString("url"),""));
                       request.setSrcIndex(StringUtils.defaultString(request.getSrcIndex(),"")+","+StringUtils.defaultString(t.getSrcIndex(),""));
                       request.setSrcName(StringUtils.defaultString(request.getSrcName(),"")+","+StringUtils.defaultString(t.getSrcName(),""));
                       request.getData().getJSONObject("AIOPResultData").put("imageUrl",StringUtils.defaultString( request.getData().getJSONObject("AIOPResultData").getString("imageUrl"),"")
                               +","+StringUtils.defaultString( t.getData().getJSONObject("AIOPResultData").getString("imageUrl"),""));
                    }
                    JSONObject   img = new JSONObject();
                    img.put("imageUrl", request.getData().getJSONObject("AIOPResultData").getString("imageUrl"));
                    String url =  request.getData().getString("url");
                    request.setData(new JSONObject());
                    request.getData().put("AIOPResultData",img);
                    request.getData().put("url",url);
                    param.getParams().getEvents().add(request);
                    String thirdpath =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_THIRD_URL).getCode();
                    if(StringUtils.isNotBlank(thirdpath)){
                        log.error("========通知其他三方地址离岗事件已推送，参数:"+JSONObject.toJSONString(param));
                        String[] ss = thirdpath.split(";");
                        for(String s : ss){
                            String response =   HttpsUtil.postJson(s,JSONObject.toJSONString(param));
                            log.error("========通知其他三方地址离岗事件已推送，结果:"+response);
                            log.error("========通知其他三方地址离岗事件已推送，结果:"+s+"\n"+response);
                        }
                    }
                }