工业级后台API v2
blame | history | patch | commit | commitdiff | ignore whitespace
于紫祥_1901
2020-09-18 732074dfc7598ad52c6ecfc0ee99bcda1cb9af94 
 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. 大屏登录


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