Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvis...

doum

2026-06-08 fad0704afaf4ed07963d267142cc6f625a09909d

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

@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
@@ -765,6 +764,26 @@
        }
    }

    public static void main(String[] args) {
        try {
            JkCabinetGridServiceImpl temp = new JkCabinetGridServiceImpl();
            FormDataApiClient apiClient = new FormDataApiClient("B4eyPmjtnvnameAKq5lbDLdRZi18VQ3p"  ,"https://lcdp.ahyc.com.cn:30443/api/");
            FormDataCreateParam param  =new FormDataCreateParam();
            WarningEvent warningEvent = new WarningEvent();
            warningEvent.setTitle("跨越生产线(测试）");
            warningEvent.setContent("跨越生产线-芜湖北围墙过道东-枪（跨越）");
            param.setData( temp.getJdyChildData(warningEvent,"gaoyf_b"));
            param.setApp_id("6954aca3cdf8fb470ca1aabd");
            param.setEntry_id("6954aca6ff1c406a1d7b9afa");
            param.setIs_start_trigger(false);
            param.setIs_start_trigger(true);
            Map<String, Object>  response =  apiClient.singleDataCreate(param,apiClient.getDefaultVersion());
            log.error(JSONObject.toJSONString(response));
        }catch (Exception e){

        }

    }

    /**
     * 简道云消息推送 定制
@@ -784,6 +803,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<>();
@@ -804,7 +824,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());
        }
@@ -1168,6 +1188,7 @@
                        .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
                        .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
                        .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
                        .selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
                        .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
                        .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
                        .eq(JkCabinet::getCode,dto.getCode())
@@ -1198,6 +1219,21 @@
                            .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                    JkCabinetLog cabinetLog = new JkCabinetLog();
                    cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
                    cabinetLog.setGridId(jkCabinetGrid.getId());
                    cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
                    cabinetLog.setCarId(jkCabinetGrid.getCarId());
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    cabinetLog.setType(Constants.ONE);
                    cabinetLog.setStatus(Constants.ZERO);
                    cabinetLog.setAuthType(3);
                    cabinetLog.setKeyStatus(Constants.TWO);
                    cabinetLog.setIsNotice(Constants.ZERO);
                    cabinetLog.setInfo("硬件同步-钥匙不在位");
                    cabinetLog.setIsdeleted(Constants.ZERO);
                    cabinetLog.setCreateDate(new Date());
                    jkCabinetLogMapper.insert(cabinetLog);
                }
            }else{
                if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
@@ -1206,6 +1242,21 @@
                            .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
                    );
                    log.error("钥匙柜信息推送实际钥匙变化："+jkCabinetGrid.getKeyCode());
                    JkCabinetLog cabinetLog = new JkCabinetLog();
                    cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
                    cabinetLog.setGridId(jkCabinetGrid.getId());
                    cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
                    cabinetLog.setCarId(jkCabinetGrid.getCarId());
                    cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
                    cabinetLog.setType(Constants.ONE);
                    cabinetLog.setStatus(Constants.ZERO);
                    cabinetLog.setAuthType(3);
                    cabinetLog.setKeyStatus(Constants.ONE);
                    cabinetLog.setIsNotice(Constants.ZERO);
                    cabinetLog.setInfo("硬件同步-钥匙在位");
                    cabinetLog.setIsdeleted(Constants.ZERO);
                    cabinetLog.setCreateDate(new Date());
                    jkCabinetLogMapper.insert(cabinetLog);
                }
            }
//            if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())