From cdec9062c85f52d43e8d74e82cbcf9f8606ebb01 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Tue, 30 Jan 2024 16:39:59 +0800 Subject: [PATCH] chore:设备在线率接口提交 --- screen-api/src/main/java/com/moral/api/entity/HistoryMinutely.java | 37 +++ screen-api/src/main/java/com/moral/api/pojo/dust/OnlineRateLogsForm.java | 24 ++ screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java | 55 ++++ screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 9 screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 39 +++ screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java | 41 +++ screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 379 +++++++++++++++++++++++++++++++ screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java | 66 +++++ screen-api/src/main/java/com/moral/api/service/DeviceService.java | 19 + screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java | 1 screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java | 3 screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java | 13 + screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 18 + screen-api/src/main/resources/mapper/DeviceMapper.xml | 9 14 files changed, 713 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java b/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java new file mode 100644 index 0000000..c740dc3 --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java @@ -0,0 +1,55 @@ +package com.moral.api.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; +import javax.validation.Valid; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.moral.api.dto.OnlineRatePageCond; +import com.moral.api.service.DeviceService; +import com.moral.api.vo.OnlineRateVo; +import com.moral.constant.ResultMessage; + +/** + * Description //todo + * + * @author swb + * @ClassName DeviceOnlineRateController + * @date 2024.01.26 10:02 + */ +@RestController +@RequestMapping("/onlineRate") +@Api(tags = {"���������������"}) +public class DeviceOnlineRateController { + + @Autowired + private DeviceService deviceService; + + @PostMapping("/page") + @ApiOperation("������") + public ResultMessage page(@Valid @RequestBody OnlineRatePageCond onlineRatePageCond) { + List<OnlineRateVo> rsList = deviceService.getPage(onlineRatePageCond); +// PageResult<OnlineRateVo> result = new PageResult<>(page); +// result.setList(page.getRecords()); + return ResultMessage.ok(rsList); + } + + @GetMapping("/detail") + @ApiOperation("������") + public ResultMessage get(@RequestParam @ApiParam(value = "mac",name = "mac")String mac, + @RequestParam @ApiParam(value = "startTime",name = "������������") String startTime, + @RequestParam @ApiParam(value = "endTime",name = "������������") String endTime, + @RequestParam @ApiParam(value = "type",name = "������������") String type){ + Map<String, Object> detail = deviceService.detail(mac, startTime, endTime, type); + return ResultMessage.ok(detail); + } +} diff --git a/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java b/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java new file mode 100644 index 0000000..6f61fbb --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java @@ -0,0 +1,41 @@ +package com.moral.api.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +import com.moral.api.pojo.query.PageCond; + +/** + * Description //todo + * + * @author swb + * @ClassName OnlineRatePageCond + * @date 2024.01.26 11:04 + */ + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="OnlineRate - ������������������", description="OnlineRate - ������������������") +public class OnlineRatePageCond implements Serializable { + + + @ApiModelProperty(value = "������id") + private Integer organizationId; + +// @ApiModelProperty(value = "������������") +// private PageCond page; + + @ApiModelProperty(value = "������������") + private String startTime; + + @ApiModelProperty(value = "������������") + private String endTime; + + +} diff --git a/screen-api/src/main/java/com/moral/api/entity/HistoryMinutely.java b/screen-api/src/main/java/com/moral/api/entity/HistoryMinutely.java new file mode 100644 index 0000000..674c68c --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/entity/HistoryMinutely.java @@ -0,0 +1,37 @@ +package com.moral.api.entity; + +import lombok.Data; + +import java.util.Date; + +import com.baomidou.mybatisplus.extension.activerecord.Model; + +/** + * Description //todo + * + * @author swb + * @ClassName HistoryMinutely + * @date 2024.01.30 13:21 + */ +@Data +public class HistoryMinutely extends Model<HistoryMinutely> { + + + private static final long serialVersionUID = 1L; + + /** + * ������mac + */ + private String mac; + + /** + * ������ + */ + private Date time; + + /** + * ������ + */ + private String value; + +} diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java index 7492170..cc01854 100644 --- a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java +++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java @@ -4,10 +4,13 @@ import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.moral.api.entity.Device; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.moral.api.pojo.dto.dataDisplay.HeatMapDTO; import com.moral.api.pojo.vo.device.AppDeviceVo; +import com.moral.api.vo.OnlineRateVo; + import io.lettuce.core.dynamic.annotation.Param; /** @@ -45,4 +48,10 @@ List<HeatMapDTO> getHeatMapV1(HashMap<String,Object> params); + //��������������������� + Page<OnlineRateVo> getPage(Page page, @Param("organizationId")Integer organizationId); + + //������������������������ + List<OnlineRateVo> getList(@Param("organizationId")Integer organizationId); + } diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java index 19ce895..b4295db 100644 --- a/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java +++ b/screen-api/src/main/java/com/moral/api/mapper/HistoryHourlyMapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.moral.api.entity.HistoryHourly; +import com.moral.api.entity.HistoryMinutely; import com.moral.api.pojo.dto.Wind.WindData; import org.apache.ibatis.annotations.Param; @@ -46,4 +47,6 @@ List<HistoryHourly> listResult(Map<String, Object> params); List<HistoryHourly> listLikeResult(Map<String, Object> params); + + List<HistoryMinutely> HistoryMinutelyQuery(Map<String, Object> params); } diff --git a/screen-api/src/main/java/com/moral/api/pojo/dust/OnlineRateLogsForm.java b/screen-api/src/main/java/com/moral/api/pojo/dust/OnlineRateLogsForm.java new file mode 100644 index 0000000..e5056e9 --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/pojo/dust/OnlineRateLogsForm.java @@ -0,0 +1,24 @@ +package com.moral.api.pojo.dust; + +import lombok.Data; + +/** + * Description //todo + * + * @author swb + * @ClassName OnlineRateLogsForm + * @date 2024.01.30 09:37 + */ + +@Data +public class OnlineRateLogsForm { + + //������������ + private String date; + //������������ + private String startTime; + //������������ + private String endTime; + //������������ + private String mun; +} diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java index 75f9d36..c6ff674 100644 --- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java +++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java @@ -1,8 +1,11 @@ package com.moral.api.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.moral.api.dto.OnlineRatePageCond; import com.moral.api.entity.Device; import com.baomidou.mybatisplus.extension.service.IService; import com.moral.api.pojo.vo.device.AppDeviceVo; +import com.moral.api.vo.OnlineRateVo; import java.util.List; import java.util.Map; @@ -66,4 +69,20 @@ */ List<Device> getOrganizationDevice(Integer id); + /** + * ��������������� + * @param onlineRatePageCond + * @return + */ + List<OnlineRateVo> getPage(OnlineRatePageCond onlineRatePageCond); + + /** + * ��������������������� + * @param mac + * @param startTime + * @param endTime + * @param type + * @return + */ + Map<String,Object> detail(String mac,String startTime,String endTime, String type); } diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java index ba4b096..0825277 100644 --- a/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java +++ b/screen-api/src/main/java/com/moral/api/service/HistoryDailyService.java @@ -7,6 +7,7 @@ import com.moral.api.entity.Device; import com.moral.api.entity.HistoryDaily; import com.baomidou.mybatisplus.extension.service.IService; +import com.moral.api.entity.HistoryMinutely; /** * <p> diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java index 042f18f..3f2c42b 100644 --- a/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java +++ b/screen-api/src/main/java/com/moral/api/service/HistoryHourlyService.java @@ -1,6 +1,7 @@ package com.moral.api.service; import com.moral.api.entity.HistoryHourly; +import com.moral.api.entity.HistoryMinutely; import com.moral.api.vo.HistoryHourlyVo; import java.util.Date; @@ -125,4 +126,16 @@ boolean historyHourly(HistoryHourlyVo historyHourlyVo); + + + + /** + * @Description: ������������mac��������������������������������� + * @Param: [mac, startDate, endDate] + * @return: java.util.Map<java.lang.String,com.moral.api.entity.HistoryDaily> + * @Author: ��������� + * @Date: 2021/9/26 + */ + List<HistoryMinutely> getHistoryMinutely(String mac, Date startDate, Date endDate); + } diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java index 453be39..aae96af 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java @@ -4,32 +4,45 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.moral.api.config.Interceptor.UserHelper; import com.moral.api.config.mybatis.MybatisPlusConfig; +import com.moral.api.dto.OnlineRatePageCond; import com.moral.api.entity.*; import com.moral.api.mapper.DeviceMapper; import com.moral.api.mapper.HistoryFiveMinutelyMapper; import com.moral.api.mapper.HistoryHourlyMapper; import com.moral.api.mapper.OrganizationUnitAlarmMapper; import com.moral.api.mapper.UnitConversionMapper; +import com.moral.api.pojo.dust.OnlineRateLogsForm; import com.moral.api.pojo.vo.device.AppDeviceVo; import com.moral.api.pojo.vo.user.QxUser; import com.moral.api.service.DeviceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.moral.api.service.HistoryDailyService; +import com.moral.api.service.HistoryFiveMinutelyService; +import com.moral.api.service.HistoryHourlyService; +import com.moral.api.service.HistoryMonthlyService; import com.moral.api.service.SensorService; import com.moral.api.service.UnitConversionService; +import com.moral.api.vo.OnlineRateVo; import com.moral.constant.Constants; import com.moral.constant.RedisConstants; import com.moral.constant.SeparateTableType; import com.moral.util.DateUtils; import com.moral.util.MybatisPLUSUtils; +import com.sun.org.apache.regexp.internal.RE; + +import org.apache.commons.collections4.CollectionUtils; import org.apache.kafka.streams.state.internals.metrics.Sensors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -61,6 +74,12 @@ @Autowired HistoryHourlyMapper historyHourlyMapper; + + @Autowired + HistoryHourlyService historyHourlyService; + + @Autowired + HistoryDailyService historyDailyService; @Autowired HistoryFiveMinutelyMapper historyFiveMinutelyMapper; @@ -536,6 +555,366 @@ return devices; } + /** + * ��������� + * @param onlineRatePageCond + * @return + */ + @Override + public List<OnlineRateVo> getPage(OnlineRatePageCond onlineRatePageCond) { + int nh = 1000 * 60 * 60; + String startTime = onlineRatePageCond.getStartTime(); + String endTime = onlineRatePageCond.getEndTime(); + Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); + Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); + long diff = end.getTime() - start.getTime(); //������������ + long hour = (diff / nh)+1; //������������������������ + + List<OnlineRateVo> OnlineRateVoList = deviceMapper.getList(onlineRatePageCond.getOrganizationId()); + if (!ObjectUtils.isEmpty(OnlineRateVoList)){ + for (OnlineRateVo onlineRateVo : OnlineRateVoList) { + List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(onlineRateVo.getMac(), start, end); + ArrayList<Date> dates = new ArrayList<>(); + ArrayList<Date> dates1 = new ArrayList<>(); + ArrayList<Date> dates2 = new ArrayList<>(); + ArrayList<Integer> list = new ArrayList<>(); + Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); + if (!ObjectUtils.isEmpty(valueByMacAndTime)){ + for (HistoryHourly historyHourly : valueByMacAndTime) { + dates.add(historyHourly.getTime()); + } + boolean flag= true; + int i = 0; + while (DateUtils.isTimeBeforE(end,start1)){ + if (dates.contains(start1)){ + if (flag){ + list.add(i); + }else { + i++; + list.add(i); + dates2.add(start1); + flag= true; + } + }else { + if (flag){ + i++; + list.add(i); + dates1.add(start1); + flag=false; + }else { + list.add(i); + } + } + start1 = DateUtils.getDateAddHour(start1,1); + } + if (!ObjectUtils.isEmpty(dates2)){ + onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1))); + } + if (!ObjectUtils.isEmpty(dates1)){ + onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1))); + } +// it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1))); + onlineRateVo.setNum(dates1.size()+""); + onlineRateVo.setOnlineTime(valueByMacAndTime.size()); + double number = (double) valueByMacAndTime.size() / hour * 100; + String result = String.format("%.2f", number); + onlineRateVo.setOnlineRate(result+"%"); + } + } + + } + /* Page<OnlineRateVo> page = deviceMapper.getPage(onlineRatePageCond.getPage().convertPage(), onlineRatePageCond.getOrganizationId()); + if(CollectionUtils.isNotEmpty(page.getRecords())){ + page.getRecords().forEach(it->{ + Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); + List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(it.getMac(), start, end); + ArrayList<Date> dates = new ArrayList<>(); + ArrayList<Date> dates1 = new ArrayList<>(); + ArrayList<Date> dates2 = new ArrayList<>(); + + ArrayList<Integer> list = new ArrayList<>(); + if (!ObjectUtils.isEmpty(valueByMacAndTime)){ + for (HistoryHourly historyHourly : valueByMacAndTime) { + dates.add(historyHourly.getTime()); + } + boolean flag= true; + int i = 0; + while (DateUtils.isTimeBeforE(end,start1)){ + if (dates.contains(start1)){ + if (flag){ + list.add(i); + }else { + i++; + list.add(i); + dates2.add(start1); + flag= true; + } + }else { + if (flag){ + i++; + list.add(i); + dates1.add(start1); + flag=false; + }else { + list.add(i); + } + } + start1 = DateUtils.getDateAddHour(start1,1); + } + if (!ObjectUtils.isEmpty(dates2)){ + it.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1))); + } + if (!ObjectUtils.isEmpty(dates1)){ + it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1))); + } +// it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1))); + it.setNum(dates1.size()+""); + it.setOnlineTime(valueByMacAndTime.size()); + double number = (double) valueByMacAndTime.size() / hour * 100; + String result = String.format("%.2f", number); + it.setOnlineRate(result+"%"); + } + }); + }*/ + return OnlineRateVoList; + } + + /** + * ��������������������� + * + * @param mac + * @param startTime + * @param endTime + * @param type + * @return + */ + @Override + public Map<String,Object> detail(String mac, String startTime, String endTime, String type) { + int nh = 1000 * 60 * 60; + long nd = 1000 * 24 * 60 * 60; + long nm = 1000 * 60; + HashMap<String, Object> rsMap = new HashMap<>(); + Map<String, Object> map = new TreeMap<>( + new Comparator<String>() { + @Override + public int compare(String o1, String o2) { + return o2.compareTo(o1); + } + } + ); +// HashMap<String, Object> map = new HashMap<>(); + //������������ + ArrayList<Date> EndDates = new ArrayList<>(); + //������������ + ArrayList<Date> StartDates = new ArrayList<>(); + ArrayList<Date> dates = new ArrayList<>(); + + if (type.equals("hour")){ + Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN); + Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_EN); + List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(mac, start, end); + if (!ObjectUtils.isEmpty(valueByMacAndTime)){ + for (HistoryHourly historyHourly : valueByMacAndTime) { + map.put(DateUtils.dateToDateString(historyHourly.getTime()),1); + dates.add(historyHourly.getTime()); + } + boolean flag= true; + while (DateUtils.isTimeBeforE(end,start)){ + if (dates.contains(start)){ + if (!flag){ + StartDates.add(start); + flag= true; + } + }else { + if (flag){ + EndDates.add(start); + flag=false; + } + map.put(DateUtils.dateToDateString(start),0); + } + start = DateUtils.getDateAddHour(start,1); + } + } + //������ + ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>(); + if (!ObjectUtils.isEmpty(EndDates)){ + for (int i = 0; i < EndDates.size(); i++) { + OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm(); + onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i))); + onlineRateLogsForm.setStartTime(ObjectUtils.isEmpty(StartDates)?"-":DateUtils.dateToDateString(StartDates.get(i))); +// if (!ObjectUtils.isEmpty(StartDates)){ +// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime(); +// onlineRateLogsForm.setMun(Long.toString(l/nh)); +// StartDates.remove(i); +// }else { +// onlineRateLogsForm.setMun("-"); +// } + onlineRateLogsForm.setDate("������"); + OrfList.add(onlineRateLogsForm); + } + } + //��������� + ArrayList<String> list1 = new ArrayList<>(); + ArrayList<Integer> list2 = new ArrayList<>(); + Set<String> strings = map.keySet(); + for (String string : strings) { + list1.add(string); + list2.add(Integer.parseInt(map.get(string).toString())); + } + rsMap.put("lineChart1",list1); + rsMap.put("lineChart2",list2); + rsMap.put("tabulation",OrfList); + //��������������������� + int endNumber = map.size() - dates.size(); + double number = (double) dates.size() / map.size() * 100; + String result = String.format("%.2f", number); + rsMap.put("pieChart1",endNumber); + rsMap.put("pieChart2",dates.size()); + rsMap.put("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+result); + + } else if (type.equals("day")){ + Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_EN); + Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_EN); + List<HistoryDaily> historyDailys = historyDailyService.getHistoryDailyByMacAndTimeSlot(mac, start, end); + if (!ObjectUtils.isEmpty(historyDailys)){ + for (HistoryDaily historyDaily : historyDailys) { + map.put(DateUtils.dateToDateString(historyDaily.getTime()),1); + dates.add(historyDaily.getTime()); + } + boolean flag= true; + while (DateUtils.isTimeBeforE(end,start)){ + if (dates.contains(start)){ + if (!flag){ + StartDates.add(start); + flag= true; + } + }else { + if (flag){ + EndDates.add(start); + flag=false; + } + map.put(DateUtils.dateToDateString(start),0); + } +// start = DateUtils.getDateAddHour(start,24); + start = DateUtils.getDateOfDay(start,1); + } + } + //������ + ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>(); + if (!ObjectUtils.isEmpty(EndDates)){ + for (int i = 0; i < EndDates.size(); i++) { + OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm(); + onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i))); +// onlineRateLogsForm.setStartTime(ObjectUtils.isEmpty(StartDates)?"-":DateUtils.dateToDateString(StartDates.get(i))); + if (ObjectUtils.isEmpty(StartDates)){ + onlineRateLogsForm.setStartTime("-"); + onlineRateLogsForm.setMun("-"); + }else { + if (EndDates.size()>StartDates.size()&& i==EndDates.size()-1){ + onlineRateLogsForm.setStartTime("-"); + onlineRateLogsForm.setMun("-"); + } + onlineRateLogsForm.setStartTime(DateUtils.dateToDateString(StartDates.get(i))); + long l = EndDates.get(i).getTime() - StartDates.get(i).getTime(); + onlineRateLogsForm.setMun(Long.toString(l/nd)); + } +// if (!ObjectUtils.isEmpty(StartDates)){ +// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime(); +// onlineRateLogsForm.setMun(Long.toString(l/nd)); +// }else { +// onlineRateLogsForm.setMun("-"); +// } + onlineRateLogsForm.setDate("���"); + OrfList.add(onlineRateLogsForm); + } + } + //��������� + ArrayList<String> list1 = new ArrayList<>(); + ArrayList<Integer> list2 = new ArrayList<>(); + Set<String> strings = map.keySet(); + for (String string : strings) { + list1.add(string); + list2.add(Integer.parseInt(map.get(string).toString())); + } + + + rsMap.put("lineChart1",list1); + rsMap.put("lineChart2",list2); + rsMap.put("tabulation",OrfList); + //��������������� + int endNumber = map.size() - dates.size(); + double number = (double) dates.size() / map.size() * 100; + String result = String.format("%.2f", number); + rsMap.put("pieChart1",endNumber); + rsMap.put("pieChart2",dates.size()); + rsMap.put("code","���"+map.size()+"������"+"������"+dates.size()+"������"+"���������"+result); + }else { + Date start = DateUtils.getDate(startTime,"yyyy-MM-dd HH:mm:00"); + Date end = DateUtils.getDate(endTime, "yyyy-MM-dd HH:mm:00"); + List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, start, end); + if (!ObjectUtils.isEmpty(historyMinutelys)){ + for (HistoryMinutely historyMinutely : historyMinutelys) { + map.put(DateUtils.dateToDateString(historyMinutely.getTime()),1); + dates.add(historyMinutely.getTime()); + } + boolean flag= true; + while (DateUtils.isTimeBeforE(end,start)){ + if (dates.contains(start)){ + if (!flag){ + StartDates.add(start); + flag= true; + } + }else { + if (flag){ + EndDates.add(start); + flag=false; + } + map.put(DateUtils.dateToDateString(start),0); + } +// start = DateUtils.getDateAddHour(start,24); + start = DateUtils.getDateOfMin(start,1); + } + } + //������ + ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>(); + if (!ObjectUtils.isEmpty(EndDates)){ + for (int i = 0; i < EndDates.size(); i++) { + OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm(); + onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i))); + onlineRateLogsForm.setStartTime(ObjectUtils.isEmpty(StartDates)?"-":DateUtils.dateToDateString(StartDates.get(i))); +// if (!ObjectUtils.isEmpty(StartDates)){ +// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime(); +// onlineRateLogsForm.setMun(Long.toString(l/nm)); +// }else { +// onlineRateLogsForm.setMun("-"); +// } + onlineRateLogsForm.setDate("������"); + OrfList.add(onlineRateLogsForm); + } + } + //��������� + ArrayList<String> list1 = new ArrayList<>(); + ArrayList<Integer> list2 = new ArrayList<>(); + Set<String> strings = map.keySet(); + for (String string : strings) { + list1.add(string); + list2.add(Integer.parseInt(map.get(string).toString())); + } + rsMap.put("lineChart1",list1); + rsMap.put("lineChart2",list2); + rsMap.put("tabulation",OrfList); + //��������������� + int endNumber = map.size() - dates.size(); + double number = (double) dates.size() / map.size() * 100; + String result = String.format("%.2f", number); + rsMap.put("pieChart1",endNumber); + rsMap.put("pieChart2",dates.size()); + rsMap.put("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+result); + } + + return rsMap; + } + private Device getDeviceUnitAlramInforByMacFromDb(String mac){ QueryWrapper<Device> wrapper = new QueryWrapper<>(); wrapper.eq("mac",mac); diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java index 745c803..4dd56ea 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java @@ -858,6 +858,24 @@ } return result; } + + /** + * @Description: ������������������������������������������������wrapper��������������� + * @Param: [wrapper, tableNames] + * @return: java.util.List<com.moral.api.entity.HistoryHourly> + * @Author: ��������� + * @Date: 2021/9/23 + */ + private List<HistoryMinutely> HistoryMinutelyQuery(Map<String, Object> params, List<String> tableNames) { + List<HistoryMinutely> result = new ArrayList<>(); + for (String tableName : tableNames) { + params.put("table",tableName); + List<HistoryMinutely> historyMinutelies = historyHourlyMapper.HistoryMinutelyQuery(params); + result.addAll(historyMinutelies); + } + return result; + } + private List<HistoryHourly> multiTableQueryLike(Map<String, Object> params, List<String> tableNames) { List<HistoryHourly> result = new ArrayList<>(); for (String tableName : tableNames) { @@ -920,4 +938,25 @@ } return true; } + + /** + * @param mac + * @param startDate + * @param endDate + * @Description: ������������mac��������������������������������� + * @Param: [mac, startDate, endDate] + * @return: java.util.Map<java.lang.String, com.moral.api.entity.HistoryDaily> + * @Author: ��������� + * @Date: 2021/9/26 + */ + @Override + public List<HistoryMinutely> getHistoryMinutely(String mac, Date startDate, Date endDate) { + Map<String, Object> mapParams = new HashMap<>(); + mapParams.put("startDate",startDate); + mapParams.put("endDate",endDate); + mapParams.put("mac",mac); + List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH); + List<HistoryMinutely> datas = HistoryMinutelyQuery(mapParams, tableNames); + return datas; + } } diff --git a/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java b/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java new file mode 100644 index 0000000..71bf08d --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java @@ -0,0 +1,66 @@ +package com.moral.api.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Objects; +/** + * Description //todo + * + * @author swb + * @ClassName onlineRateVo + * @date 2024.01.26 10:54 + */ + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="onlineRate - ������VO������", description="onlineRate - ������VO������") +public class OnlineRateVo implements Serializable { + + @ApiModelProperty(value = "������������") + private String name; + @ApiModelProperty(value = "������������������") + private String endTime; + + @ApiModelProperty(value = "������������������") + private String startTime; + + @ApiModelProperty(value = "������������") + private String num; + + @ApiModelProperty(value = "���������") + private String onlineRate; + + @ApiModelProperty(value = "������������") + private Integer onlineTime; + + @ApiModelProperty(value = "������") + private String state; + + private String mac; + + + + public String getEndTime(){ + return Objects.isNull(this.endTime)?"-":this.endTime; + } + + public String getStartTime(){ + return Objects.isNull(this.startTime)?"-":this.startTime; + } + public String getNum(){ + return Objects.isNull(this.num)?"-":this.num; + } + + public String getOnlineRate(){ + return Objects.isNull(this.onlineRate)?"0%":this.onlineRate; + } + + public Integer getOnlineTime(){ + return Objects.isNull(this.onlineTime)?0:this.onlineTime; + } +} diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml index 39de26e..996b601 100644 --- a/screen-api/src/main/resources/mapper/DeviceMapper.xml +++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml @@ -268,4 +268,13 @@ d.is_delete = 0 order by d.mac </select> + + + <select id="getPage" resultType="com.moral.api.vo.OnlineRateVo"> + select d.name,d.state,d.mac from device as d where organization_id=#{organizationId} + </select> + + <select id="getList" resultType="com.moral.api.vo.OnlineRateVo"> + select d.name,d.state,d.mac from device as d where organization_id=#{organizationId} + </select> </mapper> \ No newline at end of file diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml index 9e3acd3..1d339df 100644 --- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml +++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml @@ -128,4 +128,22 @@ order by time desc </select> + + <select id="HistoryMinutelyQuery" resultType="com.moral.api.entity.HistoryMinutely"> + SELECT mac,time,value,version FROM history_minutely${table} + WHERE 1 =1 + <if test="macs != null and macs.size!=0"> + and mac in + <foreach collection="macs" item="id" index="index" open="(" close=")" separator=","> + #{id} + </foreach> + </if> + <if test="mac != null and mac != ''"> + and mac = #{mac} + </if> + + and time BETWEEN #{startDate} and #{endDate} + + order by time desc + </select> </mapper> \ No newline at end of file -- Gitblit v1.8.0