B/S获取传感器平均值测试

kaiyu

2020-09-22 0c99deb331cb0aa749f3b7c7d802d64d67672685

 src/main/java/com/moral/controller/ScreenController.java

@@ -86,10 +86,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
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.*;
@@ -177,8 +175,6 @@
    @Resource
    private QualityDailyService qualityDailyService;

    @Resource
    private RestTemplate restTemplate;

    /**
     * Screen login. 大屏登录
@@ -699,6 +695,7 @@
    public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
            throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        //该方法用于判断时间是具体到年月日
        ParameterUtils.getTimeType4Time(parameters);
        parameters.put("monitorPointId", parameters.remove("monitorPoint"));
        Object sensorKey = parameters.remove("sensorKey");
@@ -718,6 +715,9 @@
        return new ResultBean<List<Map<String, Object>>>(list);
    }




    @GetMapping("report_alarm_datas")
    public ResultBean<List<Map<String, Object>>> getAlarmData(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);