|
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import com.gis.common.config.ConfigConstant;
|
|
|
import com.gis.common.util.Result;
|
|
|
+import com.gis.web.dto.DevicePageDto;
|
|
|
import com.gis.web.dto.PageDateDto;
|
|
|
import com.gis.common.util.DoorUtils;
|
|
|
import com.gis.web.dto.PageDto;
|
|
@@ -42,6 +43,23 @@ public class DoorController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
+ * 2021-04-019 新增接口
|
|
|
+ * 2021-04-07 已测试有数据 510124112006001
|
|
|
+ *
|
|
|
+ * 这个要pro环境才有数据
|
|
|
+ *
|
|
|
+ */
|
|
|
+ @ApiOperation("查询小区车位信息(测试:510124112006001)")
|
|
|
+ @GetMapping("countParkingInfo/{code}")
|
|
|
+ public Result countParkingInfo(@PathVariable String code) throws Exception {
|
|
|
+ String apiUrl = configConstant.apiDoor + "/bi/countParkingInfo";
|
|
|
+ TreeMap<String, Object> param = new TreeMap<>();
|
|
|
+ param.put("code", code);
|
|
|
+ return DoorUtils.doPost(apiUrl, param);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
* 2021-04-06 新增接口
|
|
|
* 2021-04-07 已测试有数据 510124112006001 4
|
|
|
*
|
|
@@ -49,12 +67,23 @@ public class DoorController {
|
|
|
*
|
|
|
*/
|
|
|
@ApiOperation(value = "设备列表信息查询", notes = "测试: code:510124112006001, type:设备名称 1-门禁 2-道闸 3-消防栓 4-井盖 5-一体机 6-投屏显示器 7-路灯 8-人脸卡口 9-人员聚集 10-气象站")
|
|
|
- @GetMapping("findDeviceList/{code}/{type}")
|
|
|
- public Result findVideoInfo(@PathVariable String code, @PathVariable String type) throws Exception {
|
|
|
+ @PostMapping("findDeviceList")
|
|
|
+ public Result findDeviceList(@RequestBody DevicePageDto param) throws Exception {
|
|
|
String apiUrl = configConstant.apiDoor + "/bi/findDeviceList";
|
|
|
TreeMap<String, Object> reqParam = new TreeMap<>();
|
|
|
- reqParam.put("code", code);
|
|
|
- reqParam.put("type", type);
|
|
|
+ reqParam.put("code", param.getCode());
|
|
|
+ reqParam.put("type", param.getType());
|
|
|
+
|
|
|
+ Integer pageSize = param.getPageSize();
|
|
|
+ if (pageSize <= 0) {
|
|
|
+ pageSize = 10;
|
|
|
+ }
|
|
|
+ Integer pageNum = param.getPageNum();
|
|
|
+ if (pageNum <= 0) {
|
|
|
+ pageNum = 1;
|
|
|
+ }
|
|
|
+ reqParam.put("pageNum", pageNum);
|
|
|
+ reqParam.put("pageSize", pageSize);
|
|
|
|
|
|
return DoorUtils.doPostDecrypt(apiUrl, reqParam);
|
|
|
}
|