fix (farm): 大屏数据维护
- 品种数据 bug - 灾害数据 bug
This commit is contained in:
@@ -1,111 +0,0 @@
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.indicatorname;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
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.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
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.indicatorname.vo.*;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO;
|
||||
import cn.iocoder.yudao.module.farm.service.indicatorname.IndicatorNameService;
|
||||
|
||||
//@Tag(name = "管理后台 - 指标名称")
|
||||
//@RestController
|
||||
//@RequestMapping("/farm/indicator-name")
|
||||
//@Validated
|
||||
public class IndicatorNameController {
|
||||
//
|
||||
// @Resource
|
||||
// private IndicatorNameService indicatorNameService;
|
||||
//
|
||||
// @PostMapping("/create")
|
||||
// @Operation(summary = "创建指标名称")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:create')")
|
||||
// public CommonResult<Long> createIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO createReqVO) {
|
||||
// return success(indicatorNameService.createIndicatorName(createReqVO));
|
||||
// }
|
||||
//
|
||||
// @PutMapping("/update")
|
||||
// @Operation(summary = "更新指标名称")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:update')")
|
||||
// public CommonResult<Boolean> updateIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO updateReqVO) {
|
||||
// indicatorNameService.updateIndicatorName(updateReqVO);
|
||||
// return success(true);
|
||||
// }
|
||||
//
|
||||
// @DeleteMapping("/delete")
|
||||
// @Operation(summary = "删除指标名称")
|
||||
// @Parameter(name = "id", description = "编号", required = true)
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')")
|
||||
// public CommonResult<Boolean> deleteIndicatorName(@RequestParam("id") Long id) {
|
||||
// indicatorNameService.deleteIndicatorName(id);
|
||||
// return success(true);
|
||||
// }
|
||||
//
|
||||
// @DeleteMapping("/delete-list")
|
||||
// @Parameter(name = "ids", description = "编号", required = true)
|
||||
// @Operation(summary = "批量删除指标名称")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')")
|
||||
// public CommonResult<Boolean> deleteIndicatorNameList(@RequestParam("ids") List<Long> ids) {
|
||||
// indicatorNameService.deleteIndicatorNameListByIds(ids);
|
||||
// return success(true);
|
||||
// }
|
||||
//
|
||||
// @GetMapping("/get")
|
||||
// @Operation(summary = "获得指标名称")
|
||||
// @Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')")
|
||||
// public CommonResult<IndicatorNameRespVO> getIndicatorName(@RequestParam("id") Long id) {
|
||||
// IndicatorNameDO indicatorName = indicatorNameService.getIndicatorName(id);
|
||||
// return success(BeanUtils.toBean(indicatorName, IndicatorNameRespVO.class));
|
||||
// }
|
||||
//
|
||||
// @GetMapping("/page")
|
||||
// @Operation(summary = "获得指标名称分页")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')")
|
||||
// public CommonResult<PageResult<IndicatorNameRespVO>> getIndicatorNamePage(@Valid IndicatorNamePageReqVO pageReqVO) {
|
||||
// PageResult<IndicatorNameDO> pageResult = indicatorNameService.getIndicatorNamePage(pageReqVO);
|
||||
// return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class));
|
||||
// }
|
||||
//
|
||||
// @GetMapping("/list")
|
||||
// @Operation(summary = "获得指标名称全量")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')")
|
||||
// public CommonResult<List<IndicatorNameRespVO>> getIndicatorNameList(@Valid IndicatorNamePageReqVO pageReqVO) {
|
||||
// List<IndicatorNameDO> pageResult = indicatorNameService.getIndicatorNameList(pageReqVO);
|
||||
// return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class));
|
||||
// }
|
||||
// @GetMapping("/export-excel")
|
||||
// @Operation(summary = "导出指标名称 Excel")
|
||||
// @PreAuthorize("@ss.hasPermission('farm:indicator-name:export')")
|
||||
// @ApiAccessLog(operateType = EXPORT)
|
||||
// public void exportIndicatorNameExcel(@Valid IndicatorNamePageReqVO pageReqVO,
|
||||
// HttpServletResponse response) throws IOException {
|
||||
// pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
// List<IndicatorNameDO> list = indicatorNameService.getIndicatorNamePage(pageReqVO).getList();
|
||||
// // 导出 Excel
|
||||
// ExcelUtils.write(response, "指标名称.xls", "数据", IndicatorNameRespVO.class,
|
||||
// BeanUtils.toBean(list, IndicatorNameRespVO.class));
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -27,6 +27,7 @@ public class VarietyDataPageReqVO extends PageParam {
|
||||
private String plantingSeason;
|
||||
|
||||
@Schema(description = "品种")
|
||||
private String cultivarId;
|
||||
private String cultivarName;
|
||||
|
||||
@Schema(description = "种植面积")
|
||||
|
||||
@@ -35,6 +35,7 @@ public class VarietyDataRespVO {
|
||||
|
||||
@Schema(description = "品种")
|
||||
@ExcelProperty("品种")
|
||||
private String cultivarId;
|
||||
private String cultivarName;
|
||||
|
||||
@Schema(description = "种植面积")
|
||||
|
||||
@@ -25,6 +25,7 @@ public class VarietyDataSaveReqVO {
|
||||
private String plantingSeason;
|
||||
|
||||
@Schema(description = "品种")
|
||||
private String cultivarId;
|
||||
private String cultivarName;
|
||||
|
||||
@Schema(description = "种植面积")
|
||||
@@ -45,5 +46,4 @@ public class VarietyDataSaveReqVO {
|
||||
@Schema(description = "租户id")
|
||||
private String tenantId;
|
||||
|
||||
private String cultivsrId;
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname;
|
||||
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNamePageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNameRespVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNameSaveReqVO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
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.*;
|
||||
import jakarta.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
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.dal.dataobject.indicatorname.IndicatorNameDO;
|
||||
import cn.iocoder.yudao.module.farm.service.indicatorname.IndicatorNameService;
|
||||
|
||||
@Tag(name = "管理后台 - 指标名称")
|
||||
@RestController
|
||||
@RequestMapping("/farm/indicator-name")
|
||||
@Validated
|
||||
public class IndicatorNameController {
|
||||
|
||||
@Resource
|
||||
private IndicatorNameService indicatorNameService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建指标名称")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:create')")
|
||||
public CommonResult<Long> createIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO createReqVO) {
|
||||
return success(indicatorNameService.createIndicatorName(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新指标名称")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:update')")
|
||||
public CommonResult<Boolean> updateIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO updateReqVO) {
|
||||
indicatorNameService.updateIndicatorName(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除指标名称")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')")
|
||||
public CommonResult<Boolean> deleteIndicatorName(@RequestParam("id") Long id) {
|
||||
indicatorNameService.deleteIndicatorName(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除指标名称")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:delete')")
|
||||
public CommonResult<Boolean> deleteIndicatorNameList(@RequestParam("ids") List<Long> ids) {
|
||||
indicatorNameService.deleteIndicatorNameListByIds(ids);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得指标名称")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:query')")
|
||||
public CommonResult<IndicatorNameRespVO> getIndicatorName(@RequestParam("id") Long id) {
|
||||
IndicatorNameDO indicatorName = indicatorNameService.getIndicatorName(id);
|
||||
return success(BeanUtils.toBean(indicatorName, IndicatorNameRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得指标名称分页")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:query')")
|
||||
public CommonResult<PageResult<IndicatorNameRespVO>> getIndicatorNamePage(@Valid IndicatorNamePageReqVO pageReqVO) {
|
||||
PageResult<IndicatorNameDO> pageResult = indicatorNameService.getIndicatorNamePage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class));
|
||||
}
|
||||
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "获得指标名称全量")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:query')")
|
||||
public CommonResult<List<IndicatorNameRespVO>> getIndicatorNameList(@Valid IndicatorNamePageReqVO pageReqVO) {
|
||||
List<IndicatorNameDO> pageResult = indicatorNameService.getIndicatorNameList(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class));
|
||||
}
|
||||
@GetMapping("/export-excel")
|
||||
@Operation(summary = "导出指标名称 Excel")
|
||||
@PreAuthorize("@ss.hasPermission('farm:indicator-name:export')")
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportIndicatorNameExcel(@Valid IndicatorNamePageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<IndicatorNameDO> list = indicatorNameService.getIndicatorNamePage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "指标名称.xls", "数据", IndicatorNameRespVO.class,
|
||||
BeanUtils.toBean(list, IndicatorNameRespVO.class));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo;
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo;
|
||||
|
||||
import lombok.*;
|
||||
import java.util.*;
|
||||
@@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo;
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
@@ -1,4 +1,4 @@
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo;
|
||||
package cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
@@ -50,6 +50,7 @@ public class VarietyDataDO extends BaseDO {
|
||||
/**
|
||||
* 品种
|
||||
*/
|
||||
private String cultivarId;
|
||||
private String cultivarName;
|
||||
/**
|
||||
* 种植面积
|
||||
@@ -74,6 +75,4 @@ public class VarietyDataDO extends BaseDO {
|
||||
|
||||
private String tenantId;
|
||||
|
||||
private String cultivsrId;
|
||||
|
||||
}
|
||||
@@ -1,13 +1,11 @@
|
||||
package cn.iocoder.yudao.module.farm.dal.mysql.indicatorname;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
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.traceability.indicatorname.vo.IndicatorNamePageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo.*;
|
||||
|
||||
/**
|
||||
* 指标名称 Mapper
|
||||
|
||||
@@ -21,6 +21,7 @@ public interface VarietyDataMapper extends BaseMapperX<VarietyDataDO> {
|
||||
.eqIfPresent(VarietyDataDO::getBaseId, reqVO.getBaseId())
|
||||
.likeIfPresent(VarietyDataDO::getBaseName, reqVO.getBaseName())
|
||||
.eqIfPresent(VarietyDataDO::getPlantingSeason, reqVO.getPlantingSeason())
|
||||
.likeIfPresent(VarietyDataDO::getCultivarId, reqVO.getCultivarId())
|
||||
.likeIfPresent(VarietyDataDO::getCultivarName, reqVO.getCultivarName())
|
||||
.eqIfPresent(VarietyDataDO::getArea, reqVO.getArea())
|
||||
.eqIfPresent(VarietyDataDO::getEstimatedOutput, reqVO.getEstimatedOutput())
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package cn.iocoder.yudao.module.farm.service.indicatorname;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNamePageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNameSaveReqVO;
|
||||
import jakarta.validation.*;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo.*;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
|
||||
/**
|
||||
* 指标名称 Service 接口
|
||||
|
||||
@@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.farm.service.indicatorname;
|
||||
|
||||
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.indicatorname.vo.IndicatorNamePageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo.IndicatorNameSaveReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNamePageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.traceability.indicatorname.vo.IndicatorNameSaveReqVO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.indicatorname.IndicatorNameMapper;
|
||||
import jakarta.annotation.Resource;
|
||||
|
||||
@@ -5,15 +5,20 @@ 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.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataPageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.screendisasterdata.vo.ScreenDisasterDataSaveReqVO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.screendisasterdata.ScreenDisasterDataDO;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.screendisasterdata.ScreenDisasterDataMapper;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
|
||||
import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.SCREEN_DISASTER_DATA_NOT_EXISTS;
|
||||
|
||||
/**
|
||||
@@ -27,6 +32,8 @@ public class ScreenDisasterDataServiceImpl implements ScreenDisasterDataService
|
||||
|
||||
@Resource
|
||||
private ScreenDisasterDataMapper screenDisasterDataMapper;
|
||||
@Resource
|
||||
private BaseInfoMapper baseInfoMapper;
|
||||
|
||||
@Override
|
||||
public String createScreenDisasterData(ScreenDisasterDataSaveReqVO createReqVO) {
|
||||
@@ -70,12 +77,23 @@ public class ScreenDisasterDataServiceImpl implements ScreenDisasterDataService
|
||||
|
||||
@Override
|
||||
public ScreenDisasterDataDO getScreenDisasterData(String id) {
|
||||
return screenDisasterDataMapper.selectById(id);
|
||||
ScreenDisasterDataDO res = screenDisasterDataMapper.selectById(id);
|
||||
BaseInfoDO bObj = baseInfoMapper.selectOne(BaseInfoDO::getId, res.getBaseId());
|
||||
|
||||
res.setBaseName(bObj.getName());
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<ScreenDisasterDataDO> getScreenDisasterDataPage(ScreenDisasterDataPageReqVO pageReqVO) {
|
||||
return screenDisasterDataMapper.selectPage(pageReqVO);
|
||||
List<BaseInfoDO> bList = baseInfoMapper.selectList(BaseInfoDO::getTenantId, getLoginUser().getTenantId());
|
||||
Map<String, String> bMap = bList.stream().collect(Collectors.toMap(BaseInfoDO::getId, BaseInfoDO::getName, (v, v1) -> v));
|
||||
|
||||
PageResult<ScreenDisasterDataDO> res = screenDisasterDataMapper.selectPage(pageReqVO);
|
||||
for (ScreenDisasterDataDO s : res.getList()) {
|
||||
s.setBaseName(bMap.getOrDefault(s.getBaseId(),""));
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,7 +6,11 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataPageReqVO;
|
||||
import cn.iocoder.yudao.module.farm.controller.admin.managementcenter.largescreen.varietydata.vo.VarietyDataSaveReqVO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.twodict.TwoDictDO;
|
||||
import cn.iocoder.yudao.module.farm.dal.dataobject.varietydata.VarietyDataDO;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.twodict.TwoDictMapper;
|
||||
import cn.iocoder.yudao.module.farm.dal.mysql.varietydata.VarietyDataMapper;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -29,6 +33,10 @@ public class VarietyDataServiceImpl implements VarietyDataService {
|
||||
|
||||
@Resource
|
||||
private VarietyDataMapper varietyDataMapper;
|
||||
@Resource
|
||||
private BaseInfoMapper baseInfoMapper;
|
||||
@Resource
|
||||
private TwoDictMapper twoDictMapper;
|
||||
|
||||
@Override
|
||||
public String createVarietyData(VarietyDataSaveReqVO createReqVO) {
|
||||
@@ -37,6 +45,14 @@ public class VarietyDataServiceImpl implements VarietyDataService {
|
||||
VarietyDataDO varietyData = BeanUtils.toBean(createReqVO, VarietyDataDO.class);
|
||||
varietyData.setId(IdUtil.fastUUID());
|
||||
varietyData.setTenantId(String.valueOf(user.getTenantId()));
|
||||
|
||||
// baseName
|
||||
BaseInfoDO bObj = baseInfoMapper.selectOne(BaseInfoDO::getId, createReqVO.getBaseId());
|
||||
// cultivarName
|
||||
TwoDictDO sObj = twoDictMapper.selectOne(TwoDictDO::getId, createReqVO.getCultivarId());
|
||||
|
||||
varietyData.setBaseName(bObj.getName());
|
||||
varietyData.setCultivarName(sObj.getName());
|
||||
varietyDataMapper.insert(varietyData);
|
||||
|
||||
// 返回
|
||||
|
||||
Reference in New Issue
Block a user