校零校准分析基础接口

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/ZeroAdjustmentAnalysisController.java

@@ -0,0 +1,105 @@
+package org.dromara.demo.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.demo.domain.vo.ZeroAdjustmentAnalysisVo;
+import org.dromara.demo.domain.bo.ZeroAdjustmentAnalysisBo;
+import org.dromara.demo.service.IZeroAdjustmentAnalysisService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 校零校准分析
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/air/zeroAdjustmentAnalysis")
+public class ZeroAdjustmentAnalysisController extends BaseController {
+
+    private final IZeroAdjustmentAnalysisService zeroAdjustmentAnalysisService;
+
+    /**
+     * 查询校零校准分析列表
+     */
+    //@SaCheckPermission("air:adjustmentAnalysis:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZeroAdjustmentAnalysisVo> list(ZeroAdjustmentAnalysisBo bo, PageQuery pageQuery) {
+        return zeroAdjustmentAnalysisService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出校零校准分析列表
+     */
+    //@SaCheckPermission("air:adjustmentAnalysis:export")
+    @Log(title = "校零校准分析", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZeroAdjustmentAnalysisBo bo, HttpServletResponse response) {
+        List<ZeroAdjustmentAnalysisVo> list = zeroAdjustmentAnalysisService.queryList(bo);
+        ExcelUtil.exportExcel(list, "校零校准分析", ZeroAdjustmentAnalysisVo.class, response);
+    }
+
+    /**
+     * 获取校零校准分析详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("air:adjustmentAnalysis:query")
+    @GetMapping("/{id}")
+    public R<ZeroAdjustmentAnalysisVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(zeroAdjustmentAnalysisService.queryById(id));
+    }
+
+    /**
+     * 新增校零校准分析
+     */
+    //@SaCheckPermission("air:adjustmentAnalysis:add")
+    @Log(title = "校零校准分析", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZeroAdjustmentAnalysisBo bo) {
+        return toAjax(zeroAdjustmentAnalysisService.insertByBo(bo));
+    }
+
+    /**
+     * 修改校零校准分析
+     */
+    //@SaCheckPermission("air:adjustmentAnalysis:edit")
+    @Log(title = "校零校准分析", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZeroAdjustmentAnalysisBo bo) {
+        return toAjax(zeroAdjustmentAnalysisService.updateByBo(bo));
+    }
+
+    /**
+     * 删除校零校准分析
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("air:adjustmentAnalysis:remove")
+    @Log(title = "校零校准分析", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(zeroAdjustmentAnalysisService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/ZeroAdjustmentAnalysis.java

@@ -0,0 +1,109 @@
+package org.dromara.demo.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+
+/**
+ * 校零校准分析对象 zero_adjustment_analysis
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("zero_adjustment_analysis")
+public class ZeroAdjustmentAnalysis extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 站点名称
+     */
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    private String area;
+
+    /**
+     * 监测项目
+     */
+    private String monitorProject;
+
+    /**
+     * 上次校零校准时间
+     */
+    private Date toZeroDate;
+
+    /**
+     * 时间跨度（如：7天、30天）
+     */
+    private String duration;
+
+    /**
+     * 核查开始日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkStartDate;
+
+    /**
+     * 核查结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkEndDate;
+
+    /**
+     * 实际校零校准次数
+     */
+    private Long actualTimes;
+
+    /**
+     * 应校零校准次数
+     */
+    private Long planTimes;
+
+    /**
+     * 监理人员
+     */
+    private String monitorPerson;
+
+    /**
+     * 监理单位
+     */
+    private String monitorCompany;
+
+    /**
+     * 环保知情人
+     */
+    private String insider;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0：未删除；1：已删除）
+     */
+    @TableLogic
+    private Long delFlag;
+
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/ZeroAdjustmentAnalysisBo.java

@@ -0,0 +1,115 @@
+package org.dromara.demo.domain.bo;
+
+import org.dromara.demo.domain.ZeroAdjustmentAnalysis;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 校零校准分析业务对象 zero_adjustment_analysis
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ZeroAdjustmentAnalysis.class, reverseConvertGenerate = false)
+public class ZeroAdjustmentAnalysisBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    //@NotBlank(message = "主键ID不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 站点名称
+     */
+    //@NotBlank(message = "站点名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    //@NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String area;
+
+    /**
+     * 监测项目
+     */
+    //@NotBlank(message = "监测项目不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String monitorProject;
+
+    /**
+     * 上次校零校准时间
+     */
+    //@NotNull(message = "上次校零校准时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date toZeroDate;
+
+    /**
+     * 时间跨度（如：7天、30天）
+     */
+    //@NotBlank(message = "时间跨度（如：7天、30天）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String duration;
+
+    /**
+     * 核查开始日期
+     */
+    //@NotNull(message = "核查开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkStartDate;
+
+    /**
+     * 核查结束日期
+     */
+    //@NotNull(message = "核查结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkEndDate;
+
+    /**
+     * 实际校零校准次数
+     */
+    //@NotNull(message = "实际校零校准次数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long actualTimes;
+
+    /**
+     * 应校零校准次数
+     */
+    //@NotNull(message = "应校零校准次数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long planTimes;
+
+    /**
+     * 监理人员
+     */
+    //@NotBlank(message = "监理人员不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String monitorPerson;
+
+    /**
+     * 监理单位
+     */
+    //@NotBlank(message = "监理单位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String monitorCompany;
+
+    /**
+     * 环保知情人
+     */
+    //@NotBlank(message = "环保知情人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String insider;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ZeroAdjustmentAnalysisVo.java

@@ -0,0 +1,124 @@
+package org.dromara.demo.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.demo.domain.ZeroAdjustmentAnalysis;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 校零校准分析视图对象 zero_adjustment_analysis
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ZeroAdjustmentAnalysis.class)
+public class ZeroAdjustmentAnalysisVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private String id;
+
+    /**
+     * 站点名称
+     */
+    @ExcelProperty(value = "站点名称")
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    @ExcelProperty(value = "所属区域")
+    private String area;
+
+    /**
+     * 监测项目
+     */
+    @ExcelProperty(value = "监测项目")
+    private String monitorProject;
+
+    /**
+     * 上次校零校准时间
+     */
+    @ExcelProperty(value = "上次校零校准时间")
+    private Date toZeroDate;
+
+    /**
+     * 时间跨度（如：7天、30天）
+     */
+    @ExcelProperty(value = "时间跨度", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "如=：7天、30天")
+    private String duration;
+
+    /**
+     * 核查开始日期
+     */
+    @ExcelProperty(value = "核查开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkStartDate;
+
+    /**
+     * 核查结束日期
+     */
+    @ExcelProperty(value = "核查结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkEndDate;
+
+    /**
+     * 实际校零校准次数
+     */
+    @ExcelProperty(value = "实际校零校准次数")
+    private Long actualTimes;
+
+    /**
+     * 应校零校准次数
+     */
+    @ExcelProperty(value = "应校零校准次数")
+    private Long planTimes;
+
+    /**
+     * 监理人员
+     */
+    @ExcelProperty(value = "监理人员")
+    private String monitorPerson;
+
+    /**
+     * 监理单位
+     */
+    @ExcelProperty(value = "监理单位")
+    private String monitorCompany;
+
+    /**
+     * 环保知情人
+     */
+    @ExcelProperty(value = "环保知情人")
+    private String insider;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ZeroAdjustmentAnalysisMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.demo.mapper;
+
+import org.dromara.demo.domain.ZeroAdjustmentAnalysis;
+import org.dromara.demo.domain.vo.ZeroAdjustmentAnalysisVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 校零校准分析Mapper接口
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+public interface ZeroAdjustmentAnalysisMapper extends BaseMapperPlus<ZeroAdjustmentAnalysis, ZeroAdjustmentAnalysisVo> {
+
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IZeroAdjustmentAnalysisService.java

@@ -0,0 +1,68 @@
+package org.dromara.demo.service;
+
+import org.dromara.demo.domain.vo.ZeroAdjustmentAnalysisVo;
+import org.dromara.demo.domain.bo.ZeroAdjustmentAnalysisBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 校零校准分析Service接口
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+public interface IZeroAdjustmentAnalysisService {
+
+    /**
+     * 查询校零校准分析
+     *
+     * @param id 主键
+     * @return 校零校准分析
+     */
+    ZeroAdjustmentAnalysisVo queryById(String id);
+
+    /**
+     * 分页查询校零校准分析列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 校零校准分析分页列表
+     */
+    TableDataInfo<ZeroAdjustmentAnalysisVo> queryPageList(ZeroAdjustmentAnalysisBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的校零校准分析列表
+     *
+     * @param bo 查询条件
+     * @return 校零校准分析列表
+     */
+    List<ZeroAdjustmentAnalysisVo> queryList(ZeroAdjustmentAnalysisBo bo);
+
+    /**
+     * 新增校零校准分析
+     *
+     * @param bo 校零校准分析
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ZeroAdjustmentAnalysisBo bo);
+
+    /**
+     * 修改校零校准分析
+     *
+     * @param bo 校零校准分析
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ZeroAdjustmentAnalysisBo bo);
+
+    /**
+     * 校验并批量删除校零校准分析信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ZeroAdjustmentAnalysisServiceImpl.java

@@ -0,0 +1,140 @@
+package org.dromara.demo.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.demo.domain.bo.ZeroAdjustmentAnalysisBo;
+import org.dromara.demo.domain.vo.ZeroAdjustmentAnalysisVo;
+import org.dromara.demo.domain.ZeroAdjustmentAnalysis;
+import org.dromara.demo.mapper.ZeroAdjustmentAnalysisMapper;
+import org.dromara.demo.service.IZeroAdjustmentAnalysisService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 校零校准分析Service业务层处理
+ *
+ * @author gejunhao
+ * @date 2025-07-08
+ */
+@RequiredArgsConstructor
+@Service
+public class ZeroAdjustmentAnalysisServiceImpl implements IZeroAdjustmentAnalysisService {
+
+    private final ZeroAdjustmentAnalysisMapper baseMapper;
+
+    /**
+     * 查询校零校准分析
+     *
+     * @param id 主键
+     * @return 校零校准分析
+     */
+    @Override
+    public ZeroAdjustmentAnalysisVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询校零校准分析列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 校零校准分析分页列表
+     */
+    @Override
+    public TableDataInfo<ZeroAdjustmentAnalysisVo> queryPageList(ZeroAdjustmentAnalysisBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZeroAdjustmentAnalysis> lqw = buildQueryWrapper(bo);
+        Page<ZeroAdjustmentAnalysisVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的校零校准分析列表
+     *
+     * @param bo 查询条件
+     * @return 校零校准分析列表
+     */
+    @Override
+    public List<ZeroAdjustmentAnalysisVo> queryList(ZeroAdjustmentAnalysisBo bo) {
+        LambdaQueryWrapper<ZeroAdjustmentAnalysis> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZeroAdjustmentAnalysis> buildQueryWrapper(ZeroAdjustmentAnalysisBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZeroAdjustmentAnalysis> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getStation()), ZeroAdjustmentAnalysis::getStation, bo.getStation());
+        lqw.eq(StringUtils.isNotBlank(bo.getArea()), ZeroAdjustmentAnalysis::getArea, bo.getArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonitorProject()), ZeroAdjustmentAnalysis::getMonitorProject, bo.getMonitorProject());
+        lqw.eq(bo.getToZeroDate() != null, ZeroAdjustmentAnalysis::getToZeroDate, bo.getToZeroDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getDuration()), ZeroAdjustmentAnalysis::getDuration, bo.getDuration());
+        lqw.eq(bo.getCheckStartDate() != null, ZeroAdjustmentAnalysis::getCheckStartDate, bo.getCheckStartDate());
+        lqw.eq(bo.getCheckEndDate() != null, ZeroAdjustmentAnalysis::getCheckEndDate, bo.getCheckEndDate());
+        lqw.eq(bo.getActualTimes() != null, ZeroAdjustmentAnalysis::getActualTimes, bo.getActualTimes());
+        lqw.eq(bo.getPlanTimes() != null, ZeroAdjustmentAnalysis::getPlanTimes, bo.getPlanTimes());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonitorPerson()), ZeroAdjustmentAnalysis::getMonitorPerson, bo.getMonitorPerson());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonitorCompany()), ZeroAdjustmentAnalysis::getMonitorCompany, bo.getMonitorCompany());
+        lqw.eq(StringUtils.isNotBlank(bo.getInsider()), ZeroAdjustmentAnalysis::getInsider, bo.getInsider());
+        return lqw;
+    }
+
+    /**
+     * 新增校零校准分析
+     *
+     * @param bo 校零校准分析
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ZeroAdjustmentAnalysisBo bo) {
+        ZeroAdjustmentAnalysis add = MapstructUtils.convert(bo, ZeroAdjustmentAnalysis.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改校零校准分析
+     *
+     * @param bo 校零校准分析
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ZeroAdjustmentAnalysisBo bo) {
+        ZeroAdjustmentAnalysis update = MapstructUtils.convert(bo, ZeroAdjustmentAnalysis.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZeroAdjustmentAnalysis entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除校零校准分析信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}