From 1485d6d9034fd9c36527133b0361cceaf97d7f5d Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Tue, 13 Aug 2019 11:04:56 +0800 Subject: [PATCH] 新增无人机实时查询Mapper接口 --- src/main/java/com/moral/controller/DeviceController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 49 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java index 762416c..5febfa5 100644 --- a/src/main/java/com/moral/controller/DeviceController.java +++ b/src/main/java/com/moral/controller/DeviceController.java @@ -1,14 +1,28 @@ package com.moral.controller; +import static com.moral.common.util.WebUtils.getParametersStartingWith; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.web.bind.annotation.CrossOrigin; +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 com.alibaba.fastjson.JSONObject; import com.moral.common.bean.PageBean; import com.moral.common.bean.ResultBean; import com.moral.entity.Device; +import com.moral.entity.DeviceProperty; import com.moral.service.DeviceService; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import javax.annotation.Resource; @RestController @RequestMapping("device") @@ -16,6 +30,14 @@ public class DeviceController { @Resource DeviceService deviceService; + @GetMapping("count-by-example") + public ResultBean<Integer> countByExample(PageBean pageBean){ + return new ResultBean<Integer>(deviceService.countByExample(pageBean)); + } + @GetMapping("count-by-times") + public ResultBean<List<Map>> countByTimes(Date start, Date end){ + return new ResultBean<List<Map>>(deviceService.countByTimes(start,end,"%Y-%m")); + } @GetMapping("page-list") public PageBean pageList(PageBean pageBean) { return deviceService.queryByPageBean(pageBean); @@ -39,4 +61,26 @@ List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId); return new ResultBean<List<Device>>(devices); } + + @GetMapping("professionId") + public ResultBean<List<Device>> getDevicesByProfessionId(HttpServletRequest request) { + Map<String, Object> parameters = getParametersStartingWith(request, null); + List<Device> devices = deviceService.getDevicesByProfessionId(parameters); + return new ResultBean<List<Device>>(devices); + } + + @PostMapping("save-or-update") + public ResultBean saveOrUpdate(@RequestBody String jsonString){ + Device device = JSONObject.parseObject(jsonString, Device.class); + DeviceProperty deviceProperty = JSONObject.parseObject(jsonString, DeviceProperty.class); + deviceService.saveOrUpdate(device,deviceProperty); + ResultBean resultBean = new ResultBean(ResultBean.SUCCESS); + return resultBean; + } + + @GetMapping("device-list") + public PageBean getDeviceList(PageBean pageBean) { + return deviceService.getDeviceList(pageBean); + } + } -- Gitblit v1.8.0