最新版本541200007最新版本541200007

doum

11 小时以前 7746d3d26aeca6a674ed0bb23779528fbf9ba349

最新版本541200007最新版本541200007

 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: visitsAdmin
    # 安全配置

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/base/EventBaseParamRequest.java

@@ -12,6 +12,7 @@
    private String   sendTime;//    P    String    事件从接收者（程序处理后）发出的时间    是    32    事件发送时间
    private String    ability;//    P    String    事件类别    是    64    标识停车场事件
    private String[] uids;//    String[]    用户id    否    不限
    private String[] quids;//    String[]    用户id    否    不限
    private String[] clients    ;//String[]    组件标识    否    不限
    private List<EventBaseInfoRequest> events;//    P    Events[]    事件信息    是    不限


 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.*;
@@ -580,6 +581,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 +622,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);
                        }
                    }
                }