diff --git a/cjy-project/src/main/java/com/cjy/reservation/mapper/AppointmentStatisticsTaskMapper.java b/cjy-project/src/main/java/com/cjy/reservation/mapper/AppointmentStatisticsTaskMapper.java index f76531b4..4e955b8a 100644 --- a/cjy-project/src/main/java/com/cjy/reservation/mapper/AppointmentStatisticsTaskMapper.java +++ b/cjy-project/src/main/java/com/cjy/reservation/mapper/AppointmentStatisticsTaskMapper.java @@ -80,4 +80,6 @@ public interface AppointmentStatisticsTaskMapper { int getWriteOffPreviousHourDate(@Param("resourceCode") String resourceCode,@Param("startTime") String startTime, @Param("endTime") String endTime); ListselectTouristVerification (@Param("resourceCode") String resourceCode); + + int selectAppointmentsNumber(@Param("resourceCode") String resourceCode,@Param("startTime") String startTime,@Param("endTime") String endTime); } diff --git a/cjy-project/src/main/java/com/cjy/reservation/service/AppointmentStatisticsTaskService.java b/cjy-project/src/main/java/com/cjy/reservation/service/AppointmentStatisticsTaskService.java index 40f490e8..22157722 100644 --- a/cjy-project/src/main/java/com/cjy/reservation/service/AppointmentStatisticsTaskService.java +++ b/cjy-project/src/main/java/com/cjy/reservation/service/AppointmentStatisticsTaskService.java @@ -86,4 +86,12 @@ public interface AppointmentStatisticsTaskService { * @return */ ListselectTouristVerification(String resourceCode); + + /** + * + * 查询景区预约量 + * @param resourceCode + * @return + */ + int selectAppointmentsNumber(String resourceCode,String startTime,String endTime); } diff --git a/cjy-project/src/main/java/com/cjy/reservation/service/impl/AppointmentStatisticsTaskServiceImpl.java b/cjy-project/src/main/java/com/cjy/reservation/service/impl/AppointmentStatisticsTaskServiceImpl.java index 24ae17b6..3f53980d 100644 --- a/cjy-project/src/main/java/com/cjy/reservation/service/impl/AppointmentStatisticsTaskServiceImpl.java +++ b/cjy-project/src/main/java/com/cjy/reservation/service/impl/AppointmentStatisticsTaskServiceImpl.java @@ -118,4 +118,10 @@ public class AppointmentStatisticsTaskServiceImpl implements AppointmentStatisti return appointmentStatisticsTaskMapper.selectTouristVerification(resourceCode); } + + @Override + public int selectAppointmentsNumber(String resourceCode, String startTime, String endTime) { + + return appointmentStatisticsTaskMapper.selectAppointmentsNumber(resourceCode,startTime,endTime); + } } diff --git a/cjy-project/src/main/java/com/cjy/reservation/task/AppointmentStatisticsTask.java b/cjy-project/src/main/java/com/cjy/reservation/task/AppointmentStatisticsTask.java index ba709d82..15bf6ab4 100644 --- a/cjy-project/src/main/java/com/cjy/reservation/task/AppointmentStatisticsTask.java +++ b/cjy-project/src/main/java/com/cjy/reservation/task/AppointmentStatisticsTask.java @@ -72,14 +72,14 @@ public class AppointmentStatisticsTask { //每小时的小时 第五分钟执行 上上小时到上小时的数据 public void getHourAppointmentLiveData() { - //需要前提条件 就是两个系统的名称要一样因为 没有同步景区id所以 只能使用名称来做数据管理 - //获取到前一小时 到 当前小时 核销的数量（即入园）和在园数 预约数是创建日期是他的吗 - String startTime = DateUtils.getNHoursAgo(1); - String endTime = DateUtils.getNHoursAgo(0); - List> list = appointmentStatisticsTaskService.getHourAppointmentLiveData(startTime, endTime); - // - list.stream().forEach(item -> { - if (item.get("resourceCode") != null && !item.get("resourceCode").toString().isEmpty()) { + List> list = appointmentStatisticsTaskService.getResourceCodeList(); + list.stream().forEach(item ->{ + if(null !=item.get("resourceCode")){ + // 查询预约量 + String startTime = DateUtils.getNHoursAgo(1); + String endTime = DateUtils.getNHoursAgo(0); + int appointmentNum = appointmentStatisticsTaskService.selectAppointmentsNumber(item.get("resourceCode")+"",startTime,endTime); + // 查询核销量 int writeOffCount = appointmentStatisticsTaskService.getWriteOffPreviousHourDate(item.get("resourceCode").toString(), startTime, endTime); ReservationHour reservationHour = new ReservationHour(); reservationHour.setResourceCode(Long.parseLong(item.get("resourceCode").toString())); @@ -90,7 +90,7 @@ public class AppointmentStatisticsTask { reservationHour.setUpdateTime(DateUtils.getNowDate()); reservationHour.setDelFlag("0"); reservationHour.setDataSources("2"); - reservationHour.setPrebookNum(Integer.parseInt(item.get("appointmentNumber").toString())); + reservationHour.setPrebookNum(appointmentNum); reservationHour.setInNum(writeOffCount); reservationHour.setIntoNum(writeOffCount); reservationHour.setHour(Integer.parseInt(endTime.split(":")[0])); @@ -98,6 +98,32 @@ public class AppointmentStatisticsTask { reservationHourService.insertReservationHour(reservationHour); } }); +// //需要前提条件 就是两个系统的名称要一样因为 没有同步景区id所以 只能使用名称来做数据管理 +// //获取到前一小时 到 当前小时 核销的数量（即入园）和在园数 预约数是创建日期是他的吗 +// String startTime = DateUtils.getNHoursAgo(1); +// String endTime = DateUtils.getNHoursAgo(0); +// List> list = appointmentStatisticsTaskService.getHourAppointmentLiveData(startTime, endTime); +// // +// list.stream().forEach(item -> { +// if (item.get("resourceCode") != null && !item.get("resourceCode").toString().isEmpty()) { +// int writeOffCount = appointmentStatisticsTaskService.getWriteOffPreviousHourDate(item.get("resourceCode").toString(), startTime, endTime); +// ReservationHour reservationHour = new ReservationHour(); +// reservationHour.setResourceCode(Long.parseLong(item.get("resourceCode").toString())); +// reservationHour.setOrganCode(Long.parseLong(item.get("organCode").toString())); +// reservationHour.setCreateBy(1 + ""); +// reservationHour.setCreateTime(DateUtils.getNowDate()); +// reservationHour.setUpdateBy(1 + ""); +// reservationHour.setUpdateTime(DateUtils.getNowDate()); +// reservationHour.setDelFlag("0"); +// reservationHour.setDataSources("2"); +// reservationHour.setPrebookNum(Integer.parseInt(item.get("appointmentNumber").toString())); +// reservationHour.setInNum(writeOffCount); +// reservationHour.setIntoNum(writeOffCount); +// reservationHour.setHour(Integer.parseInt(endTime.split(":")[0])); +// //在插入 +// reservationHourService.insertReservationHour(reservationHour); +// } +// }); } public void getSexAppointmentLiveData() { diff --git a/cjy-project/src/main/resources/mapper/marketingdata/MarketingWechatMicroblogInfoMapper.xml b/cjy-project/src/main/resources/mapper/marketingdata/MarketingWechatMicroblogInfoMapper.xml index e4c04b75..1102480b 100644 --- a/cjy-project/src/main/resources/mapper/marketingdata/MarketingWechatMicroblogInfoMapper.xml +++ b/cjy-project/src/main/resources/mapper/marketingdata/MarketingWechatMicroblogInfoMapper.xml @@ -279,7 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by statistics_time order by statistics_time desc limit 7 diff --git a/cjy-project/src/main/resources/mapper/reservationAge/AppointmentStatisticsTaskMapper.xml b/cjy-project/src/main/resources/mapper/reservationAge/AppointmentStatisticsTaskMapper.xml index 1bc3e866..5059da19 100644 --- a/cjy-project/src/main/resources/mapper/reservationAge/AppointmentStatisticsTaskMapper.xml +++ b/cjy-project/src/main/resources/mapper/reservationAge/AppointmentStatisticsTaskMapper.xml @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select COUNT(*) FROM appointment_center_data t1 where 1=1 AND DATE_FORMAT( t1.appointment_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW(), '%Y-%m-%d' ) - AND DATE_FORMAT (t1.write_off_time,'%H:00') BETWEEN #{startTime} AND #{endTime} + AND DATE_FORMAT (t1.write_off_time,'%H:00') >= #{startTime} AND DATE_FORMAT (t1.write_off_time,'%H:00') < #{endTime} and t1.external_id=#{resourceCode} and t1.del_flag!=2 and source_type=1 @@ -111,4 +111,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file