访客系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
rk
9 小时以前 6ae086d3b199c4aa7cb4d594c9b594530eb5e3f8 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java


@@ -33,6 +33,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 +42,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 +537,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 +583,10 @@


        return  null;


    }












    /**


     * 通知电信接口（离岗事件）


     * @param list