功能优化

rk

11 小时以前 3c9e375697f758e43beeaba61c78d4c303d1f2d3

功能优化

 server/visits/dmvisit_service/src/main/java/com/doumee/core/dingTalk/DingTalk.java

@@ -383,9 +383,10 @@
            request.setAgentId(agentId);
            request.setUseridList(userIds);
            request.setToAllUser(false);

            request.setMsg(msg);
            log.error("推送简道云人员离岗请求信息：====================>"+JSONObject.toJSONString(request));
            OapiMessageCorpconversationAsyncsendV2Response rsp = client.execute(request, getToken());
            log.error("推送简道云人员离岗响应信息：====================>"+JSONObject.toJSONString(rsp));
            if(rsp.getErrcode().equals(Constants.DD_ERR_CODE)){
                return true;
            }else{

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

@@ -804,6 +804,7 @@
            param.setEntry_id(entryId);
            param.setIs_start_trigger(false);
            param.setIs_start_trigger(true);
            log.error("简道云发送通知[getJDYData]请求入参====>" + JSONObject.toJSONString(param) );
            Map<String, Object>  response =  apiClient.singleDataCreate(param,apiClient.getDefaultVersion());
            /*
             Map<String,Object> map = new HashMap<>();
@@ -824,7 +825,7 @@
                    .addHeader("Content-Type", "application/json")
                    .build();
            Response response = client.newCall(request).execute();*/
            log.error("简道云发送通知返回信息" + JSONObject.toJSONString(response));
            log.error("简道云发送通知[getJDYData]返回信息" + JSONObject.toJSONString(response));
        }catch (Exception e){
            log.error("简道云发送通知返回信息异常：" + e.getMessage());
        }

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

@@ -430,6 +430,9 @@
                                            .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
                                            .eq(DdNoticeConfig::getObjType,13))>Constants.ZERO?
                                    dingTalk.getWeatherNoticeMsg(title,text):null);



                            for (Member member:memberList) {
                                WarningPush warningPush = new WarningPush();
                                warningPush.setCreateDate(new Date());

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

@@ -542,11 +542,11 @@
                                    }
                                     if(Constants.equalsInteger(warningRule.getMemberNotice(),Constants.ONE)){
                                        Boolean noticeFlag = false;
                                             if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
                                                 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()));
                                            } 
//                                             if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
//                                                 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)){