server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -398,7 +398,7 @@ maxMonth = DateUtil.getNowMonthNum(); } for (int i = maxMonth; i >0 ; i--) { dateList.add(inParkDataDTO.getDateStr()+"-"+ StringUtils.leftPad(i+"",2,"0")); dateList.add(DateUtil.getNowYearNum()+"-"+ StringUtils.leftPad(i+"",2,"0")); } }else { //日期 @@ -554,31 +554,25 @@ @Override public TelecomInParkDataVO getInParkDataForTelecom(){ TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO(); telecomInParkDataVO.setInCarNum(Constants.ZERO); telecomInParkDataVO.setInUserNum(Constants.ZERO); List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>() telecomInParkDataVO.setInCarNum( inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>() .selectAll(InoutRecord.class) .eq(InoutRecord::getIsdeleted,Constants.ZERO) .eq(InoutRecord::getInOrOut,Constants.ZERO) .isNotNull(InoutRecord::getCarCode) .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listCar)){ telecomInParkDataVO.setInCarNum( new HashSet<>(listCar.stream().map(i->i.getCarCode()).collect(Collectors.toList())).size() ); } .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ") .groupBy(InoutRecord::getCarCode) ).intValue()); List<InoutRecord> listUser = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>() telecomInParkDataVO.setInUserNum( inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>() .selectAll(InoutRecord.class) .eq(InoutRecord::getIsdeleted,Constants.ZERO) .eq(InoutRecord::getInOrOut,Constants.ZERO) .isNotNull(InoutRecord::getMemberPhone) .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listUser)){ telecomInParkDataVO.setInUserNum( new HashSet<>(listUser.stream().map(i->i.getMemberPhone()).collect(Collectors.toList())).size() ); } .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ") .groupBy(InoutRecord::getMemberPhone) ).intValue()); return telecomInParkDataVO; }
@@ -771,20 +771,20 @@ map.put("is_start_trigger","true"); map.put("data",this.getJdyChildData(warningEvent,ddUserId)); OkHttpClient client = new OkHttpClient().newBuilder() .build(); MediaType mediaType = MediaType.parse("application/json"); RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(map));//"{\"data\":{\"notice_time\":{\"value\":\"2025-12-23 04:56:29\"},\"title\":{\"value\":\"跨越生产线\"},\"user\":{\"value\":\"1568490244651036\"},\"content\":{\"value\":\"跨越生产线-芜湖物流中心北围墙过道东\"},\"notice_type\":{\"value\":\"跨越生产线\"}},\"is_start_trigger\":\"true\",\"app_id\":\"6909d0fbdb93b068192dc4a9\",\"entry_id\":\"694a19ecf57e071788efc20b\",\"is_start_workflow\":\"false\"}"); log.error("简道云发送通知请求信息" + JSONObject.toJSONString(map)); Request request = new Request.Builder() .url("https://api.jiandaoyun.com/api/v5/app/entry/data/create") .method("POST", body) .addHeader("Authorization", "Bearer "+jdyApiKey) .addHeader("Content-Type", "application/json") .build(); Response response = client.newCall(request).execute(); log.error("简道云发送通知返回信息" + JSONObject.toJSONString(response)); // OkHttpClient client = new OkHttpClient().newBuilder() // .build(); // MediaType mediaType = MediaType.parse("application/json"); // RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(map));//"{\"data\":{\"notice_time\":{\"value\":\"2025-12-23 04:56:29\"},\"title\":{\"value\":\"跨越生产线\"},\"user\":{\"value\":\"1568490244651036\"},\"content\":{\"value\":\"跨越生产线-芜湖物流中心北围墙过道东\"},\"notice_type\":{\"value\":\"跨越生产线\"}},\"is_start_trigger\":\"true\",\"app_id\":\"6909d0fbdb93b068192dc4a9\",\"entry_id\":\"694a19ecf57e071788efc20b\",\"is_start_workflow\":\"false\"}"); // log.error("简道云发送通知请求信息" + JSONObject.toJSONString(map)); // Request request = new Request.Builder() // .url("https://api.jiandaoyun.com/api/v5/app/entry/data/create") // .method("POST", body) // .addHeader("Authorization", "Bearer "+jdyApiKey) // .addHeader("Content-Type", "application/json") // .build(); // Response response = client.newCall(request).execute(); // // log.error("简道云发送通知返回信息" + JSONObject.toJSONString(response)); }
@@ -2124,10 +2124,6 @@ } @Override public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){ //人员信息
