diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java new file mode 100644 index 00000000..079540dc --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/IndicatorNameController.java @@ -0,0 +1,111 @@ +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 createIndicatorName(@Valid @RequestBody IndicatorNameSaveReqVO createReqVO) { + return success(indicatorNameService.createIndicatorName(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新指标名称") + @PreAuthorize("@ss.hasPermission('farm:indicator-name:update')") + public CommonResult 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 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 deleteIndicatorNameList(@RequestParam("ids") List 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 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> getIndicatorNamePage(@Valid IndicatorNamePageReqVO pageReqVO) { + PageResult pageResult = indicatorNameService.getIndicatorNamePage(pageReqVO); + return success(BeanUtils.toBean(pageResult, IndicatorNameRespVO.class)); + } + + @GetMapping("/list") + @Operation(summary = "获得指标名称分页") + @PreAuthorize("@ss.hasPermission('farm:indicator-name:query')") + public CommonResult> getIndicatorNameList(@Valid IndicatorNamePageReqVO pageReqVO) { + List 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 list = indicatorNameService.getIndicatorNamePage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "指标名称.xls", "数据", IndicatorNameRespVO.class, + BeanUtils.toBean(list, IndicatorNameRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNamePageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNamePageReqVO.java new file mode 100644 index 00000000..7f386bf1 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNamePageReqVO.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 指标名称分页 Request VO") +@Data +public class IndicatorNamePageReqVO extends PageParam { + + @Schema(description = "名称", example = "张三") + private String name; + + @Schema(description = "图片") + private String image; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "范围") + private String sampleValue; + private String description; + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNameRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNameRespVO.java new file mode 100644 index 00000000..025c32e6 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNameRespVO.java @@ -0,0 +1,39 @@ +package cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 指标名称 Response VO") +@Data +@ExcelIgnoreUnannotated +public class IndicatorNameRespVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23777") + @ExcelProperty("主键ID") + private Long id; + + @Schema(description = "名称", example = "张三") + @ExcelProperty("名称") + private String name; + + @Schema(description = "图片") + @ExcelProperty("图片") + private String image; + + @Schema(description = "单位") + @ExcelProperty("单位") + private String unit; + + @Schema(description = "范围") + @ExcelProperty("范围") + private String sampleValue; + private String description; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNameSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNameSaveReqVO.java new file mode 100644 index 00000000..b5ca19b1 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/indicatorname/vo/IndicatorNameSaveReqVO.java @@ -0,0 +1,25 @@ +package cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 指标名称新增/修改 Request VO") +@Data +public class IndicatorNameSaveReqVO { + + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23777") + private Long id; + + @Schema(description = "名称", example = "张三") + private String name; + + @Schema(description = "图片") + private String image; + + @Schema(description = "单位") + private String unit; + + @Schema(description = "范围") + private String sampleValue; + private String description; +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java index 170ebb66..411d5144 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/plotinfo/vo/PlotInfoRespVO.java @@ -20,7 +20,7 @@ public class PlotInfoRespVO { @Schema(description = "所属基地ID", example = "1431") @ExcelProperty("所属基地ID") private String baseId; - + private String baseName; @Schema(description = "地块ID", example = "4027") @ExcelProperty("地块ID") private String plotId; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/indicatorname/IndicatorNameDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/indicatorname/IndicatorNameDO.java new file mode 100644 index 00000000..94906e25 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/indicatorname/IndicatorNameDO.java @@ -0,0 +1,48 @@ +package cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * 指标名称 DO + * + * @author 万懋超级管理 + */ +@TableName("farm_indicator_name") +@KeySequence("farm_indicator_name_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IndicatorNameDO extends BaseDO { + + /** + * 主键ID + */ + @TableId + private Long id; + /** + * 名称 + */ + private String name; + /** + * 图片 + */ + private String image; + /** + * 单位 + */ + private String unit; + /** + * 范围 + */ + private String sampleValue; + private String description; + + private String tenantId; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/indicatorname/IndicatorNameMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/indicatorname/IndicatorNameMapper.java new file mode 100644 index 00000000..ee1b9295 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/indicatorname/IndicatorNameMapper.java @@ -0,0 +1,30 @@ +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.dal.dataobject.indicatorname.IndicatorNameDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.farm.controller.admin.indicatorname.vo.*; + +/** + * 指标名称 Mapper + * + * @author 万懋超级管理 + */ +@Mapper +public interface IndicatorNameMapper extends BaseMapperX { + + default PageResult selectPage(IndicatorNamePageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(IndicatorNameDO::getName, reqVO.getName()) + .eqIfPresent(IndicatorNameDO::getImage, reqVO.getImage()) + .eqIfPresent(IndicatorNameDO::getUnit, reqVO.getUnit()) + .eqIfPresent(IndicatorNameDO::getSampleValue, reqVO.getSampleValue()) + .betweenIfPresent(IndicatorNameDO::getCreateTime, reqVO.getCreateTime()) + .orderByAsc(IndicatorNameDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java index 0518166d..296ffc90 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/ErrorCodeConstants.java @@ -119,4 +119,5 @@ public interface ErrorCodeConstants { ErrorCode PLOT_AREA_ERRORS = new ErrorCode(1_050_036_000, "地块面积总和大于基地面积"); + ErrorCode INDICATOR_NAME_NOT_EXISTS = new ErrorCode(1_050_037_000, "指标名称不存在"); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/indicatorname/IndicatorNameService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/indicatorname/IndicatorNameService.java new file mode 100644 index 00000000..3952a3a1 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/indicatorname/IndicatorNameService.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.farm.service.indicatorname; + +import java.util.*; +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 接口 + * + * @author 万懋超级管理 + */ +public interface IndicatorNameService { + + /** + * 创建指标名称 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIndicatorName(@Valid IndicatorNameSaveReqVO createReqVO); + + /** + * 更新指标名称 + * + * @param updateReqVO 更新信息 + */ + void updateIndicatorName(@Valid IndicatorNameSaveReqVO updateReqVO); + + /** + * 删除指标名称 + * + * @param id 编号 + */ + void deleteIndicatorName(Long id); + + /** + * 批量删除指标名称 + * + * @param ids 编号 + */ + void deleteIndicatorNameListByIds(List ids); + + /** + * 获得指标名称 + * + * @param id 编号 + * @return 指标名称 + */ + IndicatorNameDO getIndicatorName(Long id); + + /** + * 获得指标名称分页 + * + * @param pageReqVO 分页查询 + * @return 指标名称分页 + */ + PageResult getIndicatorNamePage(IndicatorNamePageReqVO pageReqVO); + + List getIndicatorNameList(@Valid IndicatorNamePageReqVO pageReqVO); +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/indicatorname/IndicatorNameServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/indicatorname/IndicatorNameServiceImpl.java new file mode 100644 index 00000000..366becad --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/indicatorname/IndicatorNameServiceImpl.java @@ -0,0 +1,86 @@ +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.dal.dataobject.indicatorname.IndicatorNameDO; +import cn.iocoder.yudao.module.farm.dal.mysql.indicatorname.IndicatorNameMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +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.INDICATOR_NAME_NOT_EXISTS; + +/** + * 指标名称 Service 实现类 + * + * @author 万懋超级管理 + */ +@Service +@Validated +public class IndicatorNameServiceImpl implements IndicatorNameService { + + @Resource + private IndicatorNameMapper indicatorNameMapper; + + @Override + public Long createIndicatorName(IndicatorNameSaveReqVO createReqVO) { + // 插入 + IndicatorNameDO indicatorName = BeanUtils.toBean(createReqVO, IndicatorNameDO.class); + indicatorNameMapper.insert(indicatorName); + + // 返回 + return indicatorName.getId(); + } + + @Override + public void updateIndicatorName(IndicatorNameSaveReqVO updateReqVO) { + // 校验存在 + validateIndicatorNameExists(updateReqVO.getId()); + // 更新 + IndicatorNameDO updateObj = BeanUtils.toBean(updateReqVO, IndicatorNameDO.class); + indicatorNameMapper.updateById(updateObj); + } + + @Override + public void deleteIndicatorName(Long id) { + // 校验存在 + validateIndicatorNameExists(id); + // 删除 + indicatorNameMapper.deleteById(id); + } + + @Override + public void deleteIndicatorNameListByIds(List ids) { + // 删除 + indicatorNameMapper.deleteByIds(ids); + } + + + private void validateIndicatorNameExists(Long id) { + if (indicatorNameMapper.selectById(id) == null) { + throw exception(INDICATOR_NAME_NOT_EXISTS); + } + } + + @Override + public IndicatorNameDO getIndicatorName(Long id) { + return indicatorNameMapper.selectById(id); + } + + @Override + public PageResult getIndicatorNamePage(IndicatorNamePageReqVO pageReqVO) { + return indicatorNameMapper.selectPage(pageReqVO); + } + + @Override + public List getIndicatorNameList(IndicatorNamePageReqVO pageReqVO) { + return indicatorNameMapper.selectList(IndicatorNameDO::getTenantId, getLoginUser().getTenantId().toString()); + } + +} \ No newline at end of file diff --git a/yudao-module-farm/src/main/resources/mapper/indicatorname/IndicatorNameMapper.xml b/yudao-module-farm/src/main/resources/mapper/indicatorname/IndicatorNameMapper.xml new file mode 100644 index 00000000..f6ebb1b6 --- /dev/null +++ b/yudao-module-farm/src/main/resources/mapper/indicatorname/IndicatorNameMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file