init

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExcessiveEmissionsService.java

@@ -0,0 +1,43 @@
+package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
+
+import cn.cecep.talroad.domain.BMainActionReports;
+import cn.cecep.talroad.mapper.BMainActionReportsMapper;
+import cn.cecep.talroad.mapper.analysis.SRaActionReportsAuditResultMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hehongyu
+ * @description: 超标排放信息
+ * @date 2023/8/12 17:17
+ */
+@Slf4j
+@Service
+public class ExcessiveEmissionsService {
+
+    @Autowired
+    private SRaActionReportsAuditResultMapper mapper;
+
+    @Autowired
+    private BMainActionReportsMapper actionReportsMapper;
+
+
+    public void execute(List<String> reportIds){
+        LambdaQueryWrapper<BMainActionReports> queryWrapper = new QueryWrapper<BMainActionReports>().lambda()
+                .in(BMainActionReports::getId, reportIds);
+        List<BMainActionReports> bMainActionReports = actionReportsMapper.selectList(queryWrapper);
+        for (BMainActionReports bMainActionReport : bMainActionReports) {
+            String factoryId = bMainActionReport.getFactoryId();
+            String reportsType = bMainActionReport.getReportsType();//EmlTypeEnums
+            //根据 企业id 加 报告周期 查询到对应报警信息表 是否有超标信息
+
+
+        }
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExecuteReportAuditService.java

@@ -1,6 +1,7 @@
 package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
 
 import com.google.common.collect.Lists;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +14,20 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@RequiredArgsConstructor
 public class ExecuteReportAuditService {
+    //序号 61  （正常监测时段）无组织废气污染物排放浓度监测数据统计表
+    final FugitiveExhaustPollutantsService fugitiveExhaustPollutantsService;
+    //序号 64  非正常工况/特殊时段有组织废气污染物监测数据统计表
+    final NotNormalOrgGasPollutantsService notNormalOrgGasPollutantsService;
+    //序号 67  超标排放信息
+    final ExcessiveEmissionsService excessiveEmissionsService;
+    //序号 68  附图附件-自行监测布点图
+    final SelfMonitoringLayoutMapService selfMonitoringLayoutMapService;
+    //序号 69  污染物实际排放计算过程
+    final PollutantEmissionsCalculationProcessService pollutantEmissionsCalculationProcessService;
+    //序号 70 台账管理情况表
+    final LedgerManagementStatusTableService ledgerManagementStatusTableService;
 
     public void audit(List<String> executeReportIds){
         //执行报表分批次进行
@@ -21,6 +35,7 @@ public class ExecuteReportAuditService {
         for (List<String> partitionExecuteReportIds : partitionIds) {
             //执行所有审核任务
             try {
+                //TODO 性能 可以利用线程池同时执行 策略为CallerRunsPolicy
                 execute(partitionExecuteReportIds);
             }catch (Exception e){
                 log.error("执行审核相关任务错误 executeReportIds：{}", executeReportIds, e);
@@ -29,7 +44,8 @@ public class ExecuteReportAuditService {
     }
 
 
-    public void execute(List<String> partitionIds){
+    public void execute(List<String> reportIds){
         //所有的审核任务 需要将方法手动添加到此处！！！
+        selfMonitoringLayoutMapService.execute(reportIds);
     }
-}
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/FugitiveExhaustPollutantsService.java

@@ -1,9 +1,21 @@
 package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
 
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
 /**
  * @author hehongyu
  * @description: （正常监测时段）无组织废气污染物排放浓度监测数据统计表
  * @date 2023/8/12 17:06
  */
+@Slf4j
+@Service
 public class FugitiveExhaustPollutantsService {
+
+
+    public void execute(List<String> reportIds){
+
+    }
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/LedgerManagementStatusTableService.java

@@ -0,0 +1,21 @@
+package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hehongyu
+ * @description: 台账管理情况表
+ * @date 2023/8/12 17:22
+ */
+@Slf4j
+@Service
+public class LedgerManagementStatusTableService {
+
+
+    public void execute(List<String> reportIds){
+
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/NotNormalOrgGasPollutantsService.java

@@ -0,0 +1,21 @@
+package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hehongyu
+ * @description: 非正常工况/特殊时段有组织废气污染物监测数据统计表
+ * @date 2023/8/12 17:16
+ */
+@Slf4j
+@Service
+public class NotNormalOrgGasPollutantsService {
+
+
+    public void execute(List<String> reportIds){
+
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/PollutantEmissionsCalculationProcessService.java

@@ -0,0 +1,21 @@
+package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author hehongyu
+ * @description: 污染物实际排放计算过程
+ * @date 2023/8/12 17:18
+ */
+@Slf4j
+@Service
+public class PollutantEmissionsCalculationProcessService {
+
+    public void execute(List<String> reportIds){
+
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/SelfMonitoringLayoutMapService.java

@@ -0,0 +1,56 @@
+package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit;
+
+import cn.cecep.talroad.domain.analysis.SRaActionReportsAuditRecord;
+import cn.cecep.talroad.domain.analysis.SRaActionReportsAuditResult;
+import cn.cecep.talroad.mapper.analysis.SRaActionReportsAuditRecordMapper;
+import cn.cecep.talroad.mapper.analysis.SRaActionReportsAuditResultMapper;
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author hehongyu
+ * @description: 附图附件-自行监测布点图
+ * @date 2023/8/12 17:17
+ */
+@Slf4j
+@Service
+public class SelfMonitoringLayoutMapService {
+
+    @Autowired
+    private SRaActionReportsAuditResultMapper mapper;
+
+    @Autowired
+    private SRaActionReportsAuditRecordMapper recordMapper;
+
+    public void execute(List<String> reportIds){
+        LambdaQueryWrapper<SRaActionReportsAuditRecord> recordQueryWrapper = new QueryWrapper<SRaActionReportsAuditRecord>()
+                .lambda()
+                .select(SRaActionReportsAuditRecord::getId,SRaActionReportsAuditRecord::getReportId)
+                .in(SRaActionReportsAuditRecord::getReportId, reportIds);
+        List<SRaActionReportsAuditRecord> sRaActionReportsAuditRecords = recordMapper.selectList(recordQueryWrapper);
+        if (CollectionUtil.isEmpty(sRaActionReportsAuditRecords)){
+            log.warn("执行报告审核记录不存在！");
+            return;
+        }
+        List<String> recordIds = sRaActionReportsAuditRecords.stream().map(SRaActionReportsAuditRecord::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<SRaActionReportsAuditResult> queryWrapper = new QueryWrapper<SRaActionReportsAuditResult>().lambda().in(SRaActionReportsAuditResult::getRecordId, recordIds);
+        List<SRaActionReportsAuditResult> sRaActionReportsAuditResults = mapper.selectList(queryWrapper);
+        if (CollectionUtil.isEmpty(sRaActionReportsAuditResults)){
+            log.warn("执行报告规范性审核结果记录不存在！");
+            return;
+        }
+        //TODO 自行监测布点图 未上传  则为不规范
+        List<SRaActionReportsAuditResult> updateList = sRaActionReportsAuditResults.stream().filter(data -> StringUtils.isBlank(data.getAttachment())).collect(Collectors.toList());
+        updateList.forEach(data -> data.setAttachment("未上报自行监测布点图"));
+        mapper.batchUpdate(updateList);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/AmProblemFiVideo.java

@@ -0,0 +1,79 @@
+package cn.cecep.talroad.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+@ApiModel(value = "预警报警信息-视频监控数据entity")
+@Data
+@TableName("m_am_problem_fi_video")
+public class AmProblemFiVideo {
+
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "问题表m_am_problem_fi主键")
+    private String problemId;
+
+    @ApiModelProperty(value = "视频截图时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date videoTime;
+
+    @ApiModelProperty(value = "视频截图路径")
+    private String videoPath;
+
+    @ApiModelProperty(value = "回放的视频id。关联m_am_video_dev_fi表id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigInteger videoDevFiId;
+
+    @ApiModelProperty(value = "视频回放开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @ApiModelProperty(value = "视频回放结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @ApiModelProperty(value = "视频分析结果 1正常、2有人员/有无组织排放（分别对应人员闯入和无组织排放） 、3 黑屏、4白屏、 5花屏  、6无信号")
+    private String judgeResult;
+
+    @ApiModelProperty(value = "算法名称")
+    private String modelName;
+
+    @ApiModel(value = "预警报警信息-视频监控数据vo")
+    @Data
+    public static class Vo {
+        @ApiModelProperty(value = "摄像头ID")
+        private String devId;
+
+        @ApiModelProperty(value = "摄像头名称")
+        private String devName;
+
+        @ApiModelProperty(value = "设备来源")
+        private String devSource;
+
+        @ApiModelProperty(value = "视频回放开始时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date startTime;
+
+        @ApiModelProperty(value = "视频回放结束时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date endTime;
+
+        @ApiModelProperty(value = "视频截图路径")
+        private String videoPath;
+
+        @ApiModelProperty(value = "视频截图时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private Date videoTime;
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionInorgGas.java

@@ -36,47 +36,44 @@ public class BMainProductionInorgGas extends BaseEntity
 
     @ApiModelProperty(value = "企业id")
     /** 企业id */
-    @Excel(name = "企业id")
     private String factoryId;
 
     @ApiModelProperty(value = "排放口编号")
     /** 排放口编号 */
-    @Excel(name = "排放口编号")
     private String outletCode;
 
     @ApiModelProperty(value = "许可证无组织监测点位名称")
     /** 许可证无组织监测点位名称 */
-    @Excel(name = "许可证无组织监测点位名称")
+    @Excel(name = "许可证无组织监测点位名称",sort = 1)
     private String licenceMonName;
 
 
     @ApiModelProperty(value = "监测类型")
     /** 监测类型 */
-    @Excel(name = "监测类型")
+    @Excel(name = "监测类型",sort = 6)
     private String monitoringType;
 
 
     @ApiModelProperty(value = "无组织监测点位")
     /** 无组织监测点位 */
-    @Excel(name = "无组织监测点位")
+    @Excel(name = "无组织监测点位",sort = 7)
     private String monitoringInorganization;
 
 
     @ApiModelProperty(value = "主要污染防治措施")
     /** 主要污染防治措施 */
-    @Excel(name = "主要污染防治措施")
+    @Excel(name = "主要污染防治措施",sort = 5)
     private String pollutionPrevention;
 
 
     @ApiModelProperty(value = "产污环节")
     /** 产污环节 */
-    @Excel(name = "产污环节")
+    @Excel(name = "产污环节",sort = 3)
     private String pollutionProductionLink;
 
 
     @ApiModelProperty(value = "对应生产设施编号")
     /** 对应生产设施编号 */
-    @Excel(name = "对应生产设施编号")
     private String correspondingProductionCode;
 
     @ApiModelProperty(value = "生产设施id, 多个用逗号分隔")
@@ -85,25 +82,23 @@ public class BMainProductionInorgGas extends BaseEntity
 
     @ApiModelProperty(value = "视频监控")
     /** 视频监控 */
-    @Excel(name = "视频监控")
     private String devId;
 
 
     @ApiModelProperty(value = "对应生产设施名称")
     /** 对应生产设施名称 */
-    @Excel(name = "对应生产设施名称")
+    @Excel(name = "对应生产设施名称",sort = 2)
     private String correspondingProductionName;
 
 
     @ApiModelProperty(value = "生产设施参数")
     /** 生产设施参数 */
-    @Excel(name = "生产设施参数")
     private String proFacilityParam;
 
 
     @ApiModelProperty(value = "污染物种类")
     /** 污染物种类 */
-    @Excel(name = "污染物种类")
+    @Excel(name = "污染物种类",sort = 4)
     private String pollutionType;
 
 

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionOrganizGas.java

@@ -36,85 +36,80 @@ public class BMainProductionOrganizGas extends BaseEntity
 
     @ApiModelProperty(value = "企业id")
     /** 企业id */
-    @Excel(name = "企业id")
     private String factoryId;
 
 
     @ApiModelProperty(value = "排放口编号")
     /** 排放口编号 */
-    @Excel(name = "排放口编号")
+    @Excel(name = "排放口编号",sort = 8)
     private String outletCode;
 
 
     @ApiModelProperty(value = "排放口名称")
     /** 排放口名称 */
-    @Excel(name = "排放口名称")
+    @Excel(name = "排放口名称",sort = 9)
     private String outletName;
 
 
     @ApiModelProperty(value = "排放口类型")
     /** 排放口类型 */
-    @Excel(name = "排放口类型")
     private String outletType;
 
 
     @ApiModelProperty(value = "排口监测类型")
     /** 排口监测类型 */
-    @Excel(name = "排口监测类型")
+    @Excel(name = "监测类型",sort = 5)
     private String outletMonType;
 
 
     @ApiModelProperty(value = "治理设施编号")
     /** 治理设施编号 */
-    @Excel(name = "治理设施编号")
+    @Excel(name = "治理设施编号",sort = 6)
     private String cepFacilityCode;
 
 
     @ApiModelProperty(value = "治理设施名称")
     /** 治理设施名称 */
-    @Excel(name = "治理设施名称")
+    @Excel(name = "治理设施名称",sort = 7)
     private String cepFacilityName;
 
 
     @ApiModelProperty(value = "治理设施工艺")
     /** 治理设施工艺 */
-    @Excel(name = "治理设施工艺")
     private String cepFacilityCraft;
 
 
     @ApiModelProperty(value = "生产设施编号")
     /** 生产设施编号 */
-    @Excel(name = "生产设施编号")
+    @Excel(name = "生产设施编号",sort = 3)
     private String proFacilityCode;
 
 
     @ApiModelProperty(value = "生产设施名称")
     /** 生产设施名称 */
-    @Excel(name = "生产设施名称")
+    @Excel(name = "生产设施名称",sort = 1)
     private String proFacilityName;
 
 
     @ApiModelProperty(value = "视频监控")
     /** 视频监控 */
-    @Excel(name = "视频监控")
     private Long devId;
 
 
     @ApiModelProperty(value = "生产设施参数")
     /** 生产设施参数 */
-    @Excel(name = "生产设施参数")
     private String proFacilityParam;
 
 
     @ApiModelProperty(value = "对应产污环节名称")
     /** 对应产污环节名称 */
-    @Excel(name = "对应产污环节名称")
+    @Excel(name = "对应产污环节名称",sort = 2)
     private String pollutionProductionLink;
 
 
     @ApiModelProperty(value = "污染物种类")
     /** 污染物种类 */
-    @Excel(name = "污染物种类")
+    @Excel(name = "污染物种类",sort = 4)
     private String pollutionType;
 
     @ApiModelProperty(value = "治理设施id, 多个用逗号分隔")

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionWater.java

@@ -36,37 +36,36 @@ public class BMainProductionWater extends BaseEntity
 
     @ApiModelProperty(value = "企业id")
     /** 企业id */
-    @Excel(name = "企业id")
     private String factoryId;
 
 
     @ApiModelProperty(value = "排放口编号")
     /** 排放口编号 */
-    @Excel(name = "排放口编号")
+    @Excel(name = "排放口编号",sort = 7)
     private String outletCode;
 
 
     @ApiModelProperty(value = "排放口名称")
     /** 排放口名称 */
-    @Excel(name = "排放口名称")
+    @Excel(name = "排放口名称",sort = 8)
     private String outletName;
 
 
     @ApiModelProperty(value = "排放口类型")
     /** 排放口类型 */
-    @Excel(name = "排放口类型")
+    @Excel(name = "排放口类型",sort = 9)
     private String outletType;
 
 
     @ApiModelProperty(value = "排口监测类型")
     /** 排口监测类型 */
-    @Excel(name = "排口监测类型")
+    @Excel(name = "排口监测类型",sort = 3)
     private String outletMonType;
 
 
     @ApiModelProperty(value = "治理设施编号")
     /** 治理设施编号 */
-    @Excel(name = "治理设施编号")
+    @Excel(name = "治理设施编号",sort = 4)
     private String cepFacilityCode;
 
     @ApiModelProperty("治理设施id, 多个用逗号分隔")
@@ -75,25 +74,25 @@ public class BMainProductionWater extends BaseEntity
 
     @ApiModelProperty(value = "治理设施名称")
     /** 治理设施名称 */
-    @Excel(name = "治理设施名称")
+    @Excel(name = "治理设施名称",sort = 5)
     private String cepFacilityName;
 
 
     @ApiModelProperty(value = "治理设施工艺")
     /** 治理设施工艺 */
-    @Excel(name = "治理设施工艺")
+    @Excel(name = "治理设施工艺",sort = 6)
     private String cepFacilityCraft;
 
 
     @ApiModelProperty(value = "污染物种类")
     /** 污染物种类 */
-    @Excel(name = "污染物种类")
+    @Excel(name = "污染物种类",sort = 2)
     private String pollutionType;
 
 
     @ApiModelProperty(value = "废水类别")
     /** 废水类别 */
-    @Excel(name = "废水类别")
+    @Excel(name = "废水类别",sort = 1)
     private String waterType;
 
 

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainSolidHazardous.java

@@ -36,22 +36,22 @@ public class BMainSolidHazardous extends BaseEntity
 
     @ApiModelProperty(value = "企业id")
     /** 企业id */
-    @Excel(name = "企业id")
     private String factoryId;
 
 
     @ApiModelProperty(value = "自行贮存设施名称")
     /** 自行贮存设施名称 */
-    @Excel(name = "自行贮存设施名称")
+    @Excel(name = "自行贮存设施名称",sort = 2)
     private String facilityName;
 
 
     @ApiModelProperty(value = "自行贮存设施编号")
     /** 自行贮存设施编号 */
-    @Excel(name = "自行贮存设施编号")
+    @Excel(name = "自行贮存设施编号",sort = 3)
     private String facilityCode;
 
     @ApiModelProperty(value = "视频id")
+    @Excel(name = "视频监控",sort = 4)
     private Long devId;
 
     @Override

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelGas.java

@@ -0,0 +1,205 @@
+package cn.cecep.talroad.domain;
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import lombok.Data;
+
+/**
+    * 固定源产治排--排污许可--锅炉行业气体燃料信息
+    */
+@ApiModel(description="固定源产治排--排污许可--锅炉行业气体燃料信息")
+@Data
+@TableName(value = "b_stat_table_pwxk_boiler_fuel_gas")
+public class BStatTablePwxkBoilerFuelGas implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    @TableField(value = "factory_id")
+    @ApiModelProperty(value="企业id")
+    private String factoryId;
+
+    /**
+     * 主要生产单元名称
+     */
+    @TableField(value = "production_unit_name")
+    @ApiModelProperty(value="主要生产单元名称")
+    @Excel(name = "主要生产单元名称")
+    private String productionUnitName;
+
+    /**
+     * 生产设施编号
+     */
+    @TableField(value = "production_facilities_code")
+    @ApiModelProperty(value="生产设施编号")
+    @Excel(name = "生产设施编号")
+    private String productionFacilitiesCode;
+
+    /**
+     * 生产设施名称
+     */
+    @TableField(value = "production_facilities_name")
+    @ApiModelProperty(value="生产设施名称")
+    @Excel(name = "生产设施名称")
+    private String productionFacilitiesName;
+
+    /**
+     * 燃料名称
+     */
+    @TableField(value = "fuel_name")
+    @ApiModelProperty(value="燃料名称")
+    @Excel(name = "燃料名称")
+    private String fuelName;
+
+    /**
+     * 甲烷（%）
+     */
+    @TableField(value = "methane")
+    @ApiModelProperty(value="甲烷（%）")
+    @Excel(name = "甲烷（%）")
+    private BigDecimal methane;
+
+    /**
+     * 乙烷（%）
+     */
+    @TableField(value = "ethane")
+    @ApiModelProperty(value="乙烷（%）")
+    @Excel(name = "乙烷（%）")
+    private BigDecimal ethane;
+
+    /**
+     * 丙烷（%）
+     */
+    @TableField(value = "propane")
+    @ApiModelProperty(value="丙烷（%）")
+    @Excel(name = "丙烷（%）")
+    private BigDecimal propane;
+
+    /**
+     * 异/正丁烷（%）
+     */
+    @TableField(value = "butane")
+    @ApiModelProperty(value="异/正丁烷（%）")
+    @Excel(name = "异/正丁烷（%）")
+    private BigDecimal butane;
+
+    /**
+     * 异/正戊烷（%）
+     */
+    @TableField(value = "pentane")
+    @ApiModelProperty(value="异/正戊烷（%）")
+    @Excel(name = "异/正戊烷（%）")
+    private BigDecimal pentane;
+
+    /**
+     * 己烷及更重组分（%）
+     */
+    @TableField(value = "hexane_and_heavier")
+    @ApiModelProperty(value="己烷及更重组分（%）")
+    @Excel(name = "己烷及更重组分（%）")
+    private BigDecimal hexaneAndHeavier;
+
+    /**
+     * 一氧化碳（%）
+     */
+    @TableField(value = "co")
+    @ApiModelProperty(value="一氧化碳（%）")
+    @Excel(name = "一氧化碳（%）")
+    private BigDecimal co;
+
+    /**
+     * 二氧化碳（%）
+     */
+    @TableField(value = "co2")
+    @ApiModelProperty(value="二氧化碳（%）")
+    @Excel(name = "二氧化碳（%）")
+    private BigDecimal co2;
+
+    /**
+     * 氢（%）
+     */
+    @TableField(value = "hydrogen")
+    @ApiModelProperty(value="氢（%）")
+    @Excel(name = "氢（%）")
+    private BigDecimal hydrogen;
+
+    /**
+     * 氧（%）
+     */
+    @TableField(value = "oxygen")
+    @ApiModelProperty(value="氧（%）")
+    @Excel(name = "氧（%）")
+    private BigDecimal oxygen;
+
+    /**
+     * 氮（%）
+     */
+    @TableField(value = "nitrogen")
+    @ApiModelProperty(value="氮（%）")
+    @Excel(name = "氮（%）")
+    private BigDecimal nitrogen;
+
+    /**
+     * 硫化氢（%）
+     */
+    @TableField(value = "hydrogen_sulfide")
+    @ApiModelProperty(value="硫化氢（%）")
+    @Excel(name = "硫化氢（%）")
+    private BigDecimal hydrogenSulfide;
+
+    /**
+     * 其他组分（%）
+     */
+    @TableField(value = "other_components")
+    @ApiModelProperty(value="其他组分（%）")
+    @Excel(name = "其他组分（%）")
+    private BigDecimal otherComponents;
+
+    /**
+     * 总硫(%或mg/m3)
+     */
+    @TableField(value = "total_sulfur")
+    @ApiModelProperty(value="总硫(%或mg/m3)")
+    @Excel(name = "总硫(%或mg/m3)")
+    private BigDecimal totalSulfur;
+
+    /**
+     * 低位发热量(MJ/m3)
+     */
+    @TableField(value = "lower_heating")
+    @ApiModelProperty(value="低位发热量(MJ/m3)")
+    @Excel(name = "低位发热量(MJ/m3)")
+    private BigDecimal lowerHeating;
+
+    /**
+     * 年燃料使用量（万m3/a）
+     */
+    @TableField(value = "year_used")
+    @ApiModelProperty(value="年燃料使用量（万m3/a）")
+    @Excel(name = "年燃料使用量（万m3/a）")
+    private BigDecimal yearUsed;
+
+    @TableField(value = "trade_secrets")
+    @ApiModelProperty(value="是否涉及商业秘密（0否1是）")
+    @Excel(name = "是否涉及商业秘密", readConverterExp = "0=否,1=是")
+    private String tradeSecrets;
+
+    @TableField(value = "other_info")
+    @ApiModelProperty(value="其他信息")
+    @Excel(name = "其他信息")
+    private String otherInfo;
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelSolidLiquid.java

@@ -0,0 +1,156 @@
+package cn.cecep.talroad.domain;
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+    * 固定源产治排--排污许可--锅炉行业固体液体燃料信息
+    */
+@ApiModel(description="固定源产治排--排污许可--锅炉行业固体液体燃料信息")
+@Data
+@TableName(value = "b_stat_table_pwxk_boiler_fuel_solid_liquid")
+public class BStatTablePwxkBoilerFuelSolidLiquid implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Long id;
+    /**
+     * 企业id
+     */
+    @TableField(value = "factory_id")
+    @ApiModelProperty(value="企业id")
+    private String factoryId;
+    /**
+     * 主要生产单元名称
+     */
+    @TableField(value = "production_unit_name")
+    @ApiModelProperty(value="主要生产单元名称")
+    @Excel(name = "主要生产单元名称")
+    private String productionUnitName;
+    /**
+     * 生产设施编号
+     */
+    @TableField(value = "production_facilities_code")
+    @ApiModelProperty(value="生产设施编号")
+    @Excel(name = "生产设施编号")
+    private String productionFacilitiesCode;
+    /**
+     * 生产设施名称
+     */
+    @TableField(value = "production_facilities_name")
+    @ApiModelProperty(value="生产设施名称")
+    @Excel(name = "生产设施名称")
+    private String productionFacilitiesName;
+    /**
+     * 燃料名称
+     */
+    @TableField(value = "fuel_name")
+    @ApiModelProperty(value="燃料名称")
+    @Excel(name = "燃料名称")
+    private String fuelName;
+    /**
+     * 水分（%）
+     */
+    @TableField(value = "water_content")
+    @ApiModelProperty(value="水分（%）")
+    @Excel(name = "水分（%）")
+    private BigDecimal waterContent;
+    /**
+     * 灰分（%）
+     */
+    @TableField(value = "ash_content")
+    @ApiModelProperty(value="灰分（%）")
+    @Excel(name = "灰分（%）")
+    private BigDecimal ashContent;
+    /**
+     * 挥发分（%）
+     */
+    @TableField(value = "\"volatile_percentage\"")
+    @ApiModelProperty(value="挥发分（%）")
+    @Excel(name = "挥发分（%）")
+    private BigDecimal volatilePercentage;
+    /**
+     * 固定碳（%）
+     */
+    @TableField(value = "fixed_carbon")
+    @ApiModelProperty(value="固定碳（%）")
+    @Excel(name = "固定碳（%）")
+    private BigDecimal fixedCarbon;
+    /**
+     * 碳（%）
+     */
+    @TableField(value = "carbon")
+    @ApiModelProperty(value="碳（%）")
+    @Excel(name = "碳（%）")
+    private BigDecimal carbon;
+    /**
+     * 氢（%）
+     */
+    @TableField(value = "hydrogen")
+    @ApiModelProperty(value="氢（%）")
+    @Excel(name = "氢（%）")
+    private BigDecimal hydrogen;
+    /**
+     * 氧（%）
+     */
+    @TableField(value = "oxygen")
+    @ApiModelProperty(value="氧（%）")
+    @Excel(name = "氧（%）")
+    private BigDecimal oxygen;
+    /**
+     * 氮（%）
+     */
+    @TableField(value = "nitrogen")
+    @ApiModelProperty(value="氮（%）")
+    @Excel(name = "氮（%）")
+    private BigDecimal nitrogen;
+    /**
+     * 硫（%）
+     */
+    @TableField(value = "sulfur")
+    @ApiModelProperty(value="硫（%）")
+    @Excel(name = "硫（%）")
+    private BigDecimal sulfur;
+    /**
+     * 低位发热量(MJ/kg)
+     */
+    @TableField(value = "lower_heating")
+    @ApiModelProperty(value="低位发热量(MJ/kg)")
+    @Excel(name = "低位发热量(MJ/kg)")
+    private BigDecimal lowerHeating;
+    /**
+     * 汞含量（μg/g）
+     */
+    @TableField(value = "mercury")
+    @ApiModelProperty(value="汞含量（μg/g）")
+    @Excel(name = "汞含量（μg/g）")
+    private BigDecimal mercury;
+    /**
+     * 年燃料使用量（t/a）
+     */
+    @TableField(value = "year_used")
+    @ApiModelProperty(value="年燃料使用量（t/a）")
+    @Excel(name = "年燃料使用量（t/a）")
+    private BigDecimal yearUsed;
+
+    @TableField(value = "trade_secrets")
+    @ApiModelProperty(value="是否涉及商业秘密（0否1是）")
+    @Excel(name = "是否涉及商业秘密", readConverterExp = "0=否,1=是")
+    private String tradeSecrets;
+
+    @TableField(value = "other_info")
+    @ApiModelProperty(value="其他信息")
+    @Excel(name = "其他信息")
+    private String otherInfo;
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkFuel.java

@@ -0,0 +1,137 @@
+package cn.cecep.talroad.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import lombok.Data;
+
+/**
+ * 固定源产治排--排污许可--燃料
+ */
+@ApiModel(description = "固定源产治排--排污许可--燃料")
+@Data
+@TableName(value = "b_stat_table_pwxk_fuel")
+public class BStatTablePwxkFuel implements Serializable {
+    public static final String COL_VOLATILE = "volatile";
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    @TableField(value = "factory_id")
+    @ApiModelProperty(value = "企业id")
+    private String factoryId;
+
+    /**
+     * 燃料名称
+     */
+    @TableField(value = "fuel_name")
+    @ApiModelProperty(value = "燃料名称")
+    private String fuelName;
+
+    /**
+     * 设计年使用量
+     */
+    @TableField(value = "year_plan_used")
+    @ApiModelProperty(value = "设计年使用量")
+    private BigDecimal yearPlanUsed;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "unit")
+    @ApiModelProperty(value = "计量单位")
+    private String unit;
+
+    /**
+     * 灰分（%）
+     */
+    @TableField(value = "ash_content")
+    @ApiModelProperty(value = "灰分（%）")
+    private BigDecimal ashContent;
+
+    /**
+     * 硫分（%）
+     */
+    @TableField(value = "sulfur_content")
+    @ApiModelProperty(value = "硫分（%）")
+    private BigDecimal sulfurContent;
+
+    /**
+     * 挥发分（%）
+     */
+    @TableField(value = "volatile_percentage")
+    @ApiModelProperty(value = "挥发分（%）")
+    private BigDecimal volatilePercentage;
+
+    /**
+     * 低位发热量（kj/kg）
+     */
+    @TableField(value = "lower_heating")
+    @ApiModelProperty(value = "低位发热量（kj/kg）")
+    private BigDecimal lowerHeating;
+
+    /**
+     * 额外数据，json格式：
+     * {
+     * // 燃料列表
+     * "fuelList": [{
+     * "poisonousComponent": "", // 有毒有害成分
+     * "ratio": "", // 成分占比（%）
+     * }]
+     * }
+     */
+    @TableField(value = "extra")
+    @ApiModelProperty(value = "额外数据，json格式：,{,       // 燃料列表,	'fuelList': [{,		'poisonousComponent': '', // 有毒有害成分,		'ratio': '', // 成分占比（%）,	}],}")
+    private String extra;
+
+    /**
+     * 其他信息
+     */
+    @TableField(value = "other_info")
+    @ApiModelProperty(value = "其他信息")
+    private String otherInfo;
+
+    /**
+     * 是否涉及商业秘密（0否1是）
+     */
+    @TableField(value = "trade_secrets")
+    @ApiModelProperty(value = "是否涉及商业秘密（0否1是）")
+    private String tradeSecrets;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_FACTORY_ID = "factory_id";
+
+    public static final String COL_FUEL_NAME = "fuel_name";
+
+    public static final String COL_YEAR_PLAN_USED = "year_plan_used";
+
+    public static final String COL_UNIT = "unit";
+
+    public static final String COL_ASH_CONTENT = "ash_content";
+
+    public static final String COL_SULFUR_CONTENT = "sulfur_content";
+
+    public static final String COL_VOLATILE_PERCENTAGE = "volatile_percentage";
+
+    public static final String COL_LOWER_HEATING = "lower_heating";
+
+    public static final String COL_EXTRA = "extra";
+
+    public static final String COL_OTHER_INFO = "other_info";
+
+    public static final String COL_TRADE_SECRETS = "trade_secrets";
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkProductionFacilitiesParams.java

@@ -1,6 +1,6 @@
 package cn.cecep.talroad.domain;
 
-////import cn.cecep.talroad.common.core.annotation.ExcelNew;
+import cn.cecep.talroad.common.core.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -42,27 +42,27 @@ public class BStatTablePwxkProductionFacilitiesParams implements Serializable {
      */
     @TableField(value = "params_name")
     @ApiModelProperty(value = "参数名")
-//    @ExcelNew(needMerge = true,name = "参数名",sort = 2,cellType = ExcelNew.ColumnType.STRING)
+    @Excel(name = "参数名",sort = 2)
     private String paramsName;
     /**
      * 计量单位
      */
     @TableField(value = "params_unit")
     @ApiModelProperty(value = "计量单位")
-//    @ExcelNew(needMerge = true,name = "计量单位",sort = 3)
+    @Excel(name = "计量单位",sort = 3)
     private String paramsUnit;
     /**
      * 设计值
      */
     @TableField(value = "design_values")
     @ApiModelProperty(value = "设计值")
-//    @ExcelNew(needMerge = true,name = "设计值",sort = 4)
+    @Excel(name = "设计值",sort = 4)
     private String designValues;
     /**
      * 其他设施信息
      */
     @TableField(value = "other_params_info")
     @ApiModelProperty(value = "其他设施信息")
-//    @ExcelNew(needMerge = true,name = "其他设施信息",sort = 5)
+    @Excel(name = "其他设施信息",sort = 5)
     private String otherParamsInfo;
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkRawMaterial.java

@@ -0,0 +1,145 @@
+package cn.cecep.talroad.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import lombok.Data;
+
+/**
+    * 固定源产治排--排污许可--原辅料
+    */
+@ApiModel(description="固定源产治排--排污许可--原辅料")
+@Data
+@TableName(value = "b_stat_table_pwxk_raw_material")
+public class BStatTablePwxkRawMaterial implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键id")
+    private Long id;
+
+    /**
+     * 企业id
+     */
+    @TableField(value = "factory_id")
+    @ApiModelProperty(value="企业id")
+    private String factoryId;
+
+    /**
+     * 种类
+     */
+    @TableField(value = "raw_material_class")
+    @ApiModelProperty(value="种类")
+    private String rawMaterialClass;
+
+    /**
+     * 类型
+     */
+    @TableField(value = "raw_material_type")
+    @ApiModelProperty(value="类型")
+    private String rawMaterialType;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "raw_material_name")
+    @ApiModelProperty(value="名称")
+    private String rawMaterialName;
+
+    /**
+     * 年最大使用量
+     */
+    @TableField(value = "year_max_used")
+    @ApiModelProperty(value="年最大使用量")
+    private BigDecimal yearMaxUsed;
+
+    /**
+     * 设计年使用量
+     */
+    @TableField(value = "year_plan_used")
+    @ApiModelProperty(value="设计年使用量")
+    private BigDecimal yearPlanUsed;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "unit")
+    @ApiModelProperty(value="计量单位")
+    private String unit;
+
+    /**
+     * 硫元素占比（%）
+     */
+    @TableField(value = "sulfur_ratio")
+    @ApiModelProperty(value="硫元素占比（%）")
+    private BigDecimal sulfurRatio;
+
+    /**
+     * 有毒有害成分及占比
+     */
+    @TableField(value = "poisonous_component")
+    @ApiModelProperty(value="有毒有害成分及占比")
+    private String poisonousComponent;
+
+    /**
+     * 额外数据，json格式：
+{
+       // 辅料列表
+	"rawMaterialList": [{
+		"poisonousComponent": "", // 有毒有害成分
+		"ratio": "", // 成分占比（%）
+	}]
+}
+     */
+    @TableField(value = "extra")
+    @ApiModelProperty(value="额外数据，json格式：,{,       // 辅料列表,	'rawMaterialList': [{,		'poisonousComponent': '', // 有毒有害成分,		'ratio': '', // 成分占比（%）,	}],}")
+    private String extra;
+
+    /**
+     * 其他信息
+     */
+    @TableField(value = "other_info")
+    @ApiModelProperty(value="其他信息")
+    private String otherInfo;
+
+    /**
+     * 是否涉及商业秘密（0否1是）
+     */
+    @TableField(value = "trade_secrets")
+    @ApiModelProperty(value="是否涉及商业秘密（0否1是）")
+    private String tradeSecrets;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_FACTORY_ID = "factory_id";
+
+    public static final String COL_RAW_MATERIAL_CLASS = "raw_material_class";
+
+    public static final String COL_RAW_MATERIAL_TYPE = "raw_material_type";
+
+    public static final String COL_RAW_MATERIAL_NAME = "raw_material_name";
+
+    public static final String COL_YEAR_MAX_USED = "year_max_used";
+
+    public static final String COL_YEAR_PLAN_USED = "year_plan_used";
+
+    public static final String COL_UNIT = "unit";
+
+    public static final String COL_SULFUR_RATIO = "sulfur_ratio";
+
+    public static final String COL_POISONOUS_COMPONENT = "poisonous_component";
+
+    public static final String COL_EXTRA = "extra";
+
+    public static final String COL_OTHER_INFO = "other_info";
+
+    public static final String COL_TRADE_SECRETS = "trade_secrets";
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkWaterTreatmentLine.java

@@ -75,7 +75,7 @@ public class BStatTablePwxkWaterTreatmentLine implements Serializable {
      */
     @TableField(value = "belong_to_water_treatment_facilities")
     @ApiModelProperty(value = "是否属于工业园区配套污水处理设施（0否1是）")
-    @Excel(name = "是否属于工业园区配套污水处理设施",sort = 13)
+    @Excel(name = "是否属于工业园区配套污水处理设施",sort = 13,readConverterExp = "0=否,1=是")
     private String belongToWaterTreatmentFacilities;
     /**
      * 生产线类别

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmission.java

@@ -0,0 +1,258 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据对象 b_stat_table_zxbg_gas_emission
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放浓度监测数据")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_gas_emission")
+public class BStatTableZxbgGasEmission extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "类型")
+    /** 类型 */
+    @Excel(name = "类型")
+    private String zxbgPollutantType;
+
+
+
+
+
+
+    @ApiModelProperty(value = "排放口编码")
+    /** 排放口编码 */
+    @Excel(name = "排放口编码")
+    private String outletCode;
+
+
+    @ApiModelProperty(value = "污染物名称")
+    /** 污染物名称 */
+    @Excel(name = "污染物名称")
+    private String pollutantName;
+
+
+    @ApiModelProperty(value = "监测设施:手工、自动")
+    /** 监测设施:手工、自动 */
+    @Excel(name = "监测设施")
+    private String monitoringFacilities;
+
+
+    @ApiModelProperty(value = "设施名称")
+    /** 设施名称 */
+    @Excel(name = "设施名称")
+    private String facilityName;
+
+
+    @ApiModelProperty(value = "许可排放浓度限值")
+    /** 许可排放浓度限值 */
+    @Excel(name = "许可排放浓度限值")
+    private String emissionConcentration;
+
+
+    @ApiModelProperty(value = "有效监测数据(小时值)数量")
+    /** 有效监测数据(小时值)数量 */
+    @Excel(name = "有效监测数据(小时值)数量")
+    private String effectivelyHour;
+
+
+    @ApiModelProperty(value = "检测结果（小时浓度）最小值mg/m3")
+    /** 检测结果（小时浓度）最小值mg/m3 */
+    @Excel(name = "检测结果（小时浓度）最小值mg/m3")
+    private String detectionMinHour;
+
+
+    @ApiModelProperty(value = "检测结果（小时浓度）最大值mg/m3")
+    /** 检测结果（小时浓度）最大值mg/m3 */
+    @Excel(name = "检测结果（小时浓度）最大值")
+    private String detectionMaxHour;
+
+
+    @ApiModelProperty(value = "检测结果（小时浓度）平均值")
+    /** 检测结果（小时浓度）平均值 */
+    @Excel(name = "检测结果（小时浓度）平均值")
+    private String detectionAvgHour;
+
+
+    @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最小值")
+    /** 监测结果（折标，小时浓度,mg/Nm3）最小值 */
+    @Excel(name = "监测结果（折标，小时浓度,mg/Nm3）最小值")
+    private String foldsMinHour;
+
+
+    @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最大值")
+    /** 监测结果（折标，小时浓度,mg/Nm3）最大值 */
+    @Excel(name = "监测结果（折标，小时浓度,mg/Nm3）最大值")
+    private String foldsMaxHour;
+
+
+    @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）平均值")
+    /** 监测结果（折标，小时浓度,mg/Nm3）平均值 */
+    @Excel(name = "监测结果（折标，小时浓度,mg/Nm3）平均值")
+    private String foldsAvgHour;
+
+
+    @ApiModelProperty(value = "超标数据个数")
+    /** 超标数据个数 */
+    @Excel(name = "超标数据个数")
+    private String exceededData;
+
+
+    @ApiModelProperty(value = "超标率（%）")
+    /** 超标率（%） */
+    @Excel(name = "超标率（%）")
+    private String exceededRate;
+
+
+    @ApiModelProperty(value = "实际产生量（吨）")
+    /** 实际产生量（吨） */
+    @Excel(name = "实际产生量（吨）")
+    private String actualAmount;
+
+
+    @ApiModelProperty(value = "实际排放量（吨）")
+    /** 实际排放量（吨） */
+    @Excel(name = "实际排放量（吨）")
+    private String actualEmissions;
+
+
+    @ApiModelProperty(value = "监测仪器名称或型号")
+    /** 监测仪器名称或型号 */
+    @Excel(name = "监测仪器名称或型号")
+    private String instrumentName;
+
+
+    @ApiModelProperty(value = "手工监测采样方法及个数")
+    /** 手工监测采样方法及个数 */
+    @Excel(name = "手工监测采样方法及个数")
+    private String samplingMethod;
+
+
+    @ApiModelProperty(value = "手工测定方法")
+    /** 手工测定方法 */
+    @Excel(name = "手工测定方法")
+    private String manualMethod;
+
+
+    @ApiModelProperty(value = "监测设备测量范围(mg/m3)")
+    /** 监测设备测量范围(mg/m3) */
+    @Excel(name = "监测设备测量范围(mg/m3)")
+    private String deviceRange;
+
+
+    @ApiModelProperty(value = "监测设备准确度")
+    /** 监测设备准确度 */
+    @Excel(name = "监测设备准确度")
+    private String deviceAccuracy;
+
+
+    @ApiModelProperty(value = "监测设备检出下限mg/m3")
+    /** 监测设备检出下限mg/m3 */
+    @Excel(name = "监测设备检出下限mg/m3")
+    private String deviceCheckout;
+
+
+    @ApiModelProperty(value = "备注")
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("zxbgPollutantType", getZxbgPollutantType())
+            .append("createTime", getCreateTime())
+            .append("remark", getRemark())
+            .append("outletCode", getOutletCode())
+            .append("pollutantName", getPollutantName())
+            .append("monitoringFacilities", getMonitoringFacilities())
+            .append("facilityName", getFacilityName())
+            .append("emissionConcentration", getEmissionConcentration())
+            .append("effectivelyHour", getEffectivelyHour())
+            .append("detectionMinHour", getDetectionMinHour())
+            .append("detectionMaxHour", getDetectionMaxHour())
+            .append("detectionAvgHour", getDetectionAvgHour())
+            .append("foldsMinHour", getFoldsMinHour())
+            .append("foldsMaxHour", getFoldsMaxHour())
+            .append("foldsAvgHour", getFoldsAvgHour())
+            .append("exceededData", getExceededData())
+            .append("exceededRate", getExceededRate())
+            .append("actualAmount", getActualAmount())
+            .append("actualEmissions", getActualEmissions())
+            .append("instrumentName", getInstrumentName())
+            .append("samplingMethod", getSamplingMethod())
+            .append("manualMethod", getManualMethod())
+            .append("deviceRange", getDeviceRange())
+            .append("deviceAccuracy", getDeviceAccuracy())
+            .append("deviceCheckout", getDeviceCheckout())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionSpeed.java

@@ -0,0 +1,172 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--有组织废气污染物排放速率监测对象 b_stat_table_zxbg_gas_emission_speed
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放速率监测")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_gas_emission_speed")
+public class BStatTableZxbgGasEmissionSpeed extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "排放口编码")
+    /** 排放口编码 */
+    @Excel(name = "排放口编码")
+    private String outletCode;
+
+
+    @ApiModelProperty(value = "排放口名称")
+    /** 排放口名称 */
+    @Excel(name = "排放口名称")
+    private String outletName;
+
+
+
+
+
+
+    @ApiModelProperty(value = "污染物名称")
+    /** 污染物名称 */
+    @Excel(name = "污染物名称")
+    private String pollutantName;
+
+
+    @ApiModelProperty(value = "污染物编码")
+    /** 污染物编码 */
+    @Excel(name = "污染物编码")
+    private String pollutantCode;
+
+    @ApiModelProperty(value = "有效监测数据(小时值)数量")
+    /** 有效监测数据(小时值)数量 */
+    @Excel(name = "有效监测数据(小时值)数量")
+    private String effectivelyHour;
+
+    @ApiModelProperty(value = "许可排放浓度限值")
+    /** 许可排放浓度限值 */
+    @Excel(name = "许可排放浓度限值")
+    private String emissionConcentration;
+
+    @ApiModelProperty(value = "实际排放速率最小值")
+    /** 实际排放速率最小值 */
+    @Excel(name = "实际排放速率最小值")
+    private String detectionMinHour;
+
+
+    @ApiModelProperty(value = "实际排放速率最大值")
+    /** 实际排放速率最大值 */
+    @Excel(name = "实际排放速率最大值")
+    private String detectionMaxHour;
+
+
+    @ApiModelProperty(value = "实际排放速率平均值")
+    /** 实际排放速率平均值 */
+    @Excel(name = "实际排放速率平均值")
+    private String detectionAvgHour;
+
+
+    @ApiModelProperty(value = "超标数据个数")
+    /** 超标数据个数 */
+    @Excel(name = "超标数据个数")
+    private String exceededData;
+
+
+    @ApiModelProperty(value = "超标率（%）")
+    /** 超标率（%） */
+    @Excel(name = "超标率（%）")
+    private String exceededRate;
+
+
+    @ApiModelProperty(value = "超标原因")
+    /** 超标原因 */
+    @Excel(name = "超标原因")
+    private String exceededCause;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("outletCode", getOutletCode())
+            .append("outletName", getOutletName())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .append("pollutantName", getPollutantName())
+            .append("pollutantCode", getPollutantCode())
+            .append("emissionConcentration", getEmissionConcentration())
+            .append("effectivelyHour", getEffectivelyHour())
+            .append("detectionMinHour", getDetectionMinHour())
+            .append("detectionMaxHour", getDetectionMaxHour())
+            .append("detectionAvgHour", getDetectionAvgHour())
+            .append("exceededData", getExceededData())
+            .append("exceededRate", getExceededRate())
+            .append("exceededCause", getExceededCause())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionStatistics.java

@@ -0,0 +1,175 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计对象 b_stat_table_zxbg_gas_emission_statistics
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_gas_emission_statistics")
+public class BStatTableZxbgGasEmissionStatistics extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "类型")
+    /** 类型 */
+    @Excel(name = "类型")
+    private String zxbgPollutantType;
+
+
+    @ApiModelProperty(value = "污染物名称")
+    /** 污染物名称 */
+    @Excel(name = "污染物名称")
+    private String pollutantName;
+
+
+    @ApiModelProperty(value = "设施名称")
+    /** 设施名称 */
+    @Excel(name = "设施名称")
+    private String facilityName;
+
+
+    @ApiModelProperty(value = "生产设施/无组织排放编号")
+    /** 生产设施/无组织排放编号 */
+    @Excel(name = "生产设施/无组织排放编号")
+    private String facilitiesCode;
+
+
+    @ApiModelProperty(value = "监测时间")
+    /** 监测时间 */
+    @Excel(name = "监测时间")
+    private String monitoringTime;
+
+
+    @ApiModelProperty(value = "监测次数")
+    /** 监测次数 */
+    @Excel(name = "监测次数")
+    private Long monitoringNumber;
+
+
+    @ApiModelProperty(value = "许可排放浓度限值")
+    /** 许可排放浓度限值 */
+    @Excel(name = "许可排放浓度限值")
+    private String emissionConcentration;
+
+
+    @ApiModelProperty(value = "浓度监测结果（小时浓度）")
+    /** 浓度监测结果（小时浓度） */
+    @Excel(name = "浓度监测结果（小时浓度）")
+    private String monitoringResultsHour;
+
+
+    @ApiModelProperty(value = "浓度监测结果（折标，小时浓度）")
+    /** 浓度监测结果（折标，小时浓度） */
+    @Excel(name = "浓度监测结果（折标，小时浓度）")
+    private String monitoringFoldsHour;
+
+
+    @ApiModelProperty(value = "是否超标:0否1是")
+    /** 是否超标:0否1是 */
+    @Excel(name = "是否超标")
+    private String isExceeded;
+
+    @ApiModelProperty(value = "备注")
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+    public String getIsExceeded() {
+        return isExceeded;
+    }
+
+    public void setIsExceeded(String isExceeded) {
+        if(StringUtils.isNotBlank(isExceeded)){
+            if(isExceeded.equals("0")){this.isExceeded = "否";}
+            if(isExceeded.equals("1")){this.isExceeded = "是";}
+        }else {
+            this.isExceeded = isExceeded;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("zxbgPollutantType", getZxbgPollutantType())
+            .append("pollutantName", getPollutantName())
+            .append("facilityName", getFacilityName())
+            .append("facilitiesCode", getFacilitiesCode())
+            .append("monitoringTime", getMonitoringTime())
+            .append("monitoringNumber", getMonitoringNumber())
+            .append("emissionConcentration", getEmissionConcentration())
+            .append("monitoringResultsHour", getMonitoringResultsHour())
+            .append("monitoringFoldsHour", getMonitoringFoldsHour())
+            .append("isExceeded", getIsExceeded())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtFuel.java

@@ -0,0 +1,113 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--钢铁-燃料分析对象 b_stat_table_zxbg_gt_fuel
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--钢铁-燃料分析")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_gt_fuel")
+public class BStatTableZxbgGtFuel extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "记录内容")
+    /** 记录内容 */
+    @Excel(name = "记录内容")
+    private String recordContent;
+
+
+    @ApiModelProperty(value = "名称")
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+
+    @ApiModelProperty(value = "具体情况")
+    /** 具体情况 */
+    @Excel(name = "具体情况")
+    private String specificInformation;
+
+    @ApiModelProperty(value = "备注")
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("recordContent", getRecordContent())
+            .append("name", getName())
+            .append("specificInformation", getSpecificInformation())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtProduction.java

@@ -0,0 +1,121 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--钢铁-生产单元运行情况对象 b_stat_table_zxbg_gt_production
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--钢铁-生产单元运行情况")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_gt_production")
+public class BStatTableZxbgGtProduction extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "主要生产单元")
+    /** 主要生产单元 */
+    @Excel(name = "主要生产单元")
+    private String mainProductionUnit;
+
+
+    @ApiModelProperty(value = "名称")
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+
+    @ApiModelProperty(value = "数量")
+    /** 数量 */
+    @Excel(name = "数量")
+    private String quantity;
+
+
+    @ApiModelProperty(value = "单位")
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "备注")
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("mainProductionUnit", getMainProductionUnit())
+            .append("name", getName())
+            .append("quantity", getQuantity())
+            .append("unit", getUnit())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdFuelAnalysis.java

@@ -0,0 +1,139 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--火电燃料分析对象 b_stat_table_zxbg_hd_fuel_analysis
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--火电燃料分析")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_hd_fuel_analysis")
+public class BStatTableZxbgHdFuelAnalysis extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "生产单元")
+    /** 生产单元 */
+    @Excel(name = "生产单元")
+    private String productionUnit;
+
+
+    @ApiModelProperty(value = "燃料名称")
+    /** 燃料名称 */
+    @Excel(name = "燃料名称")
+    private String fuelName;
+
+
+    @ApiModelProperty(value = "使用量（万t/a、万m³/a）")
+    /** 使用量（万t/a、万m³/a） */
+    @Excel(name = "使用量（万t/a、万m³/a）")
+    private String usage;
+
+
+    @ApiModelProperty(value = "灰分（%）")
+    /** 灰分（%） */
+    @Excel(name = "灰分（%）")
+    private String ashContent;
+
+
+    @ApiModelProperty(value = "硫分（%）")
+    /** 硫分（%） */
+    @Excel(name = "硫分（%）")
+    private String sulfur;
+
+
+    @ApiModelProperty(value = "挥发分（%）")
+    /** 挥发分（%） */
+    @Excel(name = "挥发分（%）")
+    private String volatileContent;
+
+
+    @ApiModelProperty(value = "热值（MJ/kg、MJ/m³）")
+    /** 热值（MJ/kg、MJ/m³） */
+    @Excel(name = "热值（MJ/kg、MJ/m³）")
+    private String caloricValue;
+
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("productionUnit", getProductionUnit())
+            .append("fuelName", getFuelName())
+            .append("usage", getUsage())
+            .append("ashContent", getAshContent())
+            .append("sulfur", getSulfur())
+            .append("volatileContent", getVolatileContent())
+            .append("caloricValue", getCaloricValue())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGasPollution.java

@@ -0,0 +1,219 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--火电废气污染治理设施正常情况对象 b_stat_table_zxbg_hd_gas_pollution
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--火电废气污染治理设施正常情况")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_hd_gas_pollution")
+public class BStatTableZxbgHdGasPollution extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "生产设施名称")
+    /** 生产设施名称 */
+    @Excel(name = "生产设施名称")
+    private String productionFacilityName;
+
+
+    @ApiModelProperty(value = "生产设施编号")
+    /** 生产设施编号 */
+    @Excel(name = "生产设施编号")
+    private String productionFacilityCode;
+
+
+    @ApiModelProperty(value = "治理设施编号")
+    /** 治理设施编号 */
+    @Excel(name = "治理设施编号")
+    private String governanceFacilityCode;
+
+
+    @ApiModelProperty(value = "治理设施名称")
+    /** 治理设施名称 */
+    @Excel(name = "治理设施名称")
+    private String governanceFacilityName;
+
+    @ApiModelProperty(value = "治理设施运行时间（小时）")
+    /** 治理设施运行时间（小时） */
+    @Excel(name = "治理设施运行时间（小时）")
+    private String governanceFacilityTime;
+
+
+    @ApiModelProperty(value = "粉煤灰产生量（吨）")
+    /** 粉煤灰产生量（吨） */
+    @Excel(name = "粉煤灰产生量（吨）")
+    private String flyAshProduction;
+
+
+    @ApiModelProperty(value = "布袋除尘器清灰周期和换代情况")
+    /** 布袋除尘器清灰周期和换代情况 */
+    @Excel(name = "布袋除尘器清灰周期和换代情况")
+    private String bagFilter;
+
+
+    @ApiModelProperty(value = "除尘效率设计值")
+    /** 除尘效率设计值 */
+    @Excel(name = "除尘效率设计值")
+    private String dustRemovalEfficiency;
+
+
+    @ApiModelProperty(value = "除尘效率实际值")
+    /** 除尘效率实际值 */
+    @Excel(name = "除尘效率实际值")
+    private String actualValue;
+
+
+    @ApiModelProperty(value = "脱硫剂用量（吨）")
+    /** 脱硫剂用量（吨） */
+    @Excel(name = "脱硫剂用量（吨）")
+    private String desulfurizerDosage;
+
+
+    @ApiModelProperty(value = "脱硫副产物产生量（吨）")
+    /** 脱硫副产物产生量（吨） */
+    @Excel(name = "脱硫副产物产生量（吨）")
+    private String amountProduct;
+
+
+    @ApiModelProperty(value = "脱硫效率设计值%")
+    /** 脱硫效率设计值% */
+    @Excel(name = "脱硫效率设计值%")
+    private String designValues;
+
+
+    @ApiModelProperty(value = "脱硫效率实际值%")
+    /** 脱硫效率实际值% */
+    @Excel(name = "脱硫效率实际值%")
+    private String actualEfficiency;
+
+
+    @ApiModelProperty(value = "脱硝还原剂用量（吨）")
+    /** 脱硝还原剂用量（吨） */
+    @Excel(name = "脱硝还原剂用量（吨）")
+    private String reducingAgentDosage;
+
+
+    @ApiModelProperty(value = "脱硝效率设计值")
+    /** 脱硝效率设计值 */
+    @Excel(name = "脱硝效率设计值")
+    private String denitrationEfficiency;
+
+
+    @ApiModelProperty(value = "脱硝效率实际")
+    /** 脱硝效率实际 */
+    @Excel(name = "脱硝效率实际")
+    private String efficiencyPractical;
+
+
+    @ApiModelProperty(value = "污染治理设施运行费用（万元）")
+    /** 污染治理设施运行费用（万元） */
+    @Excel(name = "污染治理设施运行费用（万元）")
+    private String facilityOperatingCosts;
+
+
+    @ApiModelProperty(value = "综合除尘效率设计值")
+    /** 综合除尘效率设计值 */
+    @Excel(name = "综合除尘效率设计值")
+    private String efficiencyDesignValues;
+
+
+    @ApiModelProperty(value = "综合除尘效率实际值")
+    /** 综合除尘效率实际值 */
+    @Excel(name = "综合除尘效率实际值")
+    private String actualDustRemoval;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("productionFacilityName", getProductionFacilityName())
+            .append("productionFacilityCode", getProductionFacilityCode())
+            .append("governanceFacilityCode", getGovernanceFacilityCode())
+            .append("governanceFacilityName", getGovernanceFacilityName())
+            .append("governanceFacilityTime", getGovernanceFacilityTime())
+            .append("flyAshProduction", getFlyAshProduction())
+            .append("bagFilter", getBagFilter())
+            .append("dustRemovalEfficiency", getDustRemovalEfficiency())
+            .append("actualValue", getActualValue())
+            .append("desulfurizerDosage", getDesulfurizerDosage())
+            .append("amountProduct", getAmountProduct())
+            .append("designValues", getDesignValues())
+            .append("actualEfficiency", getActualEfficiency())
+            .append("reducingAgentDosage", getReducingAgentDosage())
+            .append("denitrationEfficiency", getDenitrationEfficiency())
+            .append("efficiencyPractical", getEfficiencyPractical())
+            .append("facilityOperatingCosts", getFacilityOperatingCosts())
+            .append("efficiencyDesignValues", getEfficiencyDesignValues())
+            .append("actualDustRemoval", getActualDustRemoval())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtBasic.java

@@ -0,0 +1,139 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁基本信息对象 b_stat_table_zxbg_hd_gt_basic
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--火电、钢铁基本信息")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_hd_gt_basic")
+public class BStatTableZxbgHdGtBasic extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "机组名称")
+    /** 机组名称 */
+    @Excel(name = "机组名称")
+    private String unitName;
+
+
+    @ApiModelProperty(value = "规模（万千瓦）")
+    /** 规模（万千瓦） */
+    @Excel(name = "规模（万千瓦）")
+    private String scale;
+
+
+    @ApiModelProperty(value = "设计运行时间（小时）")
+    /** 设计运行时间（小时） */
+    @Excel(name = "设计运行时间（小时）")
+    private String runTime;
+
+
+    @ApiModelProperty(value = "发电量（万千瓦时）")
+    /** 发电量（万千瓦时） */
+    @Excel(name = "发电量（万千瓦时）")
+    private String powerGeneration;
+
+
+    @ApiModelProperty(value = "供热量（万吉焦）")
+    /** 供热量（万吉焦） */
+    @Excel(name = "供热量（万吉焦）")
+    private String heatSupply;
+
+
+    @ApiModelProperty(value = "实际运行时间（小时）")
+    /** 实际运行时间（小时） */
+    @Excel(name = "实际运行时间（小时）")
+    private String actualRunningTime;
+
+
+    @ApiModelProperty(value = "平均负荷率")
+    /** 平均负荷率 */
+    @Excel(name = "平均负荷率")
+    private String averageLoadRatio;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("unitName", getUnitName())
+            .append("scale", getScale())
+            .append("runTime", getRunTime())
+            .append("powerGeneration", getPowerGeneration())
+            .append("heatSupply", getHeatSupply())
+            .append("actualRunningTime", getActualRunningTime())
+            .append("averageLoadRatio", getAverageLoadRatio())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtFuel.java

@@ -0,0 +1,157 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁燃料信息对象 b_stat_table_zxbg_hd_gt_fuel
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--火电、钢铁燃料信息")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_hd_gt_fuel")
+public class BStatTableZxbgHdGtFuel extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "机组名称")
+    /** 机组名称 */
+    @Excel(name = "机组名称")
+    private String unitName;
+
+
+    @ApiModelProperty(value = "机组类型")
+    /** 机组类型 */
+    @Excel(name = "机组类型")
+    private String unitType;
+
+
+    @ApiModelProperty(value = "燃料消耗量")
+    /** 燃料消耗量 */
+    @Excel(name = "燃料消耗量")
+    private String fuelConsumption;
+
+
+    @ApiModelProperty(value = "燃料消耗量单位")
+    /** 燃料消耗量单位 */
+    @Excel(name = "燃料消耗量单位")
+    private String fuelConsumptionUnits;
+
+
+    @ApiModelProperty(value = "发电标准煤耗")
+    /** 发电标准煤耗 */
+    @Excel(name = "发电标准煤耗")
+    private String coalConsumption;
+
+
+    @ApiModelProperty(value = "发电标准煤耗单位")
+    /** 发电标准煤耗单位 */
+    @Excel(name = "发电标准煤耗单位")
+    private String coalConsumptionUnits;
+
+
+    @ApiModelProperty(value = "产灰量")
+    /** 产灰量 */
+    @Excel(name = "产灰量")
+    private String ashProduction;
+
+
+    @ApiModelProperty(value = "产灰量单位")
+    /** 产灰量单位 */
+    @Excel(name = "产灰量单位")
+    private String ashProductionUits;
+
+
+    @ApiModelProperty(value = "产渣量")
+    /** 产渣量 */
+    @Excel(name = "产渣量")
+    private String slagProduction;
+
+
+    @ApiModelProperty(value = "产渣量单位")
+    /** 产渣量单位 */
+    @Excel(name = "产渣量单位")
+    private String slagProductionUnits;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("unitName", getUnitName())
+            .append("unitType", getUnitType())
+            .append("fuelConsumption", getFuelConsumption())
+            .append("fuelConsumptionUnits", getFuelConsumptionUnits())
+            .append("coalConsumption", getCoalConsumption())
+            .append("coalConsumptionUnits", getCoalConsumptionUnits())
+            .append("ashProduction", getAshProduction())
+            .append("ashProductionUits", getAshProductionUits())
+            .append("slagProduction", getSlagProduction())
+            .append("slagProductionUnits", getSlagProductionUnits())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtInvestment.java

@@ -0,0 +1,130 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况对象 b_stat_table_zxbg_hd_gt_investment
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_hd_gt_investment")
+public class BStatTableZxbgHdGtInvestment extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "机组名称")
+    /** 机组名称 */
+    @Excel(name = "机组名称")
+    private String unitName;
+
+
+    @ApiModelProperty(value = "治理类型")
+    /** 治理类型 */
+    @Excel(name = "治理类型")
+    private String governanceType;
+
+
+    @ApiModelProperty(value = "开工时间")
+    /** 开工时间 */
+    @Excel(name = "开工时间")
+    private String startTime;
+
+
+    @ApiModelProperty(value = "建成投产时间（拟）")
+    /** 建成投产时间（拟） */
+    @Excel(name = "建成投产时间（拟）")
+    private String productionTime;
+
+
+    @ApiModelProperty(value = "计划总投资")
+    /** 计划总投资 */
+    @Excel(name = "计划总投资")
+    private String plannedInvestment;
+
+
+    @ApiModelProperty(value = "计划周期内完成投资")
+    /** 计划周期内完成投资 */
+    @Excel(name = "计划周期内完成投资")
+    private String cycleCompleteInvestment;
+
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("unitName", getUnitName())
+            .append("governanceType", getGovernanceType())
+            .append("startTime", getStartTime())
+            .append("productionTime", getProductionTime())
+            .append("plannedInvestment", getPlannedInvestment())
+            .append("cycleCompleteInvestment", getCycleCompleteInvestment())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdWaterPollution.java

@@ -0,0 +1,247 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--火电废水污染治理设施正常情况对象 b_stat_table_zxbg_hd_water_pollution
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--火电废水污染治理设施正常情况")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_hd_water_pollution")
+public class BStatTableZxbgHdWaterPollution extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "废水类别")
+    /** 废水类别 */
+    @Excel(name = "废水类别")
+    private String waterCategory;
+
+    @ApiModelProperty(value = "治理设施编号")
+    /** 治理设施编号 */
+    @Excel(name = "治理设施编号")
+    private String governanceFacilityCode;
+
+
+    @ApiModelProperty(value = "治理设施名称")
+    /** 治理设施名称 */
+    @Excel(name = "治理设施名称")
+    private String governanceFacilityName;
+
+
+    @ApiModelProperty(value = "治理设施运行时间（小时）")
+    /** 治理设施运行时间（小时） */
+    @Excel(name = "治理设施运行时间（小时）")
+    private String governanceFacilityTime;
+
+
+    @ApiModelProperty(value = "污染治理设施工艺")
+    /** 污染治理设施工艺 */
+    @Excel(name = "污染治理设施工艺")
+    private String pollutionFacilityTechnology;
+
+
+    @ApiModelProperty(value = "污染因子")
+    /** 污染因子 */
+    @Excel(name = "污染因子")
+    private String contaminateFactor;
+
+
+    @ApiModelProperty(value = "排放去向")
+    /** 排放去向 */
+    @Excel(name = "排放去向")
+    private String emissions;
+
+
+    @ApiModelProperty(value = "受纳水体名称")
+    /** 受纳水体名称 */
+    @Excel(name = "受纳水体名称")
+    private String receivingName;
+
+
+    @ApiModelProperty(value = "用电量")
+    /** 用电量 */
+    @Excel(name = "用电量")
+    private String electricityConsumption;
+
+
+    @ApiModelProperty(value = "污水设计处理能力")
+    /** 污水设计处理能力 */
+    @Excel(name = "污水设计处理能力")
+    private String processingPower;
+
+
+    @ApiModelProperty(value = "污水实际处理量")
+    /** 污水实际处理量 */
+    @Excel(name = "污水实际处理量")
+    private String actualProcessingVolume;
+
+
+    @ApiModelProperty(value = "污水实际会用量")
+    /** 污水实际会用量 */
+    @Excel(name = "污水实际会用量")
+    private String willAmount;
+
+
+    @ApiModelProperty(value = "污水实际排放量")
+    /** 污水实际排放量 */
+    @Excel(name = "污水实际排放量")
+    private String actualEmissions;
+
+
+    @ApiModelProperty(value = "废水设计处理能力")
+    /** 废水设计处理能力 */
+    @Excel(name = "废水设计处理能力")
+    private String designProcessingPower;
+
+
+    @ApiModelProperty(value = "废水实际处理量")
+    /** 废水实际处理量 */
+    @Excel(name = "废水实际处理量")
+    private String waterTreatmentVolume;
+
+
+    @ApiModelProperty(value = "废水实际会用量")
+    /** 废水实际会用量 */
+    @Excel(name = "废水实际会用量")
+    private String waterWillAmount;
+
+
+    @ApiModelProperty(value = "废水实际排放量")
+    /** 废水实际排放量 */
+    @Excel(name = "废水实际排放量")
+    private String waterActualEmissions;
+
+
+    @ApiModelProperty(value = "污泥生成量")
+    /** 污泥生成量 */
+    @Excel(name = "污泥生成量")
+    private String sludgeGeneration;
+
+
+    @ApiModelProperty(value = "污泥含水率")
+    /** 污泥含水率 */
+    @Excel(name = "污泥含水率")
+    private String sludgeMoistureContent;
+
+
+    @ApiModelProperty(value = "循环冷却水排放量")
+    /** 循环冷却水排放量 */
+    @Excel(name = "循环冷却水排放量")
+    private String circulatingCooling;
+
+
+    @ApiModelProperty(value = "直流冷却水排水量")
+    /** 直流冷却水排水量 */
+    @Excel(name = "直流冷却水排水量")
+    private String coolingDischarge;
+
+
+    @ApiModelProperty(value = "污泥处置方式")
+    /** 污泥处置方式 */
+    @Excel(name = "污泥处置方式")
+    private String sludgeDisposalMethod;
+
+
+    @ApiModelProperty(value = "污染治理设施运行费用")
+    /** 污染治理设施运行费用 */
+    @Excel(name = "污染治理设施运行费用")
+    private String facilityOperatingCosts;
+
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("waterCategory", getWaterCategory())
+            .append("governanceFacilityCode", getGovernanceFacilityCode())
+            .append("governanceFacilityName", getGovernanceFacilityName())
+            .append("governanceFacilityTime", getGovernanceFacilityTime())
+            .append("pollutionFacilityTechnology", getPollutionFacilityTechnology())
+            .append("contaminateFactor", getContaminateFactor())
+            .append("emissions", getEmissions())
+            .append("receivingName", getReceivingName())
+            .append("electricityConsumption", getElectricityConsumption())
+            .append("processingPower", getProcessingPower())
+            .append("actualProcessingVolume", getActualProcessingVolume())
+            .append("willAmount", getWillAmount())
+            .append("actualEmissions", getActualEmissions())
+            .append("designProcessingPower", getDesignProcessingPower())
+            .append("waterTreatmentVolume", getWaterTreatmentVolume())
+            .append("waterWillAmount", getWaterWillAmount())
+            .append("waterActualEmissions", getWaterActualEmissions())
+            .append("sludgeGeneration", getSludgeGeneration())
+            .append("sludgeMoistureContent", getSludgeMoistureContent())
+            .append("circulatingCooling", getCirculatingCooling())
+            .append("coolingDischarge", getCoolingDischarge())
+            .append("sludgeDisposalMethod", getSludgeDisposalMethod())
+            .append("facilityOperatingCosts", getFacilityOperatingCosts())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnFuel.java

@@ -0,0 +1,125 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--水泥燃料分析对象 b_stat_table_zxbg_sn_fuel
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--水泥燃料分析")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_sn_fuel")
+public class BStatTableZxbgSnFuel extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "参数")
+    /** 参数 */
+    @Excel(name = "参数")
+    private String parameter;
+
+
+    @ApiModelProperty(value = "记录内容")
+    /** 记录内容 */
+    @Excel(name = "记录内容")
+    private String recordTheContent;
+
+
+    @ApiModelProperty(value = "名称")
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+
+
+
+    @ApiModelProperty(value = "类型")
+    /** 类型 */
+    @Excel(name = "类型")
+    private String type;
+
+
+    @ApiModelProperty(value = "使用情况")
+    /** 使用情况 */
+    @Excel(name = "使用情况")
+    private String usage;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("parameter", getParameter())
+            .append("recordTheContent", getRecordTheContent())
+            .append("name", getName())
+            .append("remark", getRemark())
+            .append("type", getType())
+            .append("usage", getUsage())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnProduction.java

@@ -0,0 +1,130 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--水泥-生产单元运行情况对象 b_stat_table_zxbg_sn_production
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--水泥-生产单元运行情况")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_sn_production")
+public class BStatTableZxbgSnProduction extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "主要生产单元")
+    /** 主要生产单元 */
+    @Excel(name = "主要生产单元")
+    private String mainProductionUnit;
+
+
+    @ApiModelProperty(value = "生产设施名称")
+    /** 生产设施名称 */
+    @Excel(name = "生产设施名称")
+    private String productionFacilities;
+
+
+    @ApiModelProperty(value = "名称")
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+
+    @ApiModelProperty(value = "数量")
+    /** 数量 */
+    @Excel(name = "数量")
+    private String quantity;
+
+
+    @ApiModelProperty(value = "单位")
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+
+    @ApiModelProperty(value = "备注")
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("mainProductionUnit", getMainProductionUnit())
+            .append("productionFacilities", getProductionFacilities())
+            .append("name", getName())
+            .append("quantity", getQuantity())
+            .append("unit", getUnit())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgWaterEmission.java

@@ -0,0 +1,202 @@
+package cn.cecep.talroad.domain;
+
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.Version;
+import java.util.Date;
+
+
+/**
+ * 固定源产排治--执行报告--废水污染物排放浓度监测数据对象 b_stat_table_zxbg_water_emission
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@ApiModel(value = "固定源产排治--执行报告--废水污染物排放浓度监测数据")
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("b_stat_table_zxbg_water_emission")
+public class BStatTableZxbgWaterEmission extends BStatTableZxbgJbxxInfoFactoryBase
+{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键id")
+    /** 主键id */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+
+    @ApiModelProperty(value = "企业id")
+    /** 企业id */
+    private String factoryId;
+
+
+    @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报")
+    /** 执行报告类型，0：月报，1：季报，2：年报 */
+    @Excel(name = "执行报告类型")
+    private String zxbgType;
+
+
+    @ApiModelProperty(value = "执行报告周期")
+    /** 执行报告周期 */
+    @Excel(name = "报告周期")
+    private String zxbgPeriod;
+
+
+    @ApiModelProperty(value = "类型")
+    /** 类型 */
+    private String zxbgPollutantType;
+
+    @ApiModelProperty(value = "排放口编码")
+    /** 排放口编码 */
+    @Excel(name = "排放口编码")
+    private String outletCode;
+
+
+    @ApiModelProperty(value = "污染物名称")
+    /** 污染物名称 */
+    @Excel(name = "污染物名称")
+    private String pollutantName;
+
+
+    @ApiModelProperty(value = "监测设施")
+    /** 监测设施 */
+    @Excel(name = "监测设施")
+    private String monitoringFacilities;
+
+
+    @ApiModelProperty(value = "设施名称")
+    /** 设施名称 */
+    private String facilityName;
+
+
+    @ApiModelProperty(value = "许可排放浓度限值")
+    /** 许可排放浓度限值 */
+    @Excel(name = "许可排放浓度限值")
+    private String emissionConcentration;
+
+
+    @ApiModelProperty(value = "有效监测数据(日)数量")
+    /** 有效监测数据(日)数量 */
+    @Excel(name = "有效监测数据(日)数量")
+    private String effectivelyDay;
+
+
+    @ApiModelProperty(value = "检测结果（日均浓度）最小值mg/m3")
+    /** 检测结果（日均浓度）最小值mg/m3 */
+    @Excel(name = "检测结果（日均浓度）最小值mg/m3")
+    private String detectionMinDay;
+
+
+    @ApiModelProperty(value = "检测结果（日均浓度）最大值mg/m3")
+    /** 检测结果（日均浓度）最大值mg/m3 */
+    @Excel(name = "检测结果（日均浓度）最大值mg/m3")
+    private String detectionMaxDay;
+
+
+    @ApiModelProperty(value = "检测结果（日均浓度）平均值")
+    /** 检测结果（日均浓度）平均值 */
+    @Excel(name = "检测结果（日均浓度）平均值")
+    private String detectionAvgDay;
+
+
+    @ApiModelProperty(value = "超标数据个数")
+    /** 超标数据个数 */
+    @Excel(name = "超标数据个数")
+    private String exceededData;
+
+
+    @ApiModelProperty(value = "超标率（%）")
+    /** 超标率（%） */
+    @Excel(name = "超标率（%）")
+    private String exceededRate;
+
+
+    @ApiModelProperty(value = "实际排放量（吨）")
+    /** 实际排放量（吨） */
+    @Excel(name = "实际排放量（吨）")
+    private String actualEmissions;
+
+
+    @ApiModelProperty(value = "监测仪器名称或型号")
+    /** 监测仪器名称或型号 */
+    @Excel(name = "监测仪器名称或型号")
+    private String instrumentName;
+
+
+    @ApiModelProperty(value = "手工监测采样方法及个数")
+    /** 手工监测采样方法及个数 */
+    @Excel(name = "手工监测采样方法及个数")
+    private String samplingMethod;
+
+
+    @ApiModelProperty(value = "手工测定方法")
+    /** 手工测定方法 */
+    @Excel(name = "手工测定方法")
+    private String manualMethod;
+
+    @ApiModelProperty(value = "备注")
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getZxbgType() {
+        return zxbgType;
+    }
+
+    public void setZxbgType(String zxbgType) {
+        //0：月报，1：季报，2：年报
+        if(StringUtils.isNotBlank(zxbgType)){
+            if(zxbgType.equals("0")){this.zxbgType = "月报";}
+            if(zxbgType.equals("1")){this.zxbgType = "季报";}
+            if(zxbgType.equals("2")){this.zxbgType = "年报";}
+        }else {
+            this.zxbgType = zxbgType;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("factoryId", getFactoryId())
+            .append("zxbgType", getZxbgType())
+            .append("zxbgPeriod", getZxbgPeriod())
+            .append("zxbgPollutantType", getZxbgPollutantType())
+            .append("createTime", getCreateTime())
+            .append("remark", getRemark())
+            .append("outletCode", getOutletCode())
+            .append("pollutantName", getPollutantName())
+            .append("monitoringFacilities", getMonitoringFacilities())
+            .append("facilityName", getFacilityName())
+            .append("emissionConcentration", getEmissionConcentration())
+            .append("effectivelyDay", getEffectivelyDay())
+            .append("detectionMinDay", getDetectionMinDay())
+            .append("detectionMaxDay", getDetectionMaxDay())
+            .append("detectionAvgDay", getDetectionAvgDay())
+            .append("exceededData", getExceededData())
+            .append("exceededRate", getExceededRate())
+            .append("actualEmissions", getActualEmissions())
+            .append("instrumentName", getInstrumentName())
+            .append("samplingMethod", getSamplingMethod())
+            .append("manualMethod", getManualMethod())
+            .toString();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BasModelAnalyse.java

@@ -0,0 +1,82 @@
+package cn.cecep.talroad.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ApiModel(description="bas_model_analyse")
+@Data
+@TableName(value = "bas_model_analyse")
+public class BasModelAnalyse implements Serializable {
+    public static final String COL_ID = "id";
+    public static final String COL_MODEL_NAME = "model_name";
+    public static final String COL_PARAM_NAME = "param_name";
+    public static final String COL_PARAM_ABBR = "param_abbr";
+    public static final String COL_VALUE = "value";
+    public static final String COL_RECOMMEND_VALUE = "recommend_value";
+    public static final String COL_REMARKS = "remarks";
+    public static final String COL_DELETE_STATUS = "delete_status";
+    public static final String COL_CREATE_TIME = "create_time";
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="主键id")
+    private Long id;
+    /**
+     * 模型名称
+     */
+    @TableField(value = "model_name")
+    @ApiModelProperty(value="模型名称")
+    private String modelName;
+    /**
+     * 参数名称
+     */
+    @TableField(value = "param_name")
+    @ApiModelProperty(value="参数名称")
+    private String paramName;
+    /**
+     * 参数缩写
+     */
+    @TableField(value = "param_abbr")
+    @ApiModelProperty(value="参数缩写")
+    private String paramAbbr;
+    /**
+     * 取值
+     */
+    @TableField(value = "\"value\"")
+    @ApiModelProperty(value="取值")
+    private Double value;
+    /**
+     * 推荐取值范围
+     */
+    @TableField(value = "recommend_value")
+    @ApiModelProperty(value="推荐取值范围")
+    private String recommendValue;
+    /**
+     * 备注说明
+     */
+    @TableField(value = "remarks")
+    @ApiModelProperty(value="备注说明")
+    private String remarks;
+    /**
+     * 删除状态:0--不删除，1--删除
+     */
+    @TableField(value = "delete_status")
+    @ApiModelProperty(value="删除状态:0--不删除，1--删除")
+    private String deleteStatus;
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/PcLabelFactory.java

@@ -3,6 +3,8 @@ package cn.cecep.talroad.domain;
 
 import cn.cecep.talroad.common.core.annotation.Excel;
 import cn.cecep.talroad.common.core.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,12 +13,12 @@ import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.validation.constraints.NotBlank;
+
 
 /**
  * 特征标签-与企业关系中间对象 pc_label_factory
- *
+ */
- * @author szhpt
- * @date 2023-02-02*/
 @ApiModel(value = "特征标签-与企业关系中间")
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -25,39 +27,27 @@ public class PcLabelFactory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-
+    @TableId(value = "id",type = IdType.INPUT)
     @ApiModelProperty(value = "主键id")
-    /** 主键id */
     private String id;
 
-
     @ApiModelProperty(value = "企业id")
-    /** 企业id */
     @Excel(name = "企业id")
+    @NotBlank(message = "企业不可以为空")
     private String factoryId;
 
 
     @ApiModelProperty(value = "特征标签id")
-    /** 特征标签id */
     @Excel(name = "特征标签id")
+    @NotBlank(message = "标签不可以为空")
     private String labelId;
 
     @ApiModelProperty(value = "是否是企业重点展示标签")
-    /** 特征标签id */
     @Excel(name = "是否是企业重点展示标签")
     private String lableUseing;
 
     @ApiModelProperty(value = "标签值")
+    @NotBlank(message = "标签值不能为空")
     private String labelValue;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("factoryId", getFactoryId())
-            .append("labelId", getLabelId())
-            .append("lableUseing", getLableUseing())
-            .append("labelValue", getLabelValue())
-            .toString();
-    }
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/PcRaProblemType.java

@@ -54,4 +54,8 @@ public class PcRaProblemType extends BaseEntity {
 
     private String problemType;
 
+    private String topType;
+
+    private String isStatus;
+
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaActionReportsAudit.java

@@ -38,7 +38,7 @@ public class SRaActionReportsAudit extends BaseEntity
 
     @ApiModelProperty(value = "id")
     /** id */
-    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    @TableId(value = "id",type = IdType.AUTO)
     private String id;
 
 

szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaPollManTypeChange.java

@@ -0,0 +1,93 @@
+package cn.cecep.talroad.domain.analysis;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 关联分析系统-证后监管辅助分析--排污许可管理级别变化统计
+    */
+@ApiModel(description="关联分析系统-证后监管辅助分析--排污许可管理级别变化统计")
+@Data
+@TableName(value = "s_ra_poll_man_type_change")
+public class SRaPollManTypeChange implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="主键")
+    private String id;
+
+    /**
+     * 企业id
+     */
+    @TableField(value = "factory_id")
+    @ApiModelProperty(value="企业id")
+    private String factoryId;
+
+    /**
+     * 上次排污许可证发证日期
+     */
+    @TableField(value = "last_license_time")
+    @ApiModelProperty(value="上次排污许可证发证日期")
+    private Date lastLicenseTime;
+
+    /**
+     * 上次排污许可证管理级别
+     */
+    @TableField(value = "last_license_man_type")
+    @ApiModelProperty(value="上次排污许可证管理级别")
+    private String lastLicenseManType;
+
+    /**
+     * 本次排污许可证发证日期
+     */
+    @TableField(value = "now_license_time")
+    @ApiModelProperty(value="本次排污许可证发证日期")
+    private Date nowLicenseTime;
+
+    /**
+     * 本次排污许可证管理级别
+     */
+    @TableField(value = "now_license_man_type")
+    @ApiModelProperty(value="本次排污许可证管理级别")
+    private String nowLicenseManType;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_FACTORY_ID = "factory_id";
+
+    public static final String COL_LAST_LICENSE_TIME = "last_license_time";
+
+    public static final String COL_LAST_LICENSE_MAN_TYPE = "last_license_man_type";
+
+    public static final String COL_NOW_LICENSE_TIME = "now_license_time";
+
+    public static final String COL_NOW_LICENSE_MAN_TYPE = "now_license_man_type";
+
+    public static final String COL_CREATE_TIME = "create_time";
+
+    public static final String COL_UPDATE_TIME = "update_time";
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiMapper.java

@@ -1,6 +1,7 @@
 package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.AmProblemFi;
+import cn.cecep.talroad.domain.AmProblemFiVideo;
 import cn.cecep.talroad.vo.AmProblemFiVo;
 import cn.cecep.talroad.vo.analysis.FactoryOutletStaticsVo;
 import cn.cecep.talroad.vo.query.AmProblemFiQuery;
@@ -32,7 +33,7 @@ public interface AmProblemFiMapper extends BaseMapper<AmProblemFi>
 
     void insertAmProblemFis(List<AmProblemFi> amProblemFis);
 
-    List<Map<String, Object>> selectAmProblemFiVideo(String id);
+    List<AmProblemFiVideo.Vo> selectAmProblemFiVideo(String id);
 
     List<AmProblemFi> getProblemByTypeAndTime(@Param("problemType") String problemType, @Param("dateStr") String dateStr, @Param("dateStrEnd") String dateStrEnd);
 

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiVideoMapper.java

@@ -0,0 +1,10 @@
+package cn.cecep.talroad.mapper;
+
+import cn.cecep.talroad.domain.AmProblemFiVideo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AmProblemFiVideoMapper extends BaseMapper<AmProblemFiVideo>
+{
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainHazardousSolidWasteFaMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BMainHazardousSolidWasteFa;
 import cn.cecep.talroad.vo.BMainHazardousSolidWasteFaVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,5 +24,5 @@ public interface BMainHazardousSolidWasteFaMapper extends BaseMapper<BMainHazard
      */
     public List<BMainHazardousSolidWasteFa> selectBMainHazardousSolidWasteFaList(BMainHazardousSolidWasteFa bMainHazardousSolidWasteFa);
 
-     List<BMainHazardousSolidWasteFaVo> selectListAndFactory(List<String> strings);
+     List<BMainHazardousSolidWasteFaVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainPollDisEnforcementMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BMainPollDisEnforcement;
 import cn.cecep.talroad.vo.BMainPollDisEnforcementVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,5 +24,5 @@ public interface BMainPollDisEnforcementMapper extends BaseMapper<BMainPollDisEn
      */
     public List<BMainPollDisEnforcement> selectBMainPollDisEnforcementList(BMainPollDisEnforcement bMainPollDisEnforcement);
 
-    List<BMainPollDisEnforcementVo> selectListAndFactory(List<String> strings);
+    List<BMainPollDisEnforcementVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionOrganizGasMapper.java

@@ -2,8 +2,11 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.data.analyse.task.entity.MainProductDeviceVo;
 import cn.cecep.talroad.domain.BMainProductionOrganizGas;
+import cn.cecep.talroad.vo.BMainProductionOrganizGasVo;
+import cn.cecep.talroad.vo.query.BMainProductionOrganizGasQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -24,4 +27,6 @@ public interface BMainProductionOrganizGasMapper extends BaseMapper<BMainProduct
     public List<BMainProductionOrganizGas> selectBMainProductionOrganizGasList(BMainProductionOrganizGas bMainProductionOrganizGas);
 
     List<MainProductDeviceVo> selectDeviceIdByPollutantType(String code);
+
+    List<BMainProductionOrganizGasVo.PwxkCzp> selectPwxkList(@Param("factoryIds") List<String> factoryIds, @Param("query") BMainProductionOrganizGasQuery.PwxkCzp query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionWaterMapper.java

@@ -1,8 +1,11 @@
 package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BMainProductionWater;
+import cn.cecep.talroad.vo.BMainProductionWaterVo;
+import cn.cecep.talroad.vo.query.BMainProductionWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,4 +25,5 @@ public interface BMainProductionWaterMapper extends BaseMapper<BMainProductionWa
      */
     public List<BMainProductionWater> selectBMainProductionWaterList(BMainProductionWater bMainProductionWater);
 
+    List<BMainProductionWaterVo.PwxkCzp> selectPwxkList(@Param("factoryIds") List<String> factoryIds, @Param("query") BMainProductionWaterQuery.PwxkCzp query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelGasMapper.java

@@ -0,0 +1,21 @@
+package cn.cecep.talroad.mapper;
+
+import cn.cecep.talroad.domain.BStatTablePwxkBoilerFuelGas;
+import cn.cecep.talroad.vo.BStatTablePwxkBoilerFuelGasVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BStatTablePwxkBoilerFuelGasMapper extends BaseMapper<BStatTablePwxkBoilerFuelGas> {
+    int updateBatch(List<BStatTablePwxkBoilerFuelGas> list);
+
+    int updateBatchSelective(List<BStatTablePwxkBoilerFuelGas> list);
+
+    int batchInsert(@Param("list") List<BStatTablePwxkBoilerFuelGas> list);
+
+    List<BStatTablePwxkBoilerFuelGasVo> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelSolidLiquidMapper.java

@@ -0,0 +1,22 @@
+package cn.cecep.talroad.mapper;
+
+import cn.cecep.talroad.domain.BStatTablePwxkBoilerFuelSolidLiquid;
+import cn.cecep.talroad.vo.BStatTablePwxkBoilerFuelSolidLiquidVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BStatTablePwxkBoilerFuelSolidLiquidMapper extends BaseMapper<BStatTablePwxkBoilerFuelSolidLiquid> {
+    int updateBatch(List<BStatTablePwxkBoilerFuelSolidLiquid> list);
+
+    int updateBatchSelective(List<BStatTablePwxkBoilerFuelSolidLiquid> list);
+
+    int batchInsert(@Param("list") List<BStatTablePwxkBoilerFuelSolidLiquid> list);
+
+    List<BStatTablePwxkBoilerFuelSolidLiquidVo> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkFuelMapper.java

@@ -0,0 +1,21 @@
+package cn.cecep.talroad.mapper;
+
+import cn.cecep.talroad.domain.BStatTablePwxkFuel;
+import cn.cecep.talroad.vo.BStatTablePwxkFuelVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BStatTablePwxkFuelMapper extends BaseMapper<BStatTablePwxkFuel> {
+    int updateBatch(List<BStatTablePwxkFuel> list);
+
+    int updateBatchSelective(List<BStatTablePwxkFuel> list);
+
+    int batchInsert(@Param("list") List<BStatTablePwxkFuel> list);
+
+   List<BStatTablePwxkFuelVo> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductionFacilitiesMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkProductionFacilities;
 import cn.cecep.talroad.vo.BStatTablePwxkProductionFacilitiesVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface BStatTablePwxkProductionFacilitiesMapper extends BaseMapper<BSt
 
     int batchInsert(@Param("list") List<BStatTablePwxkProductionFacilities> list);
 
-     List<BStatTablePwxkProductionFacilitiesVo> selectListAndFactory(List<String> strings);
+     List<BStatTablePwxkProductionFacilitiesVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductsMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkProducts;
 import cn.cecep.talroad.vo.BStatTablePwxkProductsVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface BStatTablePwxkProductsMapper extends BaseMapper<BStatTablePwxkP
 
     int batchInsert(@Param("list") List<BStatTablePwxkProducts> list);
 
-    List<BStatTablePwxkProductsVo> selectListAndFactory(List<String> strings);
+    List<BStatTablePwxkProductsVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkRawMaterialMapper.java

@@ -0,0 +1,21 @@
+package cn.cecep.talroad.mapper;
+
+import cn.cecep.talroad.domain.BStatTablePwxkRawMaterial;
+import cn.cecep.talroad.vo.BStatTablePwxkRawMaterialVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BStatTablePwxkRawMaterialMapper extends BaseMapper<BStatTablePwxkRawMaterial> {
+    int updateBatch(List<BStatTablePwxkRawMaterial> list);
+
+    int updateBatchSelective(List<BStatTablePwxkRawMaterial> list);
+
+    int batchInsert(@Param("list") List<BStatTablePwxkRawMaterial> list);
+
+     List<BStatTablePwxkRawMaterialVo> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkWaterIndustryIn;
 import cn.cecep.talroad.vo.BStatTablePwxkWaterIndustryInVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterIndustryInMapper extends BaseMapper<BStatTab
 
     int batchInsert(@Param("list") List<BStatTablePwxkWaterIndustryIn> list);
 
-     List<BStatTablePwxkWaterIndustryInVo> selectListAndFactory(List<String> strings);
+     List<BStatTablePwxkWaterIndustryInVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInTotalMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkWaterIndustryInTotal;
 import cn.cecep.talroad.vo.BStatTablePwxkWaterIndustryInTotalVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterIndustryInTotalMapper extends BaseMapper<BSt
 
     int batchInsert(@Param("list") List<BStatTablePwxkWaterIndustryInTotal> list);
 
-    List<BStatTablePwxkWaterIndustryInTotalVo> selectListAndFactory(List<String> strings);
+    List<BStatTablePwxkWaterIndustryInTotalVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterLifeInMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkWaterLifeIn;
 import cn.cecep.talroad.vo.BStatTablePwxkWaterLifeInVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterLifeInMapper extends BaseMapper<BStatTablePw
 
     int batchInsert(@Param("list") List<BStatTablePwxkWaterLifeIn> list);
 
-     List<BStatTablePwxkWaterLifeInVo> selectListAndFactory(List<String> strings);
+     List<BStatTablePwxkWaterLifeInVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentInAskMapper.java

@@ -2,13 +2,13 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkWaterTreatmentInAsk;
 import cn.cecep.talroad.vo.BStatTablePwxkWaterTreatmentInAskVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface BStatTablePwxkWaterTreatmentInAskMapper extends BaseMapper<BStatTablePwxkWaterTreatmentInAsk> {
     int updateBatch(List<BStatTablePwxkWaterTreatmentInAsk> list);
@@ -17,5 +17,5 @@ public interface BStatTablePwxkWaterTreatmentInAskMapper extends BaseMapper<BSta
 
     int batchInsert(@Param("list") List<BStatTablePwxkWaterTreatmentInAsk> list);
 
-    List<BStatTablePwxkWaterTreatmentInAskVo> selectListAndFactory(List<String> strings);
+    List<BStatTablePwxkWaterTreatmentInAskVo> selectListAndFactory(BStatTablepPwxkWaterQuery strings);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentLineMapper.java

@@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.BStatTablePwxkWaterTreatmentLine;
 import cn.cecep.talroad.vo.BStatTablePwxkWaterTreatmentLineVo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterTreatmentLineMapper extends BaseMapper<BStat
 
     int batchInsert(@Param("list") List<BStatTablePwxkWaterTreatmentLine> list);
 
-    List<BStatTablePwxkWaterTreatmentLineVo> selectListAndFactory(List<String> factoryIds);
+    List<BStatTablePwxkWaterTreatmentLineVo> selectListAndFactory(BStatTablepPwxkWaterQuery query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgGasEmission;
+
+/**
+ * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgGasEmissionMapper extends BaseMapper<BStatTableZxbgGasEmission>
+{
+    /**
+     * 查询固定源产排治--执行报告--有组织废气污染物排放浓度监测数据列表
+     *
+     * @param bStatTableZxbgGasEmission 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据
+     * @return 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据集合
+     */
+    public List<BStatTableZxbgGasEmission> selectBStatTableZxbgGasEmissionList(BStatTableZxbgGasEmission bStatTableZxbgGasEmission);
+
+    public List<BStatTableZxbgGasEmission> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionSpeedMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed;
+
+/**
+ * 固定源产排治--执行报告--有组织废气污染物排放速率监测Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgGasEmissionSpeedMapper extends BaseMapper<BStatTableZxbgGasEmissionSpeed>
+{
+    /**
+     * 查询固定源产排治--执行报告--有组织废气污染物排放速率监测列表
+     *
+     * @param bStatTableZxbgGasEmissionSpeed 固定源产排治--执行报告--有组织废气污染物排放速率监测
+     * @return 固定源产排治--执行报告--有组织废气污染物排放速率监测集合
+     */
+    public List<BStatTableZxbgGasEmissionSpeed> selectBStatTableZxbgGasEmissionSpeedList(BStatTableZxbgGasEmissionSpeed bStatTableZxbgGasEmissionSpeed);
+
+    public List<BStatTableZxbgGasEmissionSpeed> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionStatisticsMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics;
+
+/**
+ * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgGasEmissionStatisticsMapper extends BaseMapper<BStatTableZxbgGasEmissionStatistics>
+{
+    /**
+     * 查询固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计列表
+     *
+     * @param bStatTableZxbgGasEmissionStatistics 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计
+     * @return 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计集合
+     */
+    public List<BStatTableZxbgGasEmissionStatistics> selectBStatTableZxbgGasEmissionStatisticsList(BStatTableZxbgGasEmissionStatistics bStatTableZxbgGasEmissionStatistics);
+
+    public List<BStatTableZxbgGasEmissionStatistics> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtFuelMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgGtFuel;
+
+/**
+ * 固定源产排治--执行报告--钢铁-燃料分析Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgGtFuelMapper extends BaseMapper<BStatTableZxbgGtFuel>
+{
+    /**
+     * 查询固定源产排治--执行报告--钢铁-燃料分析列表
+     *
+     * @param bStatTableZxbgGtFuel 固定源产排治--执行报告--钢铁-燃料分析
+     * @return 固定源产排治--执行报告--钢铁-燃料分析集合
+     */
+    public List<BStatTableZxbgGtFuel> selectBStatTableZxbgGtFuelList(BStatTableZxbgGtFuel bStatTableZxbgGtFuel);
+
+    public List<BStatTableZxbgGtFuel> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtProductionMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgGtProduction;
+
+/**
+ * 固定源产排治--执行报告--钢铁-生产单元运行情况Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgGtProductionMapper extends BaseMapper<BStatTableZxbgGtProduction>
+{
+    /**
+     * 查询固定源产排治--执行报告--钢铁-生产单元运行情况列表
+     *
+     * @param bStatTableZxbgGtProduction 固定源产排治--执行报告--钢铁-生产单元运行情况
+     * @return 固定源产排治--执行报告--钢铁-生产单元运行情况集合
+     */
+    public List<BStatTableZxbgGtProduction> selectBStatTableZxbgGtProductionList(BStatTableZxbgGtProduction bStatTableZxbgGtProduction);
+
+    public List<BStatTableZxbgGtProduction> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdFuelAnalysisMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis;
+
+/**
+ * 固定源产排治--执行报告--火电燃料分析Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgHdFuelAnalysisMapper extends BaseMapper<BStatTableZxbgHdFuelAnalysis>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电燃料分析列表
+     *
+     * @param bStatTableZxbgHdFuelAnalysis 固定源产排治--执行报告--火电燃料分析
+     * @return 固定源产排治--执行报告--火电燃料分析集合
+     */
+    public List<BStatTableZxbgHdFuelAnalysis> selectBStatTableZxbgHdFuelAnalysisList(BStatTableZxbgHdFuelAnalysis bStatTableZxbgHdFuelAnalysis);
+
+    public List<BStatTableZxbgHdFuelAnalysis>  selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGasPollutionMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution;
+
+/**
+ * 固定源产排治--执行报告--火电废气污染治理设施正常情况Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgHdGasPollutionMapper extends BaseMapper<BStatTableZxbgHdGasPollution>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电废气污染治理设施正常情况列表
+     *
+     * @param bStatTableZxbgHdGasPollution 固定源产排治--执行报告--火电废气污染治理设施正常情况
+     * @return 固定源产排治--执行报告--火电废气污染治理设施正常情况集合
+     */
+    public List<BStatTableZxbgHdGasPollution> selectBStatTableZxbgHdGasPollutionList(BStatTableZxbgHdGasPollution bStatTableZxbgHdGasPollution);
+
+    public List<BStatTableZxbgHdGasPollution> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtBasicMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic;
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁基本信息Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgHdGtBasicMapper extends BaseMapper<BStatTableZxbgHdGtBasic>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电、钢铁基本信息列表
+     *
+     * @param bStatTableZxbgHdGtBasic 固定源产排治--执行报告--火电、钢铁基本信息
+     * @return 固定源产排治--执行报告--火电、钢铁基本信息集合
+     */
+    public List<BStatTableZxbgHdGtBasic> selectBStatTableZxbgHdGtBasicList(BStatTableZxbgHdGtBasic bStatTableZxbgHdGtBasic);
+
+    public List<BStatTableZxbgHdGtBasic>  selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtFuelMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel;
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁燃料信息Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgHdGtFuelMapper extends BaseMapper<BStatTableZxbgHdGtFuel>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电、钢铁燃料信息列表
+     *
+     * @param bStatTableZxbgHdGtFuel 固定源产排治--执行报告--火电、钢铁燃料信息
+     * @return 固定源产排治--执行报告--火电、钢铁燃料信息集合
+     */
+    public List<BStatTableZxbgHdGtFuel> selectBStatTableZxbgHdGtFuelList(BStatTableZxbgHdGtFuel bStatTableZxbgHdGtFuel);
+
+    public List<BStatTableZxbgHdGtFuel> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtInvestmentMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment;
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgHdGtInvestmentMapper extends BaseMapper<BStatTableZxbgHdGtInvestment>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况列表
+     *
+     * @param bStatTableZxbgHdGtInvestment 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况
+     * @return 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况集合
+     */
+    public List<BStatTableZxbgHdGtInvestment> selectBStatTableZxbgHdGtInvestmentList(BStatTableZxbgHdGtInvestment bStatTableZxbgHdGtInvestment);
+
+    public List<BStatTableZxbgHdGtInvestment> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdWaterPollutionMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution;
+
+/**
+ * 固定源产排治--执行报告--火电废水污染治理设施正常情况Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgHdWaterPollutionMapper extends BaseMapper<BStatTableZxbgHdWaterPollution>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电废水污染治理设施正常情况列表
+     *
+     * @param bStatTableZxbgHdWaterPollution 固定源产排治--执行报告--火电废水污染治理设施正常情况
+     * @return 固定源产排治--执行报告--火电废水污染治理设施正常情况集合
+     */
+    public List<BStatTableZxbgHdWaterPollution> selectBStatTableZxbgHdWaterPollutionList(BStatTableZxbgHdWaterPollution bStatTableZxbgHdWaterPollution);
+
+    public List<BStatTableZxbgHdWaterPollution> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgJbxxInfoMapper.java

@@ -27,6 +27,7 @@ public interface BStatTableZxbgJbxxInfoMapper extends BaseMapper<BStatTableZxbgJ
 
     public List<BStatTableZxbgJbxxInfo> selectListAndFactory(BStatTablepPwxkWaterQuery query);
 
+
     Integer selectCountByPeriodAndPeriod(@Param("type") String type, @Param("period") String period, @Param("records") List<String> records);
 
     List<BStatTableZxbgJbxxInfo> selectByPeriodAndPeriod(@Param("type") String type, @Param("period") String period,

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnFuelMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgSnFuel;
+
+/**
+ * 固定源产排治--执行报告--水泥燃料分析Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgSnFuelMapper extends BaseMapper<BStatTableZxbgSnFuel>
+{
+    /**
+     * 查询固定源产排治--执行报告--水泥燃料分析列表
+     *
+     * @param bStatTableZxbgSnFuel 固定源产排治--执行报告--水泥燃料分析
+     * @return 固定源产排治--执行报告--水泥燃料分析集合
+     */
+    public List<BStatTableZxbgSnFuel> selectBStatTableZxbgSnFuelList(BStatTableZxbgSnFuel bStatTableZxbgSnFuel);
+
+    public List<BStatTableZxbgSnFuel> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnProductionMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgSnProduction;
+
+/**
+ * 固定源产排治--执行报告--水泥-生产单元运行情况Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgSnProductionMapper extends BaseMapper<BStatTableZxbgSnProduction>
+{
+    /**
+     * 查询固定源产排治--执行报告--水泥-生产单元运行情况列表
+     *
+     * @param bStatTableZxbgSnProduction 固定源产排治--执行报告--水泥-生产单元运行情况
+     * @return 固定源产排治--执行报告--水泥-生产单元运行情况集合
+     */
+    public List<BStatTableZxbgSnProduction> selectBStatTableZxbgSnProductionList(BStatTableZxbgSnProduction bStatTableZxbgSnProduction);
+
+    public List<BStatTableZxbgSnProduction> selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgWaterEmissionMapper.java

@@ -0,0 +1,27 @@
+package cn.cecep.talroad.mapper;
+
+import java.util.List;
+
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission;
+
+/**
+ * 固定源产排治--执行报告--废水污染物排放浓度监测数据Mapper接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+@Mapper
+public interface BStatTableZxbgWaterEmissionMapper extends BaseMapper<BStatTableZxbgWaterEmission>
+{
+    /**
+     * 查询固定源产排治--执行报告--废水污染物排放浓度监测数据列表
+     *
+     * @param bStatTableZxbgWaterEmission 固定源产排治--执行报告--废水污染物排放浓度监测数据
+     * @return 固定源产排治--执行报告--废水污染物排放浓度监测数据集合
+     */
+    public List<BStatTableZxbgWaterEmission> selectBStatTableZxbgWaterEmissionList(BStatTableZxbgWaterEmission bStatTableZxbgWaterEmission);
+
+    public List<BStatTableZxbgWaterEmission>  selectListAndFactory(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BasModelAnalyseMapper.java

@@ -0,0 +1,16 @@
+package cn.cecep.talroad.mapper;
+
+import cn.cecep.talroad.domain.BasModelAnalyse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BasModelAnalyseMapper extends BaseMapper<BasModelAnalyse> {
+    int updateBatch(List<BasModelAnalyse> list);
+
+    int updateBatchSelective(List<BasModelAnalyse> list);
+
+    int batchInsert(@Param("list") List<BasModelAnalyse> list);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcControlRequirementsMapper.java

@@ -2,8 +2,10 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.PcControlRequirements;
 import cn.cecep.talroad.vo.PcControlRequirementsVo;
+import cn.cecep.talroad.vo.query.PcControlRequirementsQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,4 +30,12 @@ public interface PcControlRequirementsMapper extends BaseMapper<PcControlRequire
     List<PcControlRequirementsVo> selectLabelOnlineRequirements();
 
     List<PcControlRequirementsVo> selectLabelOnlineOutPoll();
+
+    List<PcControlRequirementsVo.PwxkGasOrg> selectPwxkGasOrg(@Param("factoryIds") List<String> factoryIds, @Param("query") PcControlRequirementsQuery.PwxkGasOrg query);
+
+    List<PcControlRequirementsVo.PwxkGasNoOrg> selectPwxkGasNoOrg(@Param("factoryIds") List<String> factoryIds, @Param("query") PcControlRequirementsQuery.PwxkGasNoOrg query);
+
+    List<PcControlRequirementsVo.PwxkWaterDirect> selectPwxkWaterDirect(@Param("factoryIds") List<String> factoryIds, @Param("query") PcControlRequirementsQuery.PwxkWaterDirect query);
+
+    List<PcControlRequirementsVo.PwxkWaterIndirect> selectPwxkWaterIndirect(@Param("factoryIds") List<String> factoryIds, @Param("query") PcControlRequirementsQuery.PwxkWaterIndirect query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcLabelFactoryMapper.java

@@ -2,11 +2,16 @@ package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.EarlyWarning;
 import cn.cecep.talroad.domain.PcLabelFactory;
+import cn.cecep.talroad.domain.PcLabelValue;
 import cn.cecep.talroad.domain.SEnvGasMonReal;
 import cn.cecep.talroad.vo.FactoryLicenseVo;
+import cn.cecep.talroad.vo.PcLabelFactoryVo;
 import cn.cecep.talroad.vo.WarningEnvGasMonRealVo;
+import cn.cecep.talroad.vo.query.PcLabelFactoryQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -91,4 +96,8 @@ public interface PcLabelFactoryMapper extends BaseMapper<PcLabelFactory>
         "GROUP BY f.\"id\",o.factory_id " +
         "ORDER BY f.\"id\"")
     List<PcLabelFactory> isWzzcbpfExceptionInMonthLabel(@Param("startTime")Date startTime);
+
+    Long selectCountByLableValue(PcLabelValue lableVale);
+
+    List<PcLabelFactoryVo> selectFactoryLabelList(@Param("voPage") Page<PcLabelFactoryVo> voPage, @Param("query") PcLabelFactoryQuery query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcOutletMapper.java

@@ -1,26 +1,24 @@
 package cn.cecep.talroad.mapper;
 
-import cn.cecep.talroad.domain.PcFactoryAccessControl;
 import cn.cecep.talroad.domain.PcOutlet;
 import cn.cecep.talroad.domain.analysis.SRaOverWaterPollutionTraceability;
 import cn.cecep.talroad.domain.analysis.SRaWaterPermittedOnline;
-import cn.cecep.talroad.vo.EmissionsStatVo;
+import cn.cecep.talroad.vo.*;
-import cn.cecep.talroad.vo.GasPEMonitoringPointVO;
-import cn.cecep.talroad.vo.MapPointVo;
-import cn.cecep.talroad.vo.PcOutletGasVO;
 import cn.cecep.talroad.vo.analysis.SRaRealTimeAnalysicComsitMonitorVo;
 import cn.cecep.talroad.vo.query.GasPEMonitoringPointQuery;
 import cn.cecep.talroad.vo.query.PcOutletGasQuery;
+import cn.cecep.talroad.vo.query.PcOutletQuery;
 import cn.cecep.talroad.vo.query.analysis.SRaOverWaterPollutionTraceabilityQuery;
 import cn.cecep.talroad.vo.query.analysis.SRaWaterPermittedOnlineQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.HashMap;
-import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * 废气有组织、无组织排口Mapper接口
  *
@@ -91,4 +89,9 @@ public interface PcOutletMapper extends BaseMapper<PcOutlet>
 
     int updateBatchCoordinate(List<PcOutlet> pcOutletList);
 
+    List<PcOutletVo.PwxkGas> selectPwxkList(@Param("factoryIds") List<String> factoryIds, @Param("query") PcOutletQuery.PwxkGas query);
+
+    List<PcOutletVo.PwxkWaterDirect> selectPwxkWaterDirect(@Param("factoryIds") List<String> factoryIds, @Param("query") PcOutletQuery.PwxkWaterDirect query);
+
+    List<PcOutletVo.PwxkWaterIndirect> selectPwxkWaterIndirect(@Param("factoryIds") List<String> factoryIds, @Param("query") PcOutletQuery.PwxkWaterIndirect query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/SupermonitorDrainOutletMapper.java

@@ -1,8 +1,11 @@
 package cn.cecep.talroad.mapper;
 
 import cn.cecep.talroad.domain.SupermonitorDrainOutlet;
+import cn.cecep.talroad.vo.SupermonitorDrainOutletVo;
+import cn.cecep.talroad.vo.query.SupermonitorDrainOutletQuery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,6 +23,9 @@ public interface SupermonitorDrainOutletMapper extends BaseMapper<SupermonitorDr
      * @param supermonitorDrainOutlet 排污口
      * @return 排污口集合
      */
-    public List<SupermonitorDrainOutlet> selectSupermonitorDrainOutletList(SupermonitorDrainOutlet supermonitorDrainOutlet);
+    List<SupermonitorDrainOutlet> selectSupermonitorDrainOutletList(SupermonitorDrainOutlet supermonitorDrainOutlet);
 
+    List<SupermonitorDrainOutletVo.PwxkRh> selectRhPwxkList(@Param("factoryIds") List<String> factoryIds, @Param("query") SupermonitorDrainOutletQuery.PwxkRh query);
+
+    List<SupermonitorDrainOutletVo.PwxkYs> selectYsPwxkList(@Param("factoryIds") List<String> factoryIds, @Param("query") SupermonitorDrainOutletQuery.PwxkYs query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/analysis/SRaPollManTypeChangeMapper.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.mapper.analysis;
+
+import cn.cecep.talroad.domain.analysis.SRaPollManTypeChange;
+import cn.cecep.talroad.vo.analysis.SRaPollManTypeChangeVo;
+import cn.cecep.talroad.vo.query.analysis.SRaPollManTypeChangeQuery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SRaPollManTypeChangeMapper extends BaseMapper<SRaPollManTypeChange> {
+    int updateBatch(List<SRaPollManTypeChange> list);
+
+    int updateBatchSelective(List<SRaPollManTypeChange> list);
+
+    int batchInsert(@Param("list") List<SRaPollManTypeChange> list);
+
+    IPage<SRaPollManTypeChangeVo> selectListInfo(Page<SRaPollManTypeChangeVo> page, @Param("query") SRaPollManTypeChangeQuery query);
+
+    List<String> selectIndustryPermissionNameList(SRaPollManTypeChangeQuery query);
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/BStatTablePwxkWaterAndOtherService.java

@@ -36,4 +36,12 @@ public interface BStatTablePwxkWaterAndOtherService {
     AjaxResults<Integer> saveQueryContent(@Param("query") BStatTableQueryInfo query);
 
     AjaxResults<IPage<BStatTablePwxkProductionFacilitiesVo>> selectProductionFacilities(BStatTablepPwxkWaterQuery query);
+
+    AjaxResults<IPage<BStatTablePwxkBoilerFuelGasVo>> selectBoilerFuelGas(BStatTablepPwxkWaterQuery query);
+
+    AjaxResults<IPage<BStatTablePwxkBoilerFuelSolidLiquidVo>> selectBoilerFuelSolidLiquid(BStatTablepPwxkWaterQuery query);
+
+    AjaxResults<IPage<BStatTablePwxkFuelVo>> selectFuel(BStatTablepPwxkWaterQuery query);
+
+    AjaxResults<IPage<BStatTablePwxkRawMaterialVo>> selectMaterial(BStatTablepPwxkWaterQuery query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IAmProblemFiService.java

@@ -53,7 +53,7 @@ public interface IAmProblemFiService extends  IService<AmProblemFi>
 
     Object addCause(AmProblemFi param);
 
-    List<Map<String, Object>> getAListOfAlerts();
+    List<Map<String, Object>> getAListOfAlerts(String type,String topType);
 
     List<FactoryOutletStaticsVo> selectStatisDataByMonth(Date startTime, Date endTime);
 

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionOrganizGasService.java

@@ -1,6 +1,9 @@
 package cn.cecep.talroad.service;
 
 import cn.cecep.talroad.domain.BMainProductionOrganizGas;
+import cn.cecep.talroad.vo.BMainProductionOrganizGasVo;
+import cn.cecep.talroad.vo.query.BMainProductionOrganizGasQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -21,4 +24,6 @@ public interface IBMainProductionOrganizGasService extends  IService<BMainProduc
     List<BMainProductionOrganizGas> selectBMainProductionOrganizGasList(BMainProductionOrganizGas bMainProductionOrganizGas);
 
     IProductionManageService.FrameDataVo getFrameData(String id, String startTime, String endTime, Long pageNum, Long pageSize);
+
+    List<BMainProductionOrganizGasVo.PwxkCzp> selectPwxkList(Page<BMainProductionOrganizGasVo.PwxkCzp> page, BMainProductionOrganizGasQuery.PwxkCzp query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionWaterService.java

@@ -1,6 +1,9 @@
 package cn.cecep.talroad.service;
 
 import cn.cecep.talroad.domain.BMainProductionWater;
+import cn.cecep.talroad.vo.BMainProductionWaterVo;
+import cn.cecep.talroad.vo.query.BMainProductionWaterQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -21,4 +24,6 @@ public interface IBMainProductionWaterService extends  IService<BMainProductionW
     List<BMainProductionWater> selectBMainProductionWaterList(BMainProductionWater bMainProductionWater);
 
     IProductionManageService.FrameDataVo getFrameData(String id, String startTime, String endTime, Long pageNum, Long pageSize);
+
+    List<BMainProductionWaterVo.PwxkCzp> selectPwxkList(Page<BMainProductionWaterVo.PwxkCzp> page, BMainProductionWaterQuery.PwxkCzp query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgGasEmission;
+
+/**
+ * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgGasEmissionService extends  IService<BStatTableZxbgGasEmission>
+{
+    /**
+     * 查询固定源产排治--执行报告--有组织废气污染物排放浓度监测数据列表
+     *
+     * @param bStatTableZxbgGasEmission 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据
+     * @return 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据集合
+     */
+    public List<BStatTableZxbgGasEmission> selectBStatTableZxbgGasEmissionList(BStatTableZxbgGasEmission bStatTableZxbgGasEmission);
+
+    AjaxResults<IPage<BStatTableZxbgGasEmission>> selectBStatTableZxbgGasEmissionListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionSpeedService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed;
+
+/**
+ * 固定源产排治--执行报告--有组织废气污染物排放速率监测Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgGasEmissionSpeedService extends  IService<BStatTableZxbgGasEmissionSpeed>
+{
+    /**
+     * 查询固定源产排治--执行报告--有组织废气污染物排放速率监测列表
+     *
+     * @param bStatTableZxbgGasEmissionSpeed 固定源产排治--执行报告--有组织废气污染物排放速率监测
+     * @return 固定源产排治--执行报告--有组织废气污染物排放速率监测集合
+     */
+    public List<BStatTableZxbgGasEmissionSpeed> selectBStatTableZxbgGasEmissionSpeedList(BStatTableZxbgGasEmissionSpeed bStatTableZxbgGasEmissionSpeed);
+
+    AjaxResults<IPage<BStatTableZxbgGasEmissionSpeed>> selectBStatTableZxbgGasEmissionSpeedListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionStatisticsService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics;
+
+/**
+ * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgGasEmissionStatisticsService extends  IService<BStatTableZxbgGasEmissionStatistics>
+{
+    /**
+     * 查询固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计列表
+     *
+     * @param bStatTableZxbgGasEmissionStatistics 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计
+     * @return 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计集合
+     */
+    public List<BStatTableZxbgGasEmissionStatistics> selectBStatTableZxbgGasEmissionStatisticsList(BStatTableZxbgGasEmissionStatistics bStatTableZxbgGasEmissionStatistics);
+
+    AjaxResults<IPage<BStatTableZxbgGasEmissionStatistics>> selectBStatTableZxbgGasEmissionStatisticsListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtFuelService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgGtFuel;
+
+/**
+ * 固定源产排治--执行报告--钢铁-燃料分析Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgGtFuelService extends  IService<BStatTableZxbgGtFuel>
+{
+    /**
+     * 查询固定源产排治--执行报告--钢铁-燃料分析列表
+     *
+     * @param bStatTableZxbgGtFuel 固定源产排治--执行报告--钢铁-燃料分析
+     * @return 固定源产排治--执行报告--钢铁-燃料分析集合
+     */
+    public List<BStatTableZxbgGtFuel> selectBStatTableZxbgGtFuelList(BStatTableZxbgGtFuel bStatTableZxbgGtFuel);
+
+    AjaxResults<IPage<BStatTableZxbgGtFuel>> selectBStatTableZxbgGtFuelListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtProductionService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgGtProduction;
+
+/**
+ * 固定源产排治--执行报告--钢铁-生产单元运行情况Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgGtProductionService extends  IService<BStatTableZxbgGtProduction>
+{
+    /**
+     * 查询固定源产排治--执行报告--钢铁-生产单元运行情况列表
+     *
+     * @param bStatTableZxbgGtProduction 固定源产排治--执行报告--钢铁-生产单元运行情况
+     * @return 固定源产排治--执行报告--钢铁-生产单元运行情况集合
+     */
+    public List<BStatTableZxbgGtProduction> selectBStatTableZxbgGtProductionList(BStatTableZxbgGtProduction bStatTableZxbgGtProduction);
+
+    AjaxResults<IPage<BStatTableZxbgGtProduction>> selectBStatTableZxbgGtProductionListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdFuelAnalysisService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis;
+
+/**
+ * 固定源产排治--执行报告--火电燃料分析Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgHdFuelAnalysisService extends  IService<BStatTableZxbgHdFuelAnalysis>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电燃料分析列表
+     *
+     * @param bStatTableZxbgHdFuelAnalysis 固定源产排治--执行报告--火电燃料分析
+     * @return 固定源产排治--执行报告--火电燃料分析集合
+     */
+    public List<BStatTableZxbgHdFuelAnalysis> selectBStatTableZxbgHdFuelAnalysisList(BStatTableZxbgHdFuelAnalysis bStatTableZxbgHdFuelAnalysis);
+
+    AjaxResults<IPage<BStatTableZxbgHdFuelAnalysis>> selectBStatTableZxbgHdFuelAnalysisListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGasPollutionService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution;
+
+/**
+ * 固定源产排治--执行报告--火电废气污染治理设施正常情况Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgHdGasPollutionService extends  IService<BStatTableZxbgHdGasPollution>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电废气污染治理设施正常情况列表
+     *
+     * @param bStatTableZxbgHdGasPollution 固定源产排治--执行报告--火电废气污染治理设施正常情况
+     * @return 固定源产排治--执行报告--火电废气污染治理设施正常情况集合
+     */
+    public List<BStatTableZxbgHdGasPollution> selectBStatTableZxbgHdGasPollutionList(BStatTableZxbgHdGasPollution bStatTableZxbgHdGasPollution);
+
+    AjaxResults<IPage<BStatTableZxbgHdGasPollution>> selectBStatTableZxbgHdGasPollutionListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtBasicService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic;
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁基本信息Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgHdGtBasicService extends  IService<BStatTableZxbgHdGtBasic>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电、钢铁基本信息列表
+     *
+     * @param bStatTableZxbgHdGtBasic 固定源产排治--执行报告--火电、钢铁基本信息
+     * @return 固定源产排治--执行报告--火电、钢铁基本信息集合
+     */
+    public List<BStatTableZxbgHdGtBasic> selectBStatTableZxbgHdGtBasicList(BStatTableZxbgHdGtBasic bStatTableZxbgHdGtBasic);
+
+    AjaxResults<IPage<BStatTableZxbgHdGtBasic>> selectBStatTableZxbgHdGtBasicListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtFuelService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel;
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁燃料信息Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgHdGtFuelService extends  IService<BStatTableZxbgHdGtFuel>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电、钢铁燃料信息列表
+     *
+     * @param bStatTableZxbgHdGtFuel 固定源产排治--执行报告--火电、钢铁燃料信息
+     * @return 固定源产排治--执行报告--火电、钢铁燃料信息集合
+     */
+    public List<BStatTableZxbgHdGtFuel> selectBStatTableZxbgHdGtFuelList(BStatTableZxbgHdGtFuel bStatTableZxbgHdGtFuel);
+
+    AjaxResults<IPage<BStatTableZxbgHdGtFuel>> selectBStatTableZxbgHdGtFuelListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtInvestmentService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment;
+
+/**
+ * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgHdGtInvestmentService extends  IService<BStatTableZxbgHdGtInvestment>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况列表
+     *
+     * @param bStatTableZxbgHdGtInvestment 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况
+     * @return 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况集合
+     */
+    public List<BStatTableZxbgHdGtInvestment> selectBStatTableZxbgHdGtInvestmentList(BStatTableZxbgHdGtInvestment bStatTableZxbgHdGtInvestment);
+
+    AjaxResults<IPage<BStatTableZxbgHdGtInvestment>> selectBStatTableZxbgHdGtInvestmentListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdWaterPollutionService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution;
+
+/**
+ * 固定源产排治--执行报告--火电废水污染治理设施正常情况Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgHdWaterPollutionService extends  IService<BStatTableZxbgHdWaterPollution>
+{
+    /**
+     * 查询固定源产排治--执行报告--火电废水污染治理设施正常情况列表
+     *
+     * @param bStatTableZxbgHdWaterPollution 固定源产排治--执行报告--火电废水污染治理设施正常情况
+     * @return 固定源产排治--执行报告--火电废水污染治理设施正常情况集合
+     */
+    public List<BStatTableZxbgHdWaterPollution> selectBStatTableZxbgHdWaterPollutionList(BStatTableZxbgHdWaterPollution bStatTableZxbgHdWaterPollution);
+
+    AjaxResults<IPage<BStatTableZxbgHdWaterPollution>> selectBStatTableZxbgHdWaterPollutionListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnFuelService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgSnFuel;
+
+/**
+ * 固定源产排治--执行报告--水泥燃料分析Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgSnFuelService extends  IService<BStatTableZxbgSnFuel>
+{
+    /**
+     * 查询固定源产排治--执行报告--水泥燃料分析列表
+     *
+     * @param bStatTableZxbgSnFuel 固定源产排治--执行报告--水泥燃料分析
+     * @return 固定源产排治--执行报告--水泥燃料分析集合
+     */
+    public List<BStatTableZxbgSnFuel> selectBStatTableZxbgSnFuelList(BStatTableZxbgSnFuel bStatTableZxbgSnFuel);
+
+    AjaxResults<IPage<BStatTableZxbgSnFuel>> selectBStatTableZxbgSnFuelListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnProductionService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgSnProduction;
+
+/**
+ * 固定源产排治--执行报告--水泥-生产单元运行情况Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgSnProductionService extends  IService<BStatTableZxbgSnProduction>
+{
+    /**
+     * 查询固定源产排治--执行报告--水泥-生产单元运行情况列表
+     *
+     * @param bStatTableZxbgSnProduction 固定源产排治--执行报告--水泥-生产单元运行情况
+     * @return 固定源产排治--执行报告--水泥-生产单元运行情况集合
+     */
+    public List<BStatTableZxbgSnProduction> selectBStatTableZxbgSnProductionList(BStatTableZxbgSnProduction bStatTableZxbgSnProduction);
+
+    AjaxResults<IPage<BStatTableZxbgSnProduction>> selectBStatTableZxbgSnProductionListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgWaterEmissionService.java

@@ -0,0 +1,26 @@
+package cn.cecep.talroad.service;
+import java.util.List;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission;
+
+/**
+ * 固定源产排治--执行报告--废水污染物排放浓度监测数据Service接口
+ *
+ * @author szhpt
+ * @date 2023-08-01*/
+public interface IBStatTableZxbgWaterEmissionService extends  IService<BStatTableZxbgWaterEmission>
+{
+    /**
+     * 查询固定源产排治--执行报告--废水污染物排放浓度监测数据列表
+     *
+     * @param bStatTableZxbgWaterEmission 固定源产排治--执行报告--废水污染物排放浓度监测数据
+     * @return 固定源产排治--执行报告--废水污染物排放浓度监测数据集合
+     */
+    public List<BStatTableZxbgWaterEmission> selectBStatTableZxbgWaterEmissionList(BStatTableZxbgWaterEmission bStatTableZxbgWaterEmission);
+
+    AjaxResults<IPage<BStatTableZxbgWaterEmission>> selectBStatTableZxbgWaterEmissionListBy(BStatTablepPwxkWaterQuery query);
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcControlRequirementsService.java

@@ -1,6 +1,9 @@
 package cn.cecep.talroad.service;
 
 import cn.cecep.talroad.domain.PcControlRequirements;
+import cn.cecep.talroad.vo.PcControlRequirementsVo;
+import cn.cecep.talroad.vo.query.PcControlRequirementsQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -19,5 +22,12 @@ public interface IPcControlRequirementsService extends  IService<PcControlRequir
      * @return 管控要求集合
      */
     public List<PcControlRequirements> selectPcControlRequirementsList(PcControlRequirements pcControlRequirements);
-    
+
+    List<PcControlRequirementsVo.PwxkGasOrg> selectPwxkGasOrg(Page<PcControlRequirementsVo.PwxkGasOrg> page, PcControlRequirementsQuery.PwxkGasOrg query);
+
+    List<PcControlRequirementsVo.PwxkGasNoOrg> selectPwxkGasNoOrg(Page<PcControlRequirementsVo.PwxkGasNoOrg> page, PcControlRequirementsQuery.PwxkGasNoOrg query);
+
+    List<PcControlRequirementsVo.PwxkWaterDirect> selectPwxkWaterDirect(Page<PcControlRequirementsVo.PwxkWaterDirect> page, PcControlRequirementsQuery.PwxkWaterDirect query);
+
+    List<PcControlRequirementsVo.PwxkWaterIndirect> selectPwxkWaterIndirect(Page<PcControlRequirementsVo.PwxkWaterIndirect> page, PcControlRequirementsQuery.PwxkWaterIndirect query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcFactoryService.java

@@ -4,6 +4,7 @@ import cn.cecep.talroad.domain.PcFactory;
 import cn.cecep.talroad.vo.PcFactoryLicensingStatusVo;
 import cn.cecep.talroad.vo.PcFactoryVo;
 import cn.cecep.talroad.vo.PcProfessionLicensingStatusVo;
+import cn.cecep.talroad.vo.PwxkFactoryVo;
 import cn.cecep.talroad.vo.analysis.FactoryOutletVo;
 import cn.cecep.talroad.vo.query.PcFactoryQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -59,4 +60,6 @@ public interface IPcFactoryService extends  IService<PcFactory>
     PcFactoryLicensingStatusVo licenSingStatusList();
 
     PcProfessionLicensingStatusVo professionStatusChart();
+
+    List<PwxkFactoryVo> selectPwxkList(Page<PwxkFactoryVo> page, PcFactoryQuery.SearchVo searchVo);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelFactoryService.java

@@ -1,6 +1,9 @@
 package cn.cecep.talroad.service;
 
 import cn.cecep.talroad.domain.PcLabelFactory;
+import cn.cecep.talroad.vo.PcLabelFactoryVo;
+import cn.cecep.talroad.vo.query.PcLabelFactoryQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -86,4 +89,14 @@ public interface IPcLabelFactoryService extends  IService<PcLabelFactory>
     void isZlssExceptionInMonthLabel();
 
     void isWzzcbpfExceptionInMonthLabel();
+
+    List<PcLabelFactoryVo> selectFactoryLabelList(Page<PcLabelFactoryVo> voPage, PcLabelFactoryQuery query);
+
+    void add(PcLabelFactory pcLabelFactory);
+
+    void edit(PcLabelFactory pcLabelFactory);
+
+    void delete(String id);
+
+    void batchAddFactoryLabel(PcLabelFactoryVo.FactoryLabelUpdateForm form);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelService.java

@@ -32,4 +32,10 @@ public interface IPcLabelService extends  IService<PcLabel>
     List<PcLabelVo> getChildrenLabel(String id);
 
     List<PcLabel> getPcLabelListByLabelCodes(List<String>codeList);
+
+    void add(PcLabel pcLabel);
+
+    void edit(PcLabelVo pcLabelVo);
+
+    void delete(String id);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelValueService.java

@@ -23,4 +23,10 @@ public interface IPcLabelValueService extends  IService<PcLabelValue>
     List<PcLabelValue> manualMonitoringIndustry(String name);
 
     List<PcLabelValue> selectListByLabelId(String labelId);
+
+    void add(PcLabelValue pcLabelValue);
+
+    void edit(PcLabelValue pcLabelValue);
+
+    void delete(String id);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcOutletService.java

@@ -5,10 +5,7 @@ import cn.cecep.talroad.domain.BMainMonitorPointOperationLog;
 import cn.cecep.talroad.domain.PcOutlet;
 import cn.cecep.talroad.domain.analysis.SRaOverWaterPollutionTraceability;
 import cn.cecep.talroad.domain.analysis.SRaWaterPermittedOnline;
-import cn.cecep.talroad.vo.DropDownVO;
+import cn.cecep.talroad.vo.*;
-import cn.cecep.talroad.vo.GasPEMonitoringPointVO;
-import cn.cecep.talroad.vo.OutletNameVO;
-import cn.cecep.talroad.vo.PcOutletGasVO;
 import cn.cecep.talroad.vo.analysis.SRaRealTimeAnalysicComsitMonitorVo;
 import cn.cecep.talroad.vo.query.*;
 import cn.cecep.talroad.vo.query.analysis.SRaOverWaterPollutionTraceabilityQuery;
@@ -86,4 +83,9 @@ public interface IPcOutletService extends  IService<PcOutlet>
 
     void editBatchCoordinate(PcOutlet[] pcOutletArr);
 
+    List<PcOutletVo.PwxkGas> selectPwxkList(Page<PcOutletVo.PwxkGas> page, PcOutletQuery.PwxkGas query);
+
+    List<PcOutletVo.PwxkWaterDirect> selectPwxkWaterDirect(Page<PcOutletVo.PwxkWaterDirect> page, PcOutletQuery.PwxkWaterDirect query);
+
+    List<PcOutletVo.PwxkWaterIndirect> selectPwxkWaterIndirect(Page<PcOutletVo.PwxkWaterIndirect> page, PcOutletQuery.PwxkWaterIndirect query);
 }

szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IProductionManageService.java

@@ -46,6 +46,9 @@ public interface IProductionManageService {
         @ApiModelProperty(value = "分表计电设备点位vo列表。获取指定分表计电设备点位的曲线图数据")
         private List<BasDeviceSiteVo.SimpleVo> deviceSiteSimpleVo;
 
+        @ApiModelProperty(value = "分表计电设备点位（合并图表）")
+        private List<BasDeviceSiteVo.SimpleVo> mergeDeviceSiteSimpleVo;
+
         @ApiModelProperty(value = "获取DSC设备和在线监测合并后的图表")
         private List<BasDeviceVo.DcsOnlineVo> dcsOnlineVos;