颗粒物手工比对数据管理信息基础接口

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PmDataManagementInfoController.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.PmDataManagementInfoVo;
+import org.dromara.demo.domain.bo.PmDataManagementInfoBo;
+import org.dromara.demo.service.IPmDataManagementInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 颗粒物手工比对数据管理信息
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/air/dataManagementInfo")
+public class PmDataManagementInfoController extends BaseController {
+
+    private final IPmDataManagementInfoService pmDataManagementInfoService;
+
+    /**
+     * 查询颗粒物手工比对数据管理信息列表
+     */
+    //@SaCheckPermission("air:dataManagementInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo<PmDataManagementInfoVo> list(PmDataManagementInfoBo bo, PageQuery pageQuery) {
+        return pmDataManagementInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出颗粒物手工比对数据管理信息列表
+     */
+    //@SaCheckPermission("air:dataManagementInfo:export")
+    @Log(title = "颗粒物手工比对数据管理信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PmDataManagementInfoBo bo, HttpServletResponse response) {
+        List<PmDataManagementInfoVo> list = pmDataManagementInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "颗粒物手工比对数据管理信息", PmDataManagementInfoVo.class, response);
+    }
+
+    /**
+     * 获取颗粒物手工比对数据管理信息详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("air:dataManagementInfo:query")
+    @GetMapping("/{id}")
+    public R<PmDataManagementInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(pmDataManagementInfoService.queryById(id));
+    }
+
+    /**
+     * 新增颗粒物手工比对数据管理信息
+     */
+    //@SaCheckPermission("air:dataManagementInfo:add")
+    @Log(title = "颗粒物手工比对数据管理信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PmDataManagementInfoBo bo) {
+        return toAjax(pmDataManagementInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改颗粒物手工比对数据管理信息
+     */
+    //@SaCheckPermission("air:dataManagementInfo:edit")
+    @Log(title = "颗粒物手工比对数据管理信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PmDataManagementInfoBo bo) {
+        return toAjax(pmDataManagementInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除颗粒物手工比对数据管理信息
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("air:dataManagementInfo:remove")
+    @Log(title = "颗粒物手工比对数据管理信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(pmDataManagementInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,89 @@
+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 java.io.Serial;
+
+/**
+ * 颗粒物手工比对数据管理信息对象 pm_data_management_info
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pm_data_management_info")
+public class PmDataManagementInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID（MyBatis-Plus自增）
+     */
+    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 子站名称
+     */
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    private String area;
+
+    /**
+     * 运维公司
+     */
+    private String ioCompany;
+
+    /**
+     * 开始时间
+     */
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    private Date endDate;
+
+    /**
+     * 监测项目
+     */
+    private String monitorProject;
+
+    /**
+     * 自动监测(mg/m³)
+     */
+    private Long autoMonitor;
+
+    /**
+     * 手动监测(mg/m³)
+     */
+    private Long handleMonitor;
+
+    /**
+     * 相对误差
+     */
+    private Long difference;
+
+    /**
+     * 结论
+     */
+    private String result;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+
+
+}

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

@@ -0,0 +1,97 @@
+package org.dromara.demo.domain.bo;
+
+import org.dromara.demo.domain.PmDataManagementInfo;
+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;
+
+/**
+ * 颗粒物手工比对数据管理信息业务对象 pm_data_management_info
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PmDataManagementInfo.class, reverseConvertGenerate = false)
+public class PmDataManagementInfoBo extends BaseEntity {
+
+    /**
+     * 主键ID（MyBatis-Plus自增）
+     */
+    //@NotBlank(message = "主键ID（MyBatis-Plus自增）不能为空", 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 ioCompany;
+
+    /**
+     * 开始时间
+     */
+    //@NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    //@NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 监测项目
+     */
+    //@NotBlank(message = "监测项目不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String monitorProject;
+
+    /**
+     * 自动监测(mg/m³)
+     */
+    //@NotNull(message = "自动监测(mg/m³)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long autoMonitor;
+
+    /**
+     * 手动监测(mg/m³)
+     */
+    //@NotNull(message = "手动监测(mg/m³)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long handleMonitor;
+
+    /**
+     * 相对误差
+     */
+    //@NotNull(message = "相对误差不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long difference;
+
+    /**
+     * 结论
+     */
+    //@NotBlank(message = "结论不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String result;
+
+
+}

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

@@ -35,7 +35,7 @@ public class DeviceInfoVo implements Serializable {
      * 主键ID（自增）
      */
     @ExcelProperty(value = "主键ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "自=增")
+    //@ExcelDictFormat(readConverterExp = "自=增")
     private String id;
 
     /**

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

@@ -34,7 +34,7 @@ public class OrderManagementInfoVo implements Serializable {
      * 主键ID（MyBatis-Plus自增）
      */
     @ExcelProperty(value = "主键ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "M=yBatis-Plus自增")
+    //@ExcelDictFormat(readConverterExp = "M=yBatis-Plus自增")
     private String id;
 
     /**

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

@@ -0,0 +1,106 @@
+package org.dromara.demo.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.demo.domain.PmDataManagementInfo;
+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;
+
+
+
+/**
+ * 颗粒物手工比对数据管理信息视图对象 pm_data_management_info
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PmDataManagementInfo.class)
+public class PmDataManagementInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID（MyBatis-Plus自增）
+     */
+    @ExcelProperty(value = "主键ID", converter = ExcelDictConvert.class)
+    //@ExcelDictFormat(readConverterExp = "M=yBatis-Plus自增")
+    private String id;
+
+    /**
+     * 子站名称
+     */
+    @ExcelProperty(value = "子站名称")
+    private String station;
+
+    /**
+     * 所属区域
+     */
+    @ExcelProperty(value = "所属区域")
+    private String area;
+
+    /**
+     * 运维公司
+     */
+    @ExcelProperty(value = "运维公司")
+    private String ioCompany;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 监测项目
+     */
+    @ExcelProperty(value = "监测项目")
+    private String monitorProject;
+
+    /**
+     * 自动监测(mg/m³)
+     */
+    @ExcelProperty(value = "自动监测(mg/m³)")
+    private Long autoMonitor;
+
+    /**
+     * 手动监测(mg/m³)
+     */
+    @ExcelProperty(value = "手动监测(mg/m³)")
+    private Long handleMonitor;
+
+    /**
+     * 相对误差
+     */
+    @ExcelProperty(value = "相对误差")
+    private Long difference;
+
+    /**
+     * 结论
+     */
+    @ExcelProperty(value = "结论")
+    private String result;
+
+
+}

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

@@ -32,7 +32,7 @@ public class StationInfoVo implements Serializable {
      * 主键ID（数据库自增）
      */
     @ExcelProperty(value = "主键ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "数=据库自增")
+    //@ExcelDictFormat(readConverterExp = "数=据库自增")
     private String id;
 
     /**

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

@@ -0,0 +1,15 @@
+package org.dromara.demo.mapper;
+
+import org.dromara.demo.domain.PmDataManagementInfo;
+import org.dromara.demo.domain.vo.PmDataManagementInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 颗粒物手工比对数据管理信息Mapper接口
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+public interface PmDataManagementInfoMapper extends BaseMapperPlus<PmDataManagementInfo, PmDataManagementInfoVo> {
+
+}

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

@@ -0,0 +1,68 @@
+package org.dromara.demo.service;
+
+import org.dromara.demo.domain.vo.PmDataManagementInfoVo;
+import org.dromara.demo.domain.bo.PmDataManagementInfoBo;
+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 GJH
+ * @date 2025-07-02
+ */
+public interface IPmDataManagementInfoService {
+
+    /**
+     * 查询颗粒物手工比对数据管理信息
+     *
+     * @param id 主键
+     * @return 颗粒物手工比对数据管理信息
+     */
+    PmDataManagementInfoVo queryById(String id);
+
+    /**
+     * 分页查询颗粒物手工比对数据管理信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 颗粒物手工比对数据管理信息分页列表
+     */
+    TableDataInfo<PmDataManagementInfoVo> queryPageList(PmDataManagementInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的颗粒物手工比对数据管理信息列表
+     *
+     * @param bo 查询条件
+     * @return 颗粒物手工比对数据管理信息列表
+     */
+    List<PmDataManagementInfoVo> queryList(PmDataManagementInfoBo bo);
+
+    /**
+     * 新增颗粒物手工比对数据管理信息
+     *
+     * @param bo 颗粒物手工比对数据管理信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PmDataManagementInfoBo bo);
+
+    /**
+     * 修改颗粒物手工比对数据管理信息
+     *
+     * @param bo 颗粒物手工比对数据管理信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PmDataManagementInfoBo 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/PmDataManagementInfoServiceImpl.java

@@ -0,0 +1,138 @@
+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.PmDataManagementInfoBo;
+import org.dromara.demo.domain.vo.PmDataManagementInfoVo;
+import org.dromara.demo.domain.PmDataManagementInfo;
+import org.dromara.demo.mapper.PmDataManagementInfoMapper;
+import org.dromara.demo.service.IPmDataManagementInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 颗粒物手工比对数据管理信息Service业务层处理
+ *
+ * @author GJH
+ * @date 2025-07-02
+ */
+@RequiredArgsConstructor
+@Service
+public class PmDataManagementInfoServiceImpl implements IPmDataManagementInfoService {
+
+    private final PmDataManagementInfoMapper baseMapper;
+
+    /**
+     * 查询颗粒物手工比对数据管理信息
+     *
+     * @param id 主键
+     * @return 颗粒物手工比对数据管理信息
+     */
+    @Override
+    public PmDataManagementInfoVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询颗粒物手工比对数据管理信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 颗粒物手工比对数据管理信息分页列表
+     */
+    @Override
+    public TableDataInfo<PmDataManagementInfoVo> queryPageList(PmDataManagementInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PmDataManagementInfo> lqw = buildQueryWrapper(bo);
+        Page<PmDataManagementInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的颗粒物手工比对数据管理信息列表
+     *
+     * @param bo 查询条件
+     * @return 颗粒物手工比对数据管理信息列表
+     */
+    @Override
+    public List<PmDataManagementInfoVo> queryList(PmDataManagementInfoBo bo) {
+        LambdaQueryWrapper<PmDataManagementInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PmDataManagementInfo> buildQueryWrapper(PmDataManagementInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PmDataManagementInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getStation()), PmDataManagementInfo::getStation, bo.getStation());
+        lqw.eq(StringUtils.isNotBlank(bo.getArea()), PmDataManagementInfo::getArea, bo.getArea());
+        lqw.eq(StringUtils.isNotBlank(bo.getIoCompany()), PmDataManagementInfo::getIoCompany, bo.getIoCompany());
+        lqw.eq(bo.getStartDate() != null, PmDataManagementInfo::getStartDate, bo.getStartDate());
+        lqw.eq(bo.getEndDate() != null, PmDataManagementInfo::getEndDate, bo.getEndDate());
+        lqw.eq(StringUtils.isNotBlank(bo.getMonitorProject()), PmDataManagementInfo::getMonitorProject, bo.getMonitorProject());
+        lqw.eq(bo.getAutoMonitor() != null, PmDataManagementInfo::getAutoMonitor, bo.getAutoMonitor());
+        lqw.eq(bo.getHandleMonitor() != null, PmDataManagementInfo::getHandleMonitor, bo.getHandleMonitor());
+        lqw.eq(bo.getDifference() != null, PmDataManagementInfo::getDifference, bo.getDifference());
+        lqw.eq(StringUtils.isNotBlank(bo.getResult()), PmDataManagementInfo::getResult, bo.getResult());
+        return lqw;
+    }
+
+    /**
+     * 新增颗粒物手工比对数据管理信息
+     *
+     * @param bo 颗粒物手工比对数据管理信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PmDataManagementInfoBo bo) {
+        PmDataManagementInfo add = MapstructUtils.convert(bo, PmDataManagementInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改颗粒物手工比对数据管理信息
+     *
+     * @param bo 颗粒物手工比对数据管理信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PmDataManagementInfoBo bo) {
+        PmDataManagementInfo update = MapstructUtils.convert(bo, PmDataManagementInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PmDataManagementInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除颗粒物手工比对数据管理信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}