diff --git a/cjy-project/src/main/java/com/cjy/enterpriseData/service/impl/EnterpriseDataCenterHotelGuestsServiceImpl.java b/cjy-project/src/main/java/com/cjy/enterpriseData/service/impl/EnterpriseDataCenterHotelGuestsServiceImpl.java index a35d23d4..10517010 100644 --- a/cjy-project/src/main/java/com/cjy/enterpriseData/service/impl/EnterpriseDataCenterHotelGuestsServiceImpl.java +++ b/cjy-project/src/main/java/com/cjy/enterpriseData/service/impl/EnterpriseDataCenterHotelGuestsServiceImpl.java @@ -12,96 +12,90 @@ import com.cjy.enterprisedata.service.IEnterpriseDataCenterHotelGuestsService; /** * 酒店客人信息Service业务层处理 - * + * * @author hehang * @date 2023-03-03 */ @Service -public class EnterpriseDataCenterHotelGuestsServiceImpl implements IEnterpriseDataCenterHotelGuestsService -{ - @Autowired - private EnterpriseDataCenterHotelGuestsMapper enterpriseDataCenterHotelGuestsMapper; +public class EnterpriseDataCenterHotelGuestsServiceImpl implements IEnterpriseDataCenterHotelGuestsService { + @Autowired + private EnterpriseDataCenterHotelGuestsMapper enterpriseDataCenterHotelGuestsMapper; - @Autowired - private TicketingSellTouristsPortraitMapper ticketingSellTouristsPortraitMapper; + @Autowired + private TicketingSellTouristsPortraitMapper ticketingSellTouristsPortraitMapper; - /** - * 查询酒店客人信息 - * - * @param id 酒店客人信息主键 - * @return 酒店客人信息 - */ - @Override - public EnterpriseDataCenterHotelGuests selectEnterpriseDataCenterHotelGuestsById(Long id) - { - return enterpriseDataCenterHotelGuestsMapper.selectEnterpriseDataCenterHotelGuestsById(id); - } + /** + * 查询酒店客人信息 + * + * @param id 酒店客人信息主键 + * @return 酒店客人信息 + */ + @Override + public EnterpriseDataCenterHotelGuests selectEnterpriseDataCenterHotelGuestsById(Long id) { + return enterpriseDataCenterHotelGuestsMapper.selectEnterpriseDataCenterHotelGuestsById(id); + } - /** - * 查询酒店客人信息列表 - * - * @param enterpriseDataCenterHotelGuests 酒店客人信息 - * @return 酒店客人信息 - */ - @Override - public List selectEnterpriseDataCenterHotelGuestsList(EnterpriseDataCenterHotelGuests enterpriseDataCenterHotelGuests) - { - List list =enterpriseDataCenterHotelGuestsMapper.selectEnterpriseDataCenterHotelGuestsList(enterpriseDataCenterHotelGuests); - list.stream().forEach(e -> { + /** + * 查询酒店客人信息列表 + * + * @param enterpriseDataCenterHotelGuests 酒店客人信息 + * @return 酒店客人信息 + */ + @Override + public List selectEnterpriseDataCenterHotelGuestsList(EnterpriseDataCenterHotelGuests enterpriseDataCenterHotelGuests) { + List list = enterpriseDataCenterHotelGuestsMapper.selectEnterpriseDataCenterHotelGuestsList(enterpriseDataCenterHotelGuests); + list.stream().forEach(e -> { + e.setDocumentsNumber( e.getDocumentsNumber().substring(0, 7) + "****" + e.getDocumentsNumber().substring(11, e.getDocumentsNumber().length())); e.setCity(ticketingSellTouristsPortraitMapper.getRegionName(e.getCity())); - e.setProvince(ticketingSellTouristsPortraitMapper.getRegionName(e.getProvince())); - }); + e.setProvince(ticketingSellTouristsPortraitMapper.getRegionName(e.getProvince())); + }); - return list; - } + return list; + } - /** - * 新增酒店客人信息 - * - * @param enterpriseDataCenterHotelGuests 酒店客人信息 - * @return 结果 - */ - @Override - public int insertEnterpriseDataCenterHotelGuests(EnterpriseDataCenterHotelGuests enterpriseDataCenterHotelGuests) - { - enterpriseDataCenterHotelGuests.setCreateTime(DateUtils.getNowDate()); - return enterpriseDataCenterHotelGuestsMapper.insertEnterpriseDataCenterHotelGuests(enterpriseDataCenterHotelGuests); - } + /** + * 新增酒店客人信息 + * + * @param enterpriseDataCenterHotelGuests 酒店客人信息 + * @return 结果 + */ + @Override + public int insertEnterpriseDataCenterHotelGuests(EnterpriseDataCenterHotelGuests enterpriseDataCenterHotelGuests) { + enterpriseDataCenterHotelGuests.setCreateTime(DateUtils.getNowDate()); + return enterpriseDataCenterHotelGuestsMapper.insertEnterpriseDataCenterHotelGuests(enterpriseDataCenterHotelGuests); + } - /** - * 修改酒店客人信息 - * - * @param enterpriseDataCenterHotelGuests 酒店客人信息 - * @return 结果 - */ - @Override - public int updateEnterpriseDataCenterHotelGuests(EnterpriseDataCenterHotelGuests enterpriseDataCenterHotelGuests) - { - enterpriseDataCenterHotelGuests.setUpdateTime(DateUtils.getNowDate()); - return enterpriseDataCenterHotelGuestsMapper.updateEnterpriseDataCenterHotelGuests(enterpriseDataCenterHotelGuests); - } + /** + * 修改酒店客人信息 + * + * @param enterpriseDataCenterHotelGuests 酒店客人信息 + * @return 结果 + */ + @Override + public int updateEnterpriseDataCenterHotelGuests(EnterpriseDataCenterHotelGuests enterpriseDataCenterHotelGuests) { + enterpriseDataCenterHotelGuests.setUpdateTime(DateUtils.getNowDate()); + return enterpriseDataCenterHotelGuestsMapper.updateEnterpriseDataCenterHotelGuests(enterpriseDataCenterHotelGuests); + } - /** - * 批量删除酒店客人信息 - * - * @param ids 需要删除的酒店客人信息主键 - * @return 结果 - */ - @Override - public int deleteEnterpriseDataCenterHotelGuestsByIds(Long[] ids) - { - return enterpriseDataCenterHotelGuestsMapper.deleteEnterpriseDataCenterHotelGuestsByIds(ids); - } + /** + * 批量删除酒店客人信息 + * + * @param ids 需要删除的酒店客人信息主键 + * @return 结果 + */ + @Override + public int deleteEnterpriseDataCenterHotelGuestsByIds(Long[] ids) { + return enterpriseDataCenterHotelGuestsMapper.deleteEnterpriseDataCenterHotelGuestsByIds(ids); + } - /** - * 删除酒店客人信息信息 - * - * @param id 酒店客人信息主键 - * @return 结果 - */ - @Override - public int deleteEnterpriseDataCenterHotelGuestsById(Long id) - { - return enterpriseDataCenterHotelGuestsMapper.deleteEnterpriseDataCenterHotelGuestsById(id); - } + /** + * 删除酒店客人信息信息 + * + * @param id 酒店客人信息主键 + * @return 结果 + */ + @Override + public int deleteEnterpriseDataCenterHotelGuestsById(Long id) { + return enterpriseDataCenterHotelGuestsMapper.deleteEnterpriseDataCenterHotelGuestsById(id); + } } diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/controller/OperationDataReportController.java b/cjy-project/src/main/java/com/cjy/operationdatareport/controller/OperationDataReportController.java new file mode 100644 index 00000000..c8da636e --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/controller/OperationDataReportController.java @@ -0,0 +1,68 @@ +package com.cjy.operationdatareport.controller; + +import com.cjy.common.groups.DefaultGroup; +import com.cjy.operationdatareport.dto.AlarmStatisticsDTO; +import com.cjy.operationdatareport.dto.EventStatisticsDTO; +import com.cjy.operationdatareport.service.OperationDataReportService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +@RequestMapping("/operationDataReport") +@RestController +public class OperationDataReportController extends BaseController { + @Autowired + OperationDataReportService operationDataReportService; + + /** + * 旅游资源统计 + * + * @return + */ + @GetMapping("/getTravelResourcesStatistics") + public AjaxResult getTravelResourcesStatistics(@RequestParam("resourceGrouping") List resourceGrouping, @RequestParam("dataType") List dataType) { + Map map = operationDataReportService.getTravelResourcesStatistics(getUserOrganCode(), resourceGrouping, dataType); + return success(map); + } + + /** + * 物联设备统计 + * + * @return + */ + @GetMapping("/getIotDeviceStatistics") + public AjaxResult getIotDeviceStatistics(@RequestParam("deviceType") List deviceType) { + return success(operationDataReportService.getIotDeviceStatistics(getUserOrganCode(), deviceType)); + } + + /** + * 告警统计报表 + * + * @return + */ + @PostMapping("/getAlarmStatistics") + public AjaxResult getAlarmStatistics(@Validated({DefaultGroup.class}) @RequestBody AlarmStatisticsDTO alarmStatisticsDTO) { + alarmStatisticsDTO.setOrganCode(getUserOrganCode()); + return success(operationDataReportService.getAlarmStatistics(alarmStatisticsDTO)); + } + + /** + * 事件统计报表 + * + * @return + */ + @PostMapping("/getEventStatistics") + public AjaxResult getEventStatistics(@Validated({DefaultGroup.class}) @RequestBody EventStatisticsDTO eventStatisticsDTO) { + eventStatisticsDTO.setOrganCode(getUserOrganCode()); + return success(operationDataReportService.getEventStatistics(eventStatisticsDTO)); + } +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/dto/AlarmStatisticsDTO.java b/cjy-project/src/main/java/com/cjy/operationdatareport/dto/AlarmStatisticsDTO.java new file mode 100644 index 00000000..73100d1d --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/dto/AlarmStatisticsDTO.java @@ -0,0 +1,83 @@ +package com.cjy.operationdatareport.dto; + +import com.cjy.common.groups.DefaultGroup; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public class AlarmStatisticsDTO { + //警源类型 + private List policeSourceType; + //警情分组 + private List policeGroup; + //警情类型 + private List policeType; + //告警状态 + private List alarmStatus; + @NotBlank(message = "开始时间不得为空", groups = {DefaultGroup.class }) + private String startDate; + @NotBlank(message = "结束时间不得为空", groups = {DefaultGroup.class }) + private String endDate; + private Long organCode; + + + public List getPoliceSourceType() { + return policeSourceType; + } + + public void setPoliceSourceType(List policeSourceType) { + this.policeSourceType = policeSourceType; + } + + public List getPoliceGroup() { + return policeGroup; + } + + public void setPoliceGroup(List policeGroup) { + this.policeGroup = policeGroup; + } + + public List getPoliceType() { + return policeType; + } + + public void setPoliceType(List policeType) { + this.policeType = policeType; + } + + public List getAlarmStatus() { + return alarmStatus; + } + + public void setAlarmStatus(List alarmStatus) { + this.alarmStatus = alarmStatus; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public Long getOrganCode() { + return organCode; + } + + public void setOrganCode(Long organCode) { + this.organCode = organCode; + } +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/dto/EventStatisticsDTO.java b/cjy-project/src/main/java/com/cjy/operationdatareport/dto/EventStatisticsDTO.java new file mode 100644 index 00000000..da24d5ae --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/dto/EventStatisticsDTO.java @@ -0,0 +1,70 @@ +package com.cjy.operationdatareport.dto; + +import com.cjy.common.groups.DefaultGroup; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public class EventStatisticsDTO { + private List oneGradeTypeCode; + private List towGradeTypeCode; + private List eventLevel; + + @NotBlank(message = "开始时间不得为空", groups = {DefaultGroup.class}) + private String startDate; + @NotBlank(message = "结束时间不得为空", groups = {DefaultGroup.class}) + private String endDate; + private Long organCode; + + public List getOneGradeTypeCode() { + return oneGradeTypeCode; + } + + public void setOneGradeTypeCode(List oneGradeTypeCode) { + this.oneGradeTypeCode = oneGradeTypeCode; + } + + public List getTowGradeTypeCode() { + return towGradeTypeCode; + } + + public void setTowGradeTypeCode(List towGradeTypeCode) { + this.towGradeTypeCode = towGradeTypeCode; + } + + public List getEventLevel() { + return eventLevel; + } + + public void setEventLevel(List eventLevel) { + this.eventLevel = eventLevel; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public Long getOrganCode() { + return organCode; + } + + public void setOrganCode(Long organCode) { + this.organCode = organCode; + } +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/mapper/OperationDataReportMapper.java b/cjy-project/src/main/java/com/cjy/operationdatareport/mapper/OperationDataReportMapper.java new file mode 100644 index 00000000..6df2124d --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/mapper/OperationDataReportMapper.java @@ -0,0 +1,50 @@ +package com.cjy.operationdatareport.mapper; + +import com.cjy.operationdatareport.dto.AlarmStatisticsDTO; +import com.cjy.operationdatareport.dto.EventStatisticsDTO; +import com.cjy.operationdatareport.vo.AlarmStatisticsVO; +import com.cjy.operationdatareport.vo.EventStatisticsVO; +import com.cjy.operationdatareport.vo.IotDeviceStatistics; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public interface OperationDataReportMapper { + /** + * 物联设备统计 + * + * @param organCode + * @return + */ + List getIotDeviceStatistics(@Param("organCode") Long organCode, @Param("list") List deviceType); + + /** + * 旅游资源统计 + * + * @param organCode + * @param dictValue + * @param dataType + * @return + */ + List> selectBasicResourceCount(@Param("organCode") Long organCode, @Param("dictValue") String dictValue, @Param("list") List dataType); + + /** + * 告警统计报表 + * + * @param alarmStatisticsDTO + * @return + */ + List getAlarmStatistics(AlarmStatisticsDTO alarmStatisticsDTO); + + /** + * 事件统计报表 + * @param eventStatisticsDTO + * @return + */ + List getEventStatistics(EventStatisticsDTO eventStatisticsDTO); +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/service/OperationDataReportService.java b/cjy-project/src/main/java/com/cjy/operationdatareport/service/OperationDataReportService.java new file mode 100644 index 00000000..3a49eed5 --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/service/OperationDataReportService.java @@ -0,0 +1,47 @@ +package com.cjy.operationdatareport.service; + +import com.cjy.operationdatareport.dto.AlarmStatisticsDTO; +import com.cjy.operationdatareport.dto.EventStatisticsDTO; +import com.cjy.operationdatareport.vo.AlarmStatisticsVO; +import com.cjy.operationdatareport.vo.EventStatisticsVO; +import com.cjy.operationdatareport.vo.IotDeviceStatistics; + +import java.util.List; +import java.util.Map; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public interface OperationDataReportService { + /** + * 旅游资源统计 + * + * @param organCode + * @return + */ + Map getTravelResourcesStatistics(Long organCode, List resourceGrouping, List dataType); + + /** + * 物联设备统计 + * + * @param organCode + * @return + */ + List getIotDeviceStatistics(Long organCode, List deviceType); + + /** + * 告警统计报表 + * + * @param alarmStatisticsDTO + * @return + */ + List getAlarmStatistics(AlarmStatisticsDTO alarmStatisticsDTO); + + /** + * 事件统计报表 + * @param eventStatisticsDTO + * @return + */ + List getEventStatistics(EventStatisticsDTO eventStatisticsDTO); +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/service/impl/OperationDataReportServiceImpl.java b/cjy-project/src/main/java/com/cjy/operationdatareport/service/impl/OperationDataReportServiceImpl.java new file mode 100644 index 00000000..162d8e4c --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/service/impl/OperationDataReportServiceImpl.java @@ -0,0 +1,94 @@ +package com.cjy.operationdatareport.service.impl; + +import com.cjy.operationdatareport.dto.AlarmStatisticsDTO; +import com.cjy.operationdatareport.dto.EventStatisticsDTO; +import com.cjy.operationdatareport.mapper.OperationDataReportMapper; +import com.cjy.operationdatareport.service.OperationDataReportService; +import com.cjy.operationdatareport.vo.AlarmStatisticsVO; +import com.cjy.operationdatareport.vo.EventStatisticsVO; +import com.cjy.operationdatareport.vo.IotDeviceStatistics; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.system.mapper.SysDictDataMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +@Service +public class OperationDataReportServiceImpl implements OperationDataReportService { + @Autowired + private SysDictDataMapper selectDictDataByType; + @Autowired + OperationDataReportMapper operationDataReportMapper; + + + /** + * 旅游资源统计 + * + * @param organCode + * @return + */ + @Override + public Map getTravelResourcesStatistics(Long organCode, List resourceGrouping, List dataType) { + List> list = new ArrayList<>(); + List dictDatas = new ArrayList<>(); + if (resourceGrouping.isEmpty()) { + dictDatas = selectDictDataByType.selectDictDataByType("basic_resources_type"); + } else { + dictDatas = selectDictDataByType.selectDictDataByTypeAndDictValue("basic_resources_type", resourceGrouping); + } + Map map = null; + for (SysDictData dictData : dictDatas) { + map = new HashMap<>(); + String dictValue = dictData.getDictValue(); + List> countList = operationDataReportMapper.selectBasicResourceCount(organCode, dictValue, dataType); + map.put("name", dictData.getDictLabel()); + map.put("child", countList); + list.add(map); + } + Map resultMap = new HashMap<>(); + + resultMap.put("resultList", list); + return resultMap; + } + + /** + * 物联设备统计 + * + * @param organCode + * @return + */ + @Override + public List getIotDeviceStatistics(Long organCode, List deviceType) { + return operationDataReportMapper.getIotDeviceStatistics(organCode, deviceType); + } + + /** + * 告警统计报表 + * + * @param alarmStatisticsDTO + * @return + */ + @Override + public List getAlarmStatistics(AlarmStatisticsDTO alarmStatisticsDTO) { + return operationDataReportMapper.getAlarmStatistics(alarmStatisticsDTO); + } + + /** + * 事件统计报表 + * + * @param eventStatisticsDTO + * @return + */ + @Override + public List getEventStatistics(EventStatisticsDTO eventStatisticsDTO) { + return operationDataReportMapper.getEventStatistics(eventStatisticsDTO); + } +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/vo/AlarmStatisticsVO.java b/cjy-project/src/main/java/com/cjy/operationdatareport/vo/AlarmStatisticsVO.java new file mode 100644 index 00000000..a2172832 --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/vo/AlarmStatisticsVO.java @@ -0,0 +1,67 @@ +package com.cjy.operationdatareport.vo; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public class AlarmStatisticsVO { + private String total; + //警情分类 + private String alertTypeName; + //警情分组 + private String policeGroupName; + //状态 + private String status; + //警源类型 + private String policeSourceTypeName; + //日期 + private String date; + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public String getAlertTypeName() { + return alertTypeName; + } + + public void setAlertTypeName(String alertTypeName) { + this.alertTypeName = alertTypeName; + } + + public String getPoliceGroupName() { + return policeGroupName; + } + + public void setPoliceGroupName(String policeGroupName) { + this.policeGroupName = policeGroupName; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getPoliceSourceTypeName() { + return policeSourceTypeName; + } + + public void setPoliceSourceTypeName(String policeSourceTypeName) { + this.policeSourceTypeName = policeSourceTypeName; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/vo/EventStatisticsVO.java b/cjy-project/src/main/java/com/cjy/operationdatareport/vo/EventStatisticsVO.java new file mode 100644 index 00000000..a0978c64 --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/vo/EventStatisticsVO.java @@ -0,0 +1,53 @@ +package com.cjy.operationdatareport.vo; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public class EventStatisticsVO { + private String total; + private String towGradeTypeName; + private String oneGradeTypeName; + private String date; + private String eventLevel; + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public String getTowGradeTypeName() { + return towGradeTypeName; + } + + public void setTowGradeTypeName(String towGradeTypeName) { + this.towGradeTypeName = towGradeTypeName; + } + + public String getOneGradeTypeName() { + return oneGradeTypeName; + } + + public void setOneGradeTypeName(String oneGradeTypeName) { + this.oneGradeTypeName = oneGradeTypeName; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getEventLevel() { + return eventLevel; + } + + public void setEventLevel(String eventLevel) { + this.eventLevel = eventLevel; + } +} diff --git a/cjy-project/src/main/java/com/cjy/operationdatareport/vo/IotDeviceStatistics.java b/cjy-project/src/main/java/com/cjy/operationdatareport/vo/IotDeviceStatistics.java new file mode 100644 index 00000000..b811a622 --- /dev/null +++ b/cjy-project/src/main/java/com/cjy/operationdatareport/vo/IotDeviceStatistics.java @@ -0,0 +1,37 @@ +package com.cjy.operationdatareport.vo; + +/** + * @author liangjiawei + * @createDate 2023/3/20 + */ +public class IotDeviceStatistics { + private String name; + //设备数量 + private String equipmentNumber; + //故障数量 + private String faultNumber; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEquipmentNumber() { + return equipmentNumber; + } + + public void setEquipmentNumber(String equipmentNumber) { + this.equipmentNumber = equipmentNumber; + } + + public String getFaultNumber() { + return faultNumber; + } + + public void setFaultNumber(String faultNumber) { + this.faultNumber = faultNumber; + } +} diff --git a/cjy-project/src/main/resources/mapper/operationdatareport/OperationDataReportMapper.xml b/cjy-project/src/main/resources/mapper/operationdatareport/OperationDataReportMapper.xml new file mode 100644 index 00000000..4b4eb3e1 --- /dev/null +++ b/cjy-project/src/main/resources/mapper/operationdatareport/OperationDataReportMapper.xml @@ -0,0 +1,170 @@ + + + + + + + + + + \ No newline at end of file diff --git a/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml b/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml index b7e3b4bd..babf1fdb 100644 --- a/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml +++ b/cjy-project/src/main/resources/mapper/parking/ParkingTurnoverDataMapper.xml @@ -131,8 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN b_public_service_info p ON ptd.parking_lot_id = p.id and ptd.parking_lot_id = #{parkingLotId} - and ptd.travel_time - between #{startDate} and #{endDate} + + and DATE_FORMAT( ptd.travel_time, '%Y-%m-%d' ) between #{startDate} and #{endDate} and ptd.cutscene_type = #{cutsceneType} and ptd.vehicle_type = #{vehicleType} @@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ptd.parking_lot_id = #{parkingLotId} - and ptd.travel_time between #{startDate} and #{endDate} + and DATE_FORMAT( ptd.travel_time, '%Y-%m-%d' ) between #{startDate} and #{endDate} and ptd.del_flag!=2 and ptd.cutscene_type='2' diff --git a/cjy-project/src/main/resources/mapper/ticketing/TicketingSalesFlowMapper.xml b/cjy-project/src/main/resources/mapper/ticketing/TicketingSalesFlowMapper.xml index dfa0eaed..2014be55 100644 --- a/cjy-project/src/main/resources/mapper/ticketing/TicketingSalesFlowMapper.xml +++ b/cjy-project/src/main/resources/mapper/ticketing/TicketingSalesFlowMapper.xml @@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ticketing_sales_flow sf LEFT JOIN ticketing_manage_main_part_info mmpi ON sf.manage_main_part_id = mmpi.id - and sf.sale_date between #{startDate} and #{endDate} + and DATE_FORMAT( sf.sale_date, '%Y-%m-%d' ) between #{startDate} and #{endDate} and sf.manage_main_part_id = #{manageMainPartId} and sf.channel_type = #{channelType} and sf.organ_code = #{organCode} diff --git a/cjy-project/src/main/resources/mapper/ticketing/TicketingSellTouristsPortraitMapper.xml b/cjy-project/src/main/resources/mapper/ticketing/TicketingSellTouristsPortraitMapper.xml index 8628ab81..975c2b73 100644 --- a/cjy-project/src/main/resources/mapper/ticketing/TicketingSellTouristsPortraitMapper.xml +++ b/cjy-project/src/main/resources/mapper/ticketing/TicketingSellTouristsPortraitMapper.xml @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ticketing_manage_main_part_info mmpi ON st.manage_main_part_id = mmpi.id - and st.sell_date between #{startDate} and #{endDate} + and DATE_FORMAT( st.sell_date, '%Y-%m-%d' ) between #{startDate} and #{endDate} and st.age between #{startAge} and #{endAge} and st.manage_main_part_id = #{manageMainPartId} and st.sex = #{sex} diff --git a/cjy-project/src/main/resources/mapper/ticketing/TicketingTicketCheckFlowMapper.xml b/cjy-project/src/main/resources/mapper/ticketing/TicketingTicketCheckFlowMapper.xml index 5ae8294d..36df6a0a 100644 --- a/cjy-project/src/main/resources/mapper/ticketing/TicketingTicketCheckFlowMapper.xml +++ b/cjy-project/src/main/resources/mapper/ticketing/TicketingTicketCheckFlowMapper.xml @@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ticketing_site s ON tc.site_id = s.id LEFT JOIN ticketing_equipment e ON tc.equipment_id = e.id - and tc.ticket_check_date between #{startDate} and #{endDate} + and DATE_FORMAT( tc.ticket_check_date, '%Y-%m-%d' ) between #{startDate} and #{endDate} and tc.resource_id = #{resourceId} and tc.attractions_id = #{attractionsId} and tc.site_id = #{siteId} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index a341f1e3..e4ce1074 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -27,6 +27,14 @@ public interface SysDictDataMapper */ public List selectDictDataByType(String dictType); + /** + * 通过 dictType 和dictValue 获取数据 + * @param dictType + * @param list + * @return + */ + public List selectDictDataByTypeAndDictValue(@Param("dictType") String dictType,@Param("list") List list); + /** * 根据字典类型和字典键值查询字典数据信息 * diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 8da9030b..f270c1e4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -59,7 +59,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + delete from sys_dict_data where dict_code = #{dictCode}