From bf3c82f21bb8690310e803998bb8946e96e806ee Mon Sep 17 00:00:00 2001 From: zhumeixiao <3313492479@qq.com> Date: Wed, 27 Nov 2024 19:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eviceInformationMeteorologyController.java | 11 +- ...DeviceInformationMiaoqing1Controller.java} | 21 +--- .../DeviceInformationMoistureController.java | 12 +- .../DeviceInformationMonitorController.java | 7 +- ...eviceInformationTargetpestsController.java | 7 +- .../DeviceInformationWormsController.java | 7 +- .../DeviceInformationMiaoqingController.java | 110 ------------------ .../DeviceInformationMoistureController.java | 110 ------------------ .../DeviceInformationMonitorController.java | 110 ------------------ ...eviceInformationTargetpestsController.java | 110 ------------------ .../DeviceInformationWormsController.java | 110 ------------------ .../DeviceInformationMeteorologyMapper.java | 2 +- .../DeviceInformationMiaoqingMapper.java | 2 +- .../DeviceInformationMoistureMapper.java | 2 +- .../DeviceInformationMonitorMapper.java | 2 +- .../DeviceInformationTargetpestsMapper.java | 2 +- .../mapper/DeviceInformationWormsMapper.java | 2 +- .../IDeviceInformationMeteorologyService.java | 2 +- .../IDeviceInformationMiaoqingService.java | 2 +- .../IDeviceInformationMoistureService.java | 2 +- .../IDeviceInformationMonitorService.java | 2 +- .../IDeviceInformationTargetpestsService.java | 2 +- .../IDeviceInformationWormsService.java | 2 +- ...viceInformationMeteorologyServiceImpl.java | 4 +- .../DeviceInformationMiaoqingServiceImpl.java | 7 +- .../DeviceInformationMoistureServiceImpl.java | 6 +- .../DeviceInformationMonitorServiceImpl.java | 4 +- ...viceInformationTargetpestsServiceImpl.java | 4 +- .../DeviceInformationWormsServiceImpl.java | 4 +- .../DeviceInformationMeteorologyMapper.xml | 4 +- .../DeviceInformationMiaoqingMapper.xml | 4 +- .../DeviceInformationMoistureMapper.xml | 4 +- .../mapper/DeviceInformationMonitorMapper.xml | 4 +- .../DeviceInformationTargetpestsMapper.xml | 4 +- .../mapper/DeviceInformationWormsMapper.xml | 4 +- 35 files changed, 63 insertions(+), 629 deletions(-) rename fastbee-open-api/src/main/java/com/fastbee/data/controller/{deviceInfo => aaScreenAgricultural}/DeviceInformationMeteorologyController.java (94%) rename fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/{DeviceInformationMiaoqingController.java => DeviceInformationMiaoqing1Controller.java} (80%) delete mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMiaoqingController.java delete mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMoistureController.java delete mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMonitorController.java delete mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationTargetpestsController.java delete mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationWormsController.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMeteorologyController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMeteorologyController.java similarity index 94% rename from fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMeteorologyController.java rename to fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMeteorologyController.java index 32fc1df..12736fe 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMeteorologyController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMeteorologyController.java @@ -1,4 +1,4 @@ -package com.fastbee.data.controller.deviceInfo; +package com.fastbee.data.controller.aaScreenAgricultural; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -28,7 +28,7 @@ import com.fastbee.common.core.page.TableDataInfo; * 气象设备基础信息Controller * * @author kerwincui - * @date 2024-11-18 + * @date 2024-11-27 */ @RestController @RequestMapping("/deviceInfo/meteorology") @@ -67,12 +67,11 @@ public class DeviceInformationMeteorologyController extends BaseController /** * 获取气象设备基础信息详细信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:meteorology:query')") - @GetMapping(value = "/{id}") + @GetMapping(value = "deviceEncoding") @ApiOperation("获取气象设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(String deviceEncoding) { - return success(deviceInformationMeteorologyService.selectDeviceInformationMeteorologyById(id)); + return success(deviceInformationMeteorologyService.selectDeviceInformationMeteorologyById(deviceEncoding)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMiaoqingController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMiaoqing1Controller.java similarity index 80% rename from fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMiaoqingController.java rename to fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMiaoqing1Controller.java index aaa2725..93b5578 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMiaoqingController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMiaoqing1Controller.java @@ -5,7 +5,6 @@ import javax.servlet.http.HttpServletResponse; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -15,10 +14,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; import com.fastbee.deviceInfo.domain.DeviceInformationMiaoqing; import com.fastbee.deviceInfo.service.IDeviceInformationMiaoqingService; import com.fastbee.common.utils.poi.ExcelUtil; @@ -31,9 +28,9 @@ import com.fastbee.common.core.page.TableDataInfo; * @date 2024-11-27 */ @RestController -@RequestMapping("/deviceInfo/miaoQing") +@RequestMapping("/deviceInfo/miaoQing1") @Api(tags = "苗情设备基础信息") -public class DeviceInformationMiaoqingController extends BaseController +public class DeviceInformationMiaoqing1Controller extends BaseController { @Autowired private IDeviceInformationMiaoqingService deviceInformationMiaoqingService; @@ -41,7 +38,6 @@ public class DeviceInformationMiaoqingController extends BaseController /** * 查询苗情设备基础信息列表 */ -@PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:list')") @GetMapping("/list") @ApiOperation("查询苗情设备基础信息列表") public TableDataInfo list(DeviceInformationMiaoqing deviceInformationMiaoqing) @@ -55,7 +51,6 @@ public class DeviceInformationMiaoqingController extends BaseController * 导出苗情设备基础信息列表 */ @ApiOperation("导出苗情设备基础信息列表") - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:export')") @PostMapping("/export") public void export(HttpServletResponse response, DeviceInformationMiaoqing deviceInformationMiaoqing) { @@ -67,18 +62,16 @@ public class DeviceInformationMiaoqingController extends BaseController /** * 获取苗情设备基础信息详细信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取苗情设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) + @GetMapping(value = "/deviceEncoding") + @ApiOperation("根据device_encoding获取苗情设备基础信息详细信息") + public AjaxResult getInfo(String deviceEncoding) { - return success(deviceInformationMiaoqingService.selectDeviceInformationMiaoqingById(id)); + return success(deviceInformationMiaoqingService.selectDeviceInformationMiaoqingById(deviceEncoding)); } /** * 新增苗情设备基础信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:add')") @PostMapping @ApiOperation("新增苗情设备基础信息") public AjaxResult add(@RequestBody DeviceInformationMiaoqing deviceInformationMiaoqing) @@ -89,7 +82,6 @@ public class DeviceInformationMiaoqingController extends BaseController /** * 修改苗情设备基础信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:edit')") @PutMapping @ApiOperation("修改苗情设备基础信息") public AjaxResult edit(@RequestBody DeviceInformationMiaoqing deviceInformationMiaoqing) @@ -100,7 +92,6 @@ public class DeviceInformationMiaoqingController extends BaseController /** * 删除苗情设备基础信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:remove')") @DeleteMapping("/{ids}") @ApiOperation("删除苗情设备基础信息") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMoistureController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMoistureController.java index 8eeb90f..8434a43 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMoistureController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMoistureController.java @@ -63,15 +63,13 @@ public class DeviceInformationMoistureController extends BaseController util.exportExcel(response, list, "墒情设备基础信息数据"); } - /** - * 获取墒情设备基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:moisture:query')") - @GetMapping(value = "/{id}") + + + @GetMapping(value = "/deviceEncoding") @ApiOperation("获取墒情设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(String deviceEncoding) { - return success(deviceInformationMoistureService.selectDeviceInformationMoistureById(id)); + return success(deviceInformationMoistureService.selectDeviceInformationMoistureById(deviceEncoding)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMonitorController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMonitorController.java index 17088ed..31d2c94 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMonitorController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationMonitorController.java @@ -67,12 +67,11 @@ public class DeviceInformationMonitorController extends BaseController /** * 获取监控站设备基础信息详细信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:monitor:query')") - @GetMapping(value = "/{id}") + @GetMapping(value = "/deviceEncoding") @ApiOperation("获取监控站设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(String deviceEncoding) { - return success(deviceInformationMonitorService.selectDeviceInformationMonitorById(id)); + return success(deviceInformationMonitorService.selectDeviceInformationMonitorById(deviceEncoding)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationTargetpestsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationTargetpestsController.java index 6783073..5f7a7d8 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationTargetpestsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationTargetpestsController.java @@ -67,12 +67,11 @@ public class DeviceInformationTargetpestsController extends BaseController /** * 获取靶标害虫设备基础信息详细信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:query')") - @GetMapping(value = "/{id}") + @GetMapping(value = "/deviceEncoding") @ApiOperation("获取靶标害虫设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(String deviceEncoding) { - return success(deviceInformationTargetpestsService.selectDeviceInformationTargetpestsById(id)); + return success(deviceInformationTargetpestsService.selectDeviceInformationTargetpestsById(deviceEncoding)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationWormsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationWormsController.java index c576890..dcb1d54 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationWormsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/aaScreenAgricultural/DeviceInformationWormsController.java @@ -67,12 +67,11 @@ public class DeviceInformationWormsController extends BaseController /** * 获取虫情设备基础信息详细信息 */ - @PreAuthorize("@ss.hasPermi('deviceInfo:worms:query')") - @GetMapping(value = "/{id}") + @GetMapping(value = "/deviceEncoding") @ApiOperation("获取虫情设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) + public AjaxResult getInfo(String deviceEncoding) { - return success(deviceInformationWormsService.selectDeviceInformationWormsById(id)); + return success(deviceInformationWormsService.selectDeviceInformationWormsById(deviceEncoding)); } /** diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMiaoqingController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMiaoqingController.java deleted file mode 100644 index 6749f8e..0000000 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMiaoqingController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.fastbee.data.controller.deviceInfo; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.deviceInfo.domain.DeviceInformationMiaoqing; -import com.fastbee.deviceInfo.service.IDeviceInformationMiaoqingService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; - -/** - * 苗情设备基础信息Controller - * - * @author kerwincui - * @date 2024-11-18 - */ -@RestController -@RequestMapping("/deviceInfo/miaoQing") -@Api(tags = "苗情设备基础信息") -public class DeviceInformationMiaoqingController extends BaseController -{ - @Autowired - private IDeviceInformationMiaoqingService deviceInformationMiaoqingService; - -/** - * 查询苗情设备基础信息列表 - */ -@PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:list')") -@GetMapping("/list") -@ApiOperation("查询苗情设备基础信息列表") - public TableDataInfo list(DeviceInformationMiaoqing deviceInformationMiaoqing) - { - startPage(); - List list = deviceInformationMiaoqingService.selectDeviceInformationMiaoqingList(deviceInformationMiaoqing); - return getDataTable(list); - } - - /** - * 导出苗情设备基础信息列表 - */ - @ApiOperation("导出苗情设备基础信息列表") - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, DeviceInformationMiaoqing deviceInformationMiaoqing) - { - List list = deviceInformationMiaoqingService.selectDeviceInformationMiaoqingList(deviceInformationMiaoqing); - ExcelUtil util = new ExcelUtil(DeviceInformationMiaoqing.class); - util.exportExcel(response, list, "苗情设备基础信息数据"); - } - - /** - * 获取苗情设备基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取苗情设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(deviceInformationMiaoqingService.selectDeviceInformationMiaoqingById(id)); - } - - /** - * 新增苗情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:add')") - @PostMapping - @ApiOperation("新增苗情设备基础信息") - public AjaxResult add(@RequestBody DeviceInformationMiaoqing deviceInformationMiaoqing) - { - return toAjax(deviceInformationMiaoqingService.insertDeviceInformationMiaoqing(deviceInformationMiaoqing)); - } - - /** - * 修改苗情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:edit')") - @PutMapping - @ApiOperation("修改苗情设备基础信息") - public AjaxResult edit(@RequestBody DeviceInformationMiaoqing deviceInformationMiaoqing) - { - return toAjax(deviceInformationMiaoqingService.updateDeviceInformationMiaoqing(deviceInformationMiaoqing)); - } - - /** - * 删除苗情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:miaoQing:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除苗情设备基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(deviceInformationMiaoqingService.deleteDeviceInformationMiaoqingByIds(ids)); - } -} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMoistureController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMoistureController.java deleted file mode 100644 index cf58d62..0000000 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMoistureController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.fastbee.data.controller.deviceInfo; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.deviceInfo.domain.DeviceInformationMoisture; -import com.fastbee.deviceInfo.service.IDeviceInformationMoistureService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; - -/** - * 墒情设备基础信息Controller - * - * @author kerwincui - * @date 2024-11-18 - */ -@RestController -@RequestMapping("/deviceInfo/moisture") -@Api(tags = "墒情设备基础信息") -public class DeviceInformationMoistureController extends BaseController -{ - @Autowired - private IDeviceInformationMoistureService deviceInformationMoistureService; - -/** - * 查询墒情设备基础信息列表 - */ -@PreAuthorize("@ss.hasPermi('deviceInfo:moisture:list')") -@GetMapping("/list") -@ApiOperation("查询墒情设备基础信息列表") - public TableDataInfo list(DeviceInformationMoisture deviceInformationMoisture) - { - startPage(); - List list = deviceInformationMoistureService.selectDeviceInformationMoistureList(deviceInformationMoisture); - return getDataTable(list); - } - - /** - * 导出墒情设备基础信息列表 - */ - @ApiOperation("导出墒情设备基础信息列表") - @PreAuthorize("@ss.hasPermi('deviceInfo:moisture:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, DeviceInformationMoisture deviceInformationMoisture) - { - List list = deviceInformationMoistureService.selectDeviceInformationMoistureList(deviceInformationMoisture); - ExcelUtil util = new ExcelUtil(DeviceInformationMoisture.class); - util.exportExcel(response, list, "墒情设备基础信息数据"); - } - - /** - * 获取墒情设备基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:moisture:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取墒情设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(deviceInformationMoistureService.selectDeviceInformationMoistureById(id)); - } - - /** - * 新增墒情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:moisture:add')") - @PostMapping - @ApiOperation("新增墒情设备基础信息") - public AjaxResult add(@RequestBody DeviceInformationMoisture deviceInformationMoisture) - { - return toAjax(deviceInformationMoistureService.insertDeviceInformationMoisture(deviceInformationMoisture)); - } - - /** - * 修改墒情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:moisture:edit')") - @PutMapping - @ApiOperation("修改墒情设备基础信息") - public AjaxResult edit(@RequestBody DeviceInformationMoisture deviceInformationMoisture) - { - return toAjax(deviceInformationMoistureService.updateDeviceInformationMoisture(deviceInformationMoisture)); - } - - /** - * 删除墒情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:moisture:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除墒情设备基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(deviceInformationMoistureService.deleteDeviceInformationMoistureByIds(ids)); - } -} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMonitorController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMonitorController.java deleted file mode 100644 index e549be0..0000000 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationMonitorController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.fastbee.data.controller.deviceInfo; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.deviceInfo.domain.DeviceInformationMonitor; -import com.fastbee.deviceInfo.service.IDeviceInformationMonitorService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; - -/** - * 监控站设备基础信息Controller - * - * @author kerwincui - * @date 2024-11-18 - */ -@RestController -@RequestMapping("/deviceInfo/monitor") -@Api(tags = "监控站设备基础信息") -public class DeviceInformationMonitorController extends BaseController -{ - @Autowired - private IDeviceInformationMonitorService deviceInformationMonitorService; - -/** - * 查询监控站设备基础信息列表 - */ -@PreAuthorize("@ss.hasPermi('deviceInfo:monitor:list')") -@GetMapping("/list") -@ApiOperation("查询监控站设备基础信息列表") - public TableDataInfo list(DeviceInformationMonitor deviceInformationMonitor) - { - startPage(); - List list = deviceInformationMonitorService.selectDeviceInformationMonitorList(deviceInformationMonitor); - return getDataTable(list); - } - - /** - * 导出监控站设备基础信息列表 - */ - @ApiOperation("导出监控站设备基础信息列表") - @PreAuthorize("@ss.hasPermi('deviceInfo:monitor:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, DeviceInformationMonitor deviceInformationMonitor) - { - List list = deviceInformationMonitorService.selectDeviceInformationMonitorList(deviceInformationMonitor); - ExcelUtil util = new ExcelUtil(DeviceInformationMonitor.class); - util.exportExcel(response, list, "监控站设备基础信息数据"); - } - - /** - * 获取监控站设备基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:monitor:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取监控站设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(deviceInformationMonitorService.selectDeviceInformationMonitorById(id)); - } - - /** - * 新增监控站设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:monitor:add')") - @PostMapping - @ApiOperation("新增监控站设备基础信息") - public AjaxResult add(@RequestBody DeviceInformationMonitor deviceInformationMonitor) - { - return toAjax(deviceInformationMonitorService.insertDeviceInformationMonitor(deviceInformationMonitor)); - } - - /** - * 修改监控站设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:monitor:edit')") - @PutMapping - @ApiOperation("修改监控站设备基础信息") - public AjaxResult edit(@RequestBody DeviceInformationMonitor deviceInformationMonitor) - { - return toAjax(deviceInformationMonitorService.updateDeviceInformationMonitor(deviceInformationMonitor)); - } - - /** - * 删除监控站设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:monitor:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除监控站设备基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(deviceInformationMonitorService.deleteDeviceInformationMonitorByIds(ids)); - } -} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationTargetpestsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationTargetpestsController.java deleted file mode 100644 index 4ff14d5..0000000 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationTargetpestsController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.fastbee.data.controller.deviceInfo; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.deviceInfo.domain.DeviceInformationTargetpests; -import com.fastbee.deviceInfo.service.IDeviceInformationTargetpestsService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; - -/** - * 靶标害虫设备基础信息Controller - * - * @author kerwincui - * @date 2024-11-18 - */ -@RestController -@RequestMapping("/deviceInfo/targetPests") -@Api(tags = "靶标害虫设备基础信息") -public class DeviceInformationTargetpestsController extends BaseController -{ - @Autowired - private IDeviceInformationTargetpestsService deviceInformationTargetpestsService; - -/** - * 查询靶标害虫设备基础信息列表 - */ -@PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:list')") -@GetMapping("/list") -@ApiOperation("查询靶标害虫设备基础信息列表") - public TableDataInfo list(DeviceInformationTargetpests deviceInformationTargetpests) - { - startPage(); - List list = deviceInformationTargetpestsService.selectDeviceInformationTargetpestsList(deviceInformationTargetpests); - return getDataTable(list); - } - - /** - * 导出靶标害虫设备基础信息列表 - */ - @ApiOperation("导出靶标害虫设备基础信息列表") - @PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, DeviceInformationTargetpests deviceInformationTargetpests) - { - List list = deviceInformationTargetpestsService.selectDeviceInformationTargetpestsList(deviceInformationTargetpests); - ExcelUtil util = new ExcelUtil(DeviceInformationTargetpests.class); - util.exportExcel(response, list, "靶标害虫设备基础信息数据"); - } - - /** - * 获取靶标害虫设备基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取靶标害虫设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(deviceInformationTargetpestsService.selectDeviceInformationTargetpestsById(id)); - } - - /** - * 新增靶标害虫设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:add')") - @PostMapping - @ApiOperation("新增靶标害虫设备基础信息") - public AjaxResult add(@RequestBody DeviceInformationTargetpests deviceInformationTargetpests) - { - return toAjax(deviceInformationTargetpestsService.insertDeviceInformationTargetpests(deviceInformationTargetpests)); - } - - /** - * 修改靶标害虫设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:edit')") - @PutMapping - @ApiOperation("修改靶标害虫设备基础信息") - public AjaxResult edit(@RequestBody DeviceInformationTargetpests deviceInformationTargetpests) - { - return toAjax(deviceInformationTargetpestsService.updateDeviceInformationTargetpests(deviceInformationTargetpests)); - } - - /** - * 删除靶标害虫设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:targetPests:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除靶标害虫设备基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(deviceInformationTargetpestsService.deleteDeviceInformationTargetpestsByIds(ids)); - } -} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationWormsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationWormsController.java deleted file mode 100644 index 5b2f6bb..0000000 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/deviceInfo/DeviceInformationWormsController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.fastbee.data.controller.deviceInfo; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.fastbee.common.annotation.Log; -import com.fastbee.common.core.controller.BaseController; -import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.common.enums.BusinessType; -import com.fastbee.deviceInfo.domain.DeviceInformationWorms; -import com.fastbee.deviceInfo.service.IDeviceInformationWormsService; -import com.fastbee.common.utils.poi.ExcelUtil; -import com.fastbee.common.core.page.TableDataInfo; - -/** - * 虫情设备基础信息Controller - * - * @author kerwincui - * @date 2024-11-18 - */ -@RestController -@RequestMapping("/deviceInfo/worms") -@Api(tags = "虫情设备基础信息") -public class DeviceInformationWormsController extends BaseController -{ - @Autowired - private IDeviceInformationWormsService deviceInformationWormsService; - -/** - * 查询虫情设备基础信息列表 - */ -@PreAuthorize("@ss.hasPermi('deviceInfo:worms:list')") -@GetMapping("/list") -@ApiOperation("查询虫情设备基础信息列表") - public TableDataInfo list(DeviceInformationWorms deviceInformationWorms) - { - startPage(); - List list = deviceInformationWormsService.selectDeviceInformationWormsList(deviceInformationWorms); - return getDataTable(list); - } - - /** - * 导出虫情设备基础信息列表 - */ - @ApiOperation("导出虫情设备基础信息列表") - @PreAuthorize("@ss.hasPermi('deviceInfo:worms:export')") - @PostMapping("/export") - public void export(HttpServletResponse response, DeviceInformationWorms deviceInformationWorms) - { - List list = deviceInformationWormsService.selectDeviceInformationWormsList(deviceInformationWorms); - ExcelUtil util = new ExcelUtil(DeviceInformationWorms.class); - util.exportExcel(response, list, "虫情设备基础信息数据"); - } - - /** - * 获取虫情设备基础信息详细信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:worms:query')") - @GetMapping(value = "/{id}") - @ApiOperation("获取虫情设备基础信息详细信息") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(deviceInformationWormsService.selectDeviceInformationWormsById(id)); - } - - /** - * 新增虫情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:worms:add')") - @PostMapping - @ApiOperation("新增虫情设备基础信息") - public AjaxResult add(@RequestBody DeviceInformationWorms deviceInformationWorms) - { - return toAjax(deviceInformationWormsService.insertDeviceInformationWorms(deviceInformationWorms)); - } - - /** - * 修改虫情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:worms:edit')") - @PutMapping - @ApiOperation("修改虫情设备基础信息") - public AjaxResult edit(@RequestBody DeviceInformationWorms deviceInformationWorms) - { - return toAjax(deviceInformationWormsService.updateDeviceInformationWorms(deviceInformationWorms)); - } - - /** - * 删除虫情设备基础信息 - */ - @PreAuthorize("@ss.hasPermi('deviceInfo:worms:remove')") - @DeleteMapping("/{ids}") - @ApiOperation("删除虫情设备基础信息") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(deviceInformationWormsService.deleteDeviceInformationWormsByIds(ids)); - } -} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/mapper/DeviceInformationMeteorologyMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/mapper/DeviceInformationMeteorologyMapper.java index 7483bd2..f708317 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/mapper/DeviceInformationMeteorologyMapper.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceInfo/mapper/DeviceInformationMeteorologyMapper.java @@ -21,7 +21,7 @@ public interface DeviceInformationMeteorologyMapper extends BaseMapper - - where id = #{id} + where device_encoding = #{deviceEncoding} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml index 6001e1b..1008592 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMiaoqingMapper.xml @@ -45,9 +45,9 @@ - - where id = #{id} + where device_encoding = #{device_encoding} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml index 262a9d9..af4077c 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMoistureMapper.xml @@ -47,9 +47,9 @@ - - where id = #{id} + where device_encoding = #{deviceEncoding} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml index 404f807..a009e01 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationMonitorMapper.xml @@ -55,9 +55,9 @@ - - where id = #{id} + where device_encoding = #{deviceEncoding} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml index 22fce6c..edd8fad 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationTargetpestsMapper.xml @@ -45,9 +45,9 @@ - - where id = #{id} + where device_encoding = #{deviceEncoding} diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml index b4dbf15..b0e8778 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper/DeviceInformationWormsMapper.xml @@ -43,9 +43,9 @@ - - where id = #{id} + where device_encoding = #{deviceEncoding}