From 0849b4fd1ad5626710d0aebecd1f3e419573173a Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期三, 18 九月 2024 21:03:35 +0800 Subject: [PATCH] 11 --- src/main/java/com/se/simu/controller/SimuController.java | 77 +++++++++++++++++++++++++++++++++----- 1 files changed, 66 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java index 60fdd44..2b113d3 100644 --- a/src/main/java/com/se/simu/controller/SimuController.java +++ b/src/main/java/com/se/simu/controller/SimuController.java @@ -1,13 +1,20 @@ package com.se.simu.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.se.simu.domain.po.SimuPo; import com.se.simu.domain.vo.CreateSimuVo; import com.se.simu.domain.vo.R; +import com.se.simu.domain.vo.SimuVo; +import com.se.simu.helper.StringHelper; import com.se.simu.service.GedbService; +import com.se.simu.service.SimuService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -25,16 +32,32 @@ @Resource GedbService gedbService; + @Resource + SimuService simuService; + @ApiOperation(value = "鍒涘缓") @PostMapping(value = "/create", produces = "application/json; charset=UTF-8") public R<Object> create(@RequestBody @ApiParam("鍒涘缓浠跨湡瑙嗗浘绫�") CreateSimuVo vo) { try { - // 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433 - String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496"; - String taskName = "20240913"; - Object rs = gedbService.test(bbox, taskName); + if (null == vo.getTotal() || vo.getTotal() < 1 || vo.getTotal() > 1000) { + return fail("闄嶉洦閲忎笉鑳戒负绌猴紝涓斿彇鍊煎湪1~1000涔嬮棿"); + } + if (null == vo.getDuration() || vo.getDuration() < 1 || vo.getDuration() > 120) { + return fail("浠跨湡鏃堕暱涓嶈兘涓虹┖锛屼笖鍙栧�煎湪1~120涔嬮棿"); + } + if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) { + return fail("閫夋嫨鑼冨洿涓嶈兘涓虹┖", false); + } + if (StringHelper.isEmpty(vo.getName())) { + vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date())); + } + if (null == vo.getNum() || vo.getNum() < 1) { + vo.setNum(simuService.getMaxId() + 1); + } - return success(rs); + boolean flag = simuService.create(vo); + + return success(flag, flag ? "鎴愬姛" : "澶辫触"); } catch (Exception ex) { return fail(ex, null); } @@ -42,14 +65,18 @@ @ApiOperation(value = "鍒犻櫎") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "浠诲姟ID", dataType = "Integer", paramType = "query", allowMultiple = true, example = "2") + @ApiImplicitParam(name = "ids", value = "ID", dataType = "Integer", paramType = "query", allowMultiple = true, example = "0") }) @GetMapping(value = "/del") public R<Object> del(@RequestParam List<Integer> ids) { try { - // + if (ids == null || ids.isEmpty()) { + return fail("鏃ュ織ID涓嶈兘涓虹┖", null); + } - return success(0); + int count = simuService.del(ids); + + return success(count); } catch (Exception ex) { return fail(ex, null); } @@ -57,11 +84,39 @@ @ApiOperation(value = "鑾峰彇") @GetMapping("/get") - public R<Object> get(@ApiParam("浠诲姟瑙嗗浘绫�") Object vo) { + public R<Object> get(@ApiParam("浠跨湡瑙嗗浘绫�") SimuVo vo) { try { - // + if (null == vo) { + vo = new SimuVo(); + } + if (null == vo.getPageSize() || vo.getPageSize() < 1) { + vo.setPageSize(10); + } + if (null == vo.getPageIndex() || vo.getPageIndex() < 1) { + vo.setPageIndex(1); + } - return success(null, 0); + IPage<SimuPo> paged = simuService.get(vo); + if (null == paged) { + return success(null, 0); + } + + return success(paged.getRecords(), paged.getTotal()); + } catch (Exception ex) { + return fail(ex, null); + } + } + + @ApiOperation(value = "* Test *") + @GetMapping("/test") + public R<Object> test(@ApiParam("浠跨湡瑙嗗浘绫�") SimuVo vo) { + try { + // 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433 + String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496"; + String taskName = "20240913"; + Object rs = gedbService.test(bbox, taskName); + + return success(rs); } catch (Exception ex) { return fail(ex, null); } -- Gitblit v1.9.3