boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (farm): 包路径调整

Browse Source 
- 提升代码可阅读性
This commit is contained in:
达富斌
2025-09-23 21:48:47 +08:00
parent c894b04ebf
commit 842b423012
143 changed files with 767 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Readme.md
View File

@@ -5,6 +5,9 @@ cn.iocoder.yudao.module.farm.controller.admin
├── cropfarmingcenter // 种植中心 ├── cropfarmingcenter // 种植中心
├── deviceinfo // 设备中心 ├── deviceinfo // 设备中心
├── xxx // 溯源 ├── xxx // 溯源
│ ├── productmanagement // 商品管理
│ ├── environmentindexconfig // 环境指标配置
│ └── traceabilitycode // 溯源码管理 & 溯源码查询 & 溯源统计
├── digitalcockpit // 大屏 ├── digitalcockpit // 大屏
├── managementcenter // 管理中心 ├── managementcenter // 管理中心
│ ├── baseinfo // 基地规划 │ ├── baseinfo // 基地规划
@@ -12,28 +15,31 @@ cn.iocoder.yudao.module.farm.controller.admin
│ ├── messagecenter // 消息中心 │ ├── messagecenter // 消息中心
│ ├── personnelmanagement // 人员管理 │ ├── personnelmanagement // 人员管理
│ ├── modelmanagement // 模型管理 │ ├── modelmanagement // 模型管理
│ ├── models // 模型 │ │ ├── models // 模型
│ ├── modelcycle // 管理周期 │ │ ├── modelcycle // 管理周期
│ ├── modelenvironmentindex // 环境指标 │ │ ├── modelenvironmentindex // 环境指标
│ ├── modelfarmingoperation // 农事操作 │ │ ├── modelfarmingoperation // 农事操作
│ ├── modelfarmingoperationinput // 农事操作-投入品 │ │ ├── modelfarmingoperationinput // 农事操作-投入品
│ ├── modelpestdiseaseweed // 病虫草害 │ │ ├── modelpestdiseaseweed // 病虫草害
│ ├── modelweatherdisaster // 气象灾害 │ │ └── modelweatherdisaster // 气象灾害
│ ├── basicdatamanagement // 基础数据管理 │ ├── basicdatamanagement // 基础数据管理
│ ├── xxx // 农事类型维护 │ │ ├── farmingtypemaintenance // 农事类型维护
│ ├── xxx // 农事名称维护 │ │ ├── farmingnamemaintenance // 农事名称维护
│ ├── xxx // 物种类型维护 │ │ ├── specieslibrary // 物种类型维护 & 物种库维护
│ ├── xxx // 物种库维护 │ │ ├── inputlibrary // 投入品维护
│ ├── xxx // 投入品维护 │ │ ├── disasterdata // 灾害库维护 & 气象灾害库维护
│ ├── xxx // 灾害库维护 │ │ ├── deviceclassify // 设备类型维护
│ ├── xxx // 气象灾害库维护 │ │ └── environmentindicators // 设备环境指标维护
│ ├── xxx // 设备类型维护 │ └── largescreen // 大屏数据维护
│ ├── xxx // 设备环境指标维护 │ ├── foundationinfo // 基础信息
│ ├── largescreen // 大屏数据维护 │ ├── varietydata // 品种数据
│ ├── screendisasterdata // 灾害数据
│ ├── pesticideresidueindex // 农残指标
│ └── fertilizerindex // 化肥指标
└── xxx // 系统管理 └── xxx // 系统管理
├── xxx // 租户管理 ├── xxx // 租户管理
├── xxx // 用户管理 ├── xxx // 用户管理
├── xxx // 角色管理 ├── xxx // 角色管理
├── xxx // 菜单管理 ├── xxx // 菜单管理
├── xxx // 字典管理 └── xxx // 字典管理
```` ````

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/FarmingRecordInputController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/FarmingRecordInputController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput; package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputRespVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputSaveReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo; package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo; package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/farmingrecordinput/vo/FarmingRecordInputSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo; package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

124
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceplotrelation/DevicePlotRelationController.java
View File

@@ -33,69 +33,69 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceplotrelation.DevicePlotRelationDO;
import cn.iocoder.yudao.module.farm.service.deviceplotrelation.DevicePlotRelationService; import cn.iocoder.yudao.module.farm.service.deviceplotrelation.DevicePlotRelationService;
@Tag(name = "管理后台 - 设备与地块关联") //@Tag(name = "管理后台 - 设备与地块关联")
@RestController //@RestController
@RequestMapping("/farm/device-plot-relation") //@RequestMapping("/farm/device-plot-relation")
@Validated //@Validated
public class DevicePlotRelationController { public class DevicePlotRelationController {
@Resource // @Resource
private DevicePlotRelationService devicePlotRelationService; // private DevicePlotRelationService devicePlotRelationService;
//
@PostMapping("/create") // @PostMapping("/create")
@Operation(summary = "创建设备与地块关联") // @Operation(summary = "创建设备与地块关联")
public CommonResult<String> createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) { // public CommonResult<String> createDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO createReqVO) {
return success(devicePlotRelationService.createDevicePlotRelation(createReqVO)); // return success(devicePlotRelationService.createDevicePlotRelation(createReqVO));
} // }
//
@PutMapping("/update") // @PutMapping("/update")
@Operation(summary = "更新设备与地块关联") // @Operation(summary = "更新设备与地块关联")
public CommonResult<Boolean> updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) { // public CommonResult<Boolean> updateDevicePlotRelation(@Valid @RequestBody DevicePlotRelationSaveReqVO updateReqVO) {
devicePlotRelationService.updateDevicePlotRelation(updateReqVO); // devicePlotRelationService.updateDevicePlotRelation(updateReqVO);
return success(true); // return success(true);
} // }
//
@DeleteMapping("/delete") // @DeleteMapping("/delete")
@Operation(summary = "删除设备与地块关联") // @Operation(summary = "删除设备与地块关联")
@Parameter(name = "id", description = "编号", required = true) // @Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> deleteDevicePlotRelation(@RequestParam("id") String id) { // public CommonResult<Boolean> deleteDevicePlotRelation(@RequestParam("id") String id) {
devicePlotRelationService.deleteDevicePlotRelation(id); // devicePlotRelationService.deleteDevicePlotRelation(id);
return success(true); // return success(true);
} // }
//
@DeleteMapping("/delete-list") // @DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true) // @Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除设备与地块关联") // @Operation(summary = "批量删除设备与地块关联")
public CommonResult<Boolean> deleteDevicePlotRelationList(@RequestParam("ids") List<String> ids) { // public CommonResult<Boolean> deleteDevicePlotRelationList(@RequestParam("ids") List<String> ids) {
devicePlotRelationService.deleteDevicePlotRelationListByIds(ids); // devicePlotRelationService.deleteDevicePlotRelationListByIds(ids);
return success(true); // return success(true);
} // }
//
@GetMapping("/get") // @GetMapping("/get")
@Operation(summary = "获得设备与地块关联") // @Operation(summary = "获得设备与地块关联")
@Parameter(name = "id", description = "编号", required = true, example = "1024") // @Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<DevicePlotRelationRespVO> getDevicePlotRelation(@RequestParam("id") String id) { // public CommonResult<DevicePlotRelationRespVO> getDevicePlotRelation(@RequestParam("id") String id) {
DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id); // DevicePlotRelationDO devicePlotRelation = devicePlotRelationService.getDevicePlotRelation(id);
return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class)); // return success(BeanUtils.toBean(devicePlotRelation, DevicePlotRelationRespVO.class));
} // }
//
@GetMapping("/page") // @GetMapping("/page")
@Operation(summary = "获得设备与地块关联分页") // @Operation(summary = "获得设备与地块关联分页")
public CommonResult<PageResult<DevicePlotRelationRespVO>> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) { // public CommonResult<PageResult<DevicePlotRelationRespVO>> getDevicePlotRelationPage(@Valid DevicePlotRelationPageReqVO pageReqVO) {
PageResult<DevicePlotRelationDO> pageResult = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO); // PageResult<DevicePlotRelationDO> pageResult = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DevicePlotRelationRespVO.class)); // return success(BeanUtils.toBean(pageResult, DevicePlotRelationRespVO.class));
} // }
//
@GetMapping("/export-excel") // @GetMapping("/export-excel")
@Operation(summary = "导出设备与地块关联 Excel") // @Operation(summary = "导出设备与地块关联 Excel")
@ApiAccessLog(operateType = EXPORT) // @ApiAccessLog(operateType = EXPORT)
public void exportDevicePlotRelationExcel(@Valid DevicePlotRelationPageReqVO pageReqVO, // public void exportDevicePlotRelationExcel(@Valid DevicePlotRelationPageReqVO pageReqVO,
HttpServletResponse response) throws IOException { // HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); // pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<DevicePlotRelationDO> list = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO).getList(); // List<DevicePlotRelationDO> list = devicePlotRelationService.getDevicePlotRelationPage(pageReqVO).getList();
// 导出 Excel // // 导出 Excel
ExcelUtils.write(response, "设备与地块关联.xls", "数据", DevicePlotRelationRespVO.class, // ExcelUtils.write(response, "设备与地块关联.xls", "数据", DevicePlotRelationRespVO.class,
BeanUtils.toBean(list, DevicePlotRelationRespVO.class)); // BeanUtils.toBean(list, DevicePlotRelationRespVO.class));
} // }
} }

358
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/devicestatus/DeviceStatusController.java
View File

@@ -21,184 +21,184 @@ import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 设备状态管理") //@Tag(name = "管理后台 - 设备状态管理")
@RestController //@RestController
@RequestMapping("/farm/device-status") //@RequestMapping("/farm/device-status")
@Validated //@Validated
@Slf4j //@Slf4j
public class DeviceStatusController { public class DeviceStatusController {
//
@Resource // @Resource
private DeviceStatusService deviceStatusService; // private DeviceStatusService deviceStatusService;
//
@Resource // @Resource
private DeviceInfoMapper deviceInfoMapper; // private DeviceInfoMapper deviceInfoMapper;
//
@GetMapping("/check/{deviceUniqueId}") // @GetMapping("/check/{deviceUniqueId}")
@Operation(summary = "检查设备是否在线") // @Operation(summary = "检查设备是否在线")
@Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01") // @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
@PreAuthorize("@ss.hasPermission('farm:device-status:query')") // @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
public CommonResult<Boolean> checkDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) { // public CommonResult<Boolean> checkDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
boolean online = deviceStatusService.isDeviceOnline(deviceUniqueId); // boolean online = deviceStatusService.isDeviceOnline(deviceUniqueId);
return success(online); // return success(online);
} // }
//
@GetMapping("/state/{deviceUniqueId}") // @GetMapping("/state/{deviceUniqueId}")
@Operation(summary = "获取设备状态") // @Operation(summary = "获取设备状态")
@Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01") // @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
@PreAuthorize("@ss.hasPermission('farm:device-status:query')") // @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
public CommonResult<DeviceStatusRespVO> getDeviceStatus(@PathVariable("deviceUniqueId") String deviceUniqueId) { // public CommonResult<DeviceStatusRespVO> getDeviceStatus(@PathVariable("deviceUniqueId") String deviceUniqueId) {
DeviceInfoDO device = deviceInfoMapper.selectOne(DeviceInfoDO::getDeviceUniqueId, deviceUniqueId); // DeviceInfoDO device = deviceInfoMapper.selectOne(DeviceInfoDO::getDeviceUniqueId, deviceUniqueId);
if (device == null) { // if (device == null) {
return success(null); // return success(null);
} // }
//
DeviceStatusRespVO respVO = BeanUtils.toBean(device, DeviceStatusRespVO.class); // DeviceStatusRespVO respVO = BeanUtils.toBean(device, DeviceStatusRespVO.class);
if (device.getDeviceState() != null) { // if (device.getDeviceState() != null) {
DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(device.getDeviceState()); // DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(device.getDeviceState());
if (stateEnum != null) { // if (stateEnum != null) {
respVO.setStateName(stateEnum.getName()); // respVO.setStateName(stateEnum.getName());
respVO.setOnline(DeviceStateEnum.isOnline(device.getDeviceState())); // respVO.setOnline(DeviceStateEnum.isOnline(device.getDeviceState()));
} // }
} // }
return success(respVO); // return success(respVO);
} // }
//
@GetMapping("/online-devices") // @GetMapping("/online-devices")
@Operation(summary = "获取在线设备列表") // @Operation(summary = "获取在线设备列表")
@PreAuthorize("@ss.hasPermission('farm:device-status:query')") // @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
public CommonResult<List<DeviceStatusRespVO>> getOnlineDevices() { // public CommonResult<List<DeviceStatusRespVO>> getOnlineDevices() {
List<DeviceInfoDO> devices = deviceStatusService.getOnlineDevices(); // List<DeviceInfoDO> devices = deviceStatusService.getOnlineDevices();
List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class); // List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
//
// 填充状态信息 // // 填充状态信息
respList.forEach(resp -> { // respList.forEach(resp -> {
if (resp.getState() != null) { // if (resp.getState() != null) {
DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState()); // DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
if (stateEnum != null) { // if (stateEnum != null) {
resp.setStateName(stateEnum.getName()); // resp.setStateName(stateEnum.getName());
resp.setOnline(DeviceStateEnum.isOnline(resp.getState())); // resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
} // }
} // }
}); // });
//
return success(respList); // return success(respList);
} // }
//
@GetMapping("/offline-devices") // @GetMapping("/offline-devices")
@Operation(summary = "获取离线设备列表") // @Operation(summary = "获取离线设备列表")
@PreAuthorize("@ss.hasPermission('farm:device-status:query')") // @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
public CommonResult<List<DeviceStatusRespVO>> getOfflineDevices() { // public CommonResult<List<DeviceStatusRespVO>> getOfflineDevices() {
List<DeviceInfoDO> devices = deviceStatusService.getOfflineDevices(); // List<DeviceInfoDO> devices = deviceStatusService.getOfflineDevices();
List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class); // List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
//
// 填充状态信息 // // 填充状态信息
respList.forEach(resp -> { // respList.forEach(resp -> {
if (resp.getState() != null) { // if (resp.getState() != null) {
DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState()); // DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
if (stateEnum != null) { // if (stateEnum != null) {
resp.setStateName(stateEnum.getName()); // resp.setStateName(stateEnum.getName());
resp.setOnline(DeviceStateEnum.isOnline(resp.getState())); // resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
} // }
} // }
}); // });
//
return success(respList); // return success(respList);
} // }
//
@GetMapping("/timeout-devices") // @GetMapping("/timeout-devices")
@Operation(summary = "获取超时未上报的设备列表") // @Operation(summary = "获取超时未上报的设备列表")
@Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10") // @Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10")
@PreAuthorize("@ss.hasPermission('farm:device-status:query')") // @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
public CommonResult<List<DeviceStatusRespVO>> getTimeoutDevices( // public CommonResult<List<DeviceStatusRespVO>> getTimeoutDevices(
@RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) { // @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) {
List<DeviceInfoDO> devices = deviceStatusService.getTimeoutDevices(timeoutMinutes); // List<DeviceInfoDO> devices = deviceStatusService.getTimeoutDevices(timeoutMinutes);
List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class); // List<DeviceStatusRespVO> respList = BeanUtils.toBean(devices, DeviceStatusRespVO.class);
//
// 填充状态信息 // // 填充状态信息
respList.forEach(resp -> { // respList.forEach(resp -> {
if (resp.getState() != null) { // if (resp.getState() != null) {
DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState()); // DeviceStateEnum stateEnum = DeviceStateEnum.valueOf(resp.getState());
if (stateEnum != null) { // if (stateEnum != null) {
resp.setStateName(stateEnum.getName()); // resp.setStateName(stateEnum.getName());
resp.setOnline(DeviceStateEnum.isOnline(resp.getState())); // resp.setOnline(DeviceStateEnum.isOnline(resp.getState()));
} // }
} // }
}); // });
//
return success(respList); // return success(respList);
} // }
//
@GetMapping("/statistics") // @GetMapping("/statistics")
@Operation(summary = "获取设备状态统计") // @Operation(summary = "获取设备状态统计")
@PreAuthorize("@ss.hasPermission('farm:device-status:query')") // @PreAuthorize("@ss.hasPermission('farm:device-status:query')")
public CommonResult<DeviceStatusStatisticsRespVO> getDeviceStatusStatistics() { // public CommonResult<DeviceStatusStatisticsRespVO> getDeviceStatusStatistics() {
DeviceStatusStatisticsRespVO statistics = new DeviceStatusStatisticsRespVO(); // DeviceStatusStatisticsRespVO statistics = new DeviceStatusStatisticsRespVO();
//
// 统计各状态设备数量 // // 统计各状态设备数量
Long totalCount = deviceInfoMapper.selectCount(); // Long totalCount = deviceInfoMapper.selectCount();
Long onlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.ONLINE.getState()); // Long onlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.ONLINE.getState());
Long offlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.OFFLINE.getState()); // Long offlineCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.OFFLINE.getState());
Long inactiveCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.INACTIVE.getState()); // Long inactiveCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.INACTIVE.getState());
Long maintenanceCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.MAINTENANCE.getState()); // Long maintenanceCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.MAINTENANCE.getState());
Long faultCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.FAULT.getState()); // Long faultCount = deviceInfoMapper.selectCountByState(DeviceStateEnum.FAULT.getState());
//
statistics.setTotalCount(totalCount); // statistics.setTotalCount(totalCount);
statistics.setOnlineCount(onlineCount != null ? onlineCount : 0L); // statistics.setOnlineCount(onlineCount != null ? onlineCount : 0L);
statistics.setOfflineCount(offlineCount != null ? offlineCount : 0L); // statistics.setOfflineCount(offlineCount != null ? offlineCount : 0L);
statistics.setInactiveCount(inactiveCount != null ? inactiveCount : 0L); // statistics.setInactiveCount(inactiveCount != null ? inactiveCount : 0L);
statistics.setMaintenanceCount(maintenanceCount != null ? maintenanceCount : 0L); // statistics.setMaintenanceCount(maintenanceCount != null ? maintenanceCount : 0L);
statistics.setFaultCount(faultCount != null ? faultCount : 0L); // statistics.setFaultCount(faultCount != null ? faultCount : 0L);
//
// 计算在线率和离线率 // // 计算在线率和离线率
if (totalCount > 0) { // if (totalCount > 0) {
statistics.setOnlineRate((double) statistics.getOnlineCount() / totalCount * 100); // statistics.setOnlineRate((double) statistics.getOnlineCount() / totalCount * 100);
statistics.setOfflineRate((double) statistics.getOfflineCount() / totalCount * 100); // statistics.setOfflineRate((double) statistics.getOfflineCount() / totalCount * 100);
} else { // } else {
statistics.setOnlineRate(0.0); // statistics.setOnlineRate(0.0);
statistics.setOfflineRate(0.0); // statistics.setOfflineRate(0.0);
} // }
//
return success(statistics); // return success(statistics);
} // }
//
@PostMapping("/update-state/{deviceUniqueId}") // @PostMapping("/update-state/{deviceUniqueId}")
@Operation(summary = "手动更新设备状态") // @Operation(summary = "手动更新设备状态")
@Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01") // @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
@Parameter(name = "state", description = "设备状态", required = true, example = "1") // @Parameter(name = "state", description = "设备状态", required = true, example = "1")
@PreAuthorize("@ss.hasPermission('farm:device-status:update')") // @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
public CommonResult<Boolean> updateDeviceState( // public CommonResult<Boolean> updateDeviceState(
@PathVariable("deviceUniqueId") String deviceUniqueId, // @PathVariable("deviceUniqueId") String deviceUniqueId,
@RequestParam("state") Integer state) { // @RequestParam("state") Integer state) {
deviceStatusService.updateDeviceState(deviceUniqueId, state); // deviceStatusService.updateDeviceState(deviceUniqueId, state);
return success(true); // return success(true);
} // }
//
@PostMapping("/set-online/{deviceUniqueId}") // @PostMapping("/set-online/{deviceUniqueId}")
@Operation(summary = "手动设置设备上线") // @Operation(summary = "手动设置设备上线")
@Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01") // @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
@PreAuthorize("@ss.hasPermission('farm:device-status:update')") // @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
public CommonResult<Boolean> setDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) { // public CommonResult<Boolean> setDeviceOnline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
deviceStatusService.deviceOnline(deviceUniqueId); // deviceStatusService.deviceOnline(deviceUniqueId);
return success(true); // return success(true);
} // }
//
@PostMapping("/set-offline/{deviceUniqueId}") // @PostMapping("/set-offline/{deviceUniqueId}")
@Operation(summary = "手动设置设备离线") // @Operation(summary = "手动设置设备离线")
@Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01") // @Parameter(name = "deviceUniqueId", description = "设备唯一标识", required = true, example = "2409AA01")
@PreAuthorize("@ss.hasPermission('farm:device-status:update')") // @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
public CommonResult<Boolean> setDeviceOffline(@PathVariable("deviceUniqueId") String deviceUniqueId) { // public CommonResult<Boolean> setDeviceOffline(@PathVariable("deviceUniqueId") String deviceUniqueId) {
deviceStatusService.deviceOffline(deviceUniqueId); // deviceStatusService.deviceOffline(deviceUniqueId);
return success(true); // return success(true);
} // }
//
@PostMapping("/check-offline") // @PostMapping("/check-offline")
@Operation(summary = "手动检查离线设备") // @Operation(summary = "手动检查离线设备")
@Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10") // @Parameter(name = "timeoutMinutes", description = "超时分钟数", required = false, example = "10")
@PreAuthorize("@ss.hasPermission('farm:device-status:update')") // @PreAuthorize("@ss.hasPermission('farm:device-status:update')")
public CommonResult<Integer> checkOfflineDevices( // public CommonResult<Integer> checkOfflineDevices(
@RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) { // @RequestParam(value = "timeoutMinutes", defaultValue = "10") int timeoutMinutes) {
int count = deviceStatusService.checkAndUpdateOfflineDevices(timeoutMinutes); // int count = deviceStatusService.checkAndUpdateOfflineDevices(timeoutMinutes);
return success(count); // return success(count);
} // }
} }

13
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
View File

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.admin.dict;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNamePlanRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNameRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseNameRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictRespVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictTypeCodeRespVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictTypeCodeRespVO;
@@ -305,12 +306,12 @@ public class DictController {
return success(res); return success(res);
} }
// //
// @GetMapping("/list/base-name-plan") @GetMapping("/list/base-name-plan")
// @Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动") @Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动")
// public CommonResult<List<BaseNamePlanRespVO>> getBaseNameAndPlanList() { public CommonResult<List<BaseNamePlanRespVO>> getBaseNameAndPlanList() {
// List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList(); List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
// return success(res); return success(res);
// } }
// //
// @GetMapping("/list/invest-goods") // @GetMapping("/list/invest-goods")
// @Operation(summary = "字典数据维护-下拉框列表-投入品") // @Operation(summary = "字典数据维护-下拉框列表-投入品")

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/DeviceClassifyController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/DeviceClassifyController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.*; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO;
import cn.iocoder.yudao.module.farm.service.deviceclassify.DeviceClassifyService; import cn.iocoder.yudao.module.farm.service.deviceclassify.DeviceClassifyService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifyRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifyRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceClassifySaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceClassifySaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceModelRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceclassify/vo/DeviceTypeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/DisasterDataController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/DisasterDataController.java
View File

@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.farm.controller.admin.disasterdata; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataSaveReqVO;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/disasterdata/vo/DisasterDataSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/EnvironmentIndicatorsController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/EnvironmentIndicatorsController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.EnvironmentIndicatorsSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO;
import cn.iocoder.yudao.module.farm.service.environmentindicators.EnvironmentIndicatorsService; import cn.iocoder.yudao.module.farm.service.environmentindicators.EnvironmentIndicatorsService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/environmentindicators/vo/EnvironmentIndicatorsSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

12
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/FarmingNameMaintenanceController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/FarmingNameMaintenanceController.java
View File

@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceTreeRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenanceTreeRespVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenancePageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingnamemaintenance/vo/FarmingNameMaintenanceTreeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/FarmingTypeMaintenanceController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/FarmingTypeMaintenanceController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenanceRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
import cn.iocoder.yudao.module.farm.service.farmingtypemaintenance.FarmingTypeMaintenanceService; import cn.iocoder.yudao.module.farm.service.farmingtypemaintenance.FarmingTypeMaintenanceService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenancePageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/farmingtypemaintenance/vo/FarmingTypeMaintenanceSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/InputLibraryController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/InputLibraryController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibrarySaveReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibraryRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo;
import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibrarySaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/inputlibrary/vo/InputLibrarySaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/SpeciesLibraryController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/SpeciesLibraryController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.*; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService; import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/TwoDictController.java
View File

@@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictRespVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@@ -24,10 +26,8 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.TwoDictTreeRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictTreeRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO; import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO;
import cn.iocoder.yudao.module.farm.service.twodict.TwoDictService; import cn.iocoder.yudao.module.farm.service.twodict.TwoDictService;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesAndModelTreeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesAndModelTreeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibraryRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibraryRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesLibrarySaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesLibrarySaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesThreeLevelTreeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeDetailsRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/SpeciesTwoLevelTreeSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/vo/TwoDictTreeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/specieslibrary/vo/TwoDictTreeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/FertilizerIndexController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/FertilizerIndexController.java
View File

@@ -1,10 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexSaveReqVO;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid; import jakarta.validation.Valid;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/fertilizerindex/vo/FertilizerIndexSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/fertilizerindex/vo/FertilizerIndexSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/FoundationInfoController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/FoundationInfoController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,9 +6,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO;
import cn.iocoder.yudao.module.farm.service.foundationinfo.FoundationInfoService; import cn.iocoder.yudao.module.farm.service.foundationinfo.FoundationInfoService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/foundationinfo/vo/FoundationInfoSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/foundationinfo/vo/FoundationInfoSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/PesticideResidueIndexController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/PesticideResidueIndexController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex;
import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexSaveReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/pesticideresidueindex/vo/PesticideResidueIndexSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/ScreenDisasterDataController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/ScreenDisasterDataController.java
View File

@@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataSaveReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@@ -8,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*; import jakarta.validation.*;
import jakarta.servlet.http.*; import jakarta.servlet.http.*;
import java.util.*; import java.util.*;
@@ -25,7 +27,6 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO; import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO;
import cn.iocoder.yudao.module.farm.service.screendisasterdata.ScreenDisasterDataService; import cn.iocoder.yudao.module.farm.service.screendisasterdata.ScreenDisasterDataService;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/screendisasterdata/vo/ScreenDisasterDataSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/VarietyDataController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/VarietyDataController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.varietydata; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata;
import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataRespVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo.VarietyDataSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataRespVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/varietydata/vo/VarietyDataSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/largescreen/varietydata/vo/VarietyDataSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.varietydata.vo; package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/EnvironmentIndexConfigController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/EnvironmentIndexConfigController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig; package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigRespVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigSaveReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/environmentindexconfig/vo/EnvironmentIndexConfigSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/ProductManagementController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/ProductManagementController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.productmanagement; package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement;
import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementRespVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementSaveReqVO;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementPageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productmanagement/vo/ProductManagementSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/productmanagement/vo/ProductManagementSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

11
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/TraceabilityCodeController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/TraceabilityCodeController.java
View File

@@ -1,15 +1,14 @@
package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode; package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageWithStatsRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodePageWithStatsRespVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodeRespVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodeSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO; import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
import cn.iocoder.yudao.module.farm.framework.util.TraceabilityDataConverter; import cn.iocoder.yudao.module.farm.framework.util.TraceabilityDataConverter;
import cn.iocoder.yudao.module.farm.service.traceabilitycode.TraceabilityCodeService; import cn.iocoder.yudao.module.farm.service.traceabilitycode.TraceabilityCodeService;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodePageWithStatsRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/traceability/traceabilitycode/vo/TraceabilityCodeSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo; package cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/app/traceabilitycode/APPTraceabilityCodeController.java
View File

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.farm.controller.app.traceabilitycode;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodeRespVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodeRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO; import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
import cn.iocoder.yudao.module.farm.service.traceabilitycode.TraceabilityCodeService; import cn.iocoder.yudao.module.farm.service.traceabilitycode.TraceabilityCodeService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/deviceclassify/DeviceClassifyMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.deviceclassify;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.farm.controller.admin.deviceclassify.vo.DeviceClassifyPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.deviceclassify.vo.DeviceClassifyPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java
View File

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.disasterdata.vo.DisasterDataPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindexconfig/EnvironmentIndexConfigMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.environmentindexconfig;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.environmentindexconfig.vo.EnvironmentIndexConfigPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindexconfig.EnvironmentIndexConfigDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/environmentindicators/EnvironmentIndicatorsMapper.java
View File

@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.farm.dal.mysql.environmentindicators; package cn.iocoder.yudao.module.farm.dal.mysql.environmentindicators;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.environmentindicators.vo.EnvironmentIndicatorsPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO; import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.farm.controller.admin.environmentindicators.vo.*;
/** /**
* 环境指标维护 Mapper * 环境指标维护 Mapper

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingnamemaintenance/FarmingNameMaintenanceMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingnamemaintenance;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingrecordinput/FarmingRecordInputMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingrecordinput;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecordinput.vo.FarmingRecordInputPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.farmingrecordinput.vo.FarmingRecordInputPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/farmingtypemaintenance/FarmingTypeMaintenanceMapper.java
View File

@@ -3,11 +3,9 @@ package cn.iocoder.yudao.module.farm.dal.mysql.farmingtypemaintenance;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO; import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/fertilizerindex/FertilizerIndexMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.fertilizerindex;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.fertilizerindex.vo.FertilizerIndexPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.fertilizerindex.vo.FertilizerIndexPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO; import cn.iocoder.yudao.module.farm.dal.dataobject.fertilizerindex.FertilizerIndexDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/foundationinfo/FoundationInfoMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.foundationinfo;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.foundationinfo.vo.FoundationInfoPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.foundationinfo.vo.FoundationInfoPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO; import cn.iocoder.yudao.module.farm.dal.dataobject.foundationinfo.FoundationInfoDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/inputlibrary/InputLibraryMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.inputlibrary.vo.InputLibraryPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO; import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/pesticideresidueindex/PesticideResidueIndexMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.pesticideresidueindex;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.pesticideresidueindex.vo.PesticideResidueIndexPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO; import cn.iocoder.yudao.module.farm.dal.dataobject.pesticideresidueindex.PesticideResidueIndexDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productmanagement/ProductManagementMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.productmanagement;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.productmanagement.vo.ProductManagementPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.productmanagement.vo.ProductManagementPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.productmanagement.ProductManagementDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/screendisasterdata/ScreenDisasterDataMapper.java
View File

@@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.farm.dal.mysql.screendisasterdata; package cn.iocoder.yudao.module.farm.dal.mysql.screendisasterdata;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO; import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.farm.controller.admin.screendisasterdata.vo.*;
/** /**
* 大屏数据-灾害数据 Mapper * 大屏数据-灾害数据 Mapper

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/specieslibrary/SpeciesLibraryMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.specieslibrary;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibraryPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.basicdatamanagement.specieslibrary.vo.SpeciesLibraryPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/traceabilitycode/TraceabilityCodeMapper.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.farm.dal.mysql.traceabilitycode;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.farm.controller.admin.traceabilitycode.vo.TraceabilityCodePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.traceability.traceabilitycode.vo.TraceabilityCodePageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO; import cn.iocoder.yudao.module.farm.dal.dataobject.traceabilitycode.TraceabilityCodeDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

Some files were not shown because too many files have changed in this diff Show More