From 732074dfc7598ad52c6ecfc0ee99bcda1cb9af94 Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Fri, 18 Sep 2020 14:09:26 +0800 Subject: [PATCH] 重复点删除,剔除特殊经纬度点 --- src/main/java/com/moral/controller/ScreenController.java | 45 ++++++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 68e80ef..816d5eb 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -34,26 +34,7 @@ import com.moral.entity.alarm.AlarmSensorLevel; import com.moral.entity.charts.DataSortCondition; import com.moral.entity.layout.RealTimeDeviceLayout; -import com.moral.service.AccountService; -import com.moral.service.AlarmConfigService; -import com.moral.service.AlarmDailyService; -import com.moral.service.AreaService; -import com.moral.service.DeviceService; -import com.moral.service.DeviceVersionService; -import com.moral.service.DictionaryDataService; -import com.moral.service.HangzhouAqiService; -import com.moral.service.HistoryDailyService; -import com.moral.service.HistoryHourlyService; -import com.moral.service.HistoryMinutelyService; -import com.moral.service.HistoryService; -import com.moral.service.MachineActivateService; -import com.moral.service.MonitorPointService; -import com.moral.service.OrganizationLayoutService; -import com.moral.service.OrganizationService; -import com.moral.service.QualityDailyService; -import com.moral.service.SensorService; -import com.moral.service.SensorUnitService; -import com.moral.service.WeatherService; +import com.moral.service.*; import com.moral.util.*; import com.rabbitmq.client.*; @@ -88,7 +69,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; import org.xml.sax.InputSource; - import static com.moral.common.util.ResourceUtil.getValue; import static com.moral.common.util.WebUtils.getParametersStartingWith; import static java.util.Calendar.*; @@ -116,6 +96,9 @@ MonitorPointService monitorPointService; @Resource DeviceVersionService deviceVersionService; + + @Resource + HistorySpecialService historySpecialService; /** * The screen service. @@ -175,6 +158,7 @@ @Resource private QualityDailyService qualityDailyService; + /** * Screen login. ������������ @@ -1521,6 +1505,7 @@ params.put("sensorInfo", sensorList); params.put("sensorsMap", sensorsMap); String paramsJson = params.toJSONString(); + //System.out.println(paramsJson); model.addObject("carTrajectoryParams", paramsJson); model.setViewName("cartrajectory"); return model; @@ -1996,6 +1981,8 @@ List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table); return list; } + + //������������ @GetMapping("/windAndDeviceDataByArea") @ResponseBody public List windAndDeviceDataByArea(String monitorPointId) { @@ -2012,8 +1999,6 @@ mon=""+month; } String table="history_minutely_"+year+mon; - log.info(table); - log.info(time); List list=deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,time,table); return list; } @@ -2213,4 +2198,18 @@ return new ResultBean<List<Map<String, Object>>>(list); } + + + @GetMapping("/contrastFactor") + @ApiOperation(value = "������������", notes = "������������") + @ApiImplicitParams(value = { + @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "sensor", value = "������", required = true, paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "time", value = "������(���������2020-03-19���20���21)", required = true, paramType = "query", dataType = "String")}) + public ResultBean<List<Map<String, Object>>> contrastFactor(HttpServletRequest request) throws Exception { + Map<String, Object> parameters = getParametersStartingWith(request, null); + List list=historyHourlyService.getDataByMacAndTime(parameters); + //System.out.println(list); + return new ResultBean<List<Map<String, Object>>>(list); + } } -- Gitblit v1.8.0