工业级后台API v2
blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2020-09-21 b21fc542a0ae534eeec6b08a0f97281440eba1ab 
 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.*;


@@ -86,10 +67,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.*;


@@ -117,6 +96,9 @@


    MonitorPointService monitorPointService;


    @Resource


    DeviceVersionService deviceVersionService;




  /*  @Resource


    HistorySpecialService historySpecialService;*/




    /**


     * The screen service.


@@ -177,8 +159,6 @@


    @Resource


    private QualityDailyService qualityDailyService;




    @Resource


    private RestTemplate restTemplate;




    /**


     * Screen login. 大屏登录


@@ -1504,13 +1484,15 @@


        String startHour = st.substring(st.lastIndexOf("-") + 1);


        String startTime = startYearAndDay + " " + startHour + ":00:00";


        String et = parameters.get("endTime").toString();


        String endYearAndDay = et.substring(0, st.lastIndexOf("-"));


        String endHour = et.substring(et.lastIndexOf("-") + 1);


        int endHourValue = Integer.valueOf(endHour);


        String endTime=endYearAndDay + " " + endHour + ":00:00";


       /* int endHourValue = Integer.valueOf(endHour);


        int startHourValue = Integer.valueOf(startHour);


        if (endHourValue <= startHourValue) {


            endHourValue = startHourValue + 1;


        }


        String endTime = startYearAndDay + " " + endHourValue + ":00:00";


        String endTime = startYearAndDay + " " + endHourValue + ":00:00";*/


        parameters.put("startTime", startTime);


        parameters.put("endTime", endTime);


        String mac = parameters.get("mac").toString();


@@ -1525,6 +1507,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;


@@ -2219,7 +2202,7 @@








    @GetMapping("contrastFactor")


    @GetMapping("/contrastFactor")


    @ApiOperation(value = "因子对比", notes = "因子对比")


    @ApiImplicitParams(value = {


            @ApiImplicitParam(name = "mac", value = "设备mac", required = true, paramType = "query", dataType = "String"),