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

fix (farm): 大屏-驾驶舱

Browse Source 
- 修改package结构
- 修复bug
This commit is contained in:
达富斌
2025-09-23 20:46:04 +08:00
parent b6be889d5a
commit c894b04ebf
157 changed files with 1516 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/CropFarmingCenterController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/CropFarmingCenterController.java
View File

@@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter;
package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.*;
import cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.*;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRecordSaveReqVO;
@@ -11,7 +11,6 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRec
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO;
import cn.iocoder.yudao.module.farm.enums.CommonConstants;
import cn.iocoder.yudao.module.farm.service.cropFarmingCenter.CropFarmingCenterService;
import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -31,14 +30,11 @@ import java.util.Objects;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
/**
* @description: 种植中心
* 种植区域： farm_cultivation_area
* 模型： farm_model_management
* 生产计划： farm_production_plan
* 农事记录： farm_farming_record
* @description: 生产中心
* 生产计划： /farm/farming-center/production-plan/**
* 农事计划： /farm/farming-center/farming-record/**
* @author: binda
* @date: 2025/8/19 10:39
*/
@@ -50,12 +46,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
public class CropFarmingCenterController {
private final CropFarmingCenterService cropFarmingCenterService;
private final FarmingRecordService farmingRecordService;
public CropFarmingCenterController(CropFarmingCenterService cropFarmingCenterService,
FarmingRecordService farmingRecordService) {
public CropFarmingCenterController(CropFarmingCenterService cropFarmingCenterService) {
this.cropFarmingCenterService = cropFarmingCenterService;
this.farmingRecordService = farmingRecordService;
}
// // 生产计划
@@ -125,7 +118,7 @@ public class CropFarmingCenterController {
@PostMapping("/production-plan/create")
@Operation(summary = "生产计划-创建")
public CommonResult<Boolean> createProductionPlan(@Valid @RequestBody cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo.ProductionPlanSaveReqVO createReqVO) {
public CommonResult<Boolean> createProductionPlan(@Valid @RequestBody cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo.ProductionPlanSaveReqVO createReqVO) {
cropFarmingCenterService.createProductionPlan(createReqVO);
return success(true);
}
@@ -199,34 +192,34 @@ public class CropFarmingCenterController {
@GetMapping("/farming-record/page")
@Operation(summary = "农事记录-分页")
public CommonResult<PageResult<FarmingRecordRespVO>> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) {
PageResult<FarmingRecordDO> pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO);
PageResult<FarmingRecordDO> pageResult = cropFarmingCenterService.getFarmingRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class));
}
@GetMapping("/farming-record/get/{id}")
@Operation(summary = "农事记录-查看")
public CommonResult<FarmingRecordRespVO> getFarmingRecord(@PathVariable("id") String id) {
FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id);
return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class));
FarmingRecordRespVO res = cropFarmingCenterService.getFarmingRecord(id);
return success(res);
}
@PostMapping("/farming-record/create")
@Operation(summary = "农事记录-新增")
public CommonResult<String> createFarmingRecord(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) {
return success(farmingRecordService.createFarmingRecordNew(createReqVO));
return success(cropFarmingCenterService.createFarmingRecordNew(createReqVO));
}
@PutMapping("/farming-record/update")
@Operation(summary = "农事记录-编辑")
public CommonResult<Boolean> updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) {
farmingRecordService.updateFarmingRecord(updateReqVO);
cropFarmingCenterService.updateFarmingRecord(updateReqVO);
return success(true);
}
@DeleteMapping("/farming-record/delete/{id}")
@Operation(summary = "农事记录-删除")
public CommonResult<Boolean> deleteFarmingRecord(@PathVariable("id") String id) {
farmingRecordService.deleteFarmingRecord(id);
cropFarmingCenterService.deleteFarmingRecord(id);
return success(true);
}

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

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

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

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

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanPage2ReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanPage2ReqVO.java
View File

@@ -1,13 +1,8 @@
package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo;
package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* @description: 分页请求实体

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

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

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

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo;
package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropFarmingCenter/vo/ProductionPlanRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/cropfarmingcenter/vo/ProductionPlanRespVO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.yudao.module.farm.controller.admin.cropFarmingCenter.vo;
package cn.iocoder.yudao.module.farm.controller.admin.cropfarmingcenter.vo;
import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

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

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

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

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

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

@@ -33,69 +33,69 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.module.farm.dal.dataobject.cultivationarea.CultivationAreaDO;
import cn.iocoder.yudao.module.farm.service.cultivationarea.CultivationAreaService;
@Tag(name = "管理后台 - 种植区域")
@RestController
@RequestMapping("/farm/cultivation-area")
@Validated
//@Tag(name = "管理后台 - 种植区域")
//@RestController
//@RequestMapping("/farm/cultivation-area")
//@Validated
public class CultivationAreaController {
@Resource
private CultivationAreaService cultivationAreaService;
@PostMapping("/create")
@Operation(summary = "创建种植区域")
public CommonResult<String> createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) {
return success(cultivationAreaService.createCultivationArea(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新种植区域")
public CommonResult<Boolean> updateCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO updateReqVO) {
cultivationAreaService.updateCultivationArea(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除种植区域")
@Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> deleteCultivationArea(@RequestParam("id") String id) {
cultivationAreaService.deleteCultivationArea(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除种植区域")
public CommonResult<Boolean> deleteCultivationAreaList(@RequestParam("ids") List<String> ids) {
cultivationAreaService.deleteCultivationAreaListByIds(ids);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得种植区域")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<CultivationAreaRespVO> getCultivationArea(@RequestParam("id") String id) {
CultivationAreaDO cultivationArea = cultivationAreaService.getCultivationArea(id);
return success(BeanUtils.toBean(cultivationArea, CultivationAreaRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得种植区域分页")
public CommonResult<PageResult<CultivationAreaRespVO>> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) {
PageResult<CultivationAreaDO> pageResult = cultivationAreaService.getCultivationAreaPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, CultivationAreaRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出种植区域 Excel")
@ApiAccessLog(operateType = EXPORT)
public void exportCultivationAreaExcel(@Valid CultivationAreaPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<CultivationAreaDO> list = cultivationAreaService.getCultivationAreaPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "种植区域.xls", "数据", CultivationAreaRespVO.class,
BeanUtils.toBean(list, CultivationAreaRespVO.class));
}
// @Resource
// private CultivationAreaService cultivationAreaService;
//
// @PostMapping("/create")
// @Operation(summary = "创建种植区域")
// public CommonResult<String> createCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO createReqVO) {
// return success(cultivationAreaService.createCultivationArea(createReqVO));
// }
//
// @PutMapping("/update")
// @Operation(summary = "更新种植区域")
// public CommonResult<Boolean> updateCultivationArea(@Valid @RequestBody CultivationAreaSaveReqVO updateReqVO) {
// cultivationAreaService.updateCultivationArea(updateReqVO);
// return success(true);
// }
//
// @DeleteMapping("/delete")
// @Operation(summary = "删除种植区域")
// @Parameter(name = "id", description = "编号", required = true)
// public CommonResult<Boolean> deleteCultivationArea(@RequestParam("id") String id) {
// cultivationAreaService.deleteCultivationArea(id);
// return success(true);
// }
//
// @DeleteMapping("/delete-list")
// @Parameter(name = "ids", description = "编号", required = true)
// @Operation(summary = "批量删除种植区域")
// public CommonResult<Boolean> deleteCultivationAreaList(@RequestParam("ids") List<String> ids) {
// cultivationAreaService.deleteCultivationAreaListByIds(ids);
// return success(true);
// }
//
// @GetMapping("/get")
// @Operation(summary = "获得种植区域")
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
// public CommonResult<CultivationAreaRespVO> getCultivationArea(@RequestParam("id") String id) {
// CultivationAreaDO cultivationArea = cultivationAreaService.getCultivationArea(id);
// return success(BeanUtils.toBean(cultivationArea, CultivationAreaRespVO.class));
// }
//
// @GetMapping("/page")
// @Operation(summary = "获得种植区域分页")
// public CommonResult<PageResult<CultivationAreaRespVO>> getCultivationAreaPage(@Valid CultivationAreaPageReqVO pageReqVO) {
// PageResult<CultivationAreaDO> pageResult = cultivationAreaService.getCultivationAreaPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, CultivationAreaRespVO.class));
// }
//
// @GetMapping("/export-excel")
// @Operation(summary = "导出种植区域 Excel")
// @ApiAccessLog(operateType = EXPORT)
// public void exportCultivationAreaExcel(@Valid CultivationAreaPageReqVO pageReqVO,
// HttpServletResponse response) throws IOException {
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
// List<CultivationAreaDO> list = cultivationAreaService.getCultivationAreaPage(pageReqVO).getList();
// // 导出 Excel
// ExcelUtils.write(response, "种植区域.xls", "数据", CultivationAreaRespVO.class,
// BeanUtils.toBean(list, CultivationAreaRespVO.class));
// }
}

60
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java
View File

@@ -10,16 +10,22 @@ import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoPag
import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.DeviceInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.deviceinfo.vo.v2.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.deviceinfo.DeviceInfoDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.mqtt.MqttConnectionDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO;
import cn.iocoder.yudao.module.farm.enums.CommonConstants;
import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService;
import cn.iocoder.yudao.module.farm.service.deviceinfo.DeviceInfoService;
import cn.iocoder.yudao.module.farm.service.mqtt.DeviceMqttService;
import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -30,8 +36,10 @@ import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.module.farm.enums.CommonConstants.BINDING_STATE_MAP;
import static cn.iocoder.yudao.module.farm.enums.CommonConstants.DEVICE_STATE_MAP;
@Tag(name = "管理后台 - 设备信息")
@Tag(name = "设备中心")
@RestController
@RequestMapping("/farm/device-info")
@Validated
@@ -41,6 +49,10 @@ public class DeviceInfoController {
private DeviceInfoService deviceInfoService;
@Resource
private DeviceMqttService deviceMqttService;
@Resource
private BaseInfoService baseInfoService;
@Resource
private PlotInfoService plotInfoService;
@PostMapping("/create")
@Operation(summary = "创建设备信息")
@@ -53,6 +65,33 @@ public class DeviceInfoController {
@Operation(summary = "更新设备信息")
public CommonResult<Boolean> updateDeviceInfo(@Valid @RequestBody DeviceInfoSaveV2ReqVO updateReqVO) {
DeviceInfoSaveReqVO targetObj = BeanUtils.toBean(updateReqVO, DeviceInfoSaveReqVO.class);
targetObj.setBindingState(CommonConstants.YES_CODE);
if (!StringUtils.isEmpty(targetObj.getBaseId()) && !StringUtils.isEmpty(targetObj.getBaseId())) {
BaseInfoDO b = baseInfoService.getBaseInfo(targetObj.getBaseId());
PlotInfoDO p = plotInfoService.getPlotInfo(targetObj.getPlotId());
targetObj.setBaseName(b.getName());
targetObj.setPlotName(p.getPlotName());
}
deviceInfoService.updateDeviceInfo(targetObj);
return success(true);
}
@PutMapping("/un-bundle")
@Operation(summary = "解绑设备信息")
@Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> unBundle(@RequestParam("id") String id) {
DeviceInfoSaveReqVO targetObj = new DeviceInfoSaveReqVO();
targetObj.setId(id);
targetObj.setBindingState(CommonConstants.NO_CODE);
targetObj.setDeviceState(CommonConstants.DEVICE_STATE_0);
targetObj.setBaseId("");
targetObj.setBaseName("");
targetObj.setPlotId("");
targetObj.setPlotName("");
targetObj.setPoint(null);
deviceInfoService.updateDeviceInfo(targetObj);
return success(true);
}
@@ -77,8 +116,8 @@ public class DeviceInfoController {
@Operation(summary = "获得设备信息")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<DeviceInfoDetailV2RespVO> getDeviceInfo(@RequestParam("id") String id) {
DeviceInfoDO deviceInfo = deviceInfoService.getDeviceInfo(id);
return success(BeanUtils.toBean(deviceInfo, DeviceInfoDetailV2RespVO.class));
DeviceInfoDetailV2RespVO res = deviceInfoService.getDeviceRealTimeInfo(id);
return success(res);
}
@GetMapping("/page")
@@ -86,12 +125,27 @@ public class DeviceInfoController {
public CommonResult<PageResult<DeviceInfoPageV2RespVO>> getDeviceInfoPage(@Valid DeviceInfoPageV2ReqVO pageReqVO) {
DeviceInfoPageReqVO targetObj = new DeviceInfoPageReqVO();
targetObj.setPageSize(100);
targetObj.setBaseId(pageReqVO.getBaseId());
targetObj.setDeviceType(pageReqVO.getDeviceTypeId());
targetObj.setDeviceName(pageReqVO.getDeviceName());
targetObj.setDeviceState(pageReqVO.getDeviceState());
targetObj.setBindingState(pageReqVO.getBindingState());
PageResult<DeviceInfoDO> pageResult = deviceInfoService.getDeviceInfoPage(targetObj);
PageResult<DeviceInfoPageV2RespVO> deviceInfoRespVOPageResult = BeanUtils.toBean(pageResult, DeviceInfoPageV2RespVO.class);
for (DeviceInfoPageV2RespVO d : deviceInfoRespVOPageResult.getList()) {
if (!StringUtils.isEmpty(d.getBaseId()) && !StringUtils.isEmpty(d.getBaseId())) {
BaseInfoDO b = baseInfoService.getBaseInfo(d.getBaseId());
PlotInfoDO p = plotInfoService.getPlotInfo(d.getPlotId());
d.setBasePoint(b.getPoint());
d.setPlotPoint(p.getPoint());
}
d.setDeviceStateName(DEVICE_STATE_MAP.get(d.getDeviceState()));
d.setBindingStateName(BINDING_STATE_MAP.get(d.getBindingState()));
}
return success(deviceInfoRespVOPageResult);
}

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java
View File

@@ -112,5 +112,9 @@ public class DeviceInfoSaveReqVO {
@Schema(description = "租户id", example = "11502")
private String tenantId;
@Schema(description = "设备坐标")
private String point;
@Schema(description = "负责人")
private String managerId;
}

12
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java
View File

@@ -24,6 +24,8 @@ public class DeviceInfoDetailV2RespVO {
@Schema(description = "设备类型 (设备类型ID)")
private String deviceType;
@Schema(description = "设备类型 (设备类型-名称)")
private String deviceTypeName;
@Schema(description = "设备分类名称 (设备型号,字符拼接)")
private String deviceCategoryName;
@@ -33,8 +35,8 @@ public class DeviceInfoDetailV2RespVO {
@Schema(description = "负责人")
private String managerId;
@Schema(description = "是否存在物联网卡 (1:有;2:无;)")
private Boolean isIotCardExisted;
@Schema(description = "是否存在物联网卡 (1:有;0:无;)")
private Integer isIotCardExisted;
@Schema(description = "设备状态：0-未激活，1-在线，2-离线，3-维护中，4-故障")
private Integer deviceState;
@Schema(description = "绑定状态：1: 绑定; 0: 未绑定")
@@ -76,5 +78,9 @@ public class DeviceInfoDetailV2RespVO {
private String deviceUniqueId;
}
public DeviceInfoDetailV2RespVO(String deviceUniqueId, SoilInfo soilInfo, WfInfo wfInfo) {
this.deviceUniqueId = deviceUniqueId;
this.soilInfo = soilInfo;
this.wfInfo = wfInfo;
}
}

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2ReqVO.java
View File

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class DeviceInfoPageV2ReqVO {
public class DeviceInfoPageV2ReqVO extends PageParam{
@Schema(description = "基地ID")
private String baseId;
@@ -24,5 +24,7 @@ public class DeviceInfoPageV2ReqVO {
private String deviceName;
@Schema(description = "设备状态：0-未激活，1-在线，2-离线，3-维护中，4-故障")
private Integer deviceState;
@Schema(description = "绑定状态：0-未绑定; 1:已绑定")
private Integer bindingState;
}

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoPageV2RespVO.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
* @date: 2025/9/19 14:22
*/
@Data
public class DeviceInfoPageV2RespVO extends PageParam {
public class DeviceInfoPageV2RespVO {
private String id;
@@ -30,12 +30,14 @@ public class DeviceInfoPageV2RespVO extends PageParam {
@Schema(description = "负责人")
private String managerId;
@Schema(description = "是否存在物联网卡 (1:有;2:无;)")
private Boolean isIotCardExisted;
@Schema(description = "是否存在物联网卡 (1:有;0:无;)")
private Integer isIotCardExisted;
@Schema(description = "设备状态：0-未激活，1-在线，2-离线，3-维护中，4-故障")
private Integer deviceState;
private String deviceStateName;
@Schema(description = "绑定状态：1: 绑定; 0: 未绑定")
private Integer bindingState;
private String bindingStateName;
@Schema(description = "设备坐标")
private String point;
@@ -44,10 +46,12 @@ public class DeviceInfoPageV2RespVO extends PageParam {
@Schema(description = "基地iD")
private String baseId;
private String baseName;
@Schema(description = "基地坐标")
private String basePoint;
@Schema(description = "地块ID")
private String plotId;
private String plotName;
@Schema(description = "地块坐标")
private String plotPoint;

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

@@ -1,36 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.dict;
import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNamePlanRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNameRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.FarmingTypeRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibraryRespVO;
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.SysDictTypeCodeRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibrarySaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibraryPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibraryRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesLibrarySaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.SpeciesThreeLevelTreeRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO;
import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService;
import cn.iocoder.yudao.module.farm.service.disasterdata.DisasterDataService;
@@ -43,12 +17,10 @@ import cn.iocoder.yudao.module.farm.service.sysDict.SysDictService;
import cn.iocoder.yudao.module.farm.service.twodict.TwoDictService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -94,250 +66,259 @@ public class DictController {
}
// 农事类型
@Operation(summary = "字典数据维护-农事类型-分页")
@GetMapping("/farming-type/page")
public CommonResult<PageResult<FarmingTypeMaintenanceRespVO>> getFarmingTypePage(FarmingTypeMaintenancePageReqVO reqVO) {
PageResult<FarmingTypeMaintenanceDO> result = sysDictService.getFarmingTypeMaintenancePage(reqVO);
return success(BeanUtils.toBean(result, FarmingTypeMaintenanceRespVO.class));
}
@Operation(summary = "字典数据维护-农事类型-查看")
@GetMapping("/farming-type/get/{id}")
public CommonResult<FarmingTypeMaintenanceRespVO> getFarmingTypeMaintenance(@PathVariable("id") String id) {
FarmingTypeMaintenanceDO aDo = sysDictService.getFarmingTypeMaintenance(id);
return success(BeanUtils.toBean(aDo, FarmingTypeMaintenanceRespVO.class));
}
@Operation(summary = "字典数据维护-农事类型-新增")
@PostMapping("/farming-type/create")
public CommonResult<Boolean> createFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO saveVO) {
sysDictService.createFarmingTypeMaintenance(saveVO);
return success(true);
}
@Operation(summary = "字典数据维护-农事类型-编辑")
@PutMapping("/farming-type/update")
public CommonResult<Boolean> updateFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO updateVO) {
sysDictService.updateFarmingTypeMaintenance(updateVO);
return success(true);
}
@Operation(summary = "字典数据维护-农事类型-删除")
@DeleteMapping("/farming-type/delete/{id}")
public CommonResult<Boolean> delFarmingType(@PathVariable("id") String id) {
sysDictService.deleteFarmingTypeMaintenance(id);
return success(true);
}
// 农事名称
@Operation(summary = "字典数据维护-农事名称-分页")
@GetMapping("/farming-name/page")
public CommonResult<PageResult<FarmingNameMaintenanceRespVO>> getFarmingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) {
PageResult<FarmingNameMaintenanceDO> pageResult = sysDictService.getFarmingNameMaintenancePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FarmingNameMaintenanceRespVO.class));
}
@Operation(summary = "字典数据维护-农事名称-查看")
@GetMapping("/farming-name/get/{id}")
public CommonResult<FarmingNameMaintenanceRespVO> getFarmingNameMaintenance(@PathVariable("id") String id) {
FarmingNameMaintenanceDO farmingNameMaintenance = sysDictService.getFarmingNameMaintenance(id);
return success(BeanUtils.toBean(farmingNameMaintenance, FarmingNameMaintenanceRespVO.class));
}
@Operation(summary = "字典数据维护-农事名称-新增")
@PostMapping("/farming-name/create")
public CommonResult<Boolean> createFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) {
sysDictService.createFarmingNameMaintenance(createReqVO);
return success(true);
}
// @Operation(summary = "字典数据维护-农事类型-分页")
// @GetMapping("/farming-type/page")
// public CommonResult<PageResult<FarmingTypeMaintenanceRespVO>> getFarmingTypePage(FarmingTypeMaintenancePageReqVO reqVO) {
// PageResult<FarmingTypeMaintenanceDO> result = sysDictService.getFarmingTypeMaintenancePage(reqVO);
// return success(BeanUtils.toBean(result, FarmingTypeMaintenanceRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-农事类型-查看")
// @GetMapping("/farming-type/get/{id}")
// public CommonResult<FarmingTypeMaintenanceRespVO> getFarmingTypeMaintenance(@PathVariable("id") String id) {
// FarmingTypeMaintenanceDO aDo = sysDictService.getFarmingTypeMaintenance(id);
// return success(BeanUtils.toBean(aDo, FarmingTypeMaintenanceRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-农事类型-新增")
// @PostMapping("/farming-type/create")
// public CommonResult<Boolean> createFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO saveVO) {
// sysDictService.createFarmingTypeMaintenance(saveVO);
// return success(true);
// }
//
// @Operation(summary = "字典数据维护-农事类型-编辑")
// @PutMapping("/farming-type/update")
// public CommonResult<Boolean> updateFarmingType(@RequestBody FarmingTypeMaintenanceSaveReqVO updateVO) {
// sysDictService.updateFarmingTypeMaintenance(updateVO);
// return success(true);
// }
//
// @Operation(summary = "字典数据维护-农事类型-删除")
// @DeleteMapping("/farming-type/delete/{id}")
// public CommonResult<Boolean> delFarmingType(@PathVariable("id") String id) {
// sysDictService.deleteFarmingTypeMaintenance(id);
// return success(true);
// }
//
// // 农事名称
// @Operation(summary = "字典数据维护-农事名称-分页")
// @GetMapping("/farming-name/page")
// public CommonResult<PageResult<FarmingNameMaintenanceRespVO>> getFarmingNameMaintenancePage(@Valid FarmingNameMaintenancePageReqVO pageReqVO) {
// PageResult<FarmingNameMaintenanceDO> pageResult = sysDictService.getFarmingNameMaintenancePage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, FarmingNameMaintenanceRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-农事名称-查看")
// @GetMapping("/farming-name/get/{id}")
// public CommonResult<FarmingNameMaintenanceRespVO> getFarmingNameMaintenance(@PathVariable("id") String id) {
// FarmingNameMaintenanceDO farmingNameMaintenance = sysDictService.getFarmingNameMaintenance(id);
// return success(BeanUtils.toBean(farmingNameMaintenance, FarmingNameMaintenanceRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-农事名称-新增")
// @PostMapping("/farming-name/create")
// public CommonResult<Boolean> createFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO createReqVO) {
// sysDictService.createFarmingNameMaintenance(createReqVO);
// return success(true);
// }
//
//
// @Operation(summary = "字典数据维护-农事名称-编辑")
// @PutMapping("/farming-name/update")
// public CommonResult<Boolean> updateFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) {
// sysDictService.updateFarmingNameMaintenance(updateReqVO);
// return success(true);
// }
//
//
// @Operation(summary = "字典数据维护-农事名称-删除")
// @DeleteMapping("/farming-name/delete/{id}")
// public CommonResult<Boolean> deleteFarmingNameMaintenance(@PathVariable("id") String id) {
// sysDictService.deleteFarmingNameMaintenance(id);
// return success(true);
// }
//
// // 物种库维护
// @Operation(summary = "字典数据维护-物种库-分页")
// @GetMapping("/species/page")
// public CommonResult<PageResult<SpeciesLibraryRespVO>> getSpeciesLibraryPage(@Valid SpeciesLibraryPageReqVO pageReqVO) {
// PageResult<SpeciesLibraryDO> pageResult = speciesLibraryService.getSpeciesLibraryPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, SpeciesLibraryRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-物种库-查看")
// @GetMapping("/species/get/{id}")
// public CommonResult<SpeciesLibraryRespVO> getSpeciesLibrary(@PathVariable("id") String id) {
// SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(id);
// return success(BeanUtils.toBean(speciesLibrary, SpeciesLibraryRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-物种库-新增")
// @PostMapping("/species/create")
// public CommonResult<String> createSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO createReqVO) {
// String msg = speciesLibraryService.createSpeciesLibrary(createReqVO);
//
// CommonResult<String> result = new CommonResult<>();
// result.setCode(GlobalErrorCodeConstants.SUCCESS.getCode());
// result.setData("");
// result.setMsg(msg);
// return result;
// }
//
// @Operation(summary = "字典数据维护-物种库-编辑")
// @PutMapping("/species/update")
// public CommonResult<Boolean> updateSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO updateReqVO) {
// speciesLibraryService.updateSpeciesLibrary(updateReqVO);
// return success(true);
// }
//
// @Operation(summary = "字典数据维护-物种库-删除")
// @DeleteMapping("/species/delete/{id}")
// public CommonResult<Boolean> deleteSpeciesLibrary(@PathVariable("id") String id) {
// speciesLibraryService.deleteSpeciesLibrary(id);
// return success(true);
// }
//
// // 投入品维护
// @Operation(summary = "字典数据维护-投入品-分页")
// @GetMapping("/invest-goods/page")
// public CommonResult<PageResult<InputLibraryRespVO>> getInputLibraryPage(@Valid InputLibraryPageReqVO pageReqVO) {
// PageResult<InputLibraryDO> pageResult = inputLibraryService.getInputLibraryPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, InputLibraryRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-投入品-查看")
// @GetMapping("/invest-goods/get/{id}")
// public CommonResult<InputLibraryRespVO> getInputLibrary(@PathVariable("id") String id) {
// InputLibraryDO inputLibrary = inputLibraryService.getInputLibrary(id);
// return success(BeanUtils.toBean(inputLibrary, InputLibraryRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-投入品-新增")
// @PostMapping("/invest-goods/create")
// public CommonResult<String> createInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO createReqVO) {
// return success(inputLibraryService.createInputLibrary(createReqVO));
// }
//
// @PutMapping("/invest-goods/update")
// @Operation(summary = "字典数据维护-投入品-编辑")
// public CommonResult<Boolean> updateInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO updateReqVO) {
// inputLibraryService.updateInputLibrary(updateReqVO);
// return success(true);
// }
//
//
// @Operation(summary = "字典数据维护-投入品-删除")
// @DeleteMapping("/invest-goods/delete/{id}")
// public CommonResult<Boolean> deleteInputLibrary(@PathVariable("id") String id) {
// inputLibraryService.deleteInputLibrary(id);
// return success(true);
// }
//
// // 灾害/气象灾害库维护
// @Operation(summary = "字典数据维护-灾害库-分页")
// @GetMapping("/disaster/page")
// public CommonResult<PageResult<DisasterDataRespVO>> getDisasterDataPage(@Valid DisasterDataPageReqVO pageReqVO) {
// PageResult<DisasterDataDO> pageResult = disasterDataService.getDisasterDataPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, DisasterDataRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-灾害库-查看")
// @GetMapping("/disaster/get/{id}")
// public CommonResult<DisasterDataRespVO> getDisasterData(@PathVariable("id") String id) {
// DisasterDataDO disasterData = disasterDataService.getDisasterData(id);
// return success(BeanUtils.toBean(disasterData, DisasterDataRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-灾害库-新增")
// @PostMapping("/disaster/create")
// public CommonResult<String> createDisasterData(@Valid @RequestBody DisasterDataSaveReqVO createReqVO) {
// return success(disasterDataService.createDisasterData(createReqVO));
// }
//
// @Operation(summary = "字典数据维护-灾害库-编辑")
// @PutMapping("/disaster/update")
// public CommonResult<Boolean> updateDisasterData(@Valid @RequestBody DisasterDataSaveReqVO updateReqVO) {
// disasterDataService.updateDisasterData(updateReqVO);
// return success(true);
// }
//
// @Operation(summary = "字典数据维护-灾害库-删除")
// @DeleteMapping("/disaster/delete/{id}")
// public CommonResult<Boolean> deleteDisasterData(@PathVariable("id") String id) {
// disasterDataService.deleteDisasterData(id);
// return success(true);
// }
@Operation(summary = "字典数据维护-农事名称-编辑")
@PutMapping("/farming-name/update")
public CommonResult<Boolean> updateFarmingNameMaintenance(@Valid @RequestBody FarmingNameMaintenanceSaveReqVO updateReqVO) {
sysDictService.updateFarmingNameMaintenance(updateReqVO);
return success(true);
}
@Operation(summary = "字典数据维护-农事名称-删除")
@DeleteMapping("/farming-name/delete/{id}")
public CommonResult<Boolean> deleteFarmingNameMaintenance(@PathVariable("id") String id) {
sysDictService.deleteFarmingNameMaintenance(id);
return success(true);
}
// 物种库维护
@Operation(summary = "字典数据维护-物种库-分页")
@GetMapping("/species/page")
public CommonResult<PageResult<SpeciesLibraryRespVO>> getSpeciesLibraryPage(@Valid SpeciesLibraryPageReqVO pageReqVO) {
PageResult<SpeciesLibraryDO> pageResult = speciesLibraryService.getSpeciesLibraryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, SpeciesLibraryRespVO.class));
}
@Operation(summary = "字典数据维护-物种库-查看")
@GetMapping("/species/get/{id}")
public CommonResult<SpeciesLibraryRespVO> getSpeciesLibrary(@PathVariable("id") String id) {
SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(id);
return success(BeanUtils.toBean(speciesLibrary, SpeciesLibraryRespVO.class));
}
@Operation(summary = "字典数据维护-物种库-新增")
@PostMapping("/species/create")
public CommonResult<String> createSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO createReqVO) {
String msg = speciesLibraryService.createSpeciesLibrary(createReqVO);
CommonResult<String> result = new CommonResult<>();
result.setCode(GlobalErrorCodeConstants.SUCCESS.getCode());
result.setData("");
result.setMsg(msg);
return result;
}
@Operation(summary = "字典数据维护-物种库-编辑")
@PutMapping("/species/update")
public CommonResult<Boolean> updateSpeciesLibrary(@Valid @RequestBody SpeciesLibrarySaveReqVO updateReqVO) {
speciesLibraryService.updateSpeciesLibrary(updateReqVO);
return success(true);
}
@Operation(summary = "字典数据维护-物种库-删除")
@DeleteMapping("/species/delete/{id}")
public CommonResult<Boolean> deleteSpeciesLibrary(@PathVariable("id") String id) {
speciesLibraryService.deleteSpeciesLibrary(id);
return success(true);
}
// 投入品维护
@Operation(summary = "字典数据维护-投入品-分页")
@GetMapping("/invest-goods/page")
public CommonResult<PageResult<InputLibraryRespVO>> getInputLibraryPage(@Valid InputLibraryPageReqVO pageReqVO) {
PageResult<InputLibraryDO> pageResult = inputLibraryService.getInputLibraryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, InputLibraryRespVO.class));
}
@Operation(summary = "字典数据维护-投入品-查看")
@GetMapping("/invest-goods/get/{id}")
public CommonResult<InputLibraryRespVO> getInputLibrary(@PathVariable("id") String id) {
InputLibraryDO inputLibrary = inputLibraryService.getInputLibrary(id);
return success(BeanUtils.toBean(inputLibrary, InputLibraryRespVO.class));
}
@Operation(summary = "字典数据维护-投入品-新增")
@PostMapping("/invest-goods/create")
public CommonResult<String> createInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO createReqVO) {
return success(inputLibraryService.createInputLibrary(createReqVO));
}
@PutMapping("/invest-goods/update")
@Operation(summary = "字典数据维护-投入品-编辑")
public CommonResult<Boolean> updateInputLibrary(@Valid @RequestBody InputLibrarySaveReqVO updateReqVO) {
inputLibraryService.updateInputLibrary(updateReqVO);
return success(true);
}
@Operation(summary = "字典数据维护-投入品-删除")
@DeleteMapping("/invest-goods/delete/{id}")
public CommonResult<Boolean> deleteInputLibrary(@PathVariable("id") String id) {
inputLibraryService.deleteInputLibrary(id);
return success(true);
}
// 灾害/气象灾害库维护
@Operation(summary = "字典数据维护-灾害库-分页")
@GetMapping("/disaster/page")
public CommonResult<PageResult<DisasterDataRespVO>> getDisasterDataPage(@Valid DisasterDataPageReqVO pageReqVO) {
PageResult<DisasterDataDO> pageResult = disasterDataService.getDisasterDataPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DisasterDataRespVO.class));
}
@Operation(summary = "字典数据维护-灾害库-查看")
@GetMapping("/disaster/get/{id}")
public CommonResult<DisasterDataRespVO> getDisasterData(@PathVariable("id") String id) {
DisasterDataDO disasterData = disasterDataService.getDisasterData(id);
return success(BeanUtils.toBean(disasterData, DisasterDataRespVO.class));
}
@Operation(summary = "字典数据维护-灾害库-新增")
@PostMapping("/disaster/create")
public CommonResult<String> createDisasterData(@Valid @RequestBody DisasterDataSaveReqVO createReqVO) {
return success(disasterDataService.createDisasterData(createReqVO));
}
@Operation(summary = "字典数据维护-灾害库-编辑")
@PutMapping("/disaster/update")
public CommonResult<Boolean> updateDisasterData(@Valid @RequestBody DisasterDataSaveReqVO updateReqVO) {
disasterDataService.updateDisasterData(updateReqVO);
return success(true);
}
@Operation(summary = "字典数据维护-灾害库-删除")
@DeleteMapping("/disaster/delete/{id}")
public CommonResult<Boolean> deleteDisasterData(@PathVariable("id") String id) {
disasterDataService.deleteDisasterData(id);
return success(true);
}
// 下拉框列表
@Operation(summary = "字典数据维护-下拉框列表-农事类型")
@GetMapping("/list/farming-type")
public CommonResult<List<FarmingTypeRespVO>> getFarmingTypeList() {
List<FarmingTypeMaintenanceDO> res = farmingTypeMaintenanceService.getFarmingTypeList();
return success(BeanUtils.toBean(res, FarmingTypeRespVO.class));
}
@Operation(summary = "字典数据维护-下拉框列表-三级物种类别")
@GetMapping("/list/three-library")
public CommonResult<List<SpeciesThreeLevelTreeRespVO>> getTreeLibraryList() {
try {
List<SpeciesThreeLevelTreeRespVO> threeList = speciesLibraryService.getSpeciesThreeLevelTree();
return success(threeList);
} catch (Exception e) {
log.error("获取三级物种类别列表失败", e);
return success(new ArrayList<>());
}
}
@Operation(summary = "字典数据维护-下拉框列表-二级物种类别")
@GetMapping("/list/two-library")
public CommonResult<List<SpeciesThreeLevelTreeRespVO>> getTwoLibraryList() {
try {
List<SpeciesThreeLevelTreeRespVO> twoList = speciesLibraryService.getSpeciesTwoLevelTree();
return success(twoList);
} catch (Exception e) {
log.error("获取二级物种类别列表失败", e);
return success(new ArrayList<>());
}
}
@Operation(summary = "字典数据维护-下拉框列表-物种类别与模型")
@GetMapping("/list/species-classify-model")
public CommonResult<List<SpeciesClassifyLibraryRespVO>> getSpeciesClassifyAndModelList() {
return success(sysDictService.getSpeciesClassifyAndModelList());
}
//
// // 下拉框列表
// @Operation(summary = "字典数据维护-下拉框列表-农事类型")
// @GetMapping("/list/farming-type")
// public CommonResult<List<FarmingTypeRespVO>> getFarmingTypeList() {
// List<FarmingTypeMaintenanceDO> res = farmingTypeMaintenanceService.getFarmingTypeList();
// return success(BeanUtils.toBean(res, FarmingTypeRespVO.class));
// }
//
// @Operation(summary = "字典数据维护-下拉框列表-三级物种类别")
// @GetMapping("/list/three-library")
// public CommonResult<List<SpeciesThreeLevelTreeRespVO>> getTreeLibraryList() {
// try {
// List<SpeciesThreeLevelTreeRespVO> threeList = speciesLibraryService.getSpeciesThreeLevelTree();
// return success(threeList);
// } catch (Exception e) {
// log.error("获取三级物种类别列表失败", e);
// return success(new ArrayList<>());
// }
// }
//
// @Operation(summary = "字典数据维护-下拉框列表-二级物种类别")
// @GetMapping("/list/two-library")
// public CommonResult<List<SpeciesThreeLevelTreeRespVO>> getTwoLibraryList() {
// try {
// List<SpeciesThreeLevelTreeRespVO> twoList = speciesLibraryService.getSpeciesTwoLevelTree();
// return success(twoList);
// } catch (Exception e) {
// log.error("获取二级物种类别列表失败", e);
// return success(new ArrayList<>());
// }
// }
//
// @Operation(summary = "字典数据维护-下拉框列表-物种类别与模型")
// @GetMapping("/list/species-classify-model")
// public CommonResult<List<SpeciesClassifyLibraryRespVO>> getSpeciesClassifyAndModelList() {
// return success(sysDictService.getSpeciesClassifyAndModelList());
// }
//
@GetMapping("/list/base-name")
@Operation(summary = "字典数据维护-下拉框列表-基地,地块二级联动")
public CommonResult<List<BaseNameRespVO>> getBaseNameList() {
List<BaseNameRespVO> res = baseInfoService.getBaseNameList();
return success(res);
}
@GetMapping("/list/base-name-plan")
@Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动")
public CommonResult<List<BaseNamePlanRespVO>> getBaseNameAndPlanList() {
List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
return success(res);
}
@GetMapping("/list/invest-goods")
@Operation(summary = "字典数据维护-下拉框列表-投入品")
public CommonResult<List<InputLibraryRespVO>> getInvestGoodsList() {
List<InputLibraryRespVO> res = sysDictService.getInvestGoodsList();
return success(res);
}
//
// @GetMapping("/list/base-name-plan")
// @Operation(summary = "字典数据维护-下拉框列表-基地,地块,计划三级联动")
// public CommonResult<List<BaseNamePlanRespVO>> getBaseNameAndPlanList() {
// List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
// return success(res);
// }
//
// @GetMapping("/list/invest-goods")
// @Operation(summary = "字典数据维护-下拉框列表-投入品")
// public CommonResult<List<InputLibraryRespVO>> getInvestGoodsList() {
// List<InputLibraryRespVO> res = sysDictService.getInvestGoodsList();
// return success(res);
// }
//
@Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询")
@GetMapping("/list/{dictTypeCode}")
public CommonResult<List<SysDictRespVO>> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) {

157
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/DigitalCockpit.java Normal file
View File

@@ -0,0 +1,157 @@
package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseNameRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BasePointRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.CompanyInfoRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.companyinfo.CompanyInfoDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO;
import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService;
import cn.iocoder.yudao.module.farm.service.companyinfo.CompanyInfoService;
import cn.iocoder.yudao.module.farm.service.deviceinfo.DeviceInfoService;
import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService;
import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService;
import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/**
* @description: 大屏驾驶舱
* @author: binda
* @date: 2025/9/22 14:49
*/
@Tag(name = "大屏-驾驶舱")
@RestController
@RequestMapping("/farm/digital-cockpit")
@Validated
public class DigitalCockpit {
private final BaseInfoService baseInfoService;
private final PlotInfoService plotInfoService;
private final CompanyInfoService companyInfoService;
private final DeviceInfoService deviceInfoService;
private final ProductionPlanService productionPlanService;
private final FarmingRecordService farmingRecordService;
public DigitalCockpit(BaseInfoService baseInfoService, PlotInfoService plotInfoService, CompanyInfoService companyInfoService, DeviceInfoService deviceInfoService, ProductionPlanService productionPlanService, FarmingRecordService farmingRecordService) {
this.baseInfoService = baseInfoService;
this.plotInfoService = plotInfoService;
this.companyInfoService = companyInfoService;
this.deviceInfoService = deviceInfoService;
this.productionPlanService = productionPlanService;
this.farmingRecordService = farmingRecordService;
}
@GetMapping("/company-info")
@Operation(summary = "租户信息")
public CommonResult<CompanyInfoRespVO> getCompanyInfo() {
CompanyInfoDO companyInfo = companyInfoService.getCompanyInfo();
return success(BeanUtils.toBean(companyInfo,CompanyInfoRespVO.class));
}
@GetMapping("/base-map")
@Operation(summary = "基地地图")
@Parameter(name = "baseId", description = "基地ID", required = true)
public CommonResult<List<BasePointRespVO>> getBasePointInfo(@RequestParam("baseId") String baseId) {
List<BasePointRespVO> res = new ArrayList<>();
List<BaseInfoDO> bList = baseInfoService.getBaseInfosById(baseId);
for (BaseInfoDO b : bList) {
List<PlotInfoDO> pList = plotInfoService.getPlotInfos(b.getId());
List<BasePointRespVO.PlotInfo> pRes = pList.stream().map(p -> new BasePointRespVO.PlotInfo(p.getId(), p.getPlotName(), p.getPoint(), p.getPlotColor())).toList();
BasePointRespVO target = new BasePointRespVO();
target.setBaseId(b.getId());
target.setBaseName(b.getName());
target.setPoint(b.getPoint());
target.setPlotInfos(pRes);
res.add(target);
}
return success(res);
}
@GetMapping("/base-statistics")
@Operation(summary = "基地统计信息")
@Parameter(name = "baseId", description = "基地ID", required = true)
public CommonResult<BaseStatisticsInfoRespVO> getBaseStatisticsInfo(@RequestParam("baseId") String baseId) {
BaseStatisticsInfoRespVO res = baseInfoService.getBaseStatisticsInfo(baseId);
return success(res);
}
@GetMapping("/base-name/list")
@Operation(summary = "基地下拉框")
public CommonResult<List<BaseNameRespVO>> getBaseName() {
List<BaseNameRespVO> res = baseInfoService.getBaseInfos().stream().map(e -> new BaseNameRespVO(e.getId(), e.getName())).toList();
return success(res);
}
@GetMapping("/crop-statistics/type/1")
@Operation(summary = "种植统计-种植分布")
@Parameter(name = "baseId", description = "基地ID", required = true)
@Parameter(name = "year", description = "查询条件: 年份", required = true)
public void getCropStatisticsInfo(@RequestParam("baseId") String baseId,
@RequestParam("year") String year) {
}
@GetMapping("/crop-statistics/type/2")
@Operation(summary = "种植统计-产量分布")
@Parameter(name = "baseId", description = "基地ID", required = true)
@Parameter(name = "year", description = "查询条件: 年份", required = true)
public void getYieldStatisticsInfo(@RequestParam("baseId") String baseId,
@RequestParam("year") String year) {
}
@GetMapping("/crop-statistics/type/3")
@Operation(summary = "种植统计-实际/预计产量对比")
@Parameter(name = "baseId", description = "基地ID", required = true)
@Parameter(name = "year", description = "查询条件: 年份", required = true)
public void getActualYieldStatisticsInfo(@RequestParam("baseId") String baseId,
@RequestParam("year") String year) {
}
@GetMapping("/farm-records/type/1")
@Operation(summary = "农事分布")
@Parameter(name = "baseId", description = "基地ID", required = true)
public void getFarmRecords(@RequestParam("baseId") String baseId) {
}
@GetMapping("/farm-records/type/2")
@Operation(summary = "农事活动趋势")
@Parameter(name = "baseId", description = "基地ID", required = true)
public void getFarmRecordsDirection(@RequestParam("baseId") String baseId) {
}
@GetMapping("/device-info/statistics")
@Operation(summary = "设备统计")
@Parameter(name = "baseId", description = "基地ID", required = true)
public void getDeviceInfo(@RequestParam("baseId") String baseId) {
}
@GetMapping("/device-info/monitor-data")
@Operation(summary = "监测数据")
@Parameter(name = "baseId", description = "基地ID", required = true)
public void getMonitoringData(@RequestParam("baseId") String baseId) {
}
}

21
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseNameRespVO.java Normal file
View File

@@ -0,0 +1,21 @@
package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author: binda
* @date: 2025/9/23 18:36
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class BaseNameRespVO {
@Schema(description = "基地ID")
private String baseId;
@Schema(description = "基地名称")
private String baseName;
}

43
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BasePointRespVO.java Normal file
View File

@@ -0,0 +1,43 @@
package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @description:
* @author: binda
* @date: 2025/9/23 18:28
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class BasePointRespVO {
@Schema(description = "基地ID")
private String baseId;
@Schema(description = "基地名称")
private String baseName;
@Schema(description = "基地坐标")
private String point;
@Schema(description = "地块集合")
private List<PlotInfo> plotInfos;
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class PlotInfo {
@Schema(description = "地块ID")
private String plotId;
@Schema(description = "地块名称")
private String plotName;
@Schema(description = "基地坐标")
private String point;
@Schema(description = "基地颜色")
private String plotColor;
}
}

23
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/BaseStatisticsInfoRespVO.java Normal file
View File

@@ -0,0 +1,23 @@
package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author: binda
* @date: 2025/9/22 21:32
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class BaseStatisticsInfoRespVO {
@Schema(description = "总面积")
private Integer totalArea;
@Schema(description = "基地数量")
private Integer totalBase;
@Schema(description = "地块数量")
private Integer totalPlot;
}

24
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/CompanyInfoRespVO.java Normal file
View File

@@ -0,0 +1,24 @@
package cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description: 驾驶舱-组合信息 响应数据
* @author: binda
* @date: 2025/9/22 21:24
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class CompanyInfoRespVO {
private String id;
@Schema(description = "企业名称")
private String name;
@Schema(description = "企业介绍")
private String introduction;
@Schema(description = "企业logo")
private String logoImage;
}

15
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingnamemaintenance/vo/FarmingNameMaintenanceSaveReqVO.java
View File

@@ -19,19 +19,4 @@ public class FarmingNameMaintenanceSaveReqVO {
@Schema(description = "0=启用，1=停用", example = "2")
private Integer useStatus;
// @Schema(description = "基地id", example = "23381")
// private String baseId;
//
// @Schema(description = "基地", example = "赵六")
// private String baseName;
//
// @Schema(description = "地块ID", example = "20315")
// private String plotId;
//
// @Schema(description = "地块", example = "张三")
// private String plotName;
//
// @Schema(description = "租户id", example = "15178")
// private String tenantId;
}

151
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/FarmingRecordController.java
View File

@@ -31,83 +31,82 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo.FarmingRec
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecord.FarmingRecordDO;
import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService;
@Tag(name = "管理后台 - 种植中心-农事基地-农事记录")
@RestController
@RequestMapping("/farm/farming-record")
@Validated
//@Tag(name = "种植中心-农事记录")
//@RestController
//@RequestMapping("/farm/farming-record")
//@Validated
public class FarmingRecordController {
@Resource
private FarmingRecordService farmingRecordService;
@PostMapping("/create")
@Operation(summary = "创建种植中心-农事基地-农事记录")
public CommonResult<String> createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) {
return success(farmingRecordService.createFarmingRecord(createReqVO));
}
@PostMapping("/create-new")
@Operation(summary = "创建种植中心-农事基地-农事记录（新格式）")
public CommonResult<String> createFarmingRecordNew(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) {
return success(farmingRecordService.createFarmingRecordNew(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新种植中心-农事基地-农事记录")
public CommonResult<Boolean> updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) {
farmingRecordService.updateFarmingRecord(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除种植中心-农事基地-农事记录")
@Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> deleteFarmingRecord(@RequestParam("id") String id) {
farmingRecordService.deleteFarmingRecord(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除种植中心-农事基地-农事记录")
public CommonResult<Boolean> deleteFarmingRecordList(@RequestParam("ids") List<String> ids) {
farmingRecordService.deleteFarmingRecordListByIds(ids);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得种植中心-农事基地-农事记录")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<FarmingRecordRespVO> getFarmingRecord(@RequestParam("id") String id) {
FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id);
return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得种植中心-农事基地-农事记录分页")
public CommonResult<PageResult<FarmingRecordRespVO>> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) {
PageResult<FarmingRecordDO> pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出种植中心-农事基地-农事记录 Excel")
@ApiAccessLog(operateType = EXPORT)
public void exportFarmingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<FarmingRecordDO> list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class,
BeanUtils.toBean(list, FarmingRecordRespVO.class));
}
// @Resource
// private FarmingRecordService farmingRecordService;
//
// @PostMapping("/create")
// @Operation(summary = "创建种植中心-农事基地-农事记录")
//
// public CommonResult<String> createFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO createReqVO) {
// return success(farmingRecordService.createFarmingRecord(createReqVO));
// }
//
// @PostMapping("/create-new")
// @Operation(summary = "创建种植中心-农事基地-农事记录（新格式）")
// public CommonResult<String> createFarmingRecordNew(@Valid @RequestBody FarmingRecordCreateReqVO createReqVO) {
// return success(farmingRecordService.createFarmingRecordNew(createReqVO));
// }
//
// @PutMapping("/update")
// @Operation(summary = "更新种植中心-农事基地-农事记录")
//
// public CommonResult<Boolean> updateFarmingRecord(@Valid @RequestBody FarmingRecordSaveReqVO updateReqVO) {
// farmingRecordService.updateFarmingRecord(updateReqVO);
// return success(true);
// }
//
// @DeleteMapping("/delete")
// @Operation(summary = "删除种植中心-农事基地-农事记录")
// @Parameter(name = "id", description = "编号", required = true)
//
// public CommonResult<Boolean> deleteFarmingRecord(@RequestParam("id") String id) {
// farmingRecordService.deleteFarmingRecord(id);
// return success(true);
// }
//
// @DeleteMapping("/delete-list")
// @Parameter(name = "ids", description = "编号", required = true)
// @Operation(summary = "批量删除种植中心-农事基地-农事记录")
//
// public CommonResult<Boolean> deleteFarmingRecordList(@RequestParam("ids") List<String> ids) {
// farmingRecordService.deleteFarmingRecordListByIds(ids);
// return success(true);
// }
//
// @GetMapping("/get")
// @Operation(summary = "获得种植中心-农事基地-农事记录")
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
//
// public CommonResult<FarmingRecordRespVO> getFarmingRecord(@RequestParam("id") String id) {
// FarmingRecordDO farmingRecord = farmingRecordService.getFarmingRecord(id);
// return success(BeanUtils.toBean(farmingRecord, FarmingRecordRespVO.class));
// }
//
// @GetMapping("/page")
// @Operation(summary = "获得种植中心-农事基地-农事记录分页")
//
// public CommonResult<PageResult<FarmingRecordRespVO>> getFarmingRecordPage(@Valid FarmingRecordPageReqVO pageReqVO) {
// PageResult<FarmingRecordDO> pageResult = farmingRecordService.getFarmingRecordPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, FarmingRecordRespVO.class));
// }
//
// @GetMapping("/export-excel")
// @Operation(summary = "导出种植中心-农事基地-农事记录 Excel")
//
// @ApiAccessLog(operateType = EXPORT)
// public void exportFarmingRecordExcel(@Valid FarmingRecordPageReqVO pageReqVO,
// HttpServletResponse response) throws IOException {
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
// List<FarmingRecordDO> list = farmingRecordService.getFarmingRecordPage(pageReqVO).getList();
// // 导出 Excel
// ExcelUtils.write(response, "种植中心-农事基地-农事记录.xls", "数据", FarmingRecordRespVO.class,
// BeanUtils.toBean(list, FarmingRecordRespVO.class));
// }
}

27
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/farmingrecord/vo/FarmingRecordRespVO.java
View File

@@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.farm.controller.admin.farmingrecord.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import cn.idev.excel.annotation.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingrecordinput.FarmingRecordInputDO;
@Schema(description = "管理后台 - 种植中心-农事基地-农事记录 Response VO")
@Data
@@ -45,6 +45,8 @@ public class FarmingRecordRespVO {
@Schema(description = "执行人")
@ExcelProperty("执行人")
private List<String> executor;
@Schema(description = "临时工姓名")
private String dayLaborer;
@Schema(description = "实际用工")
@ExcelProperty("实际用工")
@@ -86,10 +88,29 @@ public class FarmingRecordRespVO {
private String tenantId;
@Schema(description = "投入品列表")
private List<FarmingRecordInputDO> investGoodsList;
private List<FarmingRecordInputVO> investGoodsList;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Data
public static class FarmingRecordInputVO{
private String id;
@Schema(description = "投入品名称")
private String inputsId;
@Schema(description = "投入品类型")
private String assetType;
@Schema(description = "用量")
private BigDecimal dose;
@Schema(description = "单位")
private Integer unit;
@Schema(description = "单件")
private Integer packageUnit;
@Schema(description = "稀释倍液")
private Integer diluted;
@Schema(description = "用法")
private String usage;
}
}

6
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/BaseInfoController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/BaseInfoController.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.farm.controller.admin.baseinfo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.*;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.wx.BaseInfoForWxRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.BaseInfoForWxRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.*;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/GridInfoController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/GridInfoController.java
View File

@@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.farm.controller.admin.gridinfo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
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.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
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 static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo.*;
import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO;
import cn.iocoder.yudao.module.farm.service.gridinfo.GridInfoService;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/PlotInfoController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/PlotInfoController.java
View File

@@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.farm.controller.admin.plotinfo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo;
import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.PlotInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.plotinfo.vo.wx.RegularPlotInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.PlotInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.wx.RegularPlotInfoRespVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseAndPlotNamesRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseAndPlotNamesRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseInfoSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseInfoSaveReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNamePlanRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamePlanRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNameRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNameRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNamesRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseNamesRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo;
import lombok.AllArgsConstructor;
import lombok.Data;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseOverviewRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/BaseOverviewRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/gridinfo/vo/GridInfoSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/GridInfoSaveReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/PlotInfoSaveReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/TenantInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/TenantInfoRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/wx/BaseInfoForWxRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/BaseInfoForWxRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/wx/RegularPlotInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/baseinfo/vo/wx/RegularPlotInfoRespVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/CompanyInfoController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/CompanyInfoController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.companyinfo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo;
import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.companyinfo.vo.CompanyInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.companyinfo.vo.CompanyInfoSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/companyinfo/vo/CompanyInfoPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/companyinfo/vo/CompanyInfoSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/companyinfo/vo/CompanyInfoSaveReqVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/MessageCenterController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/MessageCenterController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.messagecenter;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,10 +6,10 @@ 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.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageCenterSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.messagecenter.vo.MessageStatisticsRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageCenterSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.messagecenter.vo.MessageStatisticsRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.messagecenter.MessageCenterDO;
import cn.iocoder.yudao.module.farm.service.messagecenter.MessageCenterService;
import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageCenterSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageCenterSaveReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/messagecenter/vo/MessageStatisticsRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/messagecenter/vo/MessageStatisticsRespVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/ModelCycleController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/ModelCycleController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelcycle;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle;
import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCyclePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCyclePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/modelcycle/vo/ModelCyclePageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCyclePageReqVO.java
View File

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

6
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleRespVO.java
View File

@@ -1,11 +1,9 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO;
import io.swagger.v3.oas.annotations.media.Schema;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelcycle/vo/ModelCycleSaveReqVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/ModelEnvironmentIndexController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/ModelEnvironmentIndexController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex;
import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/ModelFarmingOperationController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/ModelFarmingOperationController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo.ModelFarmingOperationSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperation/vo/ModelFarmingOperationSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperation.vo;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO;
import io.swagger.v3.oas.annotations.media.Schema;

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/ModelFarmingOperationInputController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/ModelFarmingOperationInputController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelfarmingoperationinput.vo.ModelFarmingOperationInputSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelfarmingoperationinput/vo/ModelFarmingOperationInputSaveReqVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/ModelPestDiseaseWeedController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/ModelPestDiseaseWeedController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed;
import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelpestdiseaseweed.vo.ModelPestDiseaseWeedSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelpestdiseaseweed/vo/ModelPestDiseaseWeedSaveReqVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/ModelManagementController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/ModelManagementController.java
View File

@@ -1,14 +1,14 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementForPlanRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementForPlanRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo.ModelManagementRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
import cn.iocoder.yudao.module.farm.framework.util.ModelManagementConvertUtil;
import cn.iocoder.yudao.module.farm.service.modelmanagement.ModelManagementService;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementForPlanRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementForPlanRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementPageReqVO.java
View File

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

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementRespVO.java
View File

@@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.models.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelcycle.vo.ModelCycleRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/models/vo/ModelManagementSaveReqVO.java
View File

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

10
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/ModelWeatherDisasterController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/ModelWeatherDisasterController.java
View File

@@ -1,12 +1,10 @@
package cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster;
import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.modelmanagement.modelweatherdisaster.vo.ModelWeatherDisasterSaveReqVO;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.validation.Valid;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
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/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/modelmanagement/modelweatherdisaster/vo/ModelWeatherDisasterSaveReqVO.java
View File

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

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/PersonnelManagementController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/PersonnelManagementController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement;
package cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
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.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.personnelmanagement.vo.PersonnelManagementSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.personnelmanagement.vo.PersonnelManagementSaveReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.PersonnelManagementDO;
import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagementService;
import io.swagger.v3.oas.annotations.Operation;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementPageReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementPageReqVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementRespVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementRespVO.java
View File

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

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/personnelmanagement/vo/PersonnelManagementSaveReqVO.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/personnelmanagement/vo/PersonnelManagementSaveReqVO.java
View File

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

138
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/pestdiseaseweedlibrary/PestDiseaseWeedLibraryController.java
View File

@@ -33,76 +33,76 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.module.farm.dal.dataobject.pestdiseaseweedlibrary.PestDiseaseWeedLibraryDO;
import cn.iocoder.yudao.module.farm.service.pestdiseaseweedlibrary.PestDiseaseWeedLibraryService;
@Tag(name = "管理后台 - 病虫草害库维护")
@RestController
@RequestMapping("/farm/pest-disease-weed-library")
@Validated
//@Tag(name = "管理后台 - 病虫草害库维护")
//@RestController
//@RequestMapping("/farm/pest-disease-weed-library")
//@Validated
public class PestDiseaseWeedLibraryController {
@Resource
private PestDiseaseWeedLibraryService pestDiseaseWeedLibraryService;
@PostMapping("/create")
@Operation(summary = "创建病虫草害库维护")
public CommonResult<String> createPestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO createReqVO) {
return success(pestDiseaseWeedLibraryService.createPestDiseaseWeedLibrary(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新病虫草害库维护")
public CommonResult<Boolean> updatePestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO updateReqVO) {
pestDiseaseWeedLibraryService.updatePestDiseaseWeedLibrary(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除病虫草害库维护")
@Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> deletePestDiseaseWeedLibrary(@RequestParam("id") String id) {
pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibrary(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除病虫草害库维护")
public CommonResult<Boolean> deletePestDiseaseWeedLibraryList(@RequestParam("ids") List<String> ids) {
pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibraryListByIds(ids);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得病虫草害库维护")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<PestDiseaseWeedLibraryRespVO> getPestDiseaseWeedLibrary(@RequestParam("id") String id) {
PestDiseaseWeedLibraryDO pestDiseaseWeedLibrary = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibrary(id);
return success(BeanUtils.toBean(pestDiseaseWeedLibrary, PestDiseaseWeedLibraryRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得病虫草害库维护分页")
public CommonResult<PageResult<PestDiseaseWeedLibraryRespVO>> getPestDiseaseWeedLibraryPage(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO) {
PageResult<PestDiseaseWeedLibraryDO> pageResult = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, PestDiseaseWeedLibraryRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出病虫草害库维护 Excel")
@ApiAccessLog(operateType = EXPORT)
public void exportPestDiseaseWeedLibraryExcel(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<PestDiseaseWeedLibraryDO> list = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "病虫草害库维护.xls", "数据", PestDiseaseWeedLibraryRespVO.class,
BeanUtils.toBean(list, PestDiseaseWeedLibraryRespVO.class));
}
// @Resource
// private PestDiseaseWeedLibraryService pestDiseaseWeedLibraryService;
//
// @PostMapping("/create")
// @Operation(summary = "创建病虫草害库维护")
//
// public CommonResult<String> createPestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO createReqVO) {
// return success(pestDiseaseWeedLibraryService.createPestDiseaseWeedLibrary(createReqVO));
// }
//
// @PutMapping("/update")
// @Operation(summary = "更新病虫草害库维护")
//
// public CommonResult<Boolean> updatePestDiseaseWeedLibrary(@Valid @RequestBody PestDiseaseWeedLibrarySaveReqVO updateReqVO) {
// pestDiseaseWeedLibraryService.updatePestDiseaseWeedLibrary(updateReqVO);
// return success(true);
// }
//
// @DeleteMapping("/delete")
// @Operation(summary = "删除病虫草害库维护")
// @Parameter(name = "id", description = "编号", required = true)
//
// public CommonResult<Boolean> deletePestDiseaseWeedLibrary(@RequestParam("id") String id) {
// pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibrary(id);
// return success(true);
// }
//
// @DeleteMapping("/delete-list")
// @Parameter(name = "ids", description = "编号", required = true)
// @Operation(summary = "批量删除病虫草害库维护")
//
// public CommonResult<Boolean> deletePestDiseaseWeedLibraryList(@RequestParam("ids") List<String> ids) {
// pestDiseaseWeedLibraryService.deletePestDiseaseWeedLibraryListByIds(ids);
// return success(true);
// }
//
// @GetMapping("/get")
// @Operation(summary = "获得病虫草害库维护")
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
//
// public CommonResult<PestDiseaseWeedLibraryRespVO> getPestDiseaseWeedLibrary(@RequestParam("id") String id) {
// PestDiseaseWeedLibraryDO pestDiseaseWeedLibrary = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibrary(id);
// return success(BeanUtils.toBean(pestDiseaseWeedLibrary, PestDiseaseWeedLibraryRespVO.class));
// }
//
// @GetMapping("/page")
// @Operation(summary = "获得病虫草害库维护分页")
//
// public CommonResult<PageResult<PestDiseaseWeedLibraryRespVO>> getPestDiseaseWeedLibraryPage(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO) {
// PageResult<PestDiseaseWeedLibraryDO> pageResult = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, PestDiseaseWeedLibraryRespVO.class));
// }
//
// @GetMapping("/export-excel")
// @Operation(summary = "导出病虫草害库维护 Excel")
//
// @ApiAccessLog(operateType = EXPORT)
// public void exportPestDiseaseWeedLibraryExcel(@Valid PestDiseaseWeedLibraryPageReqVO pageReqVO,
// HttpServletResponse response) throws IOException {
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
// List<PestDiseaseWeedLibraryDO> list = pestDiseaseWeedLibraryService.getPestDiseaseWeedLibraryPage(pageReqVO).getList();
// // 导出 Excel
// ExcelUtils.write(response, "病虫草害库维护.xls", "数据", PestDiseaseWeedLibraryRespVO.class,
// BeanUtils.toBean(list, PestDiseaseWeedLibraryRespVO.class));
// }
}

136
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/productionplan/ProductionPlanController.java
View File

@@ -31,75 +31,75 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.module.farm.dal.dataobject.productionplan.ProductionPlanDO;
import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService;
@Tag(name = "管理后台 - 种植中心-生产计划-生产计划")
@RestController
@RequestMapping("/farm/production-plan")
@Validated
//@Tag(name = "种植中心-生产计划")
//@RestController
//@RequestMapping("/farm/production-plan")
//@Validated
public class ProductionPlanController {
@Resource
private ProductionPlanService productionPlanService;
@PostMapping("/create")
@Operation(summary = "创建种植中心-生产计划-生产计划")
public CommonResult<String> createProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO createReqVO) {
return success(productionPlanService.createProductionPlan(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新种植中心-生产计划-生产计划")
public CommonResult<Boolean> updateProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO updateReqVO) {
productionPlanService.updateProductionPlan(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除种植中心-生产计划-生产计划")
@Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> deleteProductionPlan(@RequestParam("id") String id) {
productionPlanService.deleteProductionPlan(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除种植中心-生产计划-生产计划")
public CommonResult<Boolean> deleteProductionPlanList(@RequestParam("ids") List<String> ids) {
productionPlanService.deleteProductionPlanListByIds(ids);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得种植中心-生产计划-生产计划")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<ProductionPlanRespVO> getProductionPlan(@RequestParam("id") String id) {
ProductionPlanDO productionPlan = productionPlanService.getProductionPlan(id);
return success(BeanUtils.toBean(productionPlan, ProductionPlanRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得种植中心-生产计划-生产计划分页")
public CommonResult<PageResult<ProductionPlanRespVO>> getProductionPlanPage(@Valid ProductionPlanPageReqVO pageReqVO) {
PageResult<ProductionPlanDO> pageResult = productionPlanService.getProductionPlanPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ProductionPlanRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出种植中心-生产计划-生产计划 Excel")
@ApiAccessLog(operateType = EXPORT)
public void exportProductionPlanExcel(@Valid ProductionPlanPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<ProductionPlanDO> list = productionPlanService.getProductionPlanPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "种植中心-生产计划-生产计划.xls", "数据", ProductionPlanRespVO.class,
BeanUtils.toBean(list, ProductionPlanRespVO.class));
}
// @Resource
// private ProductionPlanService productionPlanService;
//
// @PostMapping("/create")
// @Operation(summary = "创建种植中心-生产计划-生产计划")
//
// public CommonResult<String> createProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO createReqVO) {
// return success(productionPlanService.createProductionPlan(createReqVO));
// }
//
// @PutMapping("/update")
// @Operation(summary = "更新种植中心-生产计划-生产计划")
//
// public CommonResult<Boolean> updateProductionPlan(@Valid @RequestBody ProductionPlanSaveReqVO updateReqVO) {
// productionPlanService.updateProductionPlan(updateReqVO);
// return success(true);
// }
//
// @DeleteMapping("/delete")
// @Operation(summary = "删除种植中心-生产计划-生产计划")
// @Parameter(name = "id", description = "编号", required = true)
//
// public CommonResult<Boolean> deleteProductionPlan(@RequestParam("id") String id) {
// productionPlanService.deleteProductionPlan(id);
// return success(true);
// }
//
// @DeleteMapping("/delete-list")
// @Parameter(name = "ids", description = "编号", required = true)
// @Operation(summary = "批量删除种植中心-生产计划-生产计划")
//
// public CommonResult<Boolean> deleteProductionPlanList(@RequestParam("ids") List<String> ids) {
// productionPlanService.deleteProductionPlanListByIds(ids);
// return success(true);
// }
//
// @GetMapping("/get")
// @Operation(summary = "获得种植中心-生产计划-生产计划")
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
//
// public CommonResult<ProductionPlanRespVO> getProductionPlan(@RequestParam("id") String id) {
// ProductionPlanDO productionPlan = productionPlanService.getProductionPlan(id);
// return success(BeanUtils.toBean(productionPlan, ProductionPlanRespVO.class));
// }
//
// @GetMapping("/page")
// @Operation(summary = "获得种植中心-生产计划-生产计划分页")
// public CommonResult<PageResult<ProductionPlanRespVO>> getProductionPlanPage(@Valid ProductionPlanPageReqVO pageReqVO) {
// PageResult<ProductionPlanDO> pageResult = productionPlanService.getProductionPlanPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, ProductionPlanRespVO.class));
// }
//
// @GetMapping("/export-excel")
// @Operation(summary = "导出种植中心-生产计划-生产计划 Excel")
//
// @ApiAccessLog(operateType = EXPORT)
// public void exportProductionPlanExcel(@Valid ProductionPlanPageReqVO pageReqVO,
// HttpServletResponse response) throws IOException {
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
// List<ProductionPlanDO> list = productionPlanService.getProductionPlanPage(pageReqVO).getList();
// // 导出 Excel
// ExcelUtils.write(response, "种植中心-生产计划-生产计划.xls", "数据", ProductionPlanRespVO.class,
// BeanUtils.toBean(list, ProductionPlanRespVO.class));
// }
}

11
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/twodict/TwoDictController.java → yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/specieslibrary/TwoDictController.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.farm.controller.admin.twodict;
package cn.iocoder.yudao.module.farm.controller.admin.specieslibrary;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
@@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
@@ -25,10 +24,10 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.twodict.vo.TwoDictTreeRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.specieslibrary.vo.TwoDictRespVO;
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.service.twodict.TwoDictService;

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

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

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

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

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

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

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

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

138
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/weatherdisasterlibrary/WeatherDisasterLibraryController.java
View File

@@ -33,76 +33,76 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.module.farm.dal.dataobject.weatherdisasterlibrary.WeatherDisasterLibraryDO;
import cn.iocoder.yudao.module.farm.service.weatherdisasterlibrary.WeatherDisasterLibraryService;
@Tag(name = "管理后台 - 气象灾害库维护")
@RestController
@RequestMapping("/farm/weather-disaster-library")
@Validated
//@Tag(name = "管理后台 - 气象灾害库维护")
//@RestController
//@RequestMapping("/farm/weather-disaster-library")
//@Validated
public class WeatherDisasterLibraryController {
@Resource
private WeatherDisasterLibraryService weatherDisasterLibraryService;
@PostMapping("/create")
@Operation(summary = "创建气象灾害库维护")
public CommonResult<String> createWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO createReqVO) {
return success(weatherDisasterLibraryService.createWeatherDisasterLibrary(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新气象灾害库维护")
public CommonResult<Boolean> updateWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO updateReqVO) {
weatherDisasterLibraryService.updateWeatherDisasterLibrary(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除气象灾害库维护")
@Parameter(name = "id", description = "编号", required = true)
public CommonResult<Boolean> deleteWeatherDisasterLibrary(@RequestParam("id") String id) {
weatherDisasterLibraryService.deleteWeatherDisasterLibrary(id);
return success(true);
}
@DeleteMapping("/delete-list")
@Parameter(name = "ids", description = "编号", required = true)
@Operation(summary = "批量删除气象灾害库维护")
public CommonResult<Boolean> deleteWeatherDisasterLibraryList(@RequestParam("ids") List<String> ids) {
weatherDisasterLibraryService.deleteWeatherDisasterLibraryListByIds(ids);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得气象灾害库维护")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<WeatherDisasterLibraryRespVO> getWeatherDisasterLibrary(@RequestParam("id") String id) {
WeatherDisasterLibraryDO weatherDisasterLibrary = weatherDisasterLibraryService.getWeatherDisasterLibrary(id);
return success(BeanUtils.toBean(weatherDisasterLibrary, WeatherDisasterLibraryRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得气象灾害库维护分页")
public CommonResult<PageResult<WeatherDisasterLibraryRespVO>> getWeatherDisasterLibraryPage(@Valid WeatherDisasterLibraryPageReqVO pageReqVO) {
PageResult<WeatherDisasterLibraryDO> pageResult = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, WeatherDisasterLibraryRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出气象灾害库维护 Excel")
@ApiAccessLog(operateType = EXPORT)
public void exportWeatherDisasterLibraryExcel(@Valid WeatherDisasterLibraryPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<WeatherDisasterLibraryDO> list = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "气象灾害库维护.xls", "数据", WeatherDisasterLibraryRespVO.class,
BeanUtils.toBean(list, WeatherDisasterLibraryRespVO.class));
}
// @Resource
// private WeatherDisasterLibraryService weatherDisasterLibraryService;
//
// @PostMapping("/create")
// @Operation(summary = "创建气象灾害库维护")
//
// public CommonResult<String> createWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO createReqVO) {
// return success(weatherDisasterLibraryService.createWeatherDisasterLibrary(createReqVO));
// }
//
// @PutMapping("/update")
// @Operation(summary = "更新气象灾害库维护")
//
// public CommonResult<Boolean> updateWeatherDisasterLibrary(@Valid @RequestBody WeatherDisasterLibrarySaveReqVO updateReqVO) {
// weatherDisasterLibraryService.updateWeatherDisasterLibrary(updateReqVO);
// return success(true);
// }
//
// @DeleteMapping("/delete")
// @Operation(summary = "删除气象灾害库维护")
// @Parameter(name = "id", description = "编号", required = true)
//
// public CommonResult<Boolean> deleteWeatherDisasterLibrary(@RequestParam("id") String id) {
// weatherDisasterLibraryService.deleteWeatherDisasterLibrary(id);
// return success(true);
// }
//
// @DeleteMapping("/delete-list")
// @Parameter(name = "ids", description = "编号", required = true)
// @Operation(summary = "批量删除气象灾害库维护")
//
// public CommonResult<Boolean> deleteWeatherDisasterLibraryList(@RequestParam("ids") List<String> ids) {
// weatherDisasterLibraryService.deleteWeatherDisasterLibraryListByIds(ids);
// return success(true);
// }
//
// @GetMapping("/get")
// @Operation(summary = "获得气象灾害库维护")
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
//
// public CommonResult<WeatherDisasterLibraryRespVO> getWeatherDisasterLibrary(@RequestParam("id") String id) {
// WeatherDisasterLibraryDO weatherDisasterLibrary = weatherDisasterLibraryService.getWeatherDisasterLibrary(id);
// return success(BeanUtils.toBean(weatherDisasterLibrary, WeatherDisasterLibraryRespVO.class));
// }
//
// @GetMapping("/page")
// @Operation(summary = "获得气象灾害库维护分页")
//
// public CommonResult<PageResult<WeatherDisasterLibraryRespVO>> getWeatherDisasterLibraryPage(@Valid WeatherDisasterLibraryPageReqVO pageReqVO) {
// PageResult<WeatherDisasterLibraryDO> pageResult = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO);
// return success(BeanUtils.toBean(pageResult, WeatherDisasterLibraryRespVO.class));
// }
//
// @GetMapping("/export-excel")
// @Operation(summary = "导出气象灾害库维护 Excel")
//
// @ApiAccessLog(operateType = EXPORT)
// public void exportWeatherDisasterLibraryExcel(@Valid WeatherDisasterLibraryPageReqVO pageReqVO,
// HttpServletResponse response) throws IOException {
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
// List<WeatherDisasterLibraryDO> list = weatherDisasterLibraryService.getWeatherDisasterLibraryPage(pageReqVO).getList();
// // 导出 Excel
// ExcelUtils.write(response, "气象灾害库维护.xls", "数据", WeatherDisasterLibraryRespVO.class,
// BeanUtils.toBean(list, WeatherDisasterLibraryRespVO.class));
// }
}

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

@@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.farm.dal.mysql.baseinfo;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.digitalcockpit.vo.BaseStatisticsInfoRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.BaseInfoPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -33,4 +34,5 @@ public interface BaseInfoMapper extends BaseMapperX<BaseInfoDO> {
BigDecimal getTotalBaseArea(@Param("id") String id, @Param("tenantId") Long tenantId);
BaseStatisticsInfoRespVO getBaseStatisticsInfo(@Param("baseId") String baseId);
}

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

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

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

@@ -34,7 +34,7 @@ public interface FarmingRecordMapper extends BaseMapperX<FarmingRecordDO> {
.likeIfPresent(FarmingRecordDO::getPlotName, reqVO.getPlotName())
.eqIfPresent(FarmingRecordDO::getTenantId, reqVO.getTenantId())
.betweenIfPresent(FarmingRecordDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(FarmingRecordDO::getCreateTime));
.orderByDesc(FarmingRecordDO::getTaskTime));
}
}

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

@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.farm.dal.mysql.gridinfo;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.baseinfo.vo.GridInfoPageReqVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.gridinfo.GridInfoDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.farm.controller.admin.gridinfo.vo.*;
/**
* 网格 Mapper

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

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

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

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

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