init

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 数据源本地存储已忽略文件
+/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/compiler.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="talroad-module" target="1.5" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/talroad-module.iml" filepath="$PROJECT_DIR$/talroad-module.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

COMMIT_EDITMSG

@@ -1 +0,0 @@
-单项重点污染物减排量

config

@@ -1,18 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = false
-	bare = false
-	logallrefupdates = true
-	symlinks = false
-	ignorecase = true
-[submodule]
-	active = .
-[remote "origin"]
-	url = http://10.0.206.25/local_projects/he_bei/tangshan/enterprise-controll/szhpt-tangshan/tang_shan_task.git
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "hehongyu_dev"]
-	remote = origin
-	merge = refs/heads/hehongyu_dev
-[branch "develop"]
-	remote = origin
-	merge = refs/heads/develop

description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

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

@@ -0,0 +1,28 @@
+package cn.cecep.talroad;
+
+
+import cn.cecep.talroad.common.security.annotation.EnableCustomConfig;
+import cn.cecep.talroad.common.security.annotation.EnableRyFeignClients;
+import cn.cecep.talroad.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * 多元融合
+ *
+ * @author talroad
+ */
+@EnableScheduling
+@EnableCustomConfig
+@EnableCustomSwagger2
+@EnableDiscoveryClient
+@EnableRyFeignClients
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+public class TaskApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(TaskApplication.class, args);
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/AuditWordField.java

@@ -0,0 +1,14 @@
+package cn.cecep.talroad.config;
+
+import java.lang.annotation.*;
+
+/**
+ * 是否为审核记录文档中选择是否的字段
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface AuditWordField {
+    //对应排序
+    int orderNum();
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/BigDecimalSerialize.java

@@ -0,0 +1,17 @@
+package cn.cecep.talroad.config;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+
+public class BigDecimalSerialize extends JsonSerializer<BigDecimal> {
+    @Override
+    public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value != null) {
+            gen.writeString(value.stripTrailingZeros().toPlainString());
+        }
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/ExchangeConfig.java

@@ -0,0 +1,38 @@
+package cn.cecep.talroad.config;
+
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Auther: cjh
+ * @Date: 2023-04-17 14:53
+ * @Class: ExchangeConfig
+ * @Deseription:
+ * @Version V1.0
+ */
+@Configuration
+public class ExchangeConfig {
+
+    /**
+     * 消息交换机的名字
+     */
+    public static final String DIRECT_EXCHANGE = "metadata-bigdata";
+
+
+    /**
+     * 1.定义direct exchange，绑定queueTest
+     * 2.durable="true" rabbitmq重启的时候不需要创建新的交换机
+     * 3.direct交换器相对来说比较简单，匹配规则为：如果路由键匹配，消息就被投送到相关的队列
+     * fanout交换器中没有路由键的概念，他会把消息发送到所有绑定在此交换器上面的队列中。
+     * topic交换器你采用模糊匹配路由键的原则进行转发消息到队列中
+     * key: queue在该direct-exchange中的key值，当消息发送给direct-exchange中指定key为设置值时，
+     * 消息将会转发给queue参数指定的消息队列
+     */
+    @Bean
+    public DirectExchange directExchange() {
+        DirectExchange directExchange = new DirectExchange(DIRECT_EXCHANGE, true, false);
+        return directExchange;
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/MyMetaObjectHandler.java

@@ -0,0 +1,28 @@
+package cn.cecep.talroad.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+
+@Slf4j
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        log.info("start insert fill...");
+        this.setFieldValByName("createTime", new Date(), metaObject);
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+        //this.setFieldValByName("status", 0, metaObject);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        log.info("start update fill...");
+        this.setFieldValByName("updateTime", new Date(), metaObject);
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/MybatisPlusConfig.java

@@ -0,0 +1,28 @@
+package cn.cecep.talroad.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@EnableTransactionManagement
+@MapperScan("cn.cecep.talroad.mapper")
+@Configuration
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+        mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        paginationInnerInterceptor.setDbType(DbType.POSTGRE_SQL);
+        paginationInnerInterceptor.setOverflow(true);
+        mybatisPlusInterceptor.addInnerInterceptor(paginationInnerInterceptor);
+        return mybatisPlusInterceptor;
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/QueueConfig.java

@@ -0,0 +1,41 @@
+package cn.cecep.talroad.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Auther: cjh
+ * @Date: 2023-04-17 14:56
+ * @Class: QueueConfig
+ * @Deseription:
+ * @Version V1.0
+ */
+@Configuration
+public class QueueConfig {
+
+    private static final String statusQueue = "status-queue";
+
+    private static final String yieldQueue = "yield-queue";
+
+    @Bean
+    public Queue statusQueue() {
+        /**
+         durable="true" 持久化 rabbitmq重启的时候不需要创建新的队列
+         auto-delete 表示消息队列没有在使用时将被自动删除 默认是false
+         exclusive  表示该消息队列是否只在当前connection生效,默认是false
+         */
+        return new Queue(statusQueue, true, false, false);
+    }
+
+    @Bean
+    public Queue yieldQueue() {
+        /**
+         durable="true" 持久化 rabbitmq重启的时候不需要创建新的队列
+         auto-delete 表示消息队列没有在使用时将被自动删除 默认是false
+         exclusive  表示该消息队列是否只在当前connection生效,默认是false
+         */
+        return new Queue(yieldQueue, true, false, false);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/config/RabbitmqConfig.java

@@ -0,0 +1,49 @@
+package cn.cecep.talroad.config;
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Auther: cjh
+ * @Date: 2023-04-17 15:20
+ * @Class: RabbitmqConfig
+ * @Deseription:
+ * @Version V1.0
+ */
+@Configuration
+public class RabbitmqConfig {
+
+    /**
+     * 停限产设备状态路由
+     */
+    public static final String ROUTE_KEY_STATUS = "route_key_status";
+    /**
+     * 产量统计路由
+     */
+    public static final String ROUTE_KEY_YIELD = "route_key_yield";
+
+    @Autowired
+    private QueueConfig queueConfig;
+    @Autowired
+    private ExchangeConfig exchangeConfig;
+
+    /**
+     * 将停限产状态消息队列和交换机进行绑定
+     */
+    @Bean
+    public Binding binding_statusQueue() {
+        return BindingBuilder.bind(queueConfig.statusQueue()).to(exchangeConfig.directExchange()).with(RabbitmqConfig.ROUTE_KEY_STATUS);
+    }
+
+    /**
+     * 将产量统计队列和交换机进行绑定
+     */
+    @Bean
+    public Binding binding_yieldQueue() {
+        return BindingBuilder.bind(queueConfig.yieldQueue()).to(exchangeConfig.directExchange()).with(RabbitmqConfig.ROUTE_KEY_YIELD);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/AmDoorMonitorAccountFiController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.AmDoorMonitorAccountFi;
+import cn.cecep.talroad.service.IAmDoorMonitorAccountFiService;
+import cn.cecep.talroad.vo.AmDoorMonitorAccountFiVo;
+import cn.cecep.talroad.vo.query.AmDoorMonitorAccountFiQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 门禁监控Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "监测监控--门禁监控")
+@RestController
+@RequestMapping("/amDoorMonitorAccountFi")
+public class AmDoorMonitorAccountFiController extends BasesController
+{
+    @Autowired
+    private IAmDoorMonitorAccountFiService amDoorMonitorAccountFiService;
+
+    /**
+     * 查询门禁监控列表
+     */
+    @ApiOperation(value = "查询门禁监控")
+    @GetMapping("/list")
+    public AjaxResults<IPage<AmDoorMonitorAccountFi>> list(AmDoorMonitorAccountFiQuery amDoorMonitorAccountFi)
+    {
+        Page<AmDoorMonitorAccountFi> page = new Page<>(amDoorMonitorAccountFi.getPageNum(), amDoorMonitorAccountFi.getPageSize());
+        IPage<AmDoorMonitorAccountFi> list = amDoorMonitorAccountFiService.page(page, AmDoorMonitorAccountFiQuery.createLambdaQueryWrapper(amDoorMonitorAccountFi));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出门禁监控列表
+     */
+    @ApiOperation(value = "导出门禁监控")
+    @Log(title = "门禁监控", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody AmDoorMonitorAccountFiQuery amDoorMonitorAccountFi)
+    {
+        List<AmDoorMonitorAccountFi> list = amDoorMonitorAccountFiService.list(AmDoorMonitorAccountFiQuery.createLambdaQueryWrapper(amDoorMonitorAccountFi));
+        ExcelUtil<AmDoorMonitorAccountFi> util = new ExcelUtil<AmDoorMonitorAccountFi>(AmDoorMonitorAccountFi.class);
+        util.exportExcel(response, list, "门禁监控数据");
+    }
+
+    /**
+     * 获取门禁监控详细信息
+     */
+    @ApiOperation(value = "获取门禁监控详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<AmDoorMonitorAccountFi> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(amDoorMonitorAccountFiService.getById(id));
+    }
+    /**
+     * 新增门禁监控
+     */
+    @ApiOperation(value = "新增门禁监控")
+    @Log(title = "门禁监控", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody AmDoorMonitorAccountFi amDoorMonitorAccountFi) {
+        return toAjax(amDoorMonitorAccountFiService.save(amDoorMonitorAccountFi));
+    }
+    /**
+     * 修改门禁监控
+     */
+    @ApiOperation(value = "修改门禁监控")
+    @Log(title = "门禁监控", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody AmDoorMonitorAccountFiVo amDoorMonitorAccountFiVo) {
+        if(ObjectUtil.isEmpty(amDoorMonitorAccountFiVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(amDoorMonitorAccountFiVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        AmDoorMonitorAccountFi amDoorMonitorAccountFi = amDoorMonitorAccountFiService.getById(amDoorMonitorAccountFiVo.getId());
+        if(ObjectUtil.isEmpty(amDoorMonitorAccountFi)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", amDoorMonitorAccountFiVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(amDoorMonitorAccountFiVo,amDoorMonitorAccountFi);
+        return toAjax(amDoorMonitorAccountFiService.saveOrUpdate(amDoorMonitorAccountFi));
+    }
+
+    /**
+     * 删除门禁监控
+     */
+    @ApiOperation(value = "删除门禁监控")
+    @RequiresPermissions("talroad:fi:remove")
+    @Log(title = "门禁监控", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(amDoorMonitorAccountFiService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/AmProblemFiController.java

@@ -0,0 +1,324 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.BussinessException;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.domain.AmProblemFi;
+import cn.cecep.talroad.domain.AmProblemFiProcess;
+import cn.cecep.talroad.enums.AmProblemAuditTypeEnum;
+import cn.cecep.talroad.enums.AmProblemStatusEnum;
+import cn.cecep.talroad.service.*;
+import cn.cecep.talroad.vo.AmProblemFiVo;
+import cn.cecep.talroad.vo.EChartsVO;
+import cn.cecep.talroad.vo.query.AmProblemFiQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.google.common.collect.Lists;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Api(tags = "预警报警信息")
+@RestController
+@RequestMapping("/amProblemFi")
+public class AmProblemFiController extends BasesController {
+    @Autowired
+    private IAmProblemFiService amProblemFiService;
+    @Autowired
+    private IAmProblemFiProcessService amProblemFiProcessService;
+    @Autowired
+    private IBEnterpriseIrBusinessAlertsService bEnterpriseIrBusinessAlertsService;
+    @Autowired
+    private IBEnterpriseIrNotifierproNoticeService bEnterpriseIrNotifierproNoticeService;
+
+    @ApiOperation(value = "查询预警报警信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<AmProblemFiVo>> list(AmProblemFiQuery query) {
+        Page<AmProblemFiVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+        amProblemFiService.selectList(page, query);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperation(value = "查询图表数据")
+    @GetMapping("/chartData")
+    public AjaxResults<List<EChartsVO.Sunburst>> chartData(AmProblemFiQuery.ChartDataParam param) {
+        String regionCode = SecurityUtils.getLoginUser().getSysUser().getRegionCode();
+        List<EChartsVO.Sunburst> data = amProblemFiService.getChartData(param, regionCode);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "查询趋势图数据")
+    @GetMapping("/trendData")
+    public AjaxResults<EChartsVO> trendData(AmProblemFiQuery.ChartDataParam param) {
+        EChartsVO data = amProblemFiService.getTrendData(param);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "导出预警报警信息")
+    @Log(title = "预警报警信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody AmProblemFiQuery query) {
+        Page<AmProblemFiVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+        List<AmProblemFiVo> list = amProblemFiService.selectList(page, query);
+        ExcelUtil<AmProblemFiVo> util = new ExcelUtil<>(AmProblemFiVo.class);
+        util.exportExcel(response, list, "预警报警信息数据");
+    }
+
+    /**
+     * 获取预警报警信息详细信息
+     */
+    @ApiOperation(value = "获取预警报警信息详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<AmProblemFiVo.Detail> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(amProblemFiService.getInfo(id));
+    }
+
+    @ApiOperation(value = "模型分析结果验证保存")
+    @PostMapping(value = "/modelValid/update")
+    public AjaxResults updateModelValid(@RequestBody @Validated AmProblemFiVo.ModelValidForm form) {
+        amProblemFiService.updateModelValid(form);
+        return AjaxResults.success();
+    }
+
+    @ApiOperation(value = "数据逻辑异常问题类型详情数据")
+    @GetMapping("/logicExceptionData")
+    public AjaxResults<IProductionManageService.FrameDataVo> logicExceptionData(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime,
+            @RequestParam("pageNum") Long pageNum,
+            @RequestParam("pageSize") Long pageSize
+    ) {
+        IProductionManageService.FrameDataVo data = amProblemFiService.logicExceptionData(id, startTime, endTime, pageNum, pageSize);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "生产问题详情数据")
+    @GetMapping("/detail/002")
+    public AjaxResults<IProductionManageService.FrameDataVo> detail002(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime,
+            @RequestParam("pageNum") Long pageNum,
+            @RequestParam("pageSize") Long pageSize
+    ) {
+        IProductionManageService.FrameDataVo data = amProblemFiService.detail002(id, startTime, endTime, pageNum, pageSize);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "排放量超标（003004）、预警（003005）详情接口")
+    @GetMapping(value = {"/detail/003004", "/detail/003005"})
+    public AjaxResults<EChartsVO> detail003004(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime
+    ) {
+        EChartsVO data = amProblemFiService.detail003004(id, startTime, endTime);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "浓度超标（003002）、预警（003003）详情接口")
+    @GetMapping(value = {"/detail/003002", "/detail/003003"})
+    public AjaxResults<EChartsVO> detail003002(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime
+    ) {
+        EChartsVO data = amProblemFiService.detail003002(id, startTime, endTime);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "获取dcs、分表计电曲线图数据")
+    @GetMapping("/detail/dcsElec")
+    public AjaxResults<IProductionManageService.FrameDataVo> dcsElec(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime,
+            @RequestParam("pageNum") Long pageNum,
+            @RequestParam("pageSize") Long pageSize
+    ) {
+        IProductionManageService.FrameDataVo data = amProblemFiService.dcsElec(id, startTime, endTime, pageNum, pageSize);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperation(value = "治理设施停运问题详情")
+    @GetMapping("/detail/elecMerge")
+    public AjaxResults<EChartsVO> elecMerge(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime
+    ) {
+        EChartsVO chartsVO = amProblemFiService.elecMerge(id, startTime, endTime);
+        return AjaxResults.success(chartsVO);
+    }
+
+    @ApiOperation(value = "生产工况监测大屏-治理设施异常问题统计")
+    @GetMapping("/problemType/count")
+    public AjaxResults<List<AmProblemFiVo.CountVo>> problemTypeCount(@RequestParam(value = "problemType", defaultValue = "004") String problemType) {
+        List<AmProblemFiVo.CountVo> data = amProblemFiService.getProblemTypeCount(problemType);
+        return AjaxResults.success(data);
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "企业端分页查询预警信息")
+    @GetMapping("/pageYjProblem")
+    public AjaxResults<IPage<AmProblemFiVo>> pageYjProblem(AmProblemFiQuery query) {
+        query.setType(0);
+        query.setFactoryId(SecurityUtils.getLoginUser().getSysUser().getFactoryId());
+        if (StringUtils.isEmpty(query.getFactoryId())) {
+            throw new BussinessException("未找到用户关联企业");
+        }
+        query.setNoRegion(true);
+        Page<AmProblemFiVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+        amProblemFiService.selectList(page, query);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "企业端分页查询报警信息")
+    @GetMapping("/pageBjProblem")
+    public AjaxResults<IPage<AmProblemFiVo>> pageBjProblem(AmProblemFiQuery query) {
+        query.setType(1);
+        query.setNoRegion(true);
+        final String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+        if (StringUtils.isEmpty(factoryId)) {
+            throw new BussinessException("未找到用户关联企业");
+        }
+        query.setFactoryId(factoryId);
+        Page<AmProblemFiVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+        amProblemFiService.selectList(page, query);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "分页查询报警审核信息")
+    @GetMapping("/pageBjShProblem")
+    public AjaxResults<IPage<AmProblemFiVo>> pageBjShProblem(AmProblemFiQuery query) {
+        query.setNoRegion(true);
+        query.setType(1);
+        query.setProblemStatusList(Lists.newArrayList(
+                AmProblemStatusEnum.WAIT_AUDIT.getValue(),
+                AmProblemStatusEnum.PASS.getValue(),
+                AmProblemStatusEnum.UN_PASS.getValue()
+        ));
+        query.setProblemAuditType(AmProblemAuditTypeEnum.ZS.getValue());
+        Page<AmProblemFiVo> page = new Page<>(query.getPageNum(), query.getPageSize());
+        amProblemFiService.selectList(page, query);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "查询报警处理详情信息")
+    @GetMapping("/getProblemProcess")
+    public AjaxResults<List<AmProblemFiProcess>> getProblemProcess(@RequestParam String problemId) {
+        return AjaxResults.success(amProblemFiProcessService.list(Wrappers.<AmProblemFiProcess>lambdaQuery().eq(AmProblemFiProcess::getProblemId, problemId)));
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "整改信息填写")
+    @PostMapping(value = "/rectify/save")
+    public AjaxResults rectifySave(@RequestBody @Validated AmProblemFiProcess param) {
+        param.setProcessUserId(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
+        param.setProcessUserName(SecurityUtils.getLoginUser().getSysUser().getNickName());
+        amProblemFiService.rectifySave(param);
+        return AjaxResults.success();
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "审核结果")
+    @PostMapping(value = "/audit/result")
+    public AjaxResults auditResult(@RequestBody @Validated AmProblemFiProcess param) {
+        param.setProcessUserId(SecurityUtils.getUserKey());
+        param.setProcessUserName(SecurityUtils.getUsername());
+        amProblemFiService.auditResult(param);
+        return AjaxResults.success();
+    }
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "预警签收")
+    @PostMapping(value = "/yj/sign")
+    public AjaxResults yjSign(@RequestBody @Validated AmProblemFiProcess param) {
+        param.setProcessUserId(SecurityUtils.getUserKey());
+        param.setProcessUserName(SecurityUtils.getUsername());
+        amProblemFiService.yjSign(param);
+        return AjaxResults.success();
+    }
+
+
+    @ApiOperation(value = "聚合接口查各类告警总数")
+    @GetMapping(value = "/countList")
+    public AjaxResults countList(@RequestParam String factoryId) {
+        List<Map<String, String>> res = new ArrayList<>();
+        if (factoryId.isEmpty()) {
+            return AjaxResults.success(res);
+        }
+        //type: 0-预警;1-报警
+        Integer warnCount = amProblemFiService.countByFactoryId(factoryId, 0);
+
+        Map<String, String> warnMap = new HashMap<>();
+        warnMap.put("typeDesc", "预警");
+        warnMap.put("id", "warn");
+        warnMap.put("count", warnCount.toString());
+        res.add(warnMap);
+
+        Integer baojinWarnCount = amProblemFiService.countByFactoryId(factoryId, 1);
+        Map<String, String> baojinWarnMap = new HashMap<>();
+        baojinWarnMap.put("typeDesc", "报警");
+        baojinWarnMap.put("id", "baojinWarn");
+        baojinWarnMap.put("count", baojinWarnCount.toString());
+        res.add(baojinWarnMap);
+        //通知
+
+        Integer noticeCount = bEnterpriseIrNotifierproNoticeService.countByFactoryId(factoryId);
+        Map<String, String> noticeCountMap = new HashMap<>();
+        noticeCountMap.put("typeDesc", "通知");
+        noticeCountMap.put("id", "notice");
+        noticeCountMap.put("count", noticeCount.toString());
+        res.add(noticeCountMap);
+
+        //提醒
+
+        Integer alertCount = bEnterpriseIrBusinessAlertsService.countByFactoryId(factoryId);
+        Map<String, String> alertCountMap = new HashMap<>();
+        alertCountMap.put("typeDesc", "业务提醒");
+        alertCountMap.put("id", "tixing");
+        alertCountMap.put("count", alertCount.toString());
+        res.add(alertCountMap);
+
+        return AjaxResults.success(res);
+    }
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "预警添加反馈")
+    @PostMapping(value = "/yj/addCause")
+    public AjaxResults addCause(@RequestBody @Validated AmProblemFi param) {
+        return AjaxResults.success(amProblemFiService.addCause(param));
+    }
+    @ApiOperation(value = "预警问题分类级联数据")
+    @GetMapping("/getAListOfAlerts")
+    public AjaxResults<List<Map<String, Object>>> getAListOfAlerts() {
+        List<Map<String, Object>> list = amProblemFiService.getAListOfAlerts();
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "整改时间填写")
+    @PostMapping(value = "/rectify/update")
+    public AjaxResults rectifyUpdate(@RequestBody @Validated AmProblemFiVo param) {
+        return AjaxResults.success(amProblemFiService.rectifyUpdate(param));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/AmProblemFiRatioController.java

@@ -0,0 +1,174 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.exception.ServiceException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResult;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.vo.AmProblemFiRatioImportVo;
+import cn.cecep.talroad.vo.PcPollutantVo;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.AmProblemFiRatioQuery;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import java.io.IOException;
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.AmProblemFiRatio;
+import cn.cecep.talroad.vo.AmProblemFiRatioVo;
+import cn.cecep.talroad.service.IAmProblemFiRatioService;
+import org.springframework.web.multipart.MultipartFile;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 预警报警信息-预警比例定制Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-06-27*/
+@Api(tags = "预警报警信息-预警比例定制")
+@RestController
+@RequestMapping("/ratio")
+public class AmProblemFiRatioController extends BasesController
+{
+    @Autowired
+    private IAmProblemFiRatioService amProblemFiRatioService;
+
+    /**
+     * 查询预警报警信息-预警比例定制列表
+     */
+    @ApiOperation(value = "查询预警报警信息-预警比例定制")
+    @GetMapping("/list")
+    public AjaxResults<IPage<AmProblemFiRatioVo>> list(AmProblemFiRatioQuery amProblemFiRatio)
+    {
+        Page<AmProblemFiRatioVo> page = new Page<>(amProblemFiRatio.getPageNum(), amProblemFiRatio.getPageSize());
+        amProblemFiRatioService.pageList(page, amProblemFiRatio);
+        return AjaxResults.success(page);
+    }
+
+    /**
+     * 查询预警报警信息-污染物下拉接口
+     */
+    @ApiOperation(value = "查询预警报警信息-污染物下拉接口")
+    @GetMapping("/pcPollutantList")
+    public AjaxResults<List<PcPollutantVo>> pcPollutantList()
+    {
+        List<PcPollutantVo> pcPollutantVos = amProblemFiRatioService.pcPollutantList();
+        return AjaxResults.success(pcPollutantVos);
+    }
+    
+
+    /**
+     * 导出预警报警信息-预警比例定制列表
+     */
+    @ApiOperation(value = "导出预警报警信息-预警比例定制")
+    @Log(title = "预警报警信息-预警比例定制", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AmProblemFiRatioQuery amProblemFiRatio)
+    {
+        List<AmProblemFiRatioVo> list = amProblemFiRatioService.selectAmProblemFiRatioList(amProblemFiRatio);
+        ExcelUtil<AmProblemFiRatioVo> util = new ExcelUtil<>(AmProblemFiRatioVo.class);
+        util.exportExcel(response, list, "预警报警信息-预警比例定制数据");
+    }
+
+    @ApiOperation(value = "预警比例定制导入模板")
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) throws IOException
+    {
+        ExcelUtil<AmProblemFiRatioImportVo> util = new ExcelUtil<>(AmProblemFiRatioImportVo.class);
+        util.importTemplateExcel(response, "预警报警信息-预警比例定制数据");
+    }
+
+    @ApiOperation(value = "预警比例定制导入数据")
+    @Log(title = "预警比例定制", businessType = BusinessType.IMPORT)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件", dataType = "MultipartFile"),
+    })
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception
+    {
+
+        String fileName = file.getOriginalFilename();
+        String fileNameFormat = fileName.substring(fileName.lastIndexOf(".") + 1);
+        if (!"xlsx".equals(fileNameFormat) && !"xls".equals(fileNameFormat)) {
+            throw new ServiceException("抱歉,导入的模板不是xlsx/xls格式,无法导入数据");
+        }
+
+        ExcelUtil<AmProblemFiRatioImportVo> util = null;
+        List<AmProblemFiRatioImportVo> sDcFacilityFiVoList = null;
+        try {
+            util = new ExcelUtil<>(AmProblemFiRatioImportVo.class);
+            sDcFacilityFiVoList = util.importExcel(file.getInputStream());
+            //添加无法录入的数据
+        } catch (Exception e) {
+            throw new ServiceException("抱歉,导入的模板数据格式不正确,无法导入数据");
+        }
+        String message = amProblemFiRatioService.importAmProblemFiRatioList(sDcFacilityFiVoList);
+        return AjaxResult.success(message);
+    }
+
+    /**
+     * 获取预警报警信息-预警比例定制详细信息
+     */
+    @ApiOperation(value = "获取预警报警信息-预警比例定制详细信息")
+    @GetMapping(value = "/getInfo")
+    public AjaxResults<AmProblemFiRatioVo> getInfo(@RequestParam Long id) {
+        return AjaxResults.success(amProblemFiRatioService.selectAmProblemFiRatio(id));
+    }
+    /**
+     * 新增预警报警信息-预警比例定制
+     */
+    @ApiOperation(value = "新增预警报警信息-预警比例定制")
+    @Log(title = "预警报警信息-预警比例定制", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody AmProblemFiRatio amProblemFiRatio) {
+        return toAjax(amProblemFiRatioService.save(amProblemFiRatio));
+    }
+    /**
+     * 修改预警报警信息-预警比例定制
+     */
+    @ApiOperation(value = "修改预警报警信息-预警比例定制")
+    @Log(title = "预警报警信息-预警比例定制", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody AmProblemFiRatioVo amProblemFiRatioVo) {
+        if(ObjectUtil.isEmpty(amProblemFiRatioVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(amProblemFiRatioVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        AmProblemFiRatio amProblemFiRatio = amProblemFiRatioService.getById(amProblemFiRatioVo.getId());
+        if(ObjectUtil.isEmpty(amProblemFiRatio)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", amProblemFiRatioVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(amProblemFiRatioVo,amProblemFiRatio);
+        return toAjax(amProblemFiRatioService.saveOrUpdate(amProblemFiRatio));
+    }
+
+    /**
+     * 删除预警报警信息-预警比例定制
+     */
+    @ApiOperation(value = "删除预警报警信息-预警比例定制")
+    @RequiresPermissions("talroad:ratio:remove")
+    @Log(title = "预警报警信息-预警比例定制", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(amProblemFiRatioService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/AmVideoDevFiController.java

@@ -0,0 +1,239 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.domain.AmVideoDevFi;
+import cn.cecep.talroad.domain.MAmVideoInfoOperationLog;
+import cn.cecep.talroad.service.IAmVideoDevFiService;
+import cn.cecep.talroad.vo.AmVideoDevFiVo;
+import cn.cecep.talroad.vo.export.AmVideoDevFiExport;
+import cn.cecep.talroad.vo.query.AmVideoDevFiQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 视频监控Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "监测监控--视频监控")
+@RestController
+@RequestMapping("/amVideoDevFi")
+public class AmVideoDevFiController extends BasesController
+{
+    @Autowired
+    private IAmVideoDevFiService amVideoDevFiService;
+
+    /**
+     * 查询视频监控列表
+     */
+    @ApiOperation(value = "查询视频监控")
+    @GetMapping("/list")
+    public AjaxResults<IPage<AmVideoDevFi>> list(AmVideoDevFiQuery amVideoDevFi)
+    {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)){
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            amVideoDevFi.setFactoryId(factoryId);
+        }
+        Page<AmVideoDevFi> page = new Page<>(amVideoDevFi.getPageNum(), amVideoDevFi.getPageSize());
+        IPage<AmVideoDevFi> list = amVideoDevFiService.page(page, AmVideoDevFiQuery.createLambdaQueryWrapper(amVideoDevFi));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "获取视频监控分组数据")
+    @GetMapping("/group/list")
+    public AjaxResults<List<AmVideoDevFiVo.DevTypeGroup>> groupList(AmVideoDevFiQuery amVideoDevFi)
+    {
+        List<AmVideoDevFiVo.DevTypeGroup> list = amVideoDevFiService.getGroupList(amVideoDevFi);
+        return AjaxResults.success(list);
+    }
+    @ApiOperation(value = "获取秸秆视频监控数据")
+    @GetMapping("/group/straw")
+    public AjaxResults<List<AmVideoDevFi>> groupStraw(@RequestParam(value = "devName",required = false) String devName)
+    {
+        List<AmVideoDevFi> list = amVideoDevFiService.list(new QueryWrapper<AmVideoDevFi>().eq("dev_type","秸秆").isNull("factory_id").like(StringUtils.isNotEmpty(devName),"dev_name",devName).orderByAsc("dev_id"));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出视频监控列表
+     */
+    @ApiOperation(value = "导出视频监控")
+    @Log(title = "视频监控", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AmVideoDevFi amVideoDevFi)
+    {
+        List<AmVideoDevFi> list = amVideoDevFiService.selectAmVideoDevFiList(amVideoDevFi);
+        ExcelUtil<AmVideoDevFi> util = new ExcelUtil<AmVideoDevFi>(AmVideoDevFi.class);
+        util.exportExcel(response, list, "视频监控数据");
+    }
+    @ApiOperation(value = "获取视频监控搜索框内容--企业端")
+    @GetMapping("/listFactoryVideo")
+    public AjaxResults<List<AmVideoDevFiExport>> listFactoryVideo(AmVideoDevFiQuery amVideoDevFi)
+    {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)){
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            amVideoDevFi.setFactoryId(factoryId);
+            amVideoDevFi.setIsStatus("1");
+        }
+        List<AmVideoDevFiExport> list = amVideoDevFiService.selectAmVideoDevFiSelectList(AmVideoDevFiQuery.createLambdaQueryWrapperFactory(amVideoDevFi));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "获取视频监控搜索框内容-排污许可设施--企业端")
+        @GetMapping("/listFactoryXkVideo")
+    public AjaxResults<List<AmVideoDevFiExport>> listFactoryXkVideo(AmVideoDevFiQuery amVideoDevFi)
+    {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)){
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            amVideoDevFi.setFactoryId(factoryId);
+            amVideoDevFi.setIndustry("XK");
+            amVideoDevFi.setIsStatus("1");
+        }
+        List<AmVideoDevFiExport> list = amVideoDevFiService.selectAmVideoDevFiSelectXkList(AmVideoDevFiQuery.createLambdaQueryWrapperXK(amVideoDevFi));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "查询视频监控-企业端")
+    @GetMapping("/listFactory")
+    public AjaxResults<IPage<AmVideoDevFiExport>> listFactory(AmVideoDevFiQuery amVideoDevFi)
+    {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)){
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            amVideoDevFi.setFactoryId(factoryId);
+            amVideoDevFi.setIsStatus("1");
+        }
+        Page<AmVideoDevFi> page = new Page<>(amVideoDevFi.getPageNum(), amVideoDevFi.getPageSize());
+        IPage<AmVideoDevFiExport> list = amVideoDevFiService.selectDeviceNameById(page, AmVideoDevFiQuery.createLambdaQueryWrapperFactory(amVideoDevFi));
+        return AjaxResults.success(list);
+    }
+    @ApiOperation(value = "导出视频监控-企业端")
+    @Log(title = "导出视频监控-企业端", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportFactory")
+    public void exportFactory(HttpServletResponse response, AmVideoDevFiQuery amVideoDevFi)
+    {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)){
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            amVideoDevFi.setFactoryId(factoryId);
+            amVideoDevFi.setIsStatus("1");
+        }
+        List<AmVideoDevFiExport> list = amVideoDevFiService.selectAmVideoDevFiSelectList(AmVideoDevFiQuery.createLambdaQueryWrapperFactory(amVideoDevFi));
+        ExcelUtil<AmVideoDevFiExport> util = new ExcelUtil<AmVideoDevFiExport>(AmVideoDevFiExport.class);
+        util.exportExcel(response, list, "视频监控数据");
+    }
+
+    @ApiOperation(value = "修改视频监控-企业端")
+    @Log(title = "视频监控", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editFactory")
+    public AjaxResults<Boolean> editFactory(@RequestBody List<AmVideoDevFiExport> amVideoDevFiVo) {
+        if(amVideoDevFiVo.size()==0){
+            throw new InvalidParameterException("没有修改的内容");
+        }
+       List<AmVideoDevFi> saveList = new ArrayList<AmVideoDevFi>();
+       List<AmVideoDevFiExport> saveExportList = new ArrayList<AmVideoDevFiExport>();
+       for(AmVideoDevFiExport avdi:amVideoDevFiVo){
+           AmVideoDevFi amVideoDevFi = amVideoDevFiService.getById(avdi.getId());
+           AmVideoDevFiExport amVideoDevFiExport = amVideoDevFiService.getByExport(avdi.getId());
+           if(ObjectUtil.isEmpty(amVideoDevFi)){
+               throw new CommonException(StrUtil.format("根据id{}查询不到数据", avdi.getId()));
+           }
+           amVideoDevFi.setDeviceId(avdi.getDeviceId());
+           saveList.add(amVideoDevFi);
+           saveExportList.add(amVideoDevFiExport);
+       }
+        amVideoDevFiService.saveLog(amVideoDevFiVo,saveExportList);
+        //赋值
+        return toAjax(amVideoDevFiService.saveOrUpdateBatch(saveList));
+    }
+
+    @ApiOperation(value = "操作日志列表-视频设备绑定排污可设备信息")
+    @PostMapping("/getMAmVideoInfoOperationLogList")
+    public AjaxResults<IPage<MAmVideoInfoOperationLog>> getMAmVideoInfoOperationLogList(AmVideoDevFiQuery amVideoDevFiVo) {
+        try {
+            IPage<MAmVideoInfoOperationLog> list = amVideoDevFiService.getMAmVideoInfoOperationLogList(amVideoDevFiVo);
+            return AjaxResults.success(list);
+        } catch (Exception e) {
+            return AjaxResults.error("操作日志列表获取失败！");
+        }
+    }
+
+    /**
+     * 获取视频监控详细信息
+     */
+    @ApiOperation(value = "获取视频监控详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<AmVideoDevFiVo> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(amVideoDevFiService.getInfo(id));
+    }
+    /**
+     * 新增视频监控
+     */
+    @ApiOperation(value = "新增视频监控")
+    @Log(title = "视频监控", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody AmVideoDevFi amVideoDevFi) {
+        return toAjax(amVideoDevFiService.save(amVideoDevFi));
+    }
+    /**
+     * 修改视频监控
+     */
+    @ApiOperation(value = "修改视频监控")
+    @Log(title = "视频监控", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody AmVideoDevFiVo amVideoDevFiVo) {
+        if(ObjectUtil.isEmpty(amVideoDevFiVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(amVideoDevFiVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        AmVideoDevFi amVideoDevFi = amVideoDevFiService.getById(amVideoDevFiVo.getId());
+        if(ObjectUtil.isEmpty(amVideoDevFi)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", amVideoDevFiVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(amVideoDevFiVo,amVideoDevFi);
+        return toAjax(amVideoDevFiService.saveOrUpdate(amVideoDevFi));
+    }
+
+    /**
+     * 删除视频监控
+     */
+    @ApiOperation(value = "删除视频监控")
+    @RequiresPermissions("talroad:fi:remove")
+    @Log(title = "视频监控", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(amVideoDevFiService.removeByIds(Arrays.asList(ids)));
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseIrBusinessAlertsController.java

@@ -0,0 +1,150 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.exception.ServiceException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BEnterpriseIrBusinessAlerts;
+import cn.cecep.talroad.service.IBEnterpriseIrBusinessAlertsService;
+import cn.cecep.talroad.vo.BEnterpriseIrBusinessAlertsVo;
+import cn.cecep.talroad.vo.query.BEnterpriseIrBusinessAlertsQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.shaded.com.google.common.base.Objects;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 通知提醒-业务提醒Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-14*/
+@Api(tags = "A通知提醒-业务提醒")
+@RestController
+@RequestMapping("/alerts")
+public class BEnterpriseIrBusinessAlertsController extends BasesController
+{
+    @Autowired
+    private IBEnterpriseIrBusinessAlertsService bEnterpriseIrBusinessAlertsService;
+
+    @ApiOperation(value = "查询企业通知提醒类型")
+    @GetMapping("/selectOptions/{factoryId}")
+    public AjaxResults<List<Map<String, String>>> selectOptions(@PathVariable(value = "factoryId") String factoryId)
+    {
+        return AjaxResults.success(bEnterpriseIrBusinessAlertsService.selectOptions(factoryId));
+    }
+
+    /**
+     * 查询通知提醒-业务提醒列表
+     */
+    @ApiOperation(value = "分页列表查询-业务提醒")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BEnterpriseIrBusinessAlerts>> list(@Valid BEnterpriseIrBusinessAlertsQuery bEnterpriseIrBusinessAlerts) throws ParseException {
+        Page<BEnterpriseIrBusinessAlerts> page = new Page<>(bEnterpriseIrBusinessAlerts.getPageNum(), bEnterpriseIrBusinessAlerts.getPageSize());
+        IPage<BEnterpriseIrBusinessAlerts> list = bEnterpriseIrBusinessAlertsService.page(page, BEnterpriseIrBusinessAlertsQuery.createLambdaQueryWrapper(bEnterpriseIrBusinessAlerts));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出通知提醒-业务提醒列表
+     */
+    @ApiOperation(value = "导出通知提醒-业务提醒")
+    @Log(title = "通知提醒-业务提醒", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BEnterpriseIrBusinessAlerts bEnterpriseIrBusinessAlerts)
+    {
+        List<BEnterpriseIrBusinessAlerts> list = bEnterpriseIrBusinessAlertsService.selectBEnterpriseIrBusinessAlertsList(bEnterpriseIrBusinessAlerts);
+        ExcelUtil<BEnterpriseIrBusinessAlerts> util = new ExcelUtil<BEnterpriseIrBusinessAlerts>(BEnterpriseIrBusinessAlerts.class);
+        util.exportExcel(response, list, "通知提醒-业务提醒数据");
+    }
+
+    /**
+     * 获取通知提醒-业务提醒详细信息
+     */
+    @ApiOperation(value = "单条查询-业务提醒详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BEnterpriseIrBusinessAlerts> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bEnterpriseIrBusinessAlertsService.getById(id));
+    }
+    /**
+     * 新增通知提醒-业务提醒
+     */
+    @ApiOperation(value = "新增通知提醒-业务提醒")
+    @Log(title = "通知提醒-业务提醒", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BEnterpriseIrBusinessAlerts bEnterpriseIrBusinessAlerts) {
+        return toAjax(bEnterpriseIrBusinessAlertsService.save(bEnterpriseIrBusinessAlerts));
+    }
+    /**
+     * 修改通知提醒-业务提醒
+     */
+    @ApiOperation(value = "修改通知提醒-业务提醒")
+    @Log(title = "通知提醒-业务提醒", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BEnterpriseIrBusinessAlertsVo bEnterpriseIrBusinessAlertsVo) {
+        if(ObjectUtil.isEmpty(bEnterpriseIrBusinessAlertsVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bEnterpriseIrBusinessAlertsVo.getBusinessId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BEnterpriseIrBusinessAlerts bEnterpriseIrBusinessAlerts = bEnterpriseIrBusinessAlertsService.getById(bEnterpriseIrBusinessAlertsVo.getBusinessId());
+        if(ObjectUtil.isEmpty(bEnterpriseIrBusinessAlerts)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bEnterpriseIrBusinessAlertsVo.getBusinessId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bEnterpriseIrBusinessAlertsVo,bEnterpriseIrBusinessAlerts);
+        return toAjax(bEnterpriseIrBusinessAlertsService.saveOrUpdate(bEnterpriseIrBusinessAlerts));
+    }
+
+    /**
+     * 已读修改
+     */
+    @ApiOperation(value = "已读-修改状态")
+    @Log(title = "已读-修改状态", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editStatus/{businessId}")
+    public AjaxResults<Boolean> editStatus(@PathVariable(value = "businessId") Long businessId) {
+        BEnterpriseIrBusinessAlerts entity = bEnterpriseIrBusinessAlertsService.getBaseMapper().selectById(businessId);
+        if(entity == null){
+            throw new ServiceException("数据不存在,请刷新!");
+        }
+        if(Objects.equal(entity.getStatus(), "1")){
+            return toAjax(true);
+        }
+        entity.setStatus("1");
+        entity.setUpdateTime(new Date());
+        return toAjax(bEnterpriseIrBusinessAlertsService.updateById(entity));
+    }
+
+    /**
+     * 删除通知提醒-业务提醒
+     */
+    @ApiOperation(value = "删除通知提醒-业务提醒")
+    @RequiresPermissions("talroad:alerts:remove")
+    @Log(title = "通知提醒-业务提醒", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bEnterpriseIrBusinessAlertsService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseIrEesController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BEnterpriseIrEes;
+import cn.cecep.talroad.service.IBEnterpriseIrEesService;
+import cn.cecep.talroad.vo.BEnterpriseIrEesVo;
+import cn.cecep.talroad.vo.query.BEnterpriseIrEesQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 知识库-生态环境标准Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-14*/
+@Api(tags = "知识库-生态环境标准")
+@RestController
+@RequestMapping("/ees")
+public class BEnterpriseIrEesController extends BasesController
+{
+    @Autowired
+    private IBEnterpriseIrEesService bEnterpriseIrEesService;
+
+    /**
+     * 查询知识库-生态环境标准列表
+     */
+    @ApiOperation(value = "查询知识库-生态环境标准")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BEnterpriseIrEes>> list(BEnterpriseIrEesQuery bEnterpriseIrEes)
+    {
+        Page<BEnterpriseIrEes> page = new Page<>(bEnterpriseIrEes.getPageNum(), bEnterpriseIrEes.getPageSize());
+        IPage<BEnterpriseIrEes> list = bEnterpriseIrEesService.page(page, BEnterpriseIrEesQuery.createLambdaQueryWrapper(bEnterpriseIrEes));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出知识库-生态环境标准列表
+     */
+    @ApiOperation(value = "导出知识库-生态环境标准")
+    @Log(title = "知识库-生态环境标准", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BEnterpriseIrEes bEnterpriseIrEes)
+    {
+        List<BEnterpriseIrEes> list = bEnterpriseIrEesService.selectBEnterpriseIrEesList(bEnterpriseIrEes);
+        ExcelUtil<BEnterpriseIrEes> util = new ExcelUtil<BEnterpriseIrEes>(BEnterpriseIrEes.class);
+        util.exportExcel(response, list, "知识库-生态环境标准数据");
+    }
+
+    /**
+     * 获取知识库-生态环境标准详细信息
+     */
+    @ApiOperation(value = "获取知识库-生态环境标准详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BEnterpriseIrEes> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bEnterpriseIrEesService.getById(id));
+    }
+    /**
+     * 新增知识库-生态环境标准
+     */
+    @ApiOperation(value = "新增知识库-生态环境标准")
+    @Log(title = "知识库-生态环境标准", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BEnterpriseIrEes bEnterpriseIrEes) {
+        return toAjax(bEnterpriseIrEesService.save(bEnterpriseIrEes));
+    }
+    /**
+     * 修改知识库-生态环境标准
+     */
+    @ApiOperation(value = "修改知识库-生态环境标准")
+    @Log(title = "知识库-生态环境标准", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BEnterpriseIrEesVo bEnterpriseIrEesVo) {
+        if(ObjectUtil.isEmpty(bEnterpriseIrEesVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bEnterpriseIrEesVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BEnterpriseIrEes bEnterpriseIrEes = bEnterpriseIrEesService.getById(bEnterpriseIrEesVo.getId());
+        if(ObjectUtil.isEmpty(bEnterpriseIrEes)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bEnterpriseIrEesVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bEnterpriseIrEesVo,bEnterpriseIrEes);
+        return toAjax(bEnterpriseIrEesService.saveOrUpdate(bEnterpriseIrEes));
+    }
+
+    /**
+     * 删除知识库-生态环境标准
+     */
+    @ApiOperation(value = "删除知识库-生态环境标准")
+    @RequiresPermissions("talroad:ees:remove")
+    @Log(title = "知识库-生态环境标准", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bEnterpriseIrEesService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseIrEesTypeController.java

@@ -0,0 +1,129 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BEnterpriseIrEesType;
+import cn.cecep.talroad.service.IBEnterpriseIrEesTypeService;
+import cn.cecep.talroad.vo.BEnterpriseIrEesTypeVo;
+import cn.cecep.talroad.vo.query.BEnterpriseIrEesTypeQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 知识库-生态环境标准-分类Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-14*/
+@Api(tags = "知识库-生态环境标准-分类")
+@RestController
+@RequestMapping("/eesType")
+public class BEnterpriseIrEesTypeController extends BasesController
+{
+    @Autowired
+    private IBEnterpriseIrEesTypeService bEnterpriseIrEesTypeService;
+
+    /**
+     * 查询行业列表
+     */
+    @ApiOperation(value = "知识库树结构")
+    @GetMapping("/selectTreeList")
+    public AjaxResults<List<BEnterpriseIrEesType>> selectTreeList(String eesClassify)
+    {
+        return AjaxResults.success(bEnterpriseIrEesTypeService.selectTreeList(eesClassify));
+    }
+
+    /**
+     * 查询知识库-生态环境标准-分类列表
+     */
+    @ApiOperation(value = "查询知识库-生态环境标准-分类")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BEnterpriseIrEesType>> list(BEnterpriseIrEesTypeQuery bEnterpriseIrEesType)
+    {
+        Page<BEnterpriseIrEesType> page = new Page<>(bEnterpriseIrEesType.getPageNum(), bEnterpriseIrEesType.getPageSize());
+        IPage<BEnterpriseIrEesType> list = bEnterpriseIrEesTypeService.page(page, BEnterpriseIrEesTypeQuery.createLambdaQueryWrapper(bEnterpriseIrEesType));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出知识库-生态环境标准-分类列表
+     */
+    @ApiOperation(value = "导出知识库-生态环境标准-分类")
+    @Log(title = "知识库-生态环境标准-分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BEnterpriseIrEesType bEnterpriseIrEesType)
+    {
+        List<BEnterpriseIrEesType> list = bEnterpriseIrEesTypeService.selectBEnterpriseIrEesTypeList(bEnterpriseIrEesType);
+        ExcelUtil<BEnterpriseIrEesType> util = new ExcelUtil<BEnterpriseIrEesType>(BEnterpriseIrEesType.class);
+        util.exportExcel(response, list, "知识库-生态环境标准-分类数据");
+    }
+
+    /**
+     * 获取知识库-生态环境标准-分类详细信息
+     */
+    @ApiOperation(value = "获取知识库-生态环境标准-分类详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<BEnterpriseIrEesType> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(bEnterpriseIrEesTypeService.getById(id));
+    }
+    /**
+     * 新增知识库-生态环境标准-分类
+     */
+    @ApiOperation(value = "新增知识库-生态环境标准-分类")
+    @Log(title = "知识库-生态环境标准-分类", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BEnterpriseIrEesType bEnterpriseIrEesType) {
+        return toAjax(bEnterpriseIrEesTypeService.save(bEnterpriseIrEesType));
+    }
+    /**
+     * 修改知识库-生态环境标准-分类
+     */
+    @ApiOperation(value = "修改知识库-生态环境标准-分类")
+    @Log(title = "知识库-生态环境标准-分类", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BEnterpriseIrEesTypeVo bEnterpriseIrEesTypeVo) {
+        if(ObjectUtil.isEmpty(bEnterpriseIrEesTypeVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bEnterpriseIrEesTypeVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BEnterpriseIrEesType bEnterpriseIrEesType = bEnterpriseIrEesTypeService.getById(bEnterpriseIrEesTypeVo.getId());
+        if(ObjectUtil.isEmpty(bEnterpriseIrEesType)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bEnterpriseIrEesTypeVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bEnterpriseIrEesTypeVo,bEnterpriseIrEesType);
+        return toAjax(bEnterpriseIrEesTypeService.saveOrUpdate(bEnterpriseIrEesType));
+    }
+
+    /**
+     * 删除知识库-生态环境标准-分类
+     */
+    @ApiOperation(value = "删除知识库-生态环境标准-分类")
+    @RequiresPermissions("talroad:type:remove")
+    @Log(title = "知识库-生态环境标准-分类", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bEnterpriseIrEesTypeService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseIrLegalController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BEnterpriseIrLegal;
+import cn.cecep.talroad.service.IBEnterpriseIrLegalService;
+import cn.cecep.talroad.vo.BEnterpriseIrLegalVo;
+import cn.cecep.talroad.vo.query.BEnterpriseIrLegalQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 知识库-法律法规Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-14*/
+@Api(tags = "知识库-法律法规")
+@RestController
+@RequestMapping("/legal")
+public class BEnterpriseIrLegalController extends BasesController
+{
+    @Autowired
+    private IBEnterpriseIrLegalService bEnterpriseIrLegalService;
+
+    /**
+     * 查询知识库-法律法规列表
+     */
+    @ApiOperation(value = "查询知识库-法律法规")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BEnterpriseIrLegal>> list(BEnterpriseIrLegalQuery bEnterpriseIrLegal)
+    {
+        Page<BEnterpriseIrLegal> page = new Page<>(bEnterpriseIrLegal.getPageNum(), bEnterpriseIrLegal.getPageSize());
+        IPage<BEnterpriseIrLegal> list = bEnterpriseIrLegalService.page(page, BEnterpriseIrLegalQuery.createLambdaQueryWrapper(bEnterpriseIrLegal));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出知识库-法律法规列表
+     */
+    @ApiOperation(value = "导出知识库-法律法规")
+    @Log(title = "知识库-法律法规", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BEnterpriseIrLegal bEnterpriseIrLegal)
+    {
+        List<BEnterpriseIrLegal> list = bEnterpriseIrLegalService.selectBEnterpriseIrLegalList(bEnterpriseIrLegal);
+        ExcelUtil<BEnterpriseIrLegal> util = new ExcelUtil<BEnterpriseIrLegal>(BEnterpriseIrLegal.class);
+        util.exportExcel(response, list, "知识库-法律法规数据");
+    }
+
+    /**
+     * 获取知识库-法律法规详细信息
+     */
+    @ApiOperation(value = "获取知识库-法律法规详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BEnterpriseIrLegal> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bEnterpriseIrLegalService.getById(id));
+    }
+    /**
+     * 新增知识库-法律法规
+     */
+    @ApiOperation(value = "新增知识库-法律法规")
+    @Log(title = "知识库-法律法规", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BEnterpriseIrLegal bEnterpriseIrLegal) {
+        return toAjax(bEnterpriseIrLegalService.save(bEnterpriseIrLegal));
+    }
+    /**
+     * 修改知识库-法律法规
+     */
+    @ApiOperation(value = "修改知识库-法律法规")
+    @Log(title = "知识库-法律法规", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BEnterpriseIrLegalVo bEnterpriseIrLegalVo) {
+        if(ObjectUtil.isEmpty(bEnterpriseIrLegalVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bEnterpriseIrLegalVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BEnterpriseIrLegal bEnterpriseIrLegal = bEnterpriseIrLegalService.getById(bEnterpriseIrLegalVo.getId());
+        if(ObjectUtil.isEmpty(bEnterpriseIrLegal)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bEnterpriseIrLegalVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bEnterpriseIrLegalVo,bEnterpriseIrLegal);
+        return toAjax(bEnterpriseIrLegalService.saveOrUpdate(bEnterpriseIrLegal));
+    }
+
+    /**
+     * 删除知识库-法律法规
+     */
+    @ApiOperation(value = "删除知识库-法律法规")
+    @RequiresPermissions("talroad:legal:remove")
+    @Log(title = "知识库-法律法规", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bEnterpriseIrLegalService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseIrNotifierproNoticeController.java

@@ -0,0 +1,147 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.exception.ServiceException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BEnterpriseIrNotifierproNotice;
+import cn.cecep.talroad.service.IBEnterpriseIrNotifierproNoticeService;
+import cn.cecep.talroad.vo.BEnterpriseIrNotifierproNoticeVo;
+import cn.cecep.talroad.vo.query.BEnterpriseIrNotifierproNoticeQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.shaded.com.google.common.base.Objects;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.util.*;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 通知提醒-通知公告Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-14*/
+@Api(tags = "A通知提醒-通知公告")
+@RestController
+@RequestMapping("/notice")
+public class BEnterpriseIrNotifierproNoticeController extends BasesController
+{
+    @Autowired
+    private IBEnterpriseIrNotifierproNoticeService bEnterpriseIrNotifierproNoticeService;
+
+    @ApiOperation(value = "查询企业通知公告类型")
+    @GetMapping("/selectOptions/{factoryId}")
+    public AjaxResults<List<Map<String, String>>> selectOptions(@PathVariable(value = "factoryId") String factoryId)
+    {
+        return AjaxResults.success(bEnterpriseIrNotifierproNoticeService.selectOptions(factoryId));
+    }
+
+    /**
+     * 查询通知提醒-通知公告列表
+     */
+    @ApiOperation(value = "分页列表查询-通知公告")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BEnterpriseIrNotifierproNotice>> list(@Valid BEnterpriseIrNotifierproNoticeQuery bEnterpriseIrNotifierproNotice) throws ParseException {
+        Page<BEnterpriseIrNotifierproNotice> page = new Page<>(bEnterpriseIrNotifierproNotice.getPageNum(), bEnterpriseIrNotifierproNotice.getPageSize());
+        IPage<BEnterpriseIrNotifierproNotice> list = bEnterpriseIrNotifierproNoticeService.page(page, BEnterpriseIrNotifierproNoticeQuery.createLambdaQueryWrapper(bEnterpriseIrNotifierproNotice));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出通知提醒-通知公告列表
+     */
+    @ApiOperation(value = "导出通知提醒-通知公告")
+    @Log(title = "通知提醒-通知公告", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BEnterpriseIrNotifierproNotice bEnterpriseIrNotifierproNotice)
+    {
+        List<BEnterpriseIrNotifierproNotice> list = bEnterpriseIrNotifierproNoticeService.selectBEnterpriseIrNotifierproNoticeList(bEnterpriseIrNotifierproNotice);
+        ExcelUtil<BEnterpriseIrNotifierproNotice> util = new ExcelUtil<BEnterpriseIrNotifierproNotice>(BEnterpriseIrNotifierproNotice.class);
+        util.exportExcel(response, list, "通知提醒-通知公告数据");
+    }
+
+    /**
+     * 获取通知提醒-通知公告详细信息
+     */
+    @ApiOperation(value = "单条查询-通知公告详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BEnterpriseIrNotifierproNotice> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bEnterpriseIrNotifierproNoticeService.getById(id));
+    }
+    /**
+     * 新增通知提醒-通知公告
+     */
+    @ApiOperation(value = "新增通知提醒-通知公告")
+    @Log(title = "通知提醒-通知公告", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BEnterpriseIrNotifierproNotice bEnterpriseIrNotifierproNotice) {
+        return toAjax(bEnterpriseIrNotifierproNoticeService.save(bEnterpriseIrNotifierproNotice));
+    }
+    /**
+     * 修改通知提醒-通知公告
+     */
+    @ApiOperation(value = "修改通知提醒-通知公告")
+    @Log(title = "通知提醒-通知公告", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BEnterpriseIrNotifierproNoticeVo bEnterpriseIrNotifierproNoticeVo) {
+        if(ObjectUtil.isEmpty(bEnterpriseIrNotifierproNoticeVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bEnterpriseIrNotifierproNoticeVo.getNoticeId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BEnterpriseIrNotifierproNotice bEnterpriseIrNotifierproNotice = bEnterpriseIrNotifierproNoticeService.getById(bEnterpriseIrNotifierproNoticeVo.getNoticeId());
+        if(ObjectUtil.isEmpty(bEnterpriseIrNotifierproNotice)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bEnterpriseIrNotifierproNoticeVo.getNoticeId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bEnterpriseIrNotifierproNoticeVo,bEnterpriseIrNotifierproNotice);
+        return toAjax(bEnterpriseIrNotifierproNoticeService.saveOrUpdate(bEnterpriseIrNotifierproNotice));
+    }
+
+    /**
+     * 已读修改
+     */
+    @ApiOperation(value = "已读-修改状态")
+    @Log(title = "已读-修改状态", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editStatus/{noticeId}")
+    public AjaxResults<Boolean> editStatus(@PathVariable(value = "noticeId") Long noticeId) {
+        BEnterpriseIrNotifierproNotice entity = bEnterpriseIrNotifierproNoticeService.getBaseMapper().selectById(noticeId);
+        if(entity == null){
+            throw new ServiceException("数据不存在,请刷新!");
+        }
+        if(Objects.equal(entity.getStatus(), "1")){
+            return toAjax(true);
+        }
+        entity.setStatus("1");
+        entity.setUpdateTime(new Date());
+        return toAjax(bEnterpriseIrNotifierproNoticeService.updateById(entity));
+    }
+
+    /**
+     * 删除通知提醒-通知公告
+     */
+    @ApiOperation(value = "删除通知提醒-通知公告")
+    @RequiresPermissions("talroad:notice:remove")
+    @Log(title = "通知提醒-通知公告", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bEnterpriseIrNotifierproNoticeService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseIrSdoeptController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BEnterpriseIrSdoept;
+import cn.cecep.talroad.service.IBEnterpriseIrSdoeptService;
+import cn.cecep.talroad.vo.BEnterpriseIrSdoeptVo;
+import cn.cecep.talroad.vo.query.BEnterpriseIrSdoeptQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 知识库-排污治理科普库Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-14*/
+@Api(tags = "知识库-排污治理科普库")
+@RestController
+@RequestMapping("/sdoept")
+public class BEnterpriseIrSdoeptController extends BasesController
+{
+    @Autowired
+    private IBEnterpriseIrSdoeptService bEnterpriseIrSdoeptService;
+
+    /**
+     * 查询知识库-排污治理科普库列表
+     */
+    @ApiOperation(value = "查询知识库-排污治理科普库")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BEnterpriseIrSdoept>> list(BEnterpriseIrSdoeptQuery bEnterpriseIrSdoept)
+    {
+        Page<BEnterpriseIrSdoept> page = new Page<>(bEnterpriseIrSdoept.getPageNum(), bEnterpriseIrSdoept.getPageSize());
+        IPage<BEnterpriseIrSdoept> list = bEnterpriseIrSdoeptService.page(page, BEnterpriseIrSdoeptQuery.createLambdaQueryWrapper(bEnterpriseIrSdoept));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出知识库-排污治理科普库列表
+     */
+    @ApiOperation(value = "导出知识库-排污治理科普库")
+    @Log(title = "知识库-排污治理科普库", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BEnterpriseIrSdoept bEnterpriseIrSdoept)
+    {
+        List<BEnterpriseIrSdoept> list = bEnterpriseIrSdoeptService.selectBEnterpriseIrSdoeptList(bEnterpriseIrSdoept);
+        ExcelUtil<BEnterpriseIrSdoept> util = new ExcelUtil<BEnterpriseIrSdoept>(BEnterpriseIrSdoept.class);
+        util.exportExcel(response, list, "知识库-排污治理科普库数据");
+    }
+
+    /**
+     * 获取知识库-排污治理科普库详细信息
+     */
+    @ApiOperation(value = "获取知识库-排污治理科普库详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BEnterpriseIrSdoept> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bEnterpriseIrSdoeptService.getById(id));
+    }
+    /**
+     * 新增知识库-排污治理科普库
+     */
+    @ApiOperation(value = "新增知识库-排污治理科普库")
+    @Log(title = "知识库-排污治理科普库", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BEnterpriseIrSdoept bEnterpriseIrSdoept) {
+        return toAjax(bEnterpriseIrSdoeptService.save(bEnterpriseIrSdoept));
+    }
+    /**
+     * 修改知识库-排污治理科普库
+     */
+    @ApiOperation(value = "修改知识库-排污治理科普库")
+    @Log(title = "知识库-排污治理科普库", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BEnterpriseIrSdoeptVo bEnterpriseIrSdoeptVo) {
+        if(ObjectUtil.isEmpty(bEnterpriseIrSdoeptVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bEnterpriseIrSdoeptVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BEnterpriseIrSdoept bEnterpriseIrSdoept = bEnterpriseIrSdoeptService.getById(bEnterpriseIrSdoeptVo.getId());
+        if(ObjectUtil.isEmpty(bEnterpriseIrSdoept)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bEnterpriseIrSdoeptVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bEnterpriseIrSdoeptVo,bEnterpriseIrSdoept);
+        return toAjax(bEnterpriseIrSdoeptService.saveOrUpdate(bEnterpriseIrSdoept));
+    }
+
+    /**
+     * 删除知识库-排污治理科普库
+     */
+    @ApiOperation(value = "删除知识库-排污治理科普库")
+    @RequiresPermissions("talroad:sdoept:remove")
+    @Log(title = "知识库-排污治理科普库", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bEnterpriseIrSdoeptService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BEnterpriseRiskAssessmentController.java

@@ -0,0 +1,51 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BEnterpriseRiskAssessment;
+import cn.cecep.talroad.domain.BEnterpriseRiskAssessmentLast;
+import cn.cecep.talroad.service.BEnterpriseRiskAssessmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: weizhuang
+ * @Date:2023/3/16 14:23
+ * @Version 1.0
+ */
+@Api(tags = "A企业风险评估")
+@RestController
+@RequestMapping("/riskAssessment")
+public class BEnterpriseRiskAssessmentController extends BasesController {
+
+    @Autowired
+    private BEnterpriseRiskAssessmentService bEnterpriseRiskAssessmentService;
+
+
+    /**
+     * 获取企业基本信息详细信息
+     */
+    @ApiOperation(value = "查询企业风险评估-新版")
+    @GetMapping(value = "/last/{factoryId}")
+    public AjaxResults<Map<String,Object>> getLastInfo(@PathVariable("factoryId") String factoryId) {
+        return AjaxResults.success(bEnterpriseRiskAssessmentService.getLastInfo(factoryId));
+    }
+
+    /**
+     * 获取企业基本信息详细信息
+     */
+    @ApiOperation(value = "查询企业风险评估-老版")
+    @GetMapping(value = "/{factoryId}")
+    public AjaxResults<BEnterpriseRiskAssessment> getInfo(@PathVariable("factoryId") String factoryId) {
+        return AjaxResults.success(bEnterpriseRiskAssessmentService.getInfo(factoryId));
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainActionReportsController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainActionReports;
+import cn.cecep.talroad.service.IBMainActionReportsService;
+import cn.cecep.talroad.vo.BMainActionReportsVo;
+import cn.cecep.talroad.vo.query.BMainActionReportsQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 执行报告Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-11*/
+@Api(tags = "业务--执行报告")
+@RestController
+@RequestMapping("/bMainActionReports")
+public class BMainActionReportsController extends BasesController
+{
+    @Autowired
+    private IBMainActionReportsService bMainActionReportsService;
+
+    /**
+     * 查询执行报告列表
+     */
+    @ApiOperation(value = "查询执行报告")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainActionReports>> list(BMainActionReportsQuery bMainActionReports)
+    {
+        Page<BMainActionReports> page = new Page<>(bMainActionReports.getPageNum(), bMainActionReports.getPageSize());
+        IPage<BMainActionReports> list = bMainActionReportsService.page(page, BMainActionReportsQuery.createLambdaQueryWrapper(bMainActionReports));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出执行报告列表
+     */
+    @ApiOperation(value = "导出执行报告")
+    @Log(title = "执行报告", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainActionReports bMainActionReports)
+    {
+        List<BMainActionReports> list = bMainActionReportsService.selectBMainActionReportsList(bMainActionReports);
+        ExcelUtil<BMainActionReports> util = new ExcelUtil<BMainActionReports>(BMainActionReports.class);
+        util.exportExcel(response, list, "执行报告数据");
+    }
+
+    /**
+     * 获取执行报告详细信息
+     */
+    @ApiOperation(value = "获取执行报告详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainActionReports> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainActionReportsService.getById(id));
+    }
+    /**
+     * 新增执行报告
+     */
+    @ApiOperation(value = "新增执行报告")
+    @Log(title = "执行报告", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainActionReports bMainActionReports) {
+        return toAjax(bMainActionReportsService.save(bMainActionReports));
+    }
+    /**
+     * 修改执行报告
+     */
+    @ApiOperation(value = "修改执行报告")
+    @Log(title = "执行报告", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainActionReportsVo bMainActionReportsVo) {
+        if(ObjectUtil.isEmpty(bMainActionReportsVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainActionReportsVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainActionReports bMainActionReports = bMainActionReportsService.getById(bMainActionReportsVo.getId());
+        if(ObjectUtil.isEmpty(bMainActionReports)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainActionReportsVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainActionReportsVo,bMainActionReports);
+        return toAjax(bMainActionReportsService.saveOrUpdate(bMainActionReports));
+    }
+
+    /**
+     * 删除执行报告
+     */
+    @ApiOperation(value = "删除执行报告")
+    @RequiresPermissions("talroad:reports:remove")
+    @Log(title = "执行报告", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainActionReportsService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainAllowablePollutionAirController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainAllowablePollutionAir;
+import cn.cecep.talroad.service.IBMainAllowablePollutionAirService;
+import cn.cecep.talroad.vo.BMainAllowablePollutionAirVo;
+import cn.cecep.talroad.vo.query.BMainAllowablePollutionAirQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 总许可量-大气排放总许可量要求Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "总许可量-大气排放总许可量要求")
+@RestController
+@RequestMapping("/bmainAllowablePollutionAir")
+public class BMainAllowablePollutionAirController extends BasesController
+{
+    @Autowired
+    private IBMainAllowablePollutionAirService bMainAllowablePollutionAirService;
+
+    /**
+     * 查询总许可量-大气排放总许可量要求列表
+     */
+    @ApiOperation(value = "查询总许可量-大气排放总许可量要求")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainAllowablePollutionAir>> list(BMainAllowablePollutionAirQuery bMainAllowablePollutionAir)
+    {
+        Page<BMainAllowablePollutionAir> page = new Page<>(bMainAllowablePollutionAir.getPageNum(), bMainAllowablePollutionAir.getPageSize());
+        IPage<BMainAllowablePollutionAir> list = bMainAllowablePollutionAirService.selectBMainAllowablePollutionAirPageList(page, BMainAllowablePollutionAirQuery.createLambdaQueryWrapper(bMainAllowablePollutionAir));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出总许可量-大气排放总许可量要求列表
+     */
+    @ApiOperation(value = "导出总许可量-大气排放总许可量要求")
+    @Log(title = "总许可量-大气排放总许可量要求", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainAllowablePollutionAir bMainAllowablePollutionAir)
+    {
+        List<BMainAllowablePollutionAir> list = bMainAllowablePollutionAirService.selectBMainAllowablePollutionAirList(bMainAllowablePollutionAir);
+        ExcelUtil<BMainAllowablePollutionAir> util = new ExcelUtil<BMainAllowablePollutionAir>(BMainAllowablePollutionAir.class);
+        util.exportExcel(response, list, "总许可量-大气排放总许可量要求数据");
+    }
+
+    /**
+     * 获取总许可量-大气排放总许可量要求详细信息
+     */
+    @ApiOperation(value = "获取总许可量-大气排放总许可量要求详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainAllowablePollutionAir> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainAllowablePollutionAirService.getById(id));
+    }
+    /**
+     * 新增总许可量-大气排放总许可量要求
+     */
+    @ApiOperation(value = "新增总许可量-大气排放总许可量要求")
+    @Log(title = "总许可量-大气排放总许可量要求", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainAllowablePollutionAir bMainAllowablePollutionAir) {
+        return toAjax(bMainAllowablePollutionAirService.save(bMainAllowablePollutionAir));
+    }
+    /**
+     * 修改总许可量-大气排放总许可量要求
+     */
+    @ApiOperation(value = "修改总许可量-大气排放总许可量要求")
+    @Log(title = "总许可量-大气排放总许可量要求", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainAllowablePollutionAirVo bMainAllowablePollutionAirVo) {
+        if(ObjectUtil.isEmpty(bMainAllowablePollutionAirVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainAllowablePollutionAirVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainAllowablePollutionAir bMainAllowablePollutionAir = bMainAllowablePollutionAirService.getById(bMainAllowablePollutionAirVo.getId());
+        if(ObjectUtil.isEmpty(bMainAllowablePollutionAir)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainAllowablePollutionAirVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainAllowablePollutionAirVo,bMainAllowablePollutionAir);
+        return toAjax(bMainAllowablePollutionAirService.saveOrUpdate(bMainAllowablePollutionAir));
+    }
+
+    /**
+     * 删除总许可量-大气排放总许可量要求
+     */
+    @ApiOperation(value = "删除总许可量-大气排放总许可量要求")
+    @RequiresPermissions("talroad:bmainAllowablePollutionAir:remove")
+    @Log(title = "总许可量-大气排放总许可量要求", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainAllowablePollutionAirService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainAllowablePollutionWaterController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainAllowablePollutionWater;
+import cn.cecep.talroad.service.IBMainAllowablePollutionWaterService;
+import cn.cecep.talroad.vo.BMainAllowablePollutionWaterVo;
+import cn.cecep.talroad.vo.query.BMainAllowablePollutionWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 总许可量- 废水排放总许可量要求Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "总许可量- 废水排放总许可量要求")
+@RestController
+@RequestMapping("/bmainAllowablePollutionWater")
+public class BMainAllowablePollutionWaterController extends BasesController
+{
+    @Autowired
+    private IBMainAllowablePollutionWaterService bMainAllowablePollutionWaterService;
+
+    /**
+     * 查询总许可量- 废水排放总许可量要求列表
+     */
+    @ApiOperation(value = "查询总许可量- 废水排放总许可量要求")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainAllowablePollutionWater>> list(BMainAllowablePollutionWaterQuery bMainAllowablePollutionWater)
+    {
+        Page<BMainAllowablePollutionWater> page = new Page<>(bMainAllowablePollutionWater.getPageNum(), bMainAllowablePollutionWater.getPageSize());
+        IPage<BMainAllowablePollutionWater> list = bMainAllowablePollutionWaterService.selectBMainAllowablePollutionWaterPageList(page, BMainAllowablePollutionWaterQuery.createLambdaQueryWrapper(bMainAllowablePollutionWater));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出总许可量- 废水排放总许可量要求列表
+     */
+    @ApiOperation(value = "导出总许可量- 废水排放总许可量要求")
+    @Log(title = "总许可量- 废水排放总许可量要求", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainAllowablePollutionWater bMainAllowablePollutionWater)
+    {
+        List<BMainAllowablePollutionWater> list = bMainAllowablePollutionWaterService.selectBMainAllowablePollutionWaterList(bMainAllowablePollutionWater);
+        ExcelUtil<BMainAllowablePollutionWater> util = new ExcelUtil<BMainAllowablePollutionWater>(BMainAllowablePollutionWater.class);
+        util.exportExcel(response, list, "总许可量- 废水排放总许可量要求数据");
+    }
+
+    /**
+     * 获取总许可量- 废水排放总许可量要求详细信息
+     */
+    @ApiOperation(value = "获取总许可量- 废水排放总许可量要求详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainAllowablePollutionWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainAllowablePollutionWaterService.getById(id));
+    }
+    /**
+     * 新增总许可量- 废水排放总许可量要求
+     */
+    @ApiOperation(value = "新增总许可量- 废水排放总许可量要求")
+    @Log(title = "总许可量- 废水排放总许可量要求", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainAllowablePollutionWater bMainAllowablePollutionWater) {
+        return toAjax(bMainAllowablePollutionWaterService.save(bMainAllowablePollutionWater));
+    }
+    /**
+     * 修改总许可量- 废水排放总许可量要求
+     */
+    @ApiOperation(value = "修改总许可量- 废水排放总许可量要求")
+    @Log(title = "总许可量- 废水排放总许可量要求", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainAllowablePollutionWaterVo bMainAllowablePollutionWaterVo) {
+        if(ObjectUtil.isEmpty(bMainAllowablePollutionWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainAllowablePollutionWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainAllowablePollutionWater bMainAllowablePollutionWater = bMainAllowablePollutionWaterService.getById(bMainAllowablePollutionWaterVo.getId());
+        if(ObjectUtil.isEmpty(bMainAllowablePollutionWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainAllowablePollutionWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainAllowablePollutionWaterVo,bMainAllowablePollutionWater);
+        return toAjax(bMainAllowablePollutionWaterService.saveOrUpdate(bMainAllowablePollutionWater));
+    }
+
+    /**
+     * 删除总许可量- 废水排放总许可量要求
+     */
+    @ApiOperation(value = "删除总许可量- 废水排放总许可量要求")
+    @RequiresPermissions("talroad:bmainAllowablePollutionWater:remove")
+    @Log(title = "总许可量- 废水排放总许可量要求", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainAllowablePollutionWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionOnlineMonAirController.java

@@ -0,0 +1,298 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.DateUtils;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionOnlineMonAir;
+import cn.cecep.talroad.domain.BMainEmissionOnlineMonWater;
+import cn.cecep.talroad.service.IBMainEmissionOnlineMonAirService;
+import cn.cecep.talroad.service.IBMainEmissionOnlineMonWaterService;
+import cn.cecep.talroad.util.CustomDateUtil;
+import cn.cecep.talroad.vo.BMainEmissionOnlineMonAirVo;
+import cn.cecep.talroad.vo.ChartVo;
+import cn.cecep.talroad.vo.query.BMainEmissionOnlineMonAirQuery;
+import cn.cecep.talroad.vo.query.BMainEmissionOnlineMonWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-在线监测排放趋势-废气Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-在线监测排放趋势-废气")
+@RestController
+@RequestMapping("/bmainEmissionOnlineMonAir")
+public class BMainEmissionOnlineMonAirController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionOnlineMonAirService bMainEmissionOnlineMonAirService;
+
+    @Autowired
+    private IBMainEmissionOnlineMonWaterService bMainEmissionOnlineMonWaterService;
+
+    /**
+     * 查询企业排放信息-在线监测排放趋势-监测点列表
+     */
+    @ApiOperation(value = "污染类别查询监测点位")
+    @GetMapping("/pullPoints")
+    public AjaxResults<List<Map<String, String>>> pullPollutants(BMainEmissionOnlineMonAirQuery bMainEmissionOnlineMonAir)
+    {
+        List<Map<String, String>> maps = Lists.newArrayList();
+        List<String> polls = Lists.newArrayList();
+        if(bMainEmissionOnlineMonAir.getFacts().equals("废气")){
+            List<BMainEmissionOnlineMonAir> list = bMainEmissionOnlineMonAirService.list(new QueryWrapper<BMainEmissionOnlineMonAir>().eq("factory_id", bMainEmissionOnlineMonAir.getFactoryId()).isNotNull("mon_name"));
+            if(!CollectionUtils.isEmpty(list)){
+                polls.addAll(list.stream().map(BMainEmissionOnlineMonAir::getMonName).distinct().collect(Collectors.toList()));
+            }
+        } else if (bMainEmissionOnlineMonAir.getFacts().equals("废水")){
+            List<BMainEmissionOnlineMonWater> list = bMainEmissionOnlineMonWaterService.list(new QueryWrapper<BMainEmissionOnlineMonWater>().eq("factory_id", bMainEmissionOnlineMonAir.getFactoryId()).isNotNull("mon_name"));
+            if(!CollectionUtils.isEmpty(list)){
+                polls.addAll(list.stream().map(BMainEmissionOnlineMonWater::getMonName).distinct().collect(Collectors.toList()));
+            }
+        }
+        if(!CollectionUtils.isEmpty(polls)){
+            polls.forEach(p->{
+                Map<String, String> map = Maps.newHashMap();
+                map.put("label", p);
+                map.put("value", p);
+                maps.add(map);
+            });
+        }
+        return AjaxResults.success(maps);
+    }
+
+    /**
+     * 废气-废水-导出企业排放信息-在线监测排放趋势
+     */
+    @ApiOperation(value = "废气-废水-导出企业排放信息-在线监测排放趋势")
+    @Log(title = "废气-废水-导出企业排放信息-在线监测排放趋势", businessType = BusinessType.EXPORT)
+    @PostMapping("/chart/export")
+    public void chartExport(HttpServletResponse response, @Valid @RequestBody BMainEmissionOnlineMonAirQuery bMainEmissionOnlineMonAir) throws ParseException {
+        switch(bMainEmissionOnlineMonAir.getFacts()){
+            case "废气":
+                bMainEmissionOnlineMonAir.setSearchBeginTime(DateUtil.parse(bMainEmissionOnlineMonAir.getSearchBeginTime(), "yyyy-MM-dd HH").toString());
+                bMainEmissionOnlineMonAir.setSearchEndTime(DateUtil.parse(bMainEmissionOnlineMonAir.getSearchEndTime(), "yyyy-MM-dd HH").toString());
+                List<BMainEmissionOnlineMonAir> airTables = bMainEmissionOnlineMonAirService.list(BMainEmissionOnlineMonAirQuery.createLambdaQueryWrapper(bMainEmissionOnlineMonAir));
+                ExcelUtil<BMainEmissionOnlineMonAir> util = new ExcelUtil<BMainEmissionOnlineMonAir>(BMainEmissionOnlineMonAir.class);
+                util.exportExcel(response, airTables, "企业点位"+bMainEmissionOnlineMonAir.getMonName()+"排放信息-在线监测排放趋势-废气数据");
+                break;
+            case "废水":
+                String searchBeginTime = DateUtil.parse(bMainEmissionOnlineMonAir.getSearchBeginTime(), "yyyy-MM-dd").toString();
+                String searchEndTime = DateUtil.parse(bMainEmissionOnlineMonAir.getSearchEndTime(), "yyyy-MM-dd").toString();
+                List<BMainEmissionOnlineMonWater> waterTables = bMainEmissionOnlineMonWaterService.list(BMainEmissionOnlineMonWaterQuery.createLambdaQueryWrapper(new BMainEmissionOnlineMonWaterQuery(bMainEmissionOnlineMonAir.getMonName(), searchBeginTime, searchEndTime)));
+                ExcelUtil<BMainEmissionOnlineMonWater> waterUtil = new ExcelUtil<BMainEmissionOnlineMonWater>(BMainEmissionOnlineMonWater.class);
+                waterUtil.exportExcel(response, waterTables, "企业点位"+bMainEmissionOnlineMonAir.getMonName()+"排放信息-在线监测排放趋势-废水数据");
+                break;
+        }
+    }
+
+    /**
+     * 查询企业排放信息-不同污染物年度排放趋势-废气列表
+     */
+    @ApiOperation(value = "废气-废水-(图表+列表)查询企业排放信息-在线监测排放趋势")
+    @GetMapping("/chart")
+    public AjaxResults<Map<String, Object>> chart(@Valid BMainEmissionOnlineMonAirQuery bMainEmissionOnlineMonAir) throws ParseException {
+        Map<String, Object> res = Maps.newHashMap();
+        ChartVo chartVo = new ChartVo();
+        switch(bMainEmissionOnlineMonAir.getFacts()){
+            case "废气":
+                bMainEmissionOnlineMonAir.setSearchBeginTime(DateUtil.parse(bMainEmissionOnlineMonAir.getSearchBeginTime(), "yyyy-MM-dd HH").toString());
+                bMainEmissionOnlineMonAir.setSearchEndTime(DateUtil.parse(bMainEmissionOnlineMonAir.getSearchEndTime(), "yyyy-MM-dd HH").toString());
+                List<BMainEmissionOnlineMonAir> airTables = bMainEmissionOnlineMonAirService.list(BMainEmissionOnlineMonAirQuery.createLambdaQueryWrapper(bMainEmissionOnlineMonAir));
+                if(!CollectionUtils.isEmpty(airTables)){
+                    chartVo.setLegendData(airTables.stream().map(BMainEmissionOnlineMonAir::getPollutionType).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+//                    chartVo.setXsxisData(formateDateLists(waterTables.stream().map(BMainEmissionOnlineMonWater::getMonitoningTime).distinct().collect(Collectors.toList()), "yyyy-MM-dd "));
+                    chartVo.setXsxisData(airTables.stream().map(BMainEmissionOnlineMonAir::getMonitoningTime).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    Map<String, List<BMainEmissionOnlineMonAir>> airMaps = airTables.stream().collect(Collectors.groupingBy(BMainEmissionOnlineMonAir::getPollutionType));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    airMaps.forEach((air, data)->{
+                        Map<Object, Object> map = Maps.newHashMap();
+                        map.put("name", air);
+                        Map<Date, List<BMainEmissionOnlineMonAir>> timeMaps = CollectionUtils.isEmpty(data) ? Maps.newHashMap() : data.stream().collect(Collectors.groupingBy(BMainEmissionOnlineMonAir::getMonitoningTime));
+                        List<Object> y = Lists.newArrayList();
+                        for (Object time : chartVo.getXsxisData()) {
+                            if(timeMaps.containsKey(time)){
+                                y.add(timeMaps.get(time).get(0).getPollutionDischarge());
+                            } else {
+                                y.add("--");
+                            }
+                        }
+                        map.put("data", y);
+                        seriesData.add(map);
+                    });
+                    chartVo.setSeriesData(seriesData);
+                    chartVo.setXsxisData(formateDateLists(airTables.stream().map(BMainEmissionOnlineMonAir::getMonitoningTime).distinct().collect(Collectors.toList()), "yyyy-MM-dd HH"));
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                    chartVo.setLegendData(new Object[0]);
+                }
+                res.put("table", airTables);
+                break;
+            case "废水":
+                String searchBeginTime = DateUtil.parse(bMainEmissionOnlineMonAir.getSearchBeginTime(), "yyyy-MM-dd").toString();
+                String searchEndTime = DateUtil.parse(bMainEmissionOnlineMonAir.getSearchEndTime(), "yyyy-MM-dd").toString();
+                List<BMainEmissionOnlineMonWater> waterTables = bMainEmissionOnlineMonWaterService.list(BMainEmissionOnlineMonWaterQuery.createLambdaQueryWrapper(new BMainEmissionOnlineMonWaterQuery(bMainEmissionOnlineMonAir.getMonName(), searchBeginTime, searchEndTime)));
+                if(!CollectionUtils.isEmpty(waterTables)){
+                    chartVo.setLegendData(waterTables.stream().map(BMainEmissionOnlineMonWater::getPollutionType).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+//                    chartVo.setXsxisData(formateDateLists(waterTables.stream().map(BMainEmissionOnlineMonWater::getMonitoningTime).distinct().collect(Collectors.toList()), "yyyy-MM-dd"));
+                    chartVo.setXsxisData(waterTables.stream().map(BMainEmissionOnlineMonWater::getMonitoningTime).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    Map<String, List<BMainEmissionOnlineMonWater>> waterMaps = waterTables.stream().collect(Collectors.groupingBy(BMainEmissionOnlineMonWater::getPollutionType));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    waterMaps.forEach((water, data)->{
+                        Map<Object, Object> map = Maps.newHashMap();
+                        map.put("name", water);
+                        Map<Date, List<BMainEmissionOnlineMonWater>> timeMaps = CollectionUtils.isEmpty(data) ? Maps.newHashMap() : data.stream().collect(Collectors.groupingBy(BMainEmissionOnlineMonWater::getMonitoningTime));
+                        List<Object> y = Lists.newArrayList();
+                        for (Object time : chartVo.getXsxisData()) {
+                            if(timeMaps.containsKey(time)){
+                                y.add(timeMaps.get(time).get(0).getPollutionDischarge());
+                            } else {
+                                y.add("--");
+                            }
+                        }
+                        map.put("data", y);
+                        seriesData.add(map);
+                    });
+                    chartVo.setSeriesData(seriesData);
+                    chartVo.setXsxisData(formateDateLists(waterTables.stream().map(BMainEmissionOnlineMonWater::getMonitoningTime).distinct().collect(Collectors.toList()), "yyyy-MM-dd"));
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                    chartVo.setLegendData(new Object[0]);
+                }
+                res.put("table", waterTables);
+                break;
+        }
+        List<String> xsxisDatas = Lists.newArrayList();
+        if(bMainEmissionOnlineMonAir.getFacts().equals("废气")){
+            xsxisDatas.addAll(CustomDateUtil.getAllHours(DateUtil.parse(bMainEmissionOnlineMonAir.getSearchBeginTime(), CustomDateUtil.HOUR_PATTERN), DateUtil.parse(bMainEmissionOnlineMonAir.getSearchEndTime(), CustomDateUtil.HOUR_PATTERN), CustomDateUtil.HOUR_PATTERN));
+        } else if (bMainEmissionOnlineMonAir.getFacts().equals("废水")){
+            xsxisDatas.addAll(CustomDateUtil.getAllDays(DateUtil.parse(bMainEmissionOnlineMonAir.getSearchBeginTime(), CustomDateUtil.DATE_PATTERN), DateUtil.parse(bMainEmissionOnlineMonAir.getSearchEndTime(), CustomDateUtil.DATE_PATTERN), CustomDateUtil.DATE_PATTERN));
+        }
+        // 无数据默认补全x轴
+        if(chartVo.getXsxisData().length == 0){
+            chartVo.setXsxisData(xsxisDatas.stream().toArray());
+        }
+        // 数据缺失, 补全x轴及对应数据
+        if(chartVo.getXsxisData().length != xsxisDatas.size()){
+            CustomDateUtil.packEcharts(chartVo, xsxisDatas);
+        }
+        res.put("chart", chartVo);
+        return AjaxResults.success(res);
+    }
+
+    private Object[] formateDateLists(List<Date> source, String format){
+        Object[] res = new Object[source.size()];
+        for (int i = 0; i < source.size(); i++) {
+            res[i] = DateUtils.parseDateToStr(format, source.get(i));
+        }
+        return res;
+    }
+
+
+    /**
+     * 查询企业排放信息-在线监测排放趋势-废气列表
+     */
+    @ApiOperation(value = "查询企业排放信息-在线监测排放趋势-废气")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionOnlineMonAir>> list(BMainEmissionOnlineMonAirQuery bMainEmissionOnlineMonAir) throws ParseException {
+        Page<BMainEmissionOnlineMonAir> page = new Page<>(bMainEmissionOnlineMonAir.getPageNum(), bMainEmissionOnlineMonAir.getPageSize());
+        IPage<BMainEmissionOnlineMonAir> list = bMainEmissionOnlineMonAirService.page(page, BMainEmissionOnlineMonAirQuery.createLambdaQueryWrapper(bMainEmissionOnlineMonAir));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出企业排放信息-在线监测排放趋势-废气列表
+     */
+    @ApiOperation(value = "导出企业排放信息-在线监测排放趋势-废气")
+    @Log(title = "企业排放信息-在线监测排放趋势-废气", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionOnlineMonAir bMainEmissionOnlineMonAir)
+    {
+        List<BMainEmissionOnlineMonAir> list = bMainEmissionOnlineMonAirService.selectBMainEmissionOnlineMonAirList(bMainEmissionOnlineMonAir);
+        ExcelUtil<BMainEmissionOnlineMonAir> util = new ExcelUtil<BMainEmissionOnlineMonAir>(BMainEmissionOnlineMonAir.class);
+        util.exportExcel(response, list, "企业排放信息-在线监测排放趋势-废气数据");
+    }
+
+    /**
+     * 获取企业排放信息-在线监测排放趋势-废气详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-在线监测排放趋势-废气详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionOnlineMonAir> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionOnlineMonAirService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-在线监测排放趋势-废气
+     */
+    @ApiOperation(value = "新增企业排放信息-在线监测排放趋势-废气")
+    @Log(title = "企业排放信息-在线监测排放趋势-废气", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionOnlineMonAir bMainEmissionOnlineMonAir) {
+        return toAjax(bMainEmissionOnlineMonAirService.save(bMainEmissionOnlineMonAir));
+    }
+    /**
+     * 修改企业排放信息-在线监测排放趋势-废气
+     */
+    @ApiOperation(value = "修改企业排放信息-在线监测排放趋势-废气")
+    @Log(title = "企业排放信息-在线监测排放趋势-废气", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionOnlineMonAirVo bMainEmissionOnlineMonAirVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionOnlineMonAirVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionOnlineMonAirVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionOnlineMonAir bMainEmissionOnlineMonAir = bMainEmissionOnlineMonAirService.getById(bMainEmissionOnlineMonAirVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionOnlineMonAir)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionOnlineMonAirVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionOnlineMonAirVo,bMainEmissionOnlineMonAir);
+        return toAjax(bMainEmissionOnlineMonAirService.saveOrUpdate(bMainEmissionOnlineMonAir));
+    }
+
+    /**
+     * 删除企业排放信息-在线监测排放趋势-废气
+     */
+    @ApiOperation(value = "删除企业排放信息-在线监测排放趋势-废气")
+    @RequiresPermissions("talroad:bmainEmissionOnlineMonAir:remove")
+    @Log(title = "企业排放信息-在线监测排放趋势-废气", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionOnlineMonAirService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionOnlineMonWaterController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionOnlineMonWater;
+import cn.cecep.talroad.service.IBMainEmissionOnlineMonWaterService;
+import cn.cecep.talroad.vo.BMainEmissionOnlineMonWaterVo;
+import cn.cecep.talroad.vo.query.BMainEmissionOnlineMonWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-在线监测排放趋势-废水Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-在线监测排放趋势-废水")
+@RestController
+@RequestMapping("/bmainEmissionOnlineMonWater")
+public class BMainEmissionOnlineMonWaterController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionOnlineMonWaterService bMainEmissionOnlineMonWaterService;
+
+    /**
+     * 查询企业排放信息-在线监测排放趋势-废水列表
+     */
+    @ApiOperation(value = "查询企业排放信息-在线监测排放趋势-废水")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionOnlineMonWater>> list(BMainEmissionOnlineMonWaterQuery bMainEmissionOnlineMonWater) throws ParseException {
+        Page<BMainEmissionOnlineMonWater> page = new Page<>(bMainEmissionOnlineMonWater.getPageNum(), bMainEmissionOnlineMonWater.getPageSize());
+        IPage<BMainEmissionOnlineMonWater> list = bMainEmissionOnlineMonWaterService.page(page, BMainEmissionOnlineMonWaterQuery.createLambdaQueryWrapper(bMainEmissionOnlineMonWater));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出企业排放信息-在线监测排放趋势-废水列表
+     */
+    @ApiOperation(value = "导出企业排放信息-在线监测排放趋势-废水")
+    @Log(title = "企业排放信息-在线监测排放趋势-废水", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionOnlineMonWater bMainEmissionOnlineMonWater)
+    {
+        List<BMainEmissionOnlineMonWater> list = bMainEmissionOnlineMonWaterService.selectBMainEmissionOnlineMonWaterList(bMainEmissionOnlineMonWater);
+        ExcelUtil<BMainEmissionOnlineMonWater> util = new ExcelUtil<BMainEmissionOnlineMonWater>(BMainEmissionOnlineMonWater.class);
+        util.exportExcel(response, list, "企业排放信息-在线监测排放趋势-废水数据");
+    }
+
+    /**
+     * 获取企业排放信息-在线监测排放趋势-废水详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-在线监测排放趋势-废水详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionOnlineMonWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionOnlineMonWaterService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-在线监测排放趋势-废水
+     */
+    @ApiOperation(value = "新增企业排放信息-在线监测排放趋势-废水")
+    @Log(title = "企业排放信息-在线监测排放趋势-废水", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionOnlineMonWater bMainEmissionOnlineMonWater) {
+        return toAjax(bMainEmissionOnlineMonWaterService.save(bMainEmissionOnlineMonWater));
+    }
+    /**
+     * 修改企业排放信息-在线监测排放趋势-废水
+     */
+    @ApiOperation(value = "修改企业排放信息-在线监测排放趋势-废水")
+    @Log(title = "企业排放信息-在线监测排放趋势-废水", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionOnlineMonWaterVo bMainEmissionOnlineMonWaterVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionOnlineMonWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionOnlineMonWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionOnlineMonWater bMainEmissionOnlineMonWater = bMainEmissionOnlineMonWaterService.getById(bMainEmissionOnlineMonWaterVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionOnlineMonWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionOnlineMonWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionOnlineMonWaterVo,bMainEmissionOnlineMonWater);
+        return toAjax(bMainEmissionOnlineMonWaterService.saveOrUpdate(bMainEmissionOnlineMonWater));
+    }
+
+    /**
+     * 删除企业排放信息-在线监测排放趋势-废水
+     */
+    @ApiOperation(value = "删除企业排放信息-在线监测排放趋势-废水")
+    @RequiresPermissions("talroad:bmainEmissionOnlineMonWater:remove")
+    @Log(title = "企业排放信息-在线监测排放趋势-废水", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionOnlineMonWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionPollutionAirController.java

@@ -0,0 +1,294 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionPollutionAir;
+import cn.cecep.talroad.domain.BMainEmissionPollutionSolidWaste;
+import cn.cecep.talroad.domain.BMainEmissionPollutionWater;
+import cn.cecep.talroad.service.IBMainEmissionPollutionAirService;
+import cn.cecep.talroad.service.IBMainEmissionPollutionSolidWasteService;
+import cn.cecep.talroad.service.IBMainEmissionPollutionWaterService;
+import cn.cecep.talroad.util.CustomDateUtil;
+import cn.cecep.talroad.vo.BMainEmissionPollutionAirVo;
+import cn.cecep.talroad.vo.ChartVo;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionAirQuery;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionSolidWasteQuery;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-不同污染物年度排放趋势-废气Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-不同污染物年度排放趋势-废气")
+@RestController
+@RequestMapping("/bmainEmissionPollutionAir")
+public class BMainEmissionPollutionAirController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionPollutionAirService bMainEmissionPollutionAirService;
+
+    @Autowired
+    private IBMainEmissionPollutionWaterService bMainEmissionPollutionWaterService;
+
+    @Autowired
+    private IBMainEmissionPollutionSolidWasteService bMainEmissionPollutionSolidWaterService;
+
+    /**
+     * 导出企业排放信息-不同污染物年度排放趋势-废气列表
+     */
+    @ApiOperation(value = "废气-废水-固废-导出企业排放信息-不同污染物年度排放趋势")
+    @Log(title = "废气-废水-固废-导出企业排放信息-不同污染物年度排放趋势", businessType = BusinessType.EXPORT)
+    @PostMapping("/chart/export")
+    public void chartExport(HttpServletResponse response, @Valid @RequestBody BMainEmissionPollutionAirQuery bMainEmissionPollutionAir)
+    {
+        switch(bMainEmissionPollutionAir.getPollutionCategory()){
+            case "废气":
+                bMainEmissionPollutionAir.setPollutionCategory(null);
+                List<BMainEmissionPollutionAir> airTables = bMainEmissionPollutionAirService.list(BMainEmissionPollutionAirQuery.createLambdaQueryWrapper(bMainEmissionPollutionAir));
+                ExcelUtil<BMainEmissionPollutionAir> util = new ExcelUtil<BMainEmissionPollutionAir>(BMainEmissionPollutionAir.class);
+                util.exportExcel(response, airTables, "企业排放信息-不同污染物年度排放趋势-废气数据");
+                break;
+            case "废水":
+                bMainEmissionPollutionAir.setPollutionCategory(null);
+                List<BMainEmissionPollutionWater> waterTables = bMainEmissionPollutionWaterService.list(BMainEmissionPollutionWaterQuery.createLambdaQueryWrapper(new BMainEmissionPollutionWaterQuery(bMainEmissionPollutionAir.getPollutionCategory(), bMainEmissionPollutionAir.getDataSource(), bMainEmissionPollutionAir.getSearchBeginYear(), bMainEmissionPollutionAir.getSearchEndYear(), bMainEmissionPollutionAir.getFactoryId())));
+                ExcelUtil<BMainEmissionPollutionWater> waterUtil = new ExcelUtil<BMainEmissionPollutionWater>(BMainEmissionPollutionWater.class);
+                waterUtil.exportExcel(response, waterTables, "企业排放信息-不同污染物年度排放趋势-废水数据");
+                break;
+            case "固废":
+                List<BMainEmissionPollutionSolidWaste> solidTables = bMainEmissionPollutionSolidWaterService.list(BMainEmissionPollutionSolidWasteQuery.createLambdaQueryWrapper(new BMainEmissionPollutionSolidWasteQuery(bMainEmissionPollutionAir.getPollutionCategory(), bMainEmissionPollutionAir.getDataSource(), bMainEmissionPollutionAir.getSearchBeginYear(), bMainEmissionPollutionAir.getSearchEndYear(), bMainEmissionPollutionAir.getFactoryId())));
+                ExcelUtil<BMainEmissionPollutionSolidWaste> solidUtil = new ExcelUtil<BMainEmissionPollutionSolidWaste>(BMainEmissionPollutionSolidWaste.class);
+                solidUtil.exportExcel(response, solidTables, "企业排放信息-不同污染物年度排放趋势-固废数据");
+                break;
+        }
+    }
+
+    /**
+     * 查询企业排放信息-不同污染物年度排放趋势-废气列表
+     */
+    @ApiOperation(value = "废气-废水-固废-(图表+列表)查询企业排放信息-不同污染物年度排放趋势")
+    @GetMapping("/chart")
+    public AjaxResults<Map<String, Object>> chart(@Valid BMainEmissionPollutionAirQuery bMainEmissionPollutionAir)
+    {
+
+        Map<String, Object> res = Maps.newHashMap();
+        ChartVo chartVo = new ChartVo();
+        switch(bMainEmissionPollutionAir.getPollutionCategory()){
+            case "废气":
+                bMainEmissionPollutionAir.setPollutionCategory(null);
+                List<String> legendData = Arrays.stream(ChartVo.AirPollutant.values()).distinct().map(ChartVo.AirPollutant::getCode).collect(Collectors.toList());
+                chartVo.setLegendData(legendData.toArray(new Object[0]));
+                List<BMainEmissionPollutionAir> airTables = bMainEmissionPollutionAirService.list(BMainEmissionPollutionAirQuery.createLambdaQueryWrapper(bMainEmissionPollutionAir));
+                if(!CollectionUtils.isEmpty(airTables)){
+                    /*List<Integer> xsxisData = Lists.newArrayList();
+                    for (int i = Integer.parseInt(tables.get(tables.size()-1).getPollYear()); i <= Integer.parseInt(tables.get(0).getPollYear()); i++) {
+                        xsxisData.add(i);
+                    }*/
+                    chartVo.setXsxisData(airTables.stream().map(BMainEmissionPollutionAir::getPollYear).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    for (Object legendDatum : chartVo.getLegendData()) {
+                        Map<Object, Object> map = Maps.newHashMap();
+                        if (legendDatum.equals("SO₂")) {
+                            map.put("name", legendDatum);
+                            map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingSo2).collect(Collectors.toList()));
+                        }else if (legendDatum.equals("NOₓ")) {
+                            map.put("name", legendDatum);
+                            map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingNox).collect(Collectors.toList()));
+                        }else if (legendDatum.equals("颗粒物")) {
+                            map.put("name", legendDatum);
+                            map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingPm).collect(Collectors.toList()));
+                        }else if (legendDatum.equals("VOCs")) {
+                            map.put("name", legendDatum);
+                            map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingVocs).collect(Collectors.toList()));
+                        }
+                        seriesData.add(map);
+                    }
+                    chartVo.setSeriesData(seriesData);
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                }
+                res.put("table", airTables);
+            break;
+            case "废水":
+                bMainEmissionPollutionAir.setPollutionCategory(null);
+                List<String> waterLegendData = Arrays.stream(ChartVo.WaterPollutant.values()).distinct().map(ChartVo.WaterPollutant::getCode).distinct().collect(Collectors.toList());
+                chartVo.setLegendData(waterLegendData.toArray(new Object[0]));
+                List<BMainEmissionPollutionWater> waterTables = bMainEmissionPollutionWaterService.list(BMainEmissionPollutionWaterQuery.createLambdaQueryWrapper(new BMainEmissionPollutionWaterQuery(bMainEmissionPollutionAir.getPollutionCategory(), bMainEmissionPollutionAir.getDataSource(), bMainEmissionPollutionAir.getSearchBeginYear(), bMainEmissionPollutionAir.getSearchEndYear(), bMainEmissionPollutionAir.getFactoryId())));
+                if(!CollectionUtils.isEmpty(waterTables)){
+                    chartVo.setXsxisData(waterTables.stream().map(BMainEmissionPollutionWater::getPollYear).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    for (Object legendDatum : chartVo.getLegendData()) {
+                        Map<Object, Object> map = Maps.newHashMap();
+                        if (legendDatum.equals("COD")) {
+                            map.put("name", legendDatum);
+                            map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingCod).collect(Collectors.toList()));
+                        }else if (legendDatum.equals("氨氮")) {
+                            map.put("name", legendDatum);
+                            map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingNhn).collect(Collectors.toList()));
+                        }else if (legendDatum.equals("总氮")) {
+                            map.put("name", legendDatum);
+                            map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingTn).collect(Collectors.toList()));
+                        }else if (legendDatum.equals("总磷")) {
+                            map.put("name", legendDatum);
+                            map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingTp).collect(Collectors.toList()));
+                        }
+                        seriesData.add(map);
+                    }
+                    chartVo.setSeriesData(seriesData);
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                }
+                res.put("table", waterTables);
+            break;
+            case "固废":
+                List<BMainEmissionPollutionSolidWaste> solidTables = bMainEmissionPollutionSolidWaterService.list(BMainEmissionPollutionSolidWasteQuery.createLambdaQueryWrapper(new BMainEmissionPollutionSolidWasteQuery(bMainEmissionPollutionAir.getPollutionCategory(), bMainEmissionPollutionAir.getDataSource(), bMainEmissionPollutionAir.getSearchBeginYear(), bMainEmissionPollutionAir.getSearchEndYear(), bMainEmissionPollutionAir.getFactoryId())));
+                if(!CollectionUtils.isEmpty(solidTables)){
+                    List<String> solidLegendData = solidTables.stream().map(BMainEmissionPollutionSolidWaste::getSolidWasteName).distinct().collect(Collectors.toList());
+                    chartVo.setLegendData(solidLegendData.toArray(new Object[0]));
+                    chartVo.setXsxisData(solidTables.stream().map(BMainEmissionPollutionSolidWaste::getPollYear).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    Map<String, List<BMainEmissionPollutionSolidWaste>> solidMaps = solidTables.stream().collect(Collectors.groupingBy(BMainEmissionPollutionSolidWaste::getSolidWasteName));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    solidMaps.forEach((solid, data)->{
+                        Map<Object, Object> map = Maps.newHashMap();
+                        map.put("name", solid);
+                        Map<String, List<BMainEmissionPollutionSolidWaste>> yearMaps = CollectionUtils.isEmpty(data) ? Maps.newHashMap() : data.stream().collect(Collectors.groupingBy(BMainEmissionPollutionSolidWaste::getPollYear));
+                        List<Object> y = Lists.newArrayList();
+                        for (Object year : chartVo.getXsxisData()) {
+                            if(yearMaps.containsKey(year)){
+                                y.add(yearMaps.get(year).get(0).getAnnualActualProduction());
+                            } else {
+                                y.add(null);
+                            }
+                        }
+                        map.put("data", y);
+                        seriesData.add(map);
+                    });
+                    chartVo.setSeriesData(seriesData);
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                }
+                res.put("table", solidTables);
+            break;
+        }
+        if(bMainEmissionPollutionAir.getSearchBeginYear() != null && bMainEmissionPollutionAir.getSearchEndYear() != null){
+            List<String> xsxisDatas = CustomDateUtil.getAllYears(DateUtil.parse(bMainEmissionPollutionAir.getSearchBeginYear()+"", CustomDateUtil.DATE_PATTERN_YEAR), DateUtil.parse(bMainEmissionPollutionAir.getSearchEndYear()+"", CustomDateUtil.DATE_PATTERN_YEAR), CustomDateUtil.DATE_PATTERN_YEAR);
+            // 无数据默认补全x轴
+            if(chartVo.getXsxisData().length == 0){
+                chartVo.setXsxisData(xsxisDatas.stream().toArray());
+            }
+            // 数据缺失, 补全x轴及对应数据
+            if(chartVo.getXsxisData().length != xsxisDatas.size()){
+                CustomDateUtil.packEcharts(chartVo, xsxisDatas);
+            }
+        }
+        res.put("chart", chartVo);
+        return AjaxResults.success(res);
+    }
+
+    /**
+     * 查询企业排放信息-不同污染物年度排放趋势-废气列表
+     */
+    @ApiOperation(value = "查询企业排放信息-不同污染物年度排放趋势-废气")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionPollutionAir>> list(BMainEmissionPollutionAirQuery bMainEmissionPollutionAir)
+    {
+        Page<BMainEmissionPollutionAir> page = new Page<>(bMainEmissionPollutionAir.getPageNum(), bMainEmissionPollutionAir.getPageSize());
+        IPage<BMainEmissionPollutionAir> list = bMainEmissionPollutionAirService.page(page, BMainEmissionPollutionAirQuery.createLambdaQueryWrapper(bMainEmissionPollutionAir));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出企业排放信息-不同污染物年度排放趋势-废气列表
+     */
+    @ApiOperation(value = "导出企业排放信息-不同污染物年度排放趋势-废气")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废气", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionPollutionAirQuery bMainEmissionPollutionAir)
+    {
+        List<BMainEmissionPollutionAir> list = bMainEmissionPollutionAirService.list(BMainEmissionPollutionAirQuery.createLambdaQueryWrapper(bMainEmissionPollutionAir));
+        ExcelUtil<BMainEmissionPollutionAir> util = new ExcelUtil<BMainEmissionPollutionAir>(BMainEmissionPollutionAir.class);
+        util.exportExcel(response, list, "企业排放信息-不同污染物年度排放趋势-废气数据");
+    }
+
+    /**
+     * 获取企业排放信息-不同污染物年度排放趋势-废气详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-不同污染物年度排放趋势-废气详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionPollutionAir> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionPollutionAirService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-不同污染物年度排放趋势-废气
+     */
+    @ApiOperation(value = "新增企业排放信息-不同污染物年度排放趋势-废气")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废气", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionPollutionAir bMainEmissionPollutionAir) {
+        return toAjax(bMainEmissionPollutionAirService.save(bMainEmissionPollutionAir));
+    }
+    /**
+     * 修改企业排放信息-不同污染物年度排放趋势-废气
+     */
+    @ApiOperation(value = "修改企业排放信息-不同污染物年度排放趋势-废气")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废气", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionPollutionAirVo bMainEmissionPollutionAirVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionAirVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionAirVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionPollutionAir bMainEmissionPollutionAir = bMainEmissionPollutionAirService.getById(bMainEmissionPollutionAirVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionAir)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionPollutionAirVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionPollutionAirVo,bMainEmissionPollutionAir);
+        return toAjax(bMainEmissionPollutionAirService.saveOrUpdate(bMainEmissionPollutionAir));
+    }
+
+    /**
+     * 删除企业排放信息-不同污染物年度排放趋势-废气
+     */
+    @ApiOperation(value = "删除企业排放信息-不同污染物年度排放趋势-废气")
+    @RequiresPermissions("talroad:bmainEmissionPollutionAir:remove")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废气", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionPollutionAirService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionPollutionSolidWasteController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionPollutionSolidWaste;
+import cn.cecep.talroad.service.IBMainEmissionPollutionSolidWasteService;
+import cn.cecep.talroad.vo.BMainEmissionPollutionSolidWasteVo;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionSolidWasteQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-不同污染物年度排放趋势-固废Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-不同污染物年度排放趋势-固废")
+@RestController
+@RequestMapping("/bmainEmissionPollutionSolidWaste")
+public class BMainEmissionPollutionSolidWasteController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionPollutionSolidWasteService bMainEmissionPollutionSolidWasteService;
+
+    /**
+     * 查询企业排放信息-不同污染物年度排放趋势-固废列表
+     */
+    @ApiOperation(value = "查询企业排放信息-不同污染物年度排放趋势-固废")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionPollutionSolidWaste>> list(BMainEmissionPollutionSolidWasteQuery bMainEmissionPollutionSolidWaste)
+    {
+        Page<BMainEmissionPollutionSolidWaste> page = new Page<>(bMainEmissionPollutionSolidWaste.getPageNum(), bMainEmissionPollutionSolidWaste.getPageSize());
+        IPage<BMainEmissionPollutionSolidWaste> list = bMainEmissionPollutionSolidWasteService.page(page, BMainEmissionPollutionSolidWasteQuery.createLambdaQueryWrapper(bMainEmissionPollutionSolidWaste));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出企业排放信息-不同污染物年度排放趋势-固废列表
+     */
+    @ApiOperation(value = "导出企业排放信息-不同污染物年度排放趋势-固废")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-固废", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionPollutionSolidWaste bMainEmissionPollutionSolidWaste)
+    {
+        List<BMainEmissionPollutionSolidWaste> list = bMainEmissionPollutionSolidWasteService.selectBMainEmissionPollutionSolidWasteList(bMainEmissionPollutionSolidWaste);
+        ExcelUtil<BMainEmissionPollutionSolidWaste> util = new ExcelUtil<BMainEmissionPollutionSolidWaste>(BMainEmissionPollutionSolidWaste.class);
+        util.exportExcel(response, list, "企业排放信息-不同污染物年度排放趋势-固废数据");
+    }
+
+    /**
+     * 获取企业排放信息-不同污染物年度排放趋势-固废详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-不同污染物年度排放趋势-固废详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionPollutionSolidWaste> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionPollutionSolidWasteService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-不同污染物年度排放趋势-固废
+     */
+    @ApiOperation(value = "新增企业排放信息-不同污染物年度排放趋势-固废")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-固废", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionPollutionSolidWaste bMainEmissionPollutionSolidWaste) {
+        return toAjax(bMainEmissionPollutionSolidWasteService.save(bMainEmissionPollutionSolidWaste));
+    }
+    /**
+     * 修改企业排放信息-不同污染物年度排放趋势-固废
+     */
+    @ApiOperation(value = "修改企业排放信息-不同污染物年度排放趋势-固废")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-固废", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionPollutionSolidWasteVo bMainEmissionPollutionSolidWasteVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionSolidWasteVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionSolidWasteVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionPollutionSolidWaste bMainEmissionPollutionSolidWaste = bMainEmissionPollutionSolidWasteService.getById(bMainEmissionPollutionSolidWasteVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionSolidWaste)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionPollutionSolidWasteVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionPollutionSolidWasteVo,bMainEmissionPollutionSolidWaste);
+        return toAjax(bMainEmissionPollutionSolidWasteService.saveOrUpdate(bMainEmissionPollutionSolidWaste));
+    }
+
+    /**
+     * 删除企业排放信息-不同污染物年度排放趋势-固废
+     */
+    @ApiOperation(value = "删除企业排放信息-不同污染物年度排放趋势-固废")
+    @RequiresPermissions("talroad:bmainEmissionPollutionSolidWaste:remove")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-固废", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionPollutionSolidWasteService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionPollutionWaterController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionPollutionWater;
+import cn.cecep.talroad.service.IBMainEmissionPollutionWaterService;
+import cn.cecep.talroad.vo.BMainEmissionPollutionWaterVo;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-不同污染物年度排放趋势-废水Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-不同污染物年度排放趋势-废水")
+@RestController
+@RequestMapping("/bmainEmissionPollutionWater")
+public class BMainEmissionPollutionWaterController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionPollutionWaterService bMainEmissionPollutionWaterService;
+
+    /**
+     * 查询企业排放信息-不同污染物年度排放趋势-废水列表
+     */
+    @ApiOperation(value = "查询企业排放信息-不同污染物年度排放趋势-废水")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionPollutionWater>> list(BMainEmissionPollutionWaterQuery bMainEmissionPollutionWater)
+    {
+        Page<BMainEmissionPollutionWater> page = new Page<>(bMainEmissionPollutionWater.getPageNum(), bMainEmissionPollutionWater.getPageSize());
+        IPage<BMainEmissionPollutionWater> list = bMainEmissionPollutionWaterService.page(page, BMainEmissionPollutionWaterQuery.createLambdaQueryWrapper(bMainEmissionPollutionWater));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出企业排放信息-不同污染物年度排放趋势-废水列表
+     */
+    @ApiOperation(value = "导出企业排放信息-不同污染物年度排放趋势-废水")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废水", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionPollutionWater bMainEmissionPollutionWater)
+    {
+        List<BMainEmissionPollutionWater> list = bMainEmissionPollutionWaterService.selectBMainEmissionPollutionWaterList(bMainEmissionPollutionWater);
+        ExcelUtil<BMainEmissionPollutionWater> util = new ExcelUtil<BMainEmissionPollutionWater>(BMainEmissionPollutionWater.class);
+        util.exportExcel(response, list, "企业排放信息-不同污染物年度排放趋势-废水数据");
+    }
+
+    /**
+     * 获取企业排放信息-不同污染物年度排放趋势-废水详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-不同污染物年度排放趋势-废水详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionPollutionWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionPollutionWaterService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-不同污染物年度排放趋势-废水
+     */
+    @ApiOperation(value = "新增企业排放信息-不同污染物年度排放趋势-废水")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废水", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionPollutionWater bMainEmissionPollutionWater) {
+        return toAjax(bMainEmissionPollutionWaterService.save(bMainEmissionPollutionWater));
+    }
+    /**
+     * 修改企业排放信息-不同污染物年度排放趋势-废水
+     */
+    @ApiOperation(value = "修改企业排放信息-不同污染物年度排放趋势-废水")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废水", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionPollutionWaterVo bMainEmissionPollutionWaterVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionPollutionWater bMainEmissionPollutionWater = bMainEmissionPollutionWaterService.getById(bMainEmissionPollutionWaterVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionPollutionWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionPollutionWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionPollutionWaterVo,bMainEmissionPollutionWater);
+        return toAjax(bMainEmissionPollutionWaterService.saveOrUpdate(bMainEmissionPollutionWater));
+    }
+
+    /**
+     * 删除企业排放信息-不同污染物年度排放趋势-废水
+     */
+    @ApiOperation(value = "删除企业排放信息-不同污染物年度排放趋势-废水")
+    @RequiresPermissions("talroad:bmainEmissionPollutionWater:remove")
+    @Log(title = "企业排放信息-不同污染物年度排放趋势-废水", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionPollutionWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionSourceAirController.java

@@ -0,0 +1,520 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.annotation.Excel;
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.DateUtils;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.utils.bean.BeanUtils;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionPollutionAir;
+import cn.cecep.talroad.domain.BMainEmissionPollutionWater;
+import cn.cecep.talroad.domain.BMainEmissionSourceAir;
+import cn.cecep.talroad.domain.BMainEmissionSourceWater;
+import cn.cecep.talroad.domain.analysis.SRaMultiSource;
+import cn.cecep.talroad.domain.analysis.SRaRealTimeAnalysisRun;
+import cn.cecep.talroad.service.IBMainEmissionPollutionAirService;
+import cn.cecep.talroad.service.IBMainEmissionPollutionWaterService;
+import cn.cecep.talroad.service.IBMainEmissionSourceAirService;
+import cn.cecep.talroad.service.IBMainEmissionSourceWaterService;
+import cn.cecep.talroad.util.CustomDateUtil;
+import cn.cecep.talroad.vo.BMainEmissionSourceAirVo;
+import cn.cecep.talroad.vo.ChartVo;
+import cn.cecep.talroad.vo.EChartsVO;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionAirQuery;
+import cn.cecep.talroad.vo.query.BMainEmissionPollutionWaterQuery;
+import cn.cecep.talroad.vo.query.BMainEmissionSourceAirQuery;
+import cn.cecep.talroad.vo.query.BMainEmissionSourceWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapBuilder;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-多来源排放量对比-废气Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-多来源排放量对比-废气")
+@RestController
+@RequestMapping("/bmainEmissionSourceAir")
+public class BMainEmissionSourceAirController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionSourceAirService bMainEmissionSourceAirService;
+
+    @Autowired
+    private IBMainEmissionSourceWaterService bMainEmissionSourceWaterService;
+
+    @Autowired
+    private IBMainEmissionPollutionAirService bMainEmissionPollutionAirService;
+
+    @Autowired
+    private IBMainEmissionPollutionWaterService bMainEmissionPollutionWaterService;
+
+
+    /**
+     * 查询企业排放信息-多来源排放量对比-废气列表
+     */
+    @ApiOperation(value = "污染类别查询污染物类别")
+    @GetMapping("/pullPollutants")
+    public AjaxResults<List<Map<String, String>>> pullPollutants(BMainEmissionSourceAirQuery bMainEmissionSourceAir)
+    {
+        List<Map<String, String>> maps = Lists.newArrayList();
+//        List<String> polls = Lists.newArrayList();
+//        if(bMainEmissionSourceAir.getFacts().equals("废气")){
+//            List<BMainEmissionSourceAir> list = bMainEmissionSourceAirService.list(new QueryWrapper<BMainEmissionSourceAir>().eq("factory_id", bMainEmissionSourceAir.getFactoryId()).isNotNull("pollution_category"));
+//            if(!CollectionUtils.isEmpty(list)){
+//                polls.addAll(list.stream().map(BMainEmissionSourceAir::getPollutionCategory).distinct().collect(Collectors.toList()));
+//            }
+//        } else if (bMainEmissionSourceAir.getFacts().equals("废水")){
+//            List<BMainEmissionSourceWater> list = bMainEmissionSourceWaterService.list(new QueryWrapper<BMainEmissionSourceWater>().eq("factory_id", bMainEmissionSourceAir.getFactoryId()).isNotNull("pollution_category"));
+//            if(!CollectionUtils.isEmpty(list)){
+//                polls.addAll(list.stream().map(BMainEmissionSourceWater::getPollutionCategory).distinct().collect(Collectors.toList()));
+//            }
+//        }
+//        if(!CollectionUtils.isEmpty(polls)){
+//            polls.forEach(p->{
+//                Map<String, String> map = Maps.newHashMap();
+//                map.put("label", p);
+//                map.put("value", p);
+//                maps.add(map);
+//            });
+//        }
+
+        String[] strings;
+        // SO₂,颗粒物,COD,总氮,NOₓ,VOCs,氨氮,总磷'
+        if (StrUtil.equals(bMainEmissionSourceAir.getFacts(), "废气")) {
+            strings = new String[]{"SO₂", "颗粒物", "NOₓ", "VOCs"};
+
+        } else if (StrUtil.equals(bMainEmissionSourceAir.getFacts(), "废水")) {
+            strings = new String[]{"COD", "总氮", "总磷", "氨氮"};
+
+        } else  {
+            throw new InvalidParameterException("参数错误");
+        }
+
+        for (String string : strings) {
+            maps.add(MapBuilder.<String, String>create()
+                    .put("label", string)
+                    .put("value", string)
+                    .build());
+        }
+
+        return AjaxResults.success(maps);
+    }
+
+    /**
+     * 废气-废水-固废-导出企业排放信息-多来源排放量对比
+     */
+    @ApiOperation(value = "废气-废水-固废-导出企业排放信息-多来源排放量对比")
+    @Log(title = "废气-废水-导出企业排放信息-多来源排放量对比", businessType = BusinessType.EXPORT)
+    @PostMapping("/chart/export")
+    public void chartExport(HttpServletResponse response, @Valid @RequestBody BMainEmissionSourceAirQuery bMainEmissionSourceAir)
+    {
+        switch(bMainEmissionSourceAir.getFacts()){
+            case "废气":
+                List<BMainEmissionSourceAir> airTables = bMainEmissionSourceAirService.list(BMainEmissionSourceAirQuery.createLambdaQueryWrapper(bMainEmissionSourceAir));
+                Class clazz =configClass(BMainEmissionSourceAir.class, bMainEmissionSourceAir.getPollutionCategory()+"系统核算排放量","systematicAccountingSo2",bMainEmissionSourceAir.getPollutionCategory()+"执行报告排放量","actionReportsSo2",bMainEmissionSourceAir.getPollutionCategory()+"许可排放量","permissionSo2");
+                ExcelUtil<BMainEmissionSourceAir> airUtil = new ExcelUtil<BMainEmissionSourceAir>(clazz);
+                airUtil.exportExcel(response, airTables, bMainEmissionSourceAir.getPollutionCategory()+"-多来源排放量对比");
+                break;
+            case "废水":
+                List<BMainEmissionSourceWater> waterTables = bMainEmissionSourceWaterService.list(BMainEmissionSourceWaterQuery.createLambdaQueryWrapper(new BMainEmissionSourceWaterQuery(bMainEmissionSourceAir.getPollutionCategory(), bMainEmissionSourceAir.getSearchBeginYear(), bMainEmissionSourceAir.getSearchEndYear(),bMainEmissionSourceAir.getFactoryId())));
+                Class clazz1 =configClass(BMainEmissionSourceWater.class, bMainEmissionSourceAir.getPollutionCategory()+"系统核算排放量","systematicAccountingCod",bMainEmissionSourceAir.getPollutionCategory()+"执行报告排放量","actionReportsCod",bMainEmissionSourceAir.getPollutionCategory()+"许可排放量","permissionCod");
+                ExcelUtil<BMainEmissionSourceWater> waterUtil = new ExcelUtil<BMainEmissionSourceWater>(clazz1);
+                waterUtil.exportExcel(response, waterTables, bMainEmissionSourceAir.getPollutionCategory()+"-多来源排放量对比");
+                break;
+        }
+    }
+    /**
+     * 注解之运行时修改字段的注解值操作
+     * @param clazz
+     * @param val
+     * @return
+     */
+    private Class configClass(Class clazz , String val,String filed,String val1,String filed1,String val2,String filed2) {
+
+        Field[] fields = clazz.getDeclaredFields();
+        try {
+            for(int i = 0;i < fields.length;i++){
+                Field f = fields[i];
+                if(f.getName().equals(filed)){
+                    Excel excelAn = f.getAnnotation(Excel.class);//Excel是注解类型
+                    if(excelAn == null){
+                        continue;
+                    }
+                    InvocationHandler h = Proxy.getInvocationHandler(excelAn);
+                    Field hField = h.getClass().getDeclaredField("memberValues");
+                    // 因为这个字段事 private final 修饰，所以要打开权限
+                    hField.setAccessible(true);
+                    // 获取 memberValues
+                    Map memberValues = (Map) hField.get(h);
+                    // 修改 value 属性值 这里修改的是@Excel(name = "姓名")
+                    //name是key
+                    memberValues.put("name", val);
+                }
+                if(f.getName().equals(filed1)){
+                    Excel excelAn = f.getAnnotation(Excel.class);//Excel是注解类型
+                    if(excelAn == null){
+                        continue;
+                    }
+                    InvocationHandler h = Proxy.getInvocationHandler(excelAn);
+                    Field hField = h.getClass().getDeclaredField("memberValues");
+                    // 因为这个字段事 private final 修饰，所以要打开权限
+                    hField.setAccessible(true);
+                    // 获取 memberValues
+                    Map memberValues = (Map) hField.get(h);
+                    // 修改 value 属性值 这里修改的是@Excel(name = "姓名")
+                    //name是key
+                    memberValues.put("name", val1);
+                }
+                if(f.getName().equals(filed2)){
+                    Excel excelAn = f.getAnnotation(Excel.class);//Excel是注解类型
+                    if(excelAn == null){
+                        continue;
+                    }
+                    InvocationHandler h = Proxy.getInvocationHandler(excelAn);
+                    Field hField = h.getClass().getDeclaredField("memberValues");
+                    // 因为这个字段事 private final 修饰，所以要打开权限
+                    hField.setAccessible(true);
+                    // 获取 memberValues
+                    Map memberValues = (Map) hField.get(h);
+                    // 修改 value 属性值 这里修改的是@Excel(name = "姓名")
+                    //name是key
+                    memberValues.put("name", val2);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return clazz;
+    }
+    @ApiOperation(value = "废气-废水-固废-查询企业排放信息-多来源排放量对比")
+    @Log(title = "废气-废水-查询企业排放信息-多来源排放量对比", businessType = BusinessType.EXPORT)
+    @PostMapping("/chart/list")
+    public AjaxResults<List<BMainEmissionSourceAir>> chartList( @RequestBody BMainEmissionSourceAirQuery bMainEmissionSourceAir)
+    {
+        List<BMainEmissionSourceAir> list=new ArrayList<>();
+        if(bMainEmissionSourceAir.getFacts().equals("废气")){
+            list= bMainEmissionSourceAirService.list(BMainEmissionSourceAirQuery.createLambdaQueryWrapper(bMainEmissionSourceAir));
+        }
+        if(bMainEmissionSourceAir.getFacts().equals("废水")){
+            List<BMainEmissionSourceWater> waterTables = bMainEmissionSourceWaterService.list(BMainEmissionSourceWaterQuery.createLambdaQueryWrapper(new BMainEmissionSourceWaterQuery(bMainEmissionSourceAir.getPollutionCategory(), bMainEmissionSourceAir.getSearchBeginYear(), bMainEmissionSourceAir.getSearchEndYear(),bMainEmissionSourceAir.getFactoryId())));
+            List<BMainEmissionSourceAir> listq=new ArrayList<>();
+            waterTables.forEach(item->{
+                BMainEmissionSourceAir bMainEmissionSourceAir1=new BMainEmissionSourceAir();
+                BeanUtils.copyProperties(item, bMainEmissionSourceAir1);
+                bMainEmissionSourceAir1.setActionReportsSo2(item.getActionReportsCod());
+                bMainEmissionSourceAir1.setSystematicAccountingSo2(item.getSystematicAccountingCod());
+                bMainEmissionSourceAir1.setPermissionSo2(item.getPermissionCod());
+                listq.add(bMainEmissionSourceAir1);
+            });
+            list=listq;
+        }
+
+        return AjaxResults.success(list);
+    }
+    @ApiOperation(value = "废气-废水-固废-查询企业排放信息-多来源排放量对比")
+    @PostMapping("/chartListBy")
+    public AjaxResults<EChartsVO> chartListBy(@RequestBody BMainEmissionSourceAirQuery bMainEmissionSourceAir)
+    {
+        List<BMainEmissionSourceAir> list=new ArrayList<>();
+        if(bMainEmissionSourceAir.getFacts().equals("废气")){
+            list= bMainEmissionSourceAirService.list(BMainEmissionSourceAirQuery.createLambdaQueryWrapper(bMainEmissionSourceAir));
+        }
+        if(bMainEmissionSourceAir.getFacts().equals("废水")){
+            List<BMainEmissionSourceWater> waterTables = bMainEmissionSourceWaterService.list(BMainEmissionSourceWaterQuery.createLambdaQueryWrapper(new BMainEmissionSourceWaterQuery(bMainEmissionSourceAir.getPollutionCategory(), bMainEmissionSourceAir.getSearchBeginYear(), bMainEmissionSourceAir.getSearchEndYear(),bMainEmissionSourceAir.getFactoryId())));
+            List<BMainEmissionSourceAir> listq=new ArrayList<>();
+            waterTables.forEach(item->{
+                BMainEmissionSourceAir bMainEmissionSourceAir1=new BMainEmissionSourceAir();
+                BeanUtils.copyProperties(item, bMainEmissionSourceAir1);
+                bMainEmissionSourceAir1.setActionReportsSo2(item.getActionReportsCod());
+                bMainEmissionSourceAir1.setSystematicAccountingSo2(item.getSystematicAccountingCod());
+                bMainEmissionSourceAir1.setPermissionSo2(item.getPermissionCod());
+                listq.add(bMainEmissionSourceAir1);
+            });
+            list=listq;
+        }
+        List<String> xdata=new ArrayList<>();
+        if(ObjectUtil.isNotNull(bMainEmissionSourceAir.getSearchBeginYear())&&ObjectUtil.isNotNull(bMainEmissionSourceAir.getSearchEndYear())){
+             xdata = CustomDateUtil.getAllYears(DateUtil.parse(bMainEmissionSourceAir.getSearchBeginYear()+"", CustomDateUtil.DATE_PATTERN_YEAR), DateUtil.parse(bMainEmissionSourceAir.getSearchEndYear()+"", CustomDateUtil.DATE_PATTERN_YEAR), CustomDateUtil.DATE_PATTERN_YEAR);
+        }else {
+            List<String> listData=new ArrayList<>();
+            list.forEach(item->{
+                listData.add(item.getPollYear());
+            });
+            xdata=listData;
+        }
+        // x轴数据
+            EChartsVO eChartsVO=new EChartsVO();
+            List<EChartsVO.SeriesObj> chartsVO= new ArrayList<>();
+            EChartsVO.SeriesObj ser = new EChartsVO.SeriesObj();
+            ser.setName("系统核算排放量");
+            ser.setProp("systematicAccountingSo2");
+            ser.setUnit("(千瓦)");
+            ser.setValues(new ArrayList<>());
+            chartsVO.add(ser);
+            EChartsVO.SeriesObj ser1 = new EChartsVO.SeriesObj();
+            ser1.setName("执行报告排放量");
+            ser1.setProp("actionReportsSo2");
+            ser1.setUnit("(千瓦)");
+            ser1.setValues(new ArrayList<>());
+            chartsVO.add(ser1);
+            EChartsVO.SeriesObj ser2 = new EChartsVO.SeriesObj();
+            ser2.setName("许可排放量");
+            ser2.setProp("permissionSo2");
+            ser2.setUnit("(千瓦)");
+            ser2.setValues(new ArrayList<>());
+            chartsVO.add(ser2);
+                /*
+                    填充系列值
+                 */
+            Map<String, BMainEmissionSourceAir> timeStatusMap = list.stream().collect(Collectors.toMap(o ->  o.getPollYear(), o -> o, (o1, o2) -> o1));
+            xdata.forEach(time->{
+                if(timeStatusMap.containsKey(time)){
+                    BMainEmissionSourceAir sRaRealTimeAnalysisRun = timeStatusMap.get(time);
+                    chartsVO.get(0).getValues().add(sRaRealTimeAnalysisRun.getSystematicAccountingSo2());
+                    chartsVO.get(1).getValues().add(sRaRealTimeAnalysisRun.getActionReportsSo2());
+                    chartsVO.get(2).getValues().add(sRaRealTimeAnalysisRun.getPermissionSo2());
+                }else {
+                    chartsVO.get(0).getValues().add(null);
+                    chartsVO.get(1).getValues().add(null);
+                    chartsVO.get(2).getValues().add(null);
+                }
+            });
+            eChartsVO.setXData(xdata);
+            eChartsVO.setSeries(chartsVO);
+        return AjaxResults.success(eChartsVO);
+    }
+
+    /**
+     * 查询企业排放信息-多来源排放量对比-废气列表
+     */
+    @ApiOperation(value = "废气-废水-(图表+列表)查询企业排放信息-多来源排放量对比")
+    @GetMapping("/chart")
+    public AjaxResults<Map<String, Object>> chart(@Valid BMainEmissionSourceAirQuery bMainEmissionSourceAir)
+    {
+        Map<String, Object> res = Maps.newHashMap();
+        ChartVo chartVo = new ChartVo();
+        switch(bMainEmissionSourceAir.getFacts()){
+            case "废气":
+                BMainEmissionPollutionAirQuery bMainEmissionPollutionAirQuery = new BMainEmissionPollutionAirQuery();
+                bMainEmissionPollutionAirQuery.setFactoryId(bMainEmissionSourceAir.getFactoryId());
+                bMainEmissionPollutionAirQuery.setDataSource("系统核算");
+                List<BMainEmissionPollutionAir> airTables = bMainEmissionPollutionAirService.list(BMainEmissionPollutionAirQuery.createLambdaQueryWrapper(bMainEmissionPollutionAirQuery));
+//                List<BMainEmissionSourceAir> airTables = bMainEmissionSourceAirService.list(BMainEmissionSourceAirQuery.createLambdaQueryWrapper(new BMainEmissionSourceAirQuery(bMainEmissionSourceAir.getPollutionCategory(), bMainEmissionSourceAir.getSearchBeginYear(), bMainEmissionSourceAir.getSearchEndYear())));
+                if(!CollectionUtils.isEmpty(airTables)){
+                    chartVo.setLegendData(new Object[]{"系统核算","执行报告"});
+                    chartVo.setXsxisData(airTables.stream().map(BMainEmissionPollutionAir::getPollYear).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    for (Object legendDatum : chartVo.getLegendData()) {
+                        Map<Object, Object> map = Maps.newHashMap();
+                        if (legendDatum.equals("系统核算")) {
+                            map.put("name", legendDatum);
+                            switch (bMainEmissionSourceAir.getPollutionCategory()) {
+                                case "SO₂":
+                                    map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingSo2).collect(Collectors.toList()));
+                                    res.put("table", airTables.stream().map(x -> new BMainEmissionSourceAir(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingSo2(), null, x.getAllowableEmissionSo2())).collect(Collectors.toList()));
+                                    break;
+                                case "颗粒物":
+                                    map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingPm).collect(Collectors.toList()));
+                                    res.put("table", airTables.stream().map(x -> new BMainEmissionSourceAir(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingPm(), null, x.getAllowableEmissionPm())).collect(Collectors.toList()));
+                                    break;
+                                case "NOₓ":
+                                    map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingNox).collect(Collectors.toList()));
+                                    res.put("table", airTables.stream().map(x -> new BMainEmissionSourceAir(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingNox(), null, x.getAllowableEmissionNox())).collect(Collectors.toList()));
+                                    break;
+                                case "VOCs":
+                                    map.put("data", airTables.stream().map(BMainEmissionPollutionAir::getActuallyEmittingVocs).collect(Collectors.toList()));
+                                    res.put("table", airTables.stream().map(x -> new BMainEmissionSourceAir(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingVocs(), null, x.getAllowableEmissionVocs())).collect(Collectors.toList()));
+                                    break;
+                            }
+                            seriesData.add(map);
+                        }
+//                        else if (legendDatum.equals("执行报告")) {
+//                            map.put("name", legendDatum);
+//                            map.put("data", new ArrayList<>(airTables.size()));
+//                            seriesData.add(map);
+//                        }
+
+                    }
+                    chartVo.setSeriesData(seriesData);
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                }
+
+//                res.put("table", airTables);
+                break;
+            case "废水":
+                BMainEmissionPollutionWaterQuery bMainEmissionPollutionWaterQuery = new BMainEmissionPollutionWaterQuery();
+                bMainEmissionPollutionWaterQuery.setFactoryId(bMainEmissionSourceAir.getFactoryId());
+                bMainEmissionPollutionWaterQuery.setDataSource("系统核算");
+                List<BMainEmissionPollutionWater> waterTables = bMainEmissionPollutionWaterService.list(BMainEmissionPollutionWaterQuery.createLambdaQueryWrapper(bMainEmissionPollutionWaterQuery));
+//                List<BMainEmissionSourceWater> waterTables = bMainEmissionPollutionWaterService.list(BMainEmissionSourceWaterQuery.createLambdaQueryWrapper(new BMainEmissionSourceWaterQuery(bMainEmissionSourceAir.getPollutionCategory(), bMainEmissionSourceAir.getSearchBeginYear(), bMainEmissionSourceAir.getSearchEndYear())));
+                if(!CollectionUtils.isEmpty(waterTables)){
+                    chartVo.setLegendData(new Object[]{"系统核算","执行报告"});
+                    chartVo.setXsxisData(waterTables.stream().map(BMainEmissionPollutionWater::getPollYear).distinct().collect(Collectors.toList()).toArray(new Object[0]));
+                    List<Map<Object, Object>> seriesData = Lists.newArrayList();
+                    for (Object legendDatum : chartVo.getLegendData()) {
+                        Map<Object, Object> map = Maps.newHashMap();
+                        if (legendDatum.equals("系统核算")) {
+                            map.put("name", legendDatum);
+
+                            switch (bMainEmissionSourceAir.getPollutionCategory()) {
+                                case "COD":
+                                    map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingCod).collect(Collectors.toList()));
+                                    res.put("table", waterTables.stream().map(x -> new BMainEmissionSourceWater(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingCod(), null, x.getAllowableEmissionCod())).collect(Collectors.toList()));
+                                    break;
+                                case "总氮":
+                                    map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingTn).collect(Collectors.toList()));
+                                    res.put("table", waterTables.stream().map(x -> new BMainEmissionSourceWater(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingTn(), null, x.getAllowableEmissionTn())).collect(Collectors.toList()));
+                                    break;
+                                case "总磷":
+                                    map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingTp).collect(Collectors.toList()));
+                                    res.put("table", waterTables.stream().map(x -> new BMainEmissionSourceWater(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingTp(), null, x.getAllowableEmissionTp())).collect(Collectors.toList()));
+                                    break;
+                                case "氨氮":
+                                    map.put("data", waterTables.stream().map(BMainEmissionPollutionWater::getActuallyEmittingNhn).collect(Collectors.toList()));
+                                    res.put("table", waterTables.stream().map(x -> new BMainEmissionSourceWater(x.getFactoryId(), x.getPollYear(), x.getActuallyEmittingNhn(), null, x.getAllowableEmissionNhn())).collect(Collectors.toList()));
+                                    break;
+                            }
+                            seriesData.add(map);
+                        }
+//                        else if (legendDatum.equals("执行报告")) {
+//                            map.put("name", legendDatum);
+//                            map.put("data", Arrays.asList(new Object[waterTables.size()]));
+//                        }
+                    }
+                    chartVo.setSeriesData(seriesData);
+                } else {
+                    chartVo.setSeriesData(Lists.newArrayList());
+                    chartVo.setXsxisData(new Object[0]);
+                    res.put("table", new ArrayList<>());
+                }
+//                res.put("table", waterTables);
+                break;
+        }
+        if(bMainEmissionSourceAir.getSearchBeginYear() != null && bMainEmissionSourceAir.getSearchEndYear() != null){
+            List<String> xsxisDatas = CustomDateUtil.getAllYears(DateUtil.parse(bMainEmissionSourceAir.getSearchBeginYear()+"", CustomDateUtil.DATE_PATTERN_YEAR), DateUtil.parse(bMainEmissionSourceAir.getSearchEndYear()+"", CustomDateUtil.DATE_PATTERN_YEAR), CustomDateUtil.DATE_PATTERN_YEAR);
+            // 无数据默认补全x轴
+            if(chartVo.getXsxisData().length == 0){
+                chartVo.setXsxisData(xsxisDatas.stream().toArray());
+            }
+            // 数据缺失, 补全x轴及对应数据
+            if(chartVo.getXsxisData().length != xsxisDatas.size()){
+                CustomDateUtil.packEcharts(chartVo, xsxisDatas);
+            }
+        }
+        res.put("chart", chartVo);
+        return AjaxResults.success(res);
+    }
+
+
+    /**
+     * 查询企业排放信息-多来源排放量对比-废气列表
+     */
+    @ApiOperation(value = "查询企业排放信息-多来源排放量对比-废气")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionSourceAir>> list(BMainEmissionSourceAirQuery bMainEmissionSourceAir)
+    {
+        Page<BMainEmissionSourceAir> page = new Page<>(bMainEmissionSourceAir.getPageNum(), bMainEmissionSourceAir.getPageSize());
+        IPage<BMainEmissionSourceAir> list = bMainEmissionSourceAirService.page(page, BMainEmissionSourceAirQuery.createLambdaQueryWrapper(bMainEmissionSourceAir));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出企业排放信息-多来源排放量对比-废气列表
+     */
+    @ApiOperation(value = "导出企业排放信息-多来源排放量对比-废气")
+    @Log(title = "企业排放信息-多来源排放量对比-废气", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionSourceAir bMainEmissionSourceAir)
+    {
+        List<BMainEmissionSourceAir> list = bMainEmissionSourceAirService.selectBMainEmissionSourceAirList(bMainEmissionSourceAir);
+        ExcelUtil<BMainEmissionSourceAir> util = new ExcelUtil<BMainEmissionSourceAir>(BMainEmissionSourceAir.class);
+        util.exportExcel(response, list, "企业排放信息-多来源排放量对比-废气数据");
+    }
+
+    /**
+     * 获取企业排放信息-多来源排放量对比-废气详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-多来源排放量对比-废气详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionSourceAir> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionSourceAirService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-多来源排放量对比-废气
+     */
+    @ApiOperation(value = "新增企业排放信息-多来源排放量对比-废气")
+    @Log(title = "企业排放信息-多来源排放量对比-废气", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionSourceAir bMainEmissionSourceAir) {
+        return toAjax(bMainEmissionSourceAirService.save(bMainEmissionSourceAir));
+    }
+    /**
+     * 修改企业排放信息-多来源排放量对比-废气
+     */
+    @ApiOperation(value = "修改企业排放信息-多来源排放量对比-废气")
+    @Log(title = "企业排放信息-多来源排放量对比-废气", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionSourceAirVo bMainEmissionSourceAirVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionSourceAirVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionSourceAirVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionSourceAir bMainEmissionSourceAir = bMainEmissionSourceAirService.getById(bMainEmissionSourceAirVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionSourceAir)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionSourceAirVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionSourceAirVo,bMainEmissionSourceAir);
+        return toAjax(bMainEmissionSourceAirService.saveOrUpdate(bMainEmissionSourceAir));
+    }
+
+    /**
+     * 删除企业排放信息-多来源排放量对比-废气
+     */
+    @ApiOperation(value = "删除企业排放信息-多来源排放量对比-废气")
+    @RequiresPermissions("talroad:bmainEmissionSourceAir:remove")
+    @Log(title = "企业排放信息-多来源排放量对比-废气", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionSourceAirService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainEmissionSourceWaterController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainEmissionSourceWater;
+import cn.cecep.talroad.service.IBMainEmissionSourceWaterService;
+import cn.cecep.talroad.vo.BMainEmissionSourceWaterVo;
+import cn.cecep.talroad.vo.query.BMainEmissionSourceWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 企业排放信息-多来源排放量对比-废水Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-31*/
+@Api(tags = "企业排放信息-多来源排放量对比-废水")
+@RestController
+@RequestMapping("/bmainEmissionSourceWater")
+public class BMainEmissionSourceWaterController extends BasesController
+{
+    @Autowired
+    private IBMainEmissionSourceWaterService bMainEmissionSourceWaterService;
+
+    /**
+     * 查询企业排放信息-多来源排放量对比-废水列表
+     */
+    @ApiOperation(value = "查询企业排放信息-多来源排放量对比-废水")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainEmissionSourceWater>> list(BMainEmissionSourceWaterQuery bMainEmissionSourceWater)
+    {
+        Page<BMainEmissionSourceWater> page = new Page<>(bMainEmissionSourceWater.getPageNum(), bMainEmissionSourceWater.getPageSize());
+        IPage<BMainEmissionSourceWater> list = bMainEmissionSourceWaterService.page(page, BMainEmissionSourceWaterQuery.createLambdaQueryWrapper(bMainEmissionSourceWater));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出企业排放信息-多来源排放量对比-废水列表
+     */
+    @ApiOperation(value = "导出企业排放信息-多来源排放量对比-废水")
+    @Log(title = "企业排放信息-多来源排放量对比-废水", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainEmissionSourceWater bMainEmissionSourceWater)
+    {
+        List<BMainEmissionSourceWater> list = bMainEmissionSourceWaterService.selectBMainEmissionSourceWaterList(bMainEmissionSourceWater);
+        ExcelUtil<BMainEmissionSourceWater> util = new ExcelUtil<BMainEmissionSourceWater>(BMainEmissionSourceWater.class);
+        util.exportExcel(response, list, "企业排放信息-多来源排放量对比-废水数据");
+    }
+
+    /**
+     * 获取企业排放信息-多来源排放量对比-废水详细信息
+     */
+    @ApiOperation(value = "获取企业排放信息-多来源排放量对比-废水详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainEmissionSourceWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainEmissionSourceWaterService.getById(id));
+    }
+    /**
+     * 新增企业排放信息-多来源排放量对比-废水
+     */
+    @ApiOperation(value = "新增企业排放信息-多来源排放量对比-废水")
+    @Log(title = "企业排放信息-多来源排放量对比-废水", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainEmissionSourceWater bMainEmissionSourceWater) {
+        return toAjax(bMainEmissionSourceWaterService.save(bMainEmissionSourceWater));
+    }
+    /**
+     * 修改企业排放信息-多来源排放量对比-废水
+     */
+    @ApiOperation(value = "修改企业排放信息-多来源排放量对比-废水")
+    @Log(title = "企业排放信息-多来源排放量对比-废水", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainEmissionSourceWaterVo bMainEmissionSourceWaterVo) {
+        if(ObjectUtil.isEmpty(bMainEmissionSourceWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainEmissionSourceWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainEmissionSourceWater bMainEmissionSourceWater = bMainEmissionSourceWaterService.getById(bMainEmissionSourceWaterVo.getId());
+        if(ObjectUtil.isEmpty(bMainEmissionSourceWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainEmissionSourceWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainEmissionSourceWaterVo,bMainEmissionSourceWater);
+        return toAjax(bMainEmissionSourceWaterService.saveOrUpdate(bMainEmissionSourceWater));
+    }
+
+    /**
+     * 删除企业排放信息-多来源排放量对比-废水
+     */
+    @ApiOperation(value = "删除企业排放信息-多来源排放量对比-废水")
+    @RequiresPermissions("talroad:bmainEmissionSourceWater:remove")
+    @Log(title = "企业排放信息-多来源排放量对比-废水", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainEmissionSourceWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainExceptionTaskCheckController.java

@@ -0,0 +1,55 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BMainExceptionTaskCheck;
+import cn.cecep.talroad.service.IBMainExceptionTaskCheckService;
+import cn.cecep.talroad.vo.BMainExceptionTaskCheckVo;
+import cn.cecep.talroad.vo.query.BMainExceptionTaskCheckQuery;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 移动执法信息-异常任务核查Controller 控制层
+ */
+@Api(tags = "移动执法信息-异常任务核查")
+@RestController
+@RequestMapping("/exceptionTaskCheck")
+public class BMainExceptionTaskCheckController extends BasesController
+{
+    @Autowired
+    private IBMainExceptionTaskCheckService bMainExceptionTaskCheckService;
+
+    @ApiOperation(value = "查询移动执法信息-异常任务核查")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainExceptionTaskCheck>> list(BMainExceptionTaskCheckQuery bMainExceptionTaskCheck)
+    {
+        Page<BMainExceptionTaskCheck> page = new Page<>(bMainExceptionTaskCheck.getPageNum(), bMainExceptionTaskCheck.getPageSize());
+        IPage<BMainExceptionTaskCheck> list = bMainExceptionTaskCheckService.page(page, BMainExceptionTaskCheckQuery.createLambdaQueryWrapper(bMainExceptionTaskCheck));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "获取区域下拉框数据, 汇总异常任务核查所有的区域")
+    @GetMapping("/regionOptions")
+    public AjaxResults<List<String>> regionOptions()
+    {
+        List<BMainExceptionTaskCheck> taskChecks = bMainExceptionTaskCheckService.list(new QueryWrapper<BMainExceptionTaskCheck>().select("region_name").groupBy("region_name"));
+        return AjaxResults.success(taskChecks.stream().map(BMainExceptionTaskCheck::getRegionName).collect(Collectors.toList()));
+    }
+
+    @ApiOperation(value = "获取移动执法信息-异常任务核查详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<BMainExceptionTaskCheckVo.DetailVo> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(bMainExceptionTaskCheckService.getInfo(id));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainFactoryVerificationController.java

@@ -0,0 +1,139 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BMainFactoryVerificationQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BMainFactoryVerification;
+import cn.cecep.talroad.vo.BMainFactoryVerificationVo;
+import cn.cecep.talroad.service.IBMainFactoryVerificationService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 移动执法信息-企业核查Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-30*/
+@Api(tags = "移动执法信息-企业核查")
+@RestController
+@RequestMapping("/verification")
+public class BMainFactoryVerificationController extends BasesController
+{
+    @Autowired
+    private IBMainFactoryVerificationService bMainFactoryVerificationService;
+
+    /**
+     * 查询移动执法信息-企业核查列表
+     */
+    @ApiOperation(value = "查询移动执法信息-企业核查")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainFactoryVerification>> list(BMainFactoryVerificationQuery bMainFactoryVerification)
+    {
+        Page<BMainFactoryVerification> page = new Page<>(bMainFactoryVerification.getPageNum(), bMainFactoryVerification.getPageSize());
+        IPage<BMainFactoryVerification> list = bMainFactoryVerificationService.page(page, BMainFactoryVerificationQuery.createLambdaQueryWrapper(bMainFactoryVerification));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出移动执法信息-企业核查列表
+     */
+    @ApiOperation(value = "导出移动执法信息-企业核查")
+    @Log(title = "移动执法信息-企业核查", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BMainFactoryVerificationQuery bMainFactoryVerification)
+    {
+        List<BMainFactoryVerification> list = bMainFactoryVerificationService.list(BMainFactoryVerificationQuery.createLambdaQueryWrapper(bMainFactoryVerification));
+        ExcelUtil<BMainFactoryVerification> util = new ExcelUtil<BMainFactoryVerification>(BMainFactoryVerification.class);
+        util.exportExcel(response, list, "移动执法信息-企业核查数据");
+    }
+
+    /**
+     * 获取移动执法信息-企业核查详细信息
+     */
+    @ApiOperation(value = "获取任务来源下拉框")
+    @GetMapping(value = "/taskSourceSelectList")
+    public AjaxResults<List<String>> taskSourceSelectList() {
+        QueryWrapper<BMainFactoryVerification> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("distinct task_source")
+                .orderByAsc("task_source");
+        List<BMainFactoryVerification> list = bMainFactoryVerificationService.list(queryWrapper);
+
+        List<String> collect = list.stream().map(BMainFactoryVerification::getTaskSource).collect(Collectors.toList());
+        return AjaxResults.success(collect);
+    }
+
+    /**
+     * 获取移动执法信息-企业核查详细信息
+     */
+    @ApiOperation(value = "获取移动执法信息-企业核查详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<BMainFactoryVerification> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(bMainFactoryVerificationService.getById(id));
+    }
+    /**
+     * 新增移动执法信息-企业核查
+     */
+    @ApiOperation(value = "新增移动执法信息-企业核查")
+    @Log(title = "移动执法信息-企业核查", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainFactoryVerification bMainFactoryVerification) {
+        return toAjax(bMainFactoryVerificationService.save(bMainFactoryVerification));
+    }
+    /**
+     * 修改移动执法信息-企业核查
+     */
+    @ApiOperation(value = "修改移动执法信息-企业核查")
+    @Log(title = "移动执法信息-企业核查", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainFactoryVerificationVo bMainFactoryVerificationVo) {
+        if(ObjectUtil.isEmpty(bMainFactoryVerificationVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainFactoryVerificationVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainFactoryVerification bMainFactoryVerification = bMainFactoryVerificationService.getById(bMainFactoryVerificationVo.getId());
+        if(ObjectUtil.isEmpty(bMainFactoryVerification)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainFactoryVerificationVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainFactoryVerificationVo,bMainFactoryVerification);
+        return toAjax(bMainFactoryVerificationService.saveOrUpdate(bMainFactoryVerification));
+    }
+
+    /**
+     * 删除移动执法信息-企业核查
+     */
+    @ApiOperation(value = "删除移动执法信息-企业核查")
+    @RequiresPermissions("talroad:verification:remove")
+    @Log(title = "移动执法信息-企业核查", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainFactoryVerificationService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainHazardousSolidWasteController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainHazardousSolidWaste;
+import cn.cecep.talroad.service.IBMainHazardousSolidWasteService;
+import cn.cecep.talroad.vo.BMainHazardousSolidWasteVo;
+import cn.cecep.talroad.vo.query.BMainHazardousSolidWasteQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固体废物基础信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "基本档案--固体废物基础信息")
+@RestController
+@RequestMapping("/bMainHazardousSolidWaste")
+public class BMainHazardousSolidWasteController extends BasesController
+{
+    @Autowired
+    private IBMainHazardousSolidWasteService bMainHazardousSolidWasteService;
+
+    /**
+     * 查询固体废物基础信息列表
+     */
+    @ApiOperation(value = "查询固体废物基础信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainHazardousSolidWaste>> list(BMainHazardousSolidWasteQuery bMainHazardousSolidWaste)
+    {
+        Page<BMainHazardousSolidWaste> page = new Page<>(bMainHazardousSolidWaste.getPageNum(), bMainHazardousSolidWaste.getPageSize());
+        IPage<BMainHazardousSolidWaste> list = bMainHazardousSolidWasteService.page(page, BMainHazardousSolidWasteQuery.createLambdaQueryWrapper(bMainHazardousSolidWaste));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出固体废物基础信息列表
+     */
+    @ApiOperation(value = "导出固体废物基础信息")
+    @Log(title = "固体废物基础信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainHazardousSolidWaste bMainHazardousSolidWaste)
+    {
+        List<BMainHazardousSolidWaste> list = bMainHazardousSolidWasteService.selectBMainHazardousSolidWasteList(bMainHazardousSolidWaste);
+        ExcelUtil<BMainHazardousSolidWaste> util = new ExcelUtil<BMainHazardousSolidWaste>(BMainHazardousSolidWaste.class);
+        util.exportExcel(response, list, "固体废物基础信息数据");
+    }
+
+    /**
+     * 获取固体废物基础信息详细信息
+     */
+    @ApiOperation(value = "获取固体废物基础信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainHazardousSolidWaste> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainHazardousSolidWasteService.getById(id));
+    }
+    /**
+     * 新增固体废物基础信息
+     */
+    @ApiOperation(value = "新增固体废物基础信息")
+    @Log(title = "固体废物基础信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainHazardousSolidWaste bMainHazardousSolidWaste) {
+        return toAjax(bMainHazardousSolidWasteService.save(bMainHazardousSolidWaste));
+    }
+    /**
+     * 修改固体废物基础信息
+     */
+    @ApiOperation(value = "修改固体废物基础信息")
+    @Log(title = "固体废物基础信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainHazardousSolidWasteVo bMainHazardousSolidWasteVo) {
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainHazardousSolidWaste bMainHazardousSolidWaste = bMainHazardousSolidWasteService.getById(bMainHazardousSolidWasteVo.getId());
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWaste)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainHazardousSolidWasteVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainHazardousSolidWasteVo,bMainHazardousSolidWaste);
+        return toAjax(bMainHazardousSolidWasteService.saveOrUpdate(bMainHazardousSolidWaste));
+    }
+
+    /**
+     * 删除固体废物基础信息
+     */
+    @ApiOperation(value = "删除固体废物基础信息")
+    @RequiresPermissions("talroad:waste:remove")
+    @Log(title = "固体废物基础信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainHazardousSolidWasteService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainHazardousSolidWasteCrController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainHazardousSolidWasteCr;
+import cn.cecep.talroad.service.IBMainHazardousSolidWasteCrService;
+import cn.cecep.talroad.vo.BMainHazardousSolidWasteCrVo;
+import cn.cecep.talroad.vo.query.BMainHazardousSolidWasteCrQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固体废物环境管理要求Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-11*/
+@Api(tags = "基本档案--固体废物环境管理要求")
+@RestController
+@RequestMapping("/bMainHazardousSolidWasteCr")
+public class BMainHazardousSolidWasteCrController extends BasesController
+{
+    @Autowired
+    private IBMainHazardousSolidWasteCrService bMainHazardousSolidWasteCrService;
+
+    /**
+     * 查询固体废物环境管理要求列表
+     */
+    @ApiOperation(value = "查询固体废物环境管理要求")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainHazardousSolidWasteCr>> list(BMainHazardousSolidWasteCrQuery bMainHazardousSolidWasteCr)
+    {
+        Page<BMainHazardousSolidWasteCr> page = new Page<>(bMainHazardousSolidWasteCr.getPageNum(), bMainHazardousSolidWasteCr.getPageSize());
+        IPage<BMainHazardousSolidWasteCr> list = bMainHazardousSolidWasteCrService.page(page, BMainHazardousSolidWasteCrQuery.createLambdaQueryWrapper(bMainHazardousSolidWasteCr));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出固体废物环境管理要求列表
+     */
+    @ApiOperation(value = "导出固体废物环境管理要求")
+    @Log(title = "固体废物环境管理要求", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainHazardousSolidWasteCr bMainHazardousSolidWasteCr)
+    {
+        List<BMainHazardousSolidWasteCr> list = bMainHazardousSolidWasteCrService.selectBMainHazardousSolidWasteCrList(bMainHazardousSolidWasteCr);
+        ExcelUtil<BMainHazardousSolidWasteCr> util = new ExcelUtil<BMainHazardousSolidWasteCr>(BMainHazardousSolidWasteCr.class);
+        util.exportExcel(response, list, "固体废物环境管理要求数据");
+    }
+
+    /**
+     * 获取固体废物环境管理要求详细信息
+     */
+    @ApiOperation(value = "获取固体废物环境管理要求详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainHazardousSolidWasteCr> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainHazardousSolidWasteCrService.getById(id));
+    }
+    /**
+     * 新增固体废物环境管理要求
+     */
+    @ApiOperation(value = "新增固体废物环境管理要求")
+    @Log(title = "固体废物环境管理要求", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainHazardousSolidWasteCr bMainHazardousSolidWasteCr) {
+        return toAjax(bMainHazardousSolidWasteCrService.save(bMainHazardousSolidWasteCr));
+    }
+    /**
+     * 修改固体废物环境管理要求
+     */
+    @ApiOperation(value = "修改固体废物环境管理要求")
+    @Log(title = "固体废物环境管理要求", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainHazardousSolidWasteCrVo bMainHazardousSolidWasteCrVo) {
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteCrVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteCrVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainHazardousSolidWasteCr bMainHazardousSolidWasteCr = bMainHazardousSolidWasteCrService.getById(bMainHazardousSolidWasteCrVo.getId());
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteCr)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainHazardousSolidWasteCrVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainHazardousSolidWasteCrVo,bMainHazardousSolidWasteCr);
+        return toAjax(bMainHazardousSolidWasteCrService.saveOrUpdate(bMainHazardousSolidWasteCr));
+    }
+
+    /**
+     * 删除固体废物环境管理要求
+     */
+    @ApiOperation(value = "删除固体废物环境管理要求")
+    @RequiresPermissions("talroad:cr:remove")
+    @Log(title = "固体废物环境管理要求", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainHazardousSolidWasteCrService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainHazardousSolidWasteFaController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainHazardousSolidWasteFa;
+import cn.cecep.talroad.service.IBMainHazardousSolidWasteFaService;
+import cn.cecep.talroad.vo.BMainHazardousSolidWasteFaVo;
+import cn.cecep.talroad.vo.query.BMainHazardousSolidWasteFaQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 自行贮存和自行利用处置设施信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "基本档案--自行贮存和自行利用处置设施信息")
+@RestController
+@RequestMapping("/bMainHazardousSolidWasteFa")
+public class BMainHazardousSolidWasteFaController extends BasesController
+{
+    @Autowired
+    private IBMainHazardousSolidWasteFaService bMainHazardousSolidWasteFaService;
+
+    /**
+     * 查询自行贮存和自行利用处置设施信息列表
+     */
+    @ApiOperation(value = "查询自行贮存和自行利用处置设施信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainHazardousSolidWasteFa>> list(BMainHazardousSolidWasteFaQuery bMainHazardousSolidWasteFa)
+    {
+        Page<BMainHazardousSolidWasteFa> page = new Page<>(bMainHazardousSolidWasteFa.getPageNum(), bMainHazardousSolidWasteFa.getPageSize());
+        IPage<BMainHazardousSolidWasteFa> list = bMainHazardousSolidWasteFaService.page(page, BMainHazardousSolidWasteFaQuery.createLambdaQueryWrapper(bMainHazardousSolidWasteFa));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出自行贮存和自行利用处置设施信息列表
+     */
+    @ApiOperation(value = "导出自行贮存和自行利用处置设施信息")
+    @Log(title = "自行贮存和自行利用处置设施信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainHazardousSolidWasteFa bMainHazardousSolidWasteFa)
+    {
+        List<BMainHazardousSolidWasteFa> list = bMainHazardousSolidWasteFaService.selectBMainHazardousSolidWasteFaList(bMainHazardousSolidWasteFa);
+        ExcelUtil<BMainHazardousSolidWasteFa> util = new ExcelUtil<BMainHazardousSolidWasteFa>(BMainHazardousSolidWasteFa.class);
+        util.exportExcel(response, list, "自行贮存和自行利用处置设施信息数据");
+    }
+
+    /**
+     * 获取自行贮存和自行利用处置设施信息详细信息
+     */
+    @ApiOperation(value = "获取自行贮存和自行利用处置设施信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainHazardousSolidWasteFa> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainHazardousSolidWasteFaService.getById(id));
+    }
+    /**
+     * 新增自行贮存和自行利用处置设施信息
+     */
+    @ApiOperation(value = "新增自行贮存和自行利用处置设施信息")
+    @Log(title = "自行贮存和自行利用处置设施信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainHazardousSolidWasteFa bMainHazardousSolidWasteFa) {
+        return toAjax(bMainHazardousSolidWasteFaService.save(bMainHazardousSolidWasteFa));
+    }
+    /**
+     * 修改自行贮存和自行利用处置设施信息
+     */
+    @ApiOperation(value = "修改自行贮存和自行利用处置设施信息")
+    @Log(title = "自行贮存和自行利用处置设施信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainHazardousSolidWasteFaVo bMainHazardousSolidWasteFaVo) {
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteFaVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteFaVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainHazardousSolidWasteFa bMainHazardousSolidWasteFa = bMainHazardousSolidWasteFaService.getById(bMainHazardousSolidWasteFaVo.getId());
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteFa)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainHazardousSolidWasteFaVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainHazardousSolidWasteFaVo,bMainHazardousSolidWasteFa);
+        return toAjax(bMainHazardousSolidWasteFaService.saveOrUpdate(bMainHazardousSolidWasteFa));
+    }
+
+    /**
+     * 删除自行贮存和自行利用处置设施信息
+     */
+    @ApiOperation(value = "删除自行贮存和自行利用处置设施信息")
+    @RequiresPermissions("talroad:fa:remove")
+    @Log(title = "自行贮存和自行利用处置设施信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainHazardousSolidWasteFaService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainHazardousSolidWasteLeController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainHazardousSolidWasteLe;
+import cn.cecep.talroad.service.IBMainHazardousSolidWasteLeService;
+import cn.cecep.talroad.vo.BMainHazardousSolidWasteLeVo;
+import cn.cecep.talroad.vo.query.BMainHazardousSolidWasteLeQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固体废物排放信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "基本档案--固体废物排放信息")
+@RestController
+@RequestMapping("/bMainHazardousSolidWasteLe")
+public class BMainHazardousSolidWasteLeController extends BasesController
+{
+    @Autowired
+    private IBMainHazardousSolidWasteLeService bMainHazardousSolidWasteLeService;
+
+    /**
+     * 查询固体废物排放信息列表
+     */
+    @ApiOperation(value = "查询固体废物排放信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainHazardousSolidWasteLe>> list(BMainHazardousSolidWasteLeQuery bMainHazardousSolidWasteLe)
+    {
+        Page<BMainHazardousSolidWasteLe> page = new Page<>(bMainHazardousSolidWasteLe.getPageNum(), bMainHazardousSolidWasteLe.getPageSize());
+        IPage<BMainHazardousSolidWasteLe> list = bMainHazardousSolidWasteLeService.page(page, BMainHazardousSolidWasteLeQuery.createLambdaQueryWrapper(bMainHazardousSolidWasteLe));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出固体废物排放信息列表
+     */
+    @ApiOperation(value = "导出固体废物排放信息")
+    @Log(title = "固体废物排放信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainHazardousSolidWasteLe bMainHazardousSolidWasteLe)
+    {
+        List<BMainHazardousSolidWasteLe> list = bMainHazardousSolidWasteLeService.selectBMainHazardousSolidWasteLeList(bMainHazardousSolidWasteLe);
+        ExcelUtil<BMainHazardousSolidWasteLe> util = new ExcelUtil<BMainHazardousSolidWasteLe>(BMainHazardousSolidWasteLe.class);
+        util.exportExcel(response, list, "固体废物排放信息数据");
+    }
+
+    /**
+     * 获取固体废物排放信息详细信息
+     */
+    @ApiOperation(value = "获取固体废物排放信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainHazardousSolidWasteLe> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainHazardousSolidWasteLeService.getById(id));
+    }
+    /**
+     * 新增固体废物排放信息
+     */
+    @ApiOperation(value = "新增固体废物排放信息")
+    @Log(title = "固体废物排放信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainHazardousSolidWasteLe bMainHazardousSolidWasteLe) {
+        return toAjax(bMainHazardousSolidWasteLeService.save(bMainHazardousSolidWasteLe));
+    }
+    /**
+     * 修改固体废物排放信息
+     */
+    @ApiOperation(value = "修改固体废物排放信息")
+    @Log(title = "固体废物排放信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainHazardousSolidWasteLeVo bMainHazardousSolidWasteLeVo) {
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteLeVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteLeVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainHazardousSolidWasteLe bMainHazardousSolidWasteLe = bMainHazardousSolidWasteLeService.getById(bMainHazardousSolidWasteLeVo.getId());
+        if(ObjectUtil.isEmpty(bMainHazardousSolidWasteLe)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainHazardousSolidWasteLeVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainHazardousSolidWasteLeVo,bMainHazardousSolidWasteLe);
+        return toAjax(bMainHazardousSolidWasteLeService.saveOrUpdate(bMainHazardousSolidWasteLe));
+    }
+
+    /**
+     * 删除固体废物排放信息
+     */
+    @ApiOperation(value = "删除固体废物排放信息")
+    @RequiresPermissions("talroad:le:remove")
+    @Log(title = "固体废物排放信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainHazardousSolidWasteLeService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainHazardousWasteOutputController.java

@@ -0,0 +1,144 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainHazardousWasteOutput;
+import cn.cecep.talroad.service.IBMainHazardousWasteOutputService;
+import cn.cecep.talroad.vo.BMainHazardousWasteOutputVo;
+import cn.cecep.talroad.vo.EChartsVO;
+import cn.cecep.talroad.vo.query.BMainHazardousWasteOutputQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.jsonwebtoken.lang.Assert;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 危废产生与处理Controller 控制层
+ *
+ * @author szhpt
+ * @date  2023-01-10 */
+@Api(tags = "基本档案--危废产生与处理")
+@RestController
+@RequestMapping("/bMainHazardousWasteOutput")
+public class BMainHazardousWasteOutputController extends BasesController {
+    @Autowired
+    private IBMainHazardousWasteOutputService bMainHazardousWasteOutputService;
+
+    /**
+     * 查询危废产生与处理列表
+     */
+    @ApiOperation(value = "查询危废产生与处理")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainHazardousWasteOutput>> list(BMainHazardousWasteOutputQuery bMainHazardousWasteOutput) {
+        if (null == bMainHazardousWasteOutput.getPageNum()) {
+            bMainHazardousWasteOutput.setPageNum(1);
+        }
+        if (null == bMainHazardousWasteOutput.getPageSize()) {
+            bMainHazardousWasteOutput.setPageSize(10);
+        }
+        Page<BMainHazardousWasteOutput> page = new Page<>(bMainHazardousWasteOutput.getPageNum(), bMainHazardousWasteOutput.getPageSize());
+        IPage<BMainHazardousWasteOutput> list = bMainHazardousWasteOutputService.page(page, BMainHazardousWasteOutputQuery.createLambdaQueryWrapper(bMainHazardousWasteOutput));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "查询危废产生与处理曲线图数据")
+    @GetMapping("/charData")
+    public AjaxResults<EChartsVO> getCharData(BMainHazardousWasteOutputQuery bMainHazardousWasteOutput) {
+        Assert.notNull(bMainHazardousWasteOutput.getStartDate(), "开始年月不能为空!");
+        Assert.notNull(bMainHazardousWasteOutput.getEndDate(), "结束年月不能为空!");
+        EChartsVO charData = bMainHazardousWasteOutputService.getCharData(bMainHazardousWasteOutput);
+        return AjaxResults.success(charData);
+    }
+
+    @ApiOperation(value = "app端-查询危废产生与处理曲线图数据")
+    @GetMapping("/appCharData")
+    public AjaxResults<EChartsVO> getAppCharData(BMainHazardousWasteOutputQuery bMainHazardousWasteOutput) {
+        Assert.notNull(bMainHazardousWasteOutput.getStartDate(), "开始年月不能为空!");
+        Assert.notNull(bMainHazardousWasteOutput.getEndDate(), "结束年月不能为空!");
+        EChartsVO charData = bMainHazardousWasteOutputService.getAppCharData(bMainHazardousWasteOutput);
+        return AjaxResults.success(charData);
+    }
+
+
+    /**
+     * 导出危废产生与处理列表
+     */
+    @ApiOperation(value = "导出危废产生与处理")
+    @Log(title = "危废产生与处理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BMainHazardousWasteOutputQuery bMainHazardousWasteOutput) {
+        List<BMainHazardousWasteOutput> list = bMainHazardousWasteOutputService.list(BMainHazardousWasteOutputQuery.createLambdaQueryWrapper(bMainHazardousWasteOutput));
+        ExcelUtil<BMainHazardousWasteOutput> util = new ExcelUtil<BMainHazardousWasteOutput>(BMainHazardousWasteOutput.class);
+        util.exportExcel(response, list, "危废产生与处理数据");
+    }
+
+    /**
+     * 获取危废产生与处理详细信息
+     */
+    @ApiOperation(value = "获取危废产生与处理详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainHazardousWasteOutput> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainHazardousWasteOutputService.getById(id));
+    }
+
+    /**
+     * 新增危废产生与处理
+     */
+    @ApiOperation(value = "新增危废产生与处理")
+    @Log(title = "危废产生与处理", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainHazardousWasteOutput bMainHazardousWasteOutput) {
+        return toAjax(bMainHazardousWasteOutputService.save(bMainHazardousWasteOutput));
+    }
+
+    /**
+     * 修改危废产生与处理
+     */
+    @ApiOperation(value = "修改危废产生与处理")
+    @Log(title = "危废产生与处理", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainHazardousWasteOutputVo bMainHazardousWasteOutputVo) {
+        if (ObjectUtil.isEmpty(bMainHazardousWasteOutputVo)) {
+            throw new InvalidParameterException("参数为空");
+        }
+        if (ObjectUtil.isEmpty(bMainHazardousWasteOutputVo.getId())) {
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainHazardousWasteOutput bMainHazardousWasteOutput = bMainHazardousWasteOutputService.getById(bMainHazardousWasteOutputVo.getId());
+        if (ObjectUtil.isEmpty(bMainHazardousWasteOutput)) {
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainHazardousWasteOutputVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainHazardousWasteOutputVo, bMainHazardousWasteOutput);
+        return toAjax(bMainHazardousWasteOutputService.saveOrUpdate(bMainHazardousWasteOutput));
+    }
+
+    /**
+     * 删除危废产生与处理
+     */
+    @ApiOperation(value = "删除危废产生与处理")
+    @RequiresPermissions("talroad:output:remove")
+    @Log(title = "危废产生与处理", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainHazardousWasteOutputService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainMobileEnforcementController.java

@@ -0,0 +1,116 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainMobileEnforcement;
+import cn.cecep.talroad.service.IBMainMobileEnforcementService;
+import cn.cecep.talroad.vo.BMainMobileEnforcementVo;
+import cn.cecep.talroad.vo.query.BMainMobileEnforcementQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 移动执法信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "业务--移动执法信息")
+@RestController
+@RequestMapping("/bMainMobileEnforcement")
+public class BMainMobileEnforcementController extends BasesController
+{
+    @Autowired
+    private IBMainMobileEnforcementService bMainMobileEnforcementService;
+
+    /**
+     * 查询移动执法信息列表
+     */
+    @ApiOperation(value = "查询移动执法信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainMobileEnforcement>> list(BMainMobileEnforcementQuery bMainMobileEnforcement)
+    {
+        return AjaxResults.success(bMainMobileEnforcementService.pullPage(bMainMobileEnforcement));
+    }
+
+
+    /**
+     * 导出移动执法信息列表
+     */
+    @ApiOperation(value = "导出移动执法信息")
+    @Log(title = "移动执法信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BMainMobileEnforcementQuery bMainMobileEnforcement)
+    {
+        List<BMainMobileEnforcement> list = bMainMobileEnforcementService.list(BMainMobileEnforcementQuery.createLambdaQueryWrapper(bMainMobileEnforcement));
+        ExcelUtil<BMainMobileEnforcement> util = new ExcelUtil<BMainMobileEnforcement>(BMainMobileEnforcement.class);
+        util.exportExcel(response, list, "移动执法信息数据");
+    }
+
+    /**
+     * 获取移动执法信息详细信息
+     */
+    @ApiOperation(value = "获取移动执法信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainMobileEnforcement> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainMobileEnforcementService.getById(id));
+    }
+    /**
+     * 新增移动执法信息
+     */
+    @ApiOperation(value = "新增移动执法信息")
+    @Log(title = "移动执法信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainMobileEnforcement bMainMobileEnforcement) {
+        return toAjax(bMainMobileEnforcementService.save(bMainMobileEnforcement));
+    }
+    /**
+     * 修改移动执法信息
+     */
+    @ApiOperation(value = "修改移动执法信息")
+    @Log(title = "移动执法信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainMobileEnforcementVo bMainMobileEnforcementVo) {
+        if(ObjectUtil.isEmpty(bMainMobileEnforcementVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainMobileEnforcementVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainMobileEnforcement bMainMobileEnforcement = bMainMobileEnforcementService.getById(bMainMobileEnforcementVo.getId());
+        if(ObjectUtil.isEmpty(bMainMobileEnforcement)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainMobileEnforcementVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainMobileEnforcementVo,bMainMobileEnforcement);
+        return toAjax(bMainMobileEnforcementService.saveOrUpdate(bMainMobileEnforcement));
+    }
+
+    /**
+     * 删除移动执法信息
+     */
+    @ApiOperation(value = "删除移动执法信息")
+    @RequiresPermissions("talroad:enforcement:remove")
+    @Log(title = "移动执法信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainMobileEnforcementService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainNoiseEmissionsController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainNoiseEmissions;
+import cn.cecep.talroad.service.IBMainNoiseEmissionsService;
+import cn.cecep.talroad.vo.BMainNoiseEmissionsVo;
+import cn.cecep.talroad.vo.query.BMainNoiseEmissionsQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 噪声排放信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "基本档案--噪声排放信息")
+@RestController
+@RequestMapping("/bMainNoiseEmissions")
+public class BMainNoiseEmissionsController extends BasesController
+{
+    @Autowired
+    private IBMainNoiseEmissionsService bMainNoiseEmissionsService;
+
+    /**
+     * 查询噪声排放信息列表
+     */
+    @ApiOperation(value = "查询噪声排放信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainNoiseEmissions>> list(BMainNoiseEmissionsQuery bMainNoiseEmissions)
+    {
+        Page<BMainNoiseEmissions> page = new Page<>(bMainNoiseEmissions.getPageNum(), bMainNoiseEmissions.getPageSize());
+        IPage<BMainNoiseEmissions> list = bMainNoiseEmissionsService.page(page, BMainNoiseEmissionsQuery.createLambdaQueryWrapper(bMainNoiseEmissions));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出噪声排放信息列表
+     */
+    @ApiOperation(value = "导出噪声排放信息")
+    @Log(title = "噪声排放信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainNoiseEmissions bMainNoiseEmissions)
+    {
+        List<BMainNoiseEmissions> list = bMainNoiseEmissionsService.selectBMainNoiseEmissionsList(bMainNoiseEmissions);
+        ExcelUtil<BMainNoiseEmissions> util = new ExcelUtil<BMainNoiseEmissions>(BMainNoiseEmissions.class);
+        util.exportExcel(response, list, "噪声排放信息数据");
+    }
+
+    /**
+     * 获取噪声排放信息详细信息
+     */
+    @ApiOperation(value = "获取噪声排放信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainNoiseEmissions> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainNoiseEmissionsService.getById(id));
+    }
+    /**
+     * 新增噪声排放信息
+     */
+    @ApiOperation(value = "新增噪声排放信息")
+    @Log(title = "噪声排放信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainNoiseEmissions bMainNoiseEmissions) {
+        return toAjax(bMainNoiseEmissionsService.save(bMainNoiseEmissions));
+    }
+    /**
+     * 修改噪声排放信息
+     */
+    @ApiOperation(value = "修改噪声排放信息")
+    @Log(title = "噪声排放信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainNoiseEmissionsVo bMainNoiseEmissionsVo) {
+        if(ObjectUtil.isEmpty(bMainNoiseEmissionsVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainNoiseEmissionsVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainNoiseEmissions bMainNoiseEmissions = bMainNoiseEmissionsService.getById(bMainNoiseEmissionsVo.getId());
+        if(ObjectUtil.isEmpty(bMainNoiseEmissions)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainNoiseEmissionsVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainNoiseEmissionsVo,bMainNoiseEmissions);
+        return toAjax(bMainNoiseEmissionsService.saveOrUpdate(bMainNoiseEmissions));
+    }
+
+    /**
+     * 删除噪声排放信息
+     */
+    @ApiOperation(value = "删除噪声排放信息")
+    @RequiresPermissions("talroad:emissions:remove")
+    @Log(title = "噪声排放信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainNoiseEmissionsService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisController.java

@@ -0,0 +1,127 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDis;
+import cn.cecep.talroad.service.IBMainPollDisService;
+import cn.cecep.talroad.util.ConvertNumber;
+import cn.cecep.talroad.vo.BMainPollDisVo;
+import cn.cecep.talroad.vo.query.BMainPollDisQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可")
+@RestController
+@RequestMapping("/BMainPollDis")
+public class BMainPollDisController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisService bMainPollDisService;
+
+    /**
+     * 查询排污许可列表
+     */
+    @ApiOperation(value = "查询排污许可")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDis>> list(BMainPollDisQuery bMainPollDis)
+    {
+        Page<BMainPollDis> page = new Page<>(bMainPollDis.getPageNum(), bMainPollDis.getPageSize());
+        IPage<BMainPollDis> list = bMainPollDisService.page(page, BMainPollDisQuery.createLambdaQueryWrapper(bMainPollDis));
+        if(!CollectionUtils.isEmpty(list.getRecords())){
+            list.getRecords().forEach(item->{
+                item.setBusinessType(BMainPollDis.PwxkzType.getByCode(item.getBusinessType()).desc);
+                item.setEditionCode(ConvertNumber.chineseNumToArabicNum(item.getEditionCode().replaceAll("第","").replaceAll("版","")).toString());
+            });
+        }
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可列表
+     */
+    @ApiOperation(value = "导出排污许可")
+    @Log(title = "排污许可", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDis bMainPollDis)
+    {
+        List<BMainPollDis> list = bMainPollDisService.selectBMainPollDisList(bMainPollDis);
+        ExcelUtil<BMainPollDis> util = new ExcelUtil<BMainPollDis>(BMainPollDis.class);
+        util.exportExcel(response, list, "排污许可数据");
+    }
+
+    /**
+     * 获取排污许可详细信息
+     */
+    @ApiOperation(value = "获取排污许可详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDis> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(bMainPollDisService.getById(id));
+    }
+    /**
+     * 新增排污许可
+     */
+    @ApiOperation(value = "新增排污许可")
+    @Log(title = "排污许可", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDis bMainPollDis) {
+        return toAjax(bMainPollDisService.save(bMainPollDis));
+    }
+    /**
+     * 修改排污许可
+     */
+    @ApiOperation(value = "修改排污许可")
+    @Log(title = "排污许可", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisVo bMainPollDisVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDis bMainPollDis = bMainPollDisService.getById(bMainPollDisVo.getId());
+        if(ObjectUtil.isEmpty(bMainPollDis)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisVo,bMainPollDis);
+        return toAjax(bMainPollDisService.saveOrUpdate(bMainPollDis));
+    }
+
+    /**
+     * 删除排污许可
+     */
+    @ApiOperation(value = "删除排污许可")
+    @RequiresPermissions("talroad:BMainPollDis:remove")
+    @Log(title = "排污许可", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainPollDisService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisEmlRecordController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisEmlRecord;
+import cn.cecep.talroad.service.IBMainPollDisEmlRecordService;
+import cn.cecep.talroad.vo.BMainPollDisEmlRecordVo;
+import cn.cecep.talroad.vo.query.BMainPollDisEmlRecordQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可环境管理台账Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可环境管理台账")
+@RestController
+@RequestMapping("/BMainPollDisEmlRecord")
+public class BMainPollDisEmlRecordController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisEmlRecordService bMainPollDisEmlRecordService;
+
+    /**
+     * 查询排污许可环境管理台账列表
+     */
+    @ApiOperation(value = "查询排污许可环境管理台账")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisEmlRecord>> list(BMainPollDisEmlRecordQuery bMainPollDisEmlRecord)
+    {
+        Page<BMainPollDisEmlRecord> page = new Page<>(bMainPollDisEmlRecord.getPageNum(), bMainPollDisEmlRecord.getPageSize());
+        IPage<BMainPollDisEmlRecord> list = bMainPollDisEmlRecordService.page(page, BMainPollDisEmlRecordQuery.createLambdaQueryWrapper(bMainPollDisEmlRecord));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可环境管理台账列表
+     */
+    @ApiOperation(value = "导出排污许可环境管理台账")
+    @Log(title = "排污许可环境管理台账", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisEmlRecord bMainPollDisEmlRecord)
+    {
+        List<BMainPollDisEmlRecord> list = bMainPollDisEmlRecordService.selectBMainPollDisEmlRecordList(bMainPollDisEmlRecord);
+        ExcelUtil<BMainPollDisEmlRecord> util = new ExcelUtil<BMainPollDisEmlRecord>(BMainPollDisEmlRecord.class);
+        util.exportExcel(response, list, "排污许可环境管理台账数据");
+    }
+
+    /**
+     * 获取排污许可环境管理台账详细信息
+     */
+    @ApiOperation(value = "获取排污许可环境管理台账详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisEmlRecord> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisEmlRecordService.getById(id));
+    }
+    /**
+     * 新增排污许可环境管理台账
+     */
+    @ApiOperation(value = "新增排污许可环境管理台账")
+    @Log(title = "排污许可环境管理台账", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisEmlRecord bMainPollDisEmlRecord) {
+        return toAjax(bMainPollDisEmlRecordService.save(bMainPollDisEmlRecord));
+    }
+    /**
+     * 修改排污许可环境管理台账
+     */
+    @ApiOperation(value = "修改排污许可环境管理台账")
+    @Log(title = "排污许可环境管理台账", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisEmlRecordVo bMainPollDisEmlRecordVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisEmlRecordVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisEmlRecordVo.getEmlId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisEmlRecord bMainPollDisEmlRecord = bMainPollDisEmlRecordService.getById(bMainPollDisEmlRecordVo.getEmlId());
+        if(ObjectUtil.isEmpty(bMainPollDisEmlRecord)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisEmlRecordVo.getEmlId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisEmlRecordVo,bMainPollDisEmlRecord);
+        return toAjax(bMainPollDisEmlRecordService.saveOrUpdate(bMainPollDisEmlRecord));
+    }
+
+    /**
+     * 删除排污许可环境管理台账
+     */
+    @ApiOperation(value = "删除排污许可环境管理台账")
+    @RequiresPermissions("talroad:BMainPollDisEmlRecord:remove")
+    @Log(title = "排污许可环境管理台账", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisEmlRecordService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisEnforcementController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisEnforcement;
+import cn.cecep.talroad.service.IBMainPollDisEnforcementService;
+import cn.cecep.talroad.vo.BMainPollDisEnforcementVo;
+import cn.cecep.talroad.vo.query.BMainPollDisEnforcementQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可执行守法报告Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可执行守法报告")
+@RestController
+@RequestMapping("/BMainPollDisEnforcement")
+public class BMainPollDisEnforcementController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisEnforcementService bMainPollDisEnforcementService;
+
+    /**
+     * 查询排污许可执行守法报告列表
+     */
+    @ApiOperation(value = "查询排污许可执行守法报告")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisEnforcement>> list(BMainPollDisEnforcementQuery bMainPollDisEnforcement)
+    {
+        Page<BMainPollDisEnforcement> page = new Page<>(bMainPollDisEnforcement.getPageNum(), bMainPollDisEnforcement.getPageSize());
+        IPage<BMainPollDisEnforcement> list = bMainPollDisEnforcementService.page(page, BMainPollDisEnforcementQuery.createLambdaQueryWrapper(bMainPollDisEnforcement));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可执行守法报告列表
+     */
+    @ApiOperation(value = "导出排污许可执行守法报告")
+    @Log(title = "排污许可执行守法报告", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisEnforcement bMainPollDisEnforcement)
+    {
+        List<BMainPollDisEnforcement> list = bMainPollDisEnforcementService.selectBMainPollDisEnforcementList(bMainPollDisEnforcement);
+        ExcelUtil<BMainPollDisEnforcement> util = new ExcelUtil<BMainPollDisEnforcement>(BMainPollDisEnforcement.class);
+        util.exportExcel(response, list, "排污许可执行守法报告数据");
+    }
+
+    /**
+     * 获取排污许可执行守法报告详细信息
+     */
+    @ApiOperation(value = "获取排污许可执行守法报告详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisEnforcement> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisEnforcementService.getById(id));
+    }
+    /**
+     * 新增排污许可执行守法报告
+     */
+    @ApiOperation(value = "新增排污许可执行守法报告")
+    @Log(title = "排污许可执行守法报告", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisEnforcement bMainPollDisEnforcement) {
+        return toAjax(bMainPollDisEnforcementService.save(bMainPollDisEnforcement));
+    }
+    /**
+     * 修改排污许可执行守法报告
+     */
+    @ApiOperation(value = "修改排污许可执行守法报告")
+    @Log(title = "排污许可执行守法报告", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisEnforcementVo bMainPollDisEnforcementVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisEnforcementVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisEnforcementVo.getEnforcementId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisEnforcement bMainPollDisEnforcement = bMainPollDisEnforcementService.getById(bMainPollDisEnforcementVo.getEnforcementId());
+        if(ObjectUtil.isEmpty(bMainPollDisEnforcement)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisEnforcementVo.getEnforcementId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisEnforcementVo,bMainPollDisEnforcement);
+        return toAjax(bMainPollDisEnforcementService.saveOrUpdate(bMainPollDisEnforcement));
+    }
+
+    /**
+     * 删除排污许可执行守法报告
+     */
+    @ApiOperation(value = "删除排污许可执行守法报告")
+    @RequiresPermissions("talroad:BMainPollDisEnforcement:remove")
+    @Log(title = "排污许可执行守法报告", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisEnforcementService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisFileController.java

@@ -0,0 +1,154 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisFile;
+import cn.cecep.talroad.service.IBMainPollDisFileService;
+import cn.cecep.talroad.vo.BMainPollDisFileVo;
+import cn.cecep.talroad.vo.query.BMainPollDisFileQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
+import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可附件信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可附件信息")
+@RestController
+@RequestMapping("/BMainPollDisFile")
+public class BMainPollDisFileController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisFileService bMainPollDisFileService;
+
+    /**
+     * 查询排污许可附件信息列表
+     */
+    @ApiOperation(value = "查询排污许可附件信息")
+    @GetMapping("/list")
+    public AjaxResults<ArrayList<HashMap>> list(BMainPollDisFileQuery bMainPollDisFile)
+    {
+        Page<BMainPollDisFile> page = new Page<>(bMainPollDisFile.getPageNum(), 99);
+        IPage<BMainPollDisFile> list = bMainPollDisFileService.page(page, BMainPollDisFileQuery.createLambdaQueryWrapper(bMainPollDisFile));
+        List<BMainPollDisFile> dbFiles = list.getRecords();
+        Map<String, List<BMainPollDisFile>> dbFileMaps = CollectionUtils.isEmpty(dbFiles) ? Maps.newHashMap() : dbFiles.stream().collect(Collectors.groupingBy(BMainPollDisFile::getFileType));
+        BMainPollDisFile.PwxkzFile[] values = BMainPollDisFile.PwxkzFile.values();
+        ArrayList<HashMap> res = Lists.newArrayList();
+        for (BMainPollDisFile.PwxkzFile file : values) {
+            HashMap<String, Object> item = Maps.newHashMap();
+            item.put("type", file.desc);
+            item.put("files", dbFileMaps.containsKey(file.desc) ? dbFileMaps.get(file.desc) : Lists.newArrayList());
+            res.add(item);
+        }
+        return AjaxResults.success(res);
+    }
+    
+
+    /**
+     * 导出排污许可附件信息列表
+     */
+    @ApiOperation(value = "导出排污许可附件信息")
+    @Log(title = "排污许可附件信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisFile bMainPollDisFile)
+    {
+        List<BMainPollDisFile> list = bMainPollDisFileService.selectBMainPollDisFileList(bMainPollDisFile);
+        ExcelUtil<BMainPollDisFile> util = new ExcelUtil<BMainPollDisFile>(BMainPollDisFile.class);
+        util.exportExcel(response, list, "排污许可附件信息数据");
+    }
+
+    /**
+     * 获取排污许可附件信息详细信息
+     */
+    @ApiOperation(value = "获取排污许可附件信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisFile> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisFileService.getById(id));
+    }
+
+    /**
+     * 获取指定企业指定排污许可证附件信息
+     */
+    @ApiOperation(value = "获取指定企业指定排污许可证附件信息")
+    @PostMapping(value = "/{factoryId}/{pollDisId}")
+    public AjaxResults<List<BMainPollDisFile>> getInfo(@PathVariable("factoryId") String factoryId,
+                                                 @PathVariable("pollDisId") String pollDisId) {
+        return AjaxResults.success(bMainPollDisFileService.list(BMainPollDisFile.createLambdaQueryWrapper(factoryId, pollDisId)));
+    }
+
+    /**
+     * 新增排污许可附件信息
+     */
+    @ApiOperation(value = "新增排污许可附件信息")
+    @Log(title = "排污许可附件信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisFile bMainPollDisFile) {
+        return toAjax(bMainPollDisFileService.save(bMainPollDisFile));
+    }
+    /**
+     * 修改排污许可附件信息
+     */
+    @ApiOperation(value = "修改排污许可附件信息")
+    @Log(title = "排污许可附件信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisFileVo bMainPollDisFileVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisFileVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisFileVo.getFileId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisFile bMainPollDisFile = bMainPollDisFileService.getById(bMainPollDisFileVo.getFileId());
+        if(ObjectUtil.isEmpty(bMainPollDisFile)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisFileVo.getFileId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisFileVo,bMainPollDisFile);
+        return toAjax(bMainPollDisFileService.saveOrUpdate(bMainPollDisFile));
+    }
+
+    /**
+     * 删除排污许可附件信息
+     */
+    @ApiOperation(value = "删除排污许可附件信息")
+    @RequiresPermissions("talroad:BMainPollDisFile:remove")
+    @Log(title = "排污许可附件信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisFileService.removeByIds(Arrays.asList(ids)));
+    }
+
+    /**
+     * 单条删除-排污许可附件信息
+     */
+    @ApiOperation(value = "删除排污许可附件信息-单条")
+    @RequiresPermissions("talroad:BMainPollDisFile:remove")
+    @Log(title = "排污许可附件信息", businessType = BusinessType.DELETE)
+    @PostMapping("/removeOne/{id}")
+    public AjaxResults<Boolean> removeOne(@PathVariable Long id) {
+        return toAjax(bMainPollDisFileService.removeById(id));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisGasMoutController.java

@@ -0,0 +1,116 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisGasMout;
+import cn.cecep.talroad.service.IBMainPollDisGasMoutService;
+import cn.cecep.talroad.vo.BMainPollDisGasMoutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisGasMoutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可大气主排放口Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可大气主排放口")
+@RestController
+@RequestMapping("/BMainPollDisGasMout")
+public class BMainPollDisGasMoutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisGasMoutService bMainPollDisGasMoutService;
+
+    /**
+     * 查询排污许可大气主排放口列表
+     */
+    @ApiOperation(value = "查询排污许可大气主排放口")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisGasMout>> list(BMainPollDisGasMoutQuery bMainPollDisGasMout)
+    {
+        return AjaxResults.success(bMainPollDisGasMoutService.pullPage(bMainPollDisGasMout));
+    }
+    
+
+    /**
+     * 导出排污许可大气主排放口列表
+     */
+    @ApiOperation(value = "导出排污许可大气主排放口")
+    @Log(title = "排污许可大气主排放口", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisGasMout bMainPollDisGasMout)
+    {
+        List<BMainPollDisGasMout> list = bMainPollDisGasMoutService.selectBMainPollDisGasMoutList(bMainPollDisGasMout);
+        ExcelUtil<BMainPollDisGasMout> util = new ExcelUtil<BMainPollDisGasMout>(BMainPollDisGasMout.class);
+        util.exportExcel(response, list, "排污许可大气主排放口数据");
+    }
+
+    /**
+     * 获取排污许可大气主排放口详细信息
+     */
+    @ApiOperation(value = "获取排污许可大气主排放口详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisGasMout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisGasMoutService.getById(id));
+    }
+    /**
+     * 新增排污许可大气主排放口
+     */
+    @ApiOperation(value = "新增排污许可大气主排放口")
+    @Log(title = "排污许可大气主排放口", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisGasMout bMainPollDisGasMout) {
+        return toAjax(bMainPollDisGasMoutService.save(bMainPollDisGasMout));
+    }
+    /**
+     * 修改排污许可大气主排放口
+     */
+    @ApiOperation(value = "修改排污许可大气主排放口")
+    @Log(title = "排污许可大气主排放口", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisGasMoutVo bMainPollDisGasMoutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisGasMoutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisGasMoutVo.getMoutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisGasMout bMainPollDisGasMout = bMainPollDisGasMoutService.getById(bMainPollDisGasMoutVo.getMoutId());
+        if(ObjectUtil.isEmpty(bMainPollDisGasMout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisGasMoutVo.getMoutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisGasMoutVo,bMainPollDisGasMout);
+        return toAjax(bMainPollDisGasMoutService.saveOrUpdate(bMainPollDisGasMout));
+    }
+
+    /**
+     * 删除排污许可大气主排放口
+     */
+    @ApiOperation(value = "删除排污许可大气主排放口")
+    @RequiresPermissions("talroad:BMainPollDisGasMout:remove")
+    @Log(title = "排污许可大气主排放口", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisGasMoutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisGasOoutController.java

@@ -0,0 +1,116 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisGasOout;
+import cn.cecep.talroad.service.IBMainPollDisGasOoutService;
+import cn.cecep.talroad.vo.BMainPollDisGasOoutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisGasOoutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可大气一般排放口Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可大气一般排放口")
+@RestController
+@RequestMapping("/BMainPollDisGasOout")
+public class BMainPollDisGasOoutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisGasOoutService bMainPollDisGasOoutService;
+
+    /**
+     * 查询排污许可大气一般排放口列表
+     */
+    @ApiOperation(value = "查询排污许可大气一般排放口")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisGasOout>> list(BMainPollDisGasOoutQuery bMainPollDisGasOout)
+    {
+        return AjaxResults.success(bMainPollDisGasOoutService.pullPage(bMainPollDisGasOout));
+    }
+    
+
+    /**
+     * 导出排污许可大气一般排放口列表
+     */
+    @ApiOperation(value = "导出排污许可大气一般排放口")
+    @Log(title = "排污许可大气一般排放口", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisGasOout bMainPollDisGasOout)
+    {
+        List<BMainPollDisGasOout> list = bMainPollDisGasOoutService.selectBMainPollDisGasOoutList(bMainPollDisGasOout);
+        ExcelUtil<BMainPollDisGasOout> util = new ExcelUtil<BMainPollDisGasOout>(BMainPollDisGasOout.class);
+        util.exportExcel(response, list, "排污许可大气一般排放口数据");
+    }
+
+    /**
+     * 获取排污许可大气一般排放口详细信息
+     */
+    @ApiOperation(value = "获取排污许可大气一般排放口详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisGasOout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisGasOoutService.getById(id));
+    }
+    /**
+     * 新增排污许可大气一般排放口
+     */
+    @ApiOperation(value = "新增排污许可大气一般排放口")
+    @Log(title = "排污许可大气一般排放口", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisGasOout bMainPollDisGasOout) {
+        return toAjax(bMainPollDisGasOoutService.save(bMainPollDisGasOout));
+    }
+    /**
+     * 修改排污许可大气一般排放口
+     */
+    @ApiOperation(value = "修改排污许可大气一般排放口")
+    @Log(title = "排污许可大气一般排放口", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisGasOoutVo bMainPollDisGasOoutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisGasOoutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisGasOoutVo.getOoutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisGasOout bMainPollDisGasOout = bMainPollDisGasOoutService.getById(bMainPollDisGasOoutVo.getOoutId());
+        if(ObjectUtil.isEmpty(bMainPollDisGasOout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisGasOoutVo.getOoutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisGasOoutVo,bMainPollDisGasOout);
+        return toAjax(bMainPollDisGasOoutService.saveOrUpdate(bMainPollDisGasOout));
+    }
+
+    /**
+     * 删除排污许可大气一般排放口
+     */
+    @ApiOperation(value = "删除排污许可大气一般排放口")
+    @RequiresPermissions("talroad:BMainPollDisGasOout:remove")
+    @Log(title = "排污许可大气一般排放口", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisGasOoutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisGasPollController.java

@@ -0,0 +1,41 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BMainPollDisGasPoll;
+import cn.cecep.talroad.service.BMainPollDisGasPollService;
+import cn.cecep.talroad.vo.query.BMainPollDisGasToutQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可大气排放总计Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污单位排放总许可量")
+@RestController
+@RequestMapping("/BMainPollDisGasPollTout")
+public class BMainPollDisGasPollController extends BasesController
+{
+    @Autowired
+    private BMainPollDisGasPollService bMainPollDisGasPollService;
+
+    /**
+     * 查询排污许可大气排放总计列表
+     */
+    @ApiOperation(value = "查询排污单位排放总许可量")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisGasPoll>> list(BMainPollDisGasToutQuery bMainPollDisGasTout)
+    {
+        return AjaxResults.success(bMainPollDisGasPollService.pullPage(bMainPollDisGasTout));
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisGasSoutController.java

@@ -0,0 +1,159 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisGasSout;
+import cn.cecep.talroad.service.IBMainPollDisGasSoutService;
+import cn.cecep.talroad.vo.BMainPollDisGasSoutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisGasSoutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可大气特殊情况Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可大气特殊情况")
+@RestController
+@RequestMapping("/BMainPollDisGasSout")
+public class BMainPollDisGasSoutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisGasSoutService bMainPollDisGasSoutService;
+
+    /**
+     * 查询排污许可大气特殊情况列表
+     */
+    @ApiOperation(value = "查询排污许可大气特殊情况")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisGasSout>> list(@Valid BMainPollDisGasSoutQuery bMainPollDisGasSout)
+    {
+        Page<BMainPollDisGasSout> page = new Page<>(bMainPollDisGasSout.getPageNum(), bMainPollDisGasSout.getPageSize());
+        IPage<BMainPollDisGasSout> list = bMainPollDisGasSoutService.page(page, BMainPollDisGasSoutQuery.createLambdaQueryWrapper(bMainPollDisGasSout));
+        List<BMainPollDisGasSout> records = list.getRecords();
+        if(CollectionUtils.isNotEmpty(records)){
+            ArrayList<BMainPollDisGasSout> res = Lists.newArrayList();
+            List<BMainPollDisGasSout> mainDrain = records.stream().filter(item -> item.getPollutantType().equals("0")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(mainDrain)){
+                mainDrain.forEach(item->{
+                    item.setVent("主要排放口");
+                });
+                res.addAll(mainDrain);
+            }
+            List<BMainPollDisGasSout> drain = records.stream().filter(item -> item.getPollutantType().equals("1")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(drain)){
+                drain.forEach(item->{
+                    item.setVent("一般排放口");
+                });
+                res.addAll(drain);
+            }
+            list.setRecords(res);
+            List<BMainPollDisGasSout> wzzs = records.stream().filter(item -> item.getPollutantType().equals("2")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(wzzs)){
+                wzzs.forEach(item->{
+                    item.setVent("无组织排放口");
+                });
+                res.addAll(wzzs);
+            }
+            List<BMainPollDisGasSout> amounts = records.stream().filter(item -> item.getPollutantType().equals("3")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(amounts)){
+                amounts.forEach(item->{
+                    item.setVent("全厂合计");
+                });
+                res.addAll(amounts);
+            }
+            list.setRecords(res);
+        }
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可大气特殊情况列表
+     */
+    @ApiOperation(value = "导出排污许可大气特殊情况")
+    @Log(title = "排污许可大气特殊情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisGasSout bMainPollDisGasSout)
+    {
+        List<BMainPollDisGasSout> list = bMainPollDisGasSoutService.list(new QueryWrapper<>());
+        ExcelUtil<BMainPollDisGasSout> util = new ExcelUtil<BMainPollDisGasSout>(BMainPollDisGasSout.class);
+        util.exportExcel(response, list, "排污许可大气特殊情况数据");
+    }
+
+    /**
+     * 获取排污许可大气特殊情况详细信息
+     */
+    @ApiOperation(value = "获取排污许可大气特殊情况详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisGasSout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisGasSoutService.getById(id));
+    }
+    /**
+     * 新增排污许可大气特殊情况
+     */
+    @ApiOperation(value = "新增排污许可大气特殊情况")
+    @Log(title = "排污许可大气特殊情况", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisGasSout bMainPollDisGasSout) {
+        return toAjax(bMainPollDisGasSoutService.save(bMainPollDisGasSout));
+    }
+    /**
+     * 修改排污许可大气特殊情况
+     */
+    @ApiOperation(value = "修改排污许可大气特殊情况")
+    @Log(title = "排污许可大气特殊情况", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisGasSoutVo bMainPollDisGasSoutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisGasSoutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisGasSoutVo.getSoutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisGasSout bMainPollDisGasSout = bMainPollDisGasSoutService.getById(bMainPollDisGasSoutVo.getSoutId());
+        if(ObjectUtil.isEmpty(bMainPollDisGasSout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisGasSoutVo.getSoutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisGasSoutVo,bMainPollDisGasSout);
+        return toAjax(bMainPollDisGasSoutService.saveOrUpdate(bMainPollDisGasSout));
+    }
+
+    /**
+     * 删除排污许可大气特殊情况
+     */
+    @ApiOperation(value = "删除排污许可大气特殊情况")
+    @RequiresPermissions("talroad:BMainPollDisGasSout:remove")
+    @Log(title = "排污许可大气特殊情况", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisGasSoutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisGasToutController.java

@@ -0,0 +1,116 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisGasTout;
+import cn.cecep.talroad.service.IBMainPollDisGasToutService;
+import cn.cecep.talroad.vo.BMainPollDisGasToutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisGasToutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可大气排放总计Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可大气排放总计")
+@RestController
+@RequestMapping("/BMainPollDisGasTout")
+public class BMainPollDisGasToutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisGasToutService bMainPollDisGasToutService;
+
+    /**
+     * 查询排污许可大气排放总计列表
+     */
+    @ApiOperation(value = "查询排污许可大气排放总计")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisGasTout>> list(BMainPollDisGasToutQuery bMainPollDisGasTout)
+    {
+        return AjaxResults.success(bMainPollDisGasToutService.pullPage(bMainPollDisGasTout));
+    }
+    
+
+    /**
+     * 导出排污许可大气排放总计列表
+     */
+    @ApiOperation(value = "导出排污许可大气排放总计")
+    @Log(title = "排污许可大气排放总计", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisGasTout bMainPollDisGasTout)
+    {
+        List<BMainPollDisGasTout> list = bMainPollDisGasToutService.selectBMainPollDisGasToutList(bMainPollDisGasTout);
+        ExcelUtil<BMainPollDisGasTout> util = new ExcelUtil<BMainPollDisGasTout>(BMainPollDisGasTout.class);
+        util.exportExcel(response, list, "排污许可大气排放总计数据");
+    }
+
+    /**
+     * 获取排污许可大气排放总计详细信息
+     */
+    @ApiOperation(value = "获取排污许可大气排放总计详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisGasTout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisGasToutService.getById(id));
+    }
+    /**
+     * 新增排污许可大气排放总计
+     */
+    @ApiOperation(value = "新增排污许可大气排放总计")
+    @Log(title = "排污许可大气排放总计", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisGasTout bMainPollDisGasTout) {
+        return toAjax(bMainPollDisGasToutService.save(bMainPollDisGasTout));
+    }
+    /**
+     * 修改排污许可大气排放总计
+     */
+    @ApiOperation(value = "修改排污许可大气排放总计")
+    @Log(title = "排污许可大气排放总计", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisGasToutVo bMainPollDisGasToutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisGasToutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisGasToutVo.getToutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisGasTout bMainPollDisGasTout = bMainPollDisGasToutService.getById(bMainPollDisGasToutVo.getToutId());
+        if(ObjectUtil.isEmpty(bMainPollDisGasTout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisGasToutVo.getToutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisGasToutVo,bMainPollDisGasTout);
+        return toAjax(bMainPollDisGasToutService.saveOrUpdate(bMainPollDisGasTout));
+    }
+
+    /**
+     * 删除排污许可大气排放总计
+     */
+    @ApiOperation(value = "删除排污许可大气排放总计")
+    @RequiresPermissions("talroad:BMainPollDisGasTout:remove")
+    @Log(title = "排污许可大气排放总计", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisGasToutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisGasWzzToutController.java

@@ -0,0 +1,41 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BMainPollDisGasWzzTout;
+import cn.cecep.talroad.service.BMainPollDisGasWzzToutService;
+import cn.cecep.talroad.vo.query.BMainPollDisGasToutQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可大气排放总计Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可大气无组织排放总计")
+@RestController
+@RequestMapping("/BMainPollDisGasWzzTout")
+public class BMainPollDisGasWzzToutController extends BasesController
+{
+    @Autowired
+    private BMainPollDisGasWzzToutService bMainPollDisGasWzzToutService;
+
+    /**
+     * 查询排污许可大气排放总计列表
+     */
+    @ApiOperation(value = "查询排污许可大气无组织排放总计")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisGasWzzTout>> list(BMainPollDisGasToutQuery bMainPollDisGasTout)
+    {
+        return AjaxResults.success(bMainPollDisGasWzzToutService.pullPage(bMainPollDisGasTout));
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisInformationController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisInformation;
+import cn.cecep.talroad.service.IBMainPollDisInformationService;
+import cn.cecep.talroad.vo.BMainPollDisInformationVo;
+import cn.cecep.talroad.vo.query.BMainPollDisInformationQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可信息公开Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可信息公开")
+@RestController
+@RequestMapping("/BMainPollDisInformation")
+public class BMainPollDisInformationController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisInformationService bMainPollDisInformationService;
+
+    /**
+     * 查询排污许可信息公开列表
+     */
+    @ApiOperation(value = "查询排污许可信息公开")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisInformation>> list(BMainPollDisInformationQuery bMainPollDisInformation)
+    {
+        Page<BMainPollDisInformation> page = new Page<>(bMainPollDisInformation.getPageNum(), bMainPollDisInformation.getPageSize());
+        IPage<BMainPollDisInformation> list = bMainPollDisInformationService.page(page, BMainPollDisInformationQuery.createLambdaQueryWrapper(bMainPollDisInformation));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可信息公开列表
+     */
+    @ApiOperation(value = "导出排污许可信息公开")
+    @Log(title = "排污许可信息公开", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisInformation bMainPollDisInformation)
+    {
+        List<BMainPollDisInformation> list = bMainPollDisInformationService.selectBMainPollDisInformationList(bMainPollDisInformation);
+        ExcelUtil<BMainPollDisInformation> util = new ExcelUtil<BMainPollDisInformation>(BMainPollDisInformation.class);
+        util.exportExcel(response, list, "排污许可信息公开数据");
+    }
+
+    /**
+     * 获取排污许可信息公开详细信息
+     */
+    @ApiOperation(value = "获取排污许可信息公开详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisInformation> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisInformationService.getById(id));
+    }
+    /**
+     * 新增排污许可信息公开
+     */
+    @ApiOperation(value = "新增排污许可信息公开")
+    @Log(title = "排污许可信息公开", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisInformation bMainPollDisInformation) {
+        return toAjax(bMainPollDisInformationService.save(bMainPollDisInformation));
+    }
+    /**
+     * 修改排污许可信息公开
+     */
+    @ApiOperation(value = "修改排污许可信息公开")
+    @Log(title = "排污许可信息公开", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisInformationVo bMainPollDisInformationVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisInformationVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisInformationVo.getInformationId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisInformation bMainPollDisInformation = bMainPollDisInformationService.getById(bMainPollDisInformationVo.getInformationId());
+        if(ObjectUtil.isEmpty(bMainPollDisInformation)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisInformationVo.getInformationId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisInformationVo,bMainPollDisInformation);
+        return toAjax(bMainPollDisInformationService.saveOrUpdate(bMainPollDisInformation));
+    }
+
+    /**
+     * 删除排污许可信息公开
+     */
+    @ApiOperation(value = "删除排污许可信息公开")
+    @RequiresPermissions("talroad:BMainPollDisInformation:remove")
+    @Log(title = "排污许可信息公开", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisInformationService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisNoiseController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisNoise;
+import cn.cecep.talroad.service.IBMainPollDisNoiseService;
+import cn.cecep.talroad.vo.BMainPollDisNoiseVo;
+import cn.cecep.talroad.vo.query.BMainPollDisNoiseQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可其他许可噪声排放Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可其他许可噪声排放")
+@RestController
+@RequestMapping("/BMainPollDisNoise")
+public class BMainPollDisNoiseController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisNoiseService bMainPollDisNoiseService;
+
+    /**
+     * 查询排污许可其他许可噪声排放列表
+     */
+    @ApiOperation(value = "查询排污许可其他许可噪声排放")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisNoise>> list(BMainPollDisNoiseQuery bMainPollDisNoise)
+    {
+        Page<BMainPollDisNoise> page = new Page<>(bMainPollDisNoise.getPageNum(), bMainPollDisNoise.getPageSize());
+        IPage<BMainPollDisNoise> list = bMainPollDisNoiseService.page(page, BMainPollDisNoiseQuery.createLambdaQueryWrapper(bMainPollDisNoise));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可其他许可噪声排放列表
+     */
+    @ApiOperation(value = "导出排污许可其他许可噪声排放")
+    @Log(title = "排污许可其他许可噪声排放", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisNoise bMainPollDisNoise)
+    {
+        List<BMainPollDisNoise> list = bMainPollDisNoiseService.selectBMainPollDisNoiseList(bMainPollDisNoise);
+        ExcelUtil<BMainPollDisNoise> util = new ExcelUtil<BMainPollDisNoise>(BMainPollDisNoise.class);
+        util.exportExcel(response, list, "排污许可其他许可噪声排放数据");
+    }
+
+    /**
+     * 获取排污许可其他许可噪声排放详细信息
+     */
+    @ApiOperation(value = "获取排污许可其他许可噪声排放详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisNoise> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisNoiseService.getById(id));
+    }
+    /**
+     * 新增排污许可其他许可噪声排放
+     */
+    @ApiOperation(value = "新增排污许可其他许可噪声排放")
+    @Log(title = "排污许可其他许可噪声排放", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisNoise bMainPollDisNoise) {
+        return toAjax(bMainPollDisNoiseService.save(bMainPollDisNoise));
+    }
+    /**
+     * 修改排污许可其他许可噪声排放
+     */
+    @ApiOperation(value = "修改排污许可其他许可噪声排放")
+    @Log(title = "排污许可其他许可噪声排放", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisNoiseVo bMainPollDisNoiseVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseVo.getNoiseId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisNoise bMainPollDisNoise = bMainPollDisNoiseService.getById(bMainPollDisNoiseVo.getNoiseId());
+        if(ObjectUtil.isEmpty(bMainPollDisNoise)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisNoiseVo.getNoiseId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisNoiseVo,bMainPollDisNoise);
+        return toAjax(bMainPollDisNoiseService.saveOrUpdate(bMainPollDisNoise));
+    }
+
+    /**
+     * 删除排污许可其他许可噪声排放
+     */
+    @ApiOperation(value = "删除排污许可其他许可噪声排放")
+    @RequiresPermissions("talroad:BMainPollDisNoise:remove")
+    @Log(title = "排污许可其他许可噪声排放", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisNoiseService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisNoiseRegulationController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisNoiseRegulation;
+import cn.cecep.talroad.service.IBMainPollDisNoiseRegulationService;
+import cn.cecep.talroad.vo.BMainPollDisNoiseRegulationVo;
+import cn.cecep.talroad.vo.query.BMainPollDisNoiseRegulationQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可其他许可改正规定Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可其他许可改正规定")
+@RestController
+@RequestMapping("/BMainPollDisNoiseRegulation")
+public class BMainPollDisNoiseRegulationController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisNoiseRegulationService bMainPollDisNoiseRegulationService;
+
+    /**
+     * 查询排污许可其他许可改正规定列表
+     */
+    @ApiOperation(value = "查询排污许可其他许可改正规定")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisNoiseRegulation>> list(BMainPollDisNoiseRegulationQuery bMainPollDisNoiseRegulation)
+    {
+        Page<BMainPollDisNoiseRegulation> page = new Page<>(bMainPollDisNoiseRegulation.getPageNum(), bMainPollDisNoiseRegulation.getPageSize());
+        IPage<BMainPollDisNoiseRegulation> list = bMainPollDisNoiseRegulationService.page(page, BMainPollDisNoiseRegulationQuery.createLambdaQueryWrapper(bMainPollDisNoiseRegulation));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可其他许可改正规定列表
+     */
+    @ApiOperation(value = "导出排污许可其他许可改正规定")
+    @Log(title = "排污许可其他许可改正规定", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisNoiseRegulation bMainPollDisNoiseRegulation)
+    {
+        List<BMainPollDisNoiseRegulation> list = bMainPollDisNoiseRegulationService.selectBMainPollDisNoiseRegulationList(bMainPollDisNoiseRegulation);
+        ExcelUtil<BMainPollDisNoiseRegulation> util = new ExcelUtil<BMainPollDisNoiseRegulation>(BMainPollDisNoiseRegulation.class);
+        util.exportExcel(response, list, "排污许可其他许可改正规定数据");
+    }
+
+    /**
+     * 获取排污许可其他许可改正规定详细信息
+     */
+    @ApiOperation(value = "获取排污许可其他许可改正规定详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisNoiseRegulation> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisNoiseRegulationService.getById(id));
+    }
+    /**
+     * 新增排污许可其他许可改正规定
+     */
+    @ApiOperation(value = "新增排污许可其他许可改正规定")
+    @Log(title = "排污许可其他许可改正规定", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisNoiseRegulation bMainPollDisNoiseRegulation) {
+        return toAjax(bMainPollDisNoiseRegulationService.save(bMainPollDisNoiseRegulation));
+    }
+    /**
+     * 修改排污许可其他许可改正规定
+     */
+    @ApiOperation(value = "修改排污许可其他许可改正规定")
+    @Log(title = "排污许可其他许可改正规定", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisNoiseRegulationVo bMainPollDisNoiseRegulationVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseRegulationVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseRegulationVo.getRegulationId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisNoiseRegulation bMainPollDisNoiseRegulation = bMainPollDisNoiseRegulationService.getById(bMainPollDisNoiseRegulationVo.getRegulationId());
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseRegulation)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisNoiseRegulationVo.getRegulationId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisNoiseRegulationVo,bMainPollDisNoiseRegulation);
+        return toAjax(bMainPollDisNoiseRegulationService.saveOrUpdate(bMainPollDisNoiseRegulation));
+    }
+
+    /**
+     * 删除排污许可其他许可改正规定
+     */
+    @ApiOperation(value = "删除排污许可其他许可改正规定")
+    @RequiresPermissions("talroad:BMainPollDisNoiseRegulation:remove")
+    @Log(title = "排污许可其他许可改正规定", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisNoiseRegulationService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisNoiseRequireController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisNoiseRequire;
+import cn.cecep.talroad.service.IBMainPollDisNoiseRequireService;
+import cn.cecep.talroad.vo.BMainPollDisNoiseRequireVo;
+import cn.cecep.talroad.vo.query.BMainPollDisNoiseRequireQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可环境管理要求Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可环境管理要求")
+@RestController
+@RequestMapping("/BMainPollDisNoiseRequire")
+public class BMainPollDisNoiseRequireController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisNoiseRequireService bMainPollDisNoiseRequireService;
+
+    /**
+     * 查询排污许可环境管理要求列表
+     */
+    @ApiOperation(value = "查询排污许可环境管理要求")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisNoiseRequire>> list(BMainPollDisNoiseRequireQuery bMainPollDisNoiseRequire)
+    {
+        Page<BMainPollDisNoiseRequire> page = new Page<>(bMainPollDisNoiseRequire.getPageNum(), bMainPollDisNoiseRequire.getPageSize());
+        IPage<BMainPollDisNoiseRequire> list = bMainPollDisNoiseRequireService.page(page, BMainPollDisNoiseRequireQuery.createLambdaQueryWrapper(bMainPollDisNoiseRequire));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可环境管理要求列表
+     */
+    @ApiOperation(value = "导出排污许可环境管理要求")
+    @Log(title = "排污许可环境管理要求", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisNoiseRequire bMainPollDisNoiseRequire)
+    {
+        List<BMainPollDisNoiseRequire> list = bMainPollDisNoiseRequireService.selectBMainPollDisNoiseRequireList(bMainPollDisNoiseRequire);
+        ExcelUtil<BMainPollDisNoiseRequire> util = new ExcelUtil<BMainPollDisNoiseRequire>(BMainPollDisNoiseRequire.class);
+        util.exportExcel(response, list, "排污许可环境管理要求数据");
+    }
+
+    /**
+     * 获取排污许可环境管理要求详细信息
+     */
+    @ApiOperation(value = "获取排污许可环境管理要求详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisNoiseRequire> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisNoiseRequireService.getById(id));
+    }
+    /**
+     * 新增排污许可环境管理要求
+     */
+    @ApiOperation(value = "新增排污许可环境管理要求")
+    @Log(title = "排污许可环境管理要求", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisNoiseRequire bMainPollDisNoiseRequire) {
+        return toAjax(bMainPollDisNoiseRequireService.save(bMainPollDisNoiseRequire));
+    }
+    /**
+     * 修改排污许可环境管理要求
+     */
+    @ApiOperation(value = "修改排污许可环境管理要求")
+    @Log(title = "排污许可环境管理要求", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisNoiseRequireVo bMainPollDisNoiseRequireVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseRequireVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseRequireVo.getRequireId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisNoiseRequire bMainPollDisNoiseRequire = bMainPollDisNoiseRequireService.getById(bMainPollDisNoiseRequireVo.getRequireId());
+        if(ObjectUtil.isEmpty(bMainPollDisNoiseRequire)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisNoiseRequireVo.getRequireId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisNoiseRequireVo,bMainPollDisNoiseRequire);
+        return toAjax(bMainPollDisNoiseRequireService.saveOrUpdate(bMainPollDisNoiseRequire));
+    }
+
+    /**
+     * 删除排污许可环境管理要求
+     */
+    @ApiOperation(value = "删除排污许可环境管理要求")
+    @RequiresPermissions("talroad:BMainPollDisNoiseRequire:remove")
+    @Log(title = "排污许可环境管理要求", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisNoiseRequireService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisSelfMonController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisSelfMon;
+import cn.cecep.talroad.service.IBMainPollDisSelfMonService;
+import cn.cecep.talroad.vo.BMainPollDisSelfMonVo;
+import cn.cecep.talroad.vo.query.BMainPollDisSelfMonQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可自行监测要求Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可自行监测要求")
+@RestController
+@RequestMapping("/BMainPollDisSelfMon")
+public class BMainPollDisSelfMonController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisSelfMonService bMainPollDisSelfMonService;
+
+    /**
+     * 查询排污许可自行监测要求列表
+     */
+    @ApiOperation(value = "查询排污许可自行监测要求")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisSelfMon>> list(BMainPollDisSelfMonQuery bMainPollDisSelfMon)
+    {
+        Page<BMainPollDisSelfMon> page = new Page<>(bMainPollDisSelfMon.getPageNum(), bMainPollDisSelfMon.getPageSize());
+        IPage<BMainPollDisSelfMon> list = bMainPollDisSelfMonService.page(page, BMainPollDisSelfMonQuery.createLambdaQueryWrapper(bMainPollDisSelfMon));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可自行监测要求列表
+     */
+    @ApiOperation(value = "导出排污许可自行监测要求")
+    @Log(title = "排污许可自行监测要求", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisSelfMon bMainPollDisSelfMon)
+    {
+        List<BMainPollDisSelfMon> list = bMainPollDisSelfMonService.selectBMainPollDisSelfMonList(bMainPollDisSelfMon);
+        ExcelUtil<BMainPollDisSelfMon> util = new ExcelUtil<BMainPollDisSelfMon>(BMainPollDisSelfMon.class);
+        util.exportExcel(response, list, "排污许可自行监测要求数据");
+    }
+
+    /**
+     * 获取排污许可自行监测要求详细信息
+     */
+    @ApiOperation(value = "获取排污许可自行监测要求详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisSelfMon> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisSelfMonService.getById(id));
+    }
+    /**
+     * 新增排污许可自行监测要求
+     */
+    @ApiOperation(value = "新增排污许可自行监测要求")
+    @Log(title = "排污许可自行监测要求", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisSelfMon bMainPollDisSelfMon) {
+        return toAjax(bMainPollDisSelfMonService.save(bMainPollDisSelfMon));
+    }
+    /**
+     * 修改排污许可自行监测要求
+     */
+    @ApiOperation(value = "修改排污许可自行监测要求")
+    @Log(title = "排污许可自行监测要求", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisSelfMonVo bMainPollDisSelfMonVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisSelfMonVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisSelfMonVo.getMonId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisSelfMon bMainPollDisSelfMon = bMainPollDisSelfMonService.getById(bMainPollDisSelfMonVo.getMonId());
+        if(ObjectUtil.isEmpty(bMainPollDisSelfMon)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisSelfMonVo.getMonId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisSelfMonVo,bMainPollDisSelfMon);
+        return toAjax(bMainPollDisSelfMonService.saveOrUpdate(bMainPollDisSelfMon));
+    }
+
+    /**
+     * 删除排污许可自行监测要求
+     */
+    @ApiOperation(value = "删除排污许可自行监测要求")
+    @RequiresPermissions("talroad:BMainPollDisSelfMon:remove")
+    @Log(title = "排污许可自行监测要求", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisSelfMonService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisSelfMonOtherController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisSelfMonOther;
+import cn.cecep.talroad.service.IBMainPollDisSelfMonOtherService;
+import cn.cecep.talroad.vo.BMainPollDisSelfMonOtherVo;
+import cn.cecep.talroad.vo.query.BMainPollDisSelfMonOtherQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可自行监测记录Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可自行监测记录")
+@RestController
+@RequestMapping("/BMainPollDisSelfMonOther")
+public class BMainPollDisSelfMonOtherController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisSelfMonOtherService bMainPollDisSelfMonOtherService;
+
+    /**
+     * 查询排污许可自行监测记录列表
+     */
+    @ApiOperation(value = "查询排污许可自行监测记录")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisSelfMonOther>> list(BMainPollDisSelfMonOtherQuery bMainPollDisSelfMonOther)
+    {
+        Page<BMainPollDisSelfMonOther> page = new Page<>(bMainPollDisSelfMonOther.getPageNum(), bMainPollDisSelfMonOther.getPageSize());
+        IPage<BMainPollDisSelfMonOther> list = bMainPollDisSelfMonOtherService.page(page, BMainPollDisSelfMonOtherQuery.createLambdaQueryWrapper(bMainPollDisSelfMonOther));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可自行监测记录列表
+     */
+    @ApiOperation(value = "导出排污许可自行监测记录")
+    @Log(title = "排污许可自行监测记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisSelfMonOther bMainPollDisSelfMonOther)
+    {
+        List<BMainPollDisSelfMonOther> list = bMainPollDisSelfMonOtherService.selectBMainPollDisSelfMonOtherList(bMainPollDisSelfMonOther);
+        ExcelUtil<BMainPollDisSelfMonOther> util = new ExcelUtil<BMainPollDisSelfMonOther>(BMainPollDisSelfMonOther.class);
+        util.exportExcel(response, list, "排污许可自行监测记录数据");
+    }
+
+    /**
+     * 获取排污许可自行监测记录详细信息
+     */
+    @ApiOperation(value = "获取排污许可自行监测记录详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisSelfMonOther> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisSelfMonOtherService.getById(id));
+    }
+    /**
+     * 新增排污许可自行监测记录
+     */
+    @ApiOperation(value = "新增排污许可自行监测记录")
+    @Log(title = "排污许可自行监测记录", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisSelfMonOther bMainPollDisSelfMonOther) {
+        return toAjax(bMainPollDisSelfMonOtherService.save(bMainPollDisSelfMonOther));
+    }
+    /**
+     * 修改排污许可自行监测记录
+     */
+    @ApiOperation(value = "修改排污许可自行监测记录")
+    @Log(title = "排污许可自行监测记录", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisSelfMonOtherVo bMainPollDisSelfMonOtherVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisSelfMonOtherVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisSelfMonOtherVo.getMonOtherId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisSelfMonOther bMainPollDisSelfMonOther = bMainPollDisSelfMonOtherService.getById(bMainPollDisSelfMonOtherVo.getMonOtherId());
+        if(ObjectUtil.isEmpty(bMainPollDisSelfMonOther)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisSelfMonOtherVo.getMonOtherId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisSelfMonOtherVo,bMainPollDisSelfMonOther);
+        return toAjax(bMainPollDisSelfMonOtherService.saveOrUpdate(bMainPollDisSelfMonOther));
+    }
+
+    /**
+     * 删除排污许可自行监测记录
+     */
+    @ApiOperation(value = "删除排污许可自行监测记录")
+    @RequiresPermissions("talroad:BMainPollDisSelfMonOther:remove")
+    @Log(title = "排污许可自行监测记录", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisSelfMonOtherService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisWaterMoutController.java

@@ -0,0 +1,143 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisWaterMout;
+import cn.cecep.talroad.service.IBMainPollDisWaterMoutService;
+import cn.cecep.talroad.vo.BMainPollDisWaterMoutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisWaterMoutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可水污染物主排放口Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可水污染物主排放口")
+@RestController
+@RequestMapping("/BMainPollDisWaterMout")
+public class BMainPollDisWaterMoutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisWaterMoutService bMainPollDisWaterMoutService;
+
+    /**
+     * 查询排污许可水污染物主排放口列表
+     */
+    @ApiOperation(value = "查询排污许可水污染物主排放口")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisWaterMout>> list(BMainPollDisWaterMoutQuery bMainPollDisWaterMout)
+    {
+        Page<BMainPollDisWaterMout> page = new Page<>(bMainPollDisWaterMout.getPageNum(), bMainPollDisWaterMout.getPageSize());
+        IPage<BMainPollDisWaterMout> list = bMainPollDisWaterMoutService.page(page, BMainPollDisWaterMoutQuery.createLambdaQueryWrapper(bMainPollDisWaterMout));
+        List<BMainPollDisWaterMout> records = list.getRecords();
+        if(CollectionUtils.isNotEmpty(records)){
+            List<BMainPollDisWaterMout> mainDrain = records.stream().filter(item -> item.getOutletUseTotal().equals("1")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(mainDrain)){
+                mainDrain.forEach(item->{
+                    item.setPollutantsMgRate(item.getPollutantsType());
+                    item.setPollutantsType("");
+                    item.setVent("主要排放口合计");
+                });
+            }
+            List<BMainPollDisWaterMout> drain = records.stream().filter(item -> item.getOutletUseTotal().equals("0")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(drain)){
+                drain.sort(Comparator.comparing(BMainPollDisWaterMout::getOutletCode, Comparator.naturalOrder()));
+            }
+            ArrayList<BMainPollDisWaterMout> res = Lists.newArrayList();
+            res.addAll(drain);
+            res.addAll(mainDrain);
+            list.setRecords(res);
+        }
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可水污染物主排放口列表
+     */
+    @ApiOperation(value = "导出排污许可水污染物主排放口")
+    @Log(title = "排污许可水污染物主排放口", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisWaterMout bMainPollDisWaterMout)
+    {
+        List<BMainPollDisWaterMout> list = bMainPollDisWaterMoutService.selectBMainPollDisWaterMoutList(bMainPollDisWaterMout);
+        ExcelUtil<BMainPollDisWaterMout> util = new ExcelUtil<BMainPollDisWaterMout>(BMainPollDisWaterMout.class);
+        util.exportExcel(response, list, "排污许可水污染物主排放口数据");
+    }
+
+    /**
+     * 获取排污许可水污染物主排放口详细信息
+     */
+    @ApiOperation(value = "获取排污许可水污染物主排放口详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisWaterMout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisWaterMoutService.getById(id));
+    }
+    /**
+     * 新增排污许可水污染物主排放口
+     */
+    @ApiOperation(value = "新增排污许可水污染物主排放口")
+    @Log(title = "排污许可水污染物主排放口", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisWaterMout bMainPollDisWaterMout) {
+        return toAjax(bMainPollDisWaterMoutService.save(bMainPollDisWaterMout));
+    }
+    /**
+     * 修改排污许可水污染物主排放口
+     */
+    @ApiOperation(value = "修改排污许可水污染物主排放口")
+    @Log(title = "排污许可水污染物主排放口", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisWaterMoutVo bMainPollDisWaterMoutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisWaterMoutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisWaterMoutVo.getMoutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisWaterMout bMainPollDisWaterMout = bMainPollDisWaterMoutService.getById(bMainPollDisWaterMoutVo.getMoutId());
+        if(ObjectUtil.isEmpty(bMainPollDisWaterMout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisWaterMoutVo.getMoutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisWaterMoutVo,bMainPollDisWaterMout);
+        return toAjax(bMainPollDisWaterMoutService.saveOrUpdate(bMainPollDisWaterMout));
+    }
+
+    /**
+     * 删除排污许可水污染物主排放口
+     */
+    @ApiOperation(value = "删除排污许可水污染物主排放口")
+    @RequiresPermissions("talroad:BMainPollDisWaterMout:remove")
+    @Log(title = "排污许可水污染物主排放口", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisWaterMoutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisWaterOoutController.java

@@ -0,0 +1,143 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisWaterOout;
+import cn.cecep.talroad.service.IBMainPollDisWaterOoutService;
+import cn.cecep.talroad.vo.BMainPollDisWaterOoutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisWaterOoutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可水污染物一般排放口Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可水污染物一般排放口")
+@RestController
+@RequestMapping("/BMainPollDisWaterOout")
+public class BMainPollDisWaterOoutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisWaterOoutService bMainPollDisWaterOoutService;
+
+    /**
+     * 查询排污许可水污染物一般排放口列表
+     */
+    @ApiOperation(value = "查询排污许可水污染物一般排放口")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisWaterOout>> list(BMainPollDisWaterOoutQuery bMainPollDisWaterOout)
+    {
+        Page<BMainPollDisWaterOout> page = new Page<>(bMainPollDisWaterOout.getPageNum(), bMainPollDisWaterOout.getPageSize());
+        IPage<BMainPollDisWaterOout> list = bMainPollDisWaterOoutService.page(page, BMainPollDisWaterOoutQuery.createLambdaQueryWrapper(bMainPollDisWaterOout));
+        List<BMainPollDisWaterOout> records = list.getRecords();
+        if(CollectionUtils.isNotEmpty(records)){
+            List<BMainPollDisWaterOout> mainDrain = records.stream().filter(item -> item.getOutletUseTotal().equals("1")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(mainDrain)){
+                mainDrain.forEach(item->{
+                    item.setPollutantsMgRate(item.getPollutantsType());
+                    item.setPollutantsType("");
+                    item.setVent("一般排放口合计");
+                });
+            }
+            List<BMainPollDisWaterOout> drain = records.stream().filter(item -> item.getOutletUseTotal().equals("0")).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(drain)){
+                drain.sort(Comparator.comparing(BMainPollDisWaterOout::getOutletCode, Comparator.naturalOrder()));
+            }
+            ArrayList<BMainPollDisWaterOout> res = Lists.newArrayList();
+            res.addAll(drain);
+            res.addAll(mainDrain);
+            list.setRecords(res);
+        }
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可水污染物一般排放口列表
+     */
+    @ApiOperation(value = "导出排污许可水污染物一般排放口")
+    @Log(title = "排污许可水污染物一般排放口", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisWaterOout bMainPollDisWaterOout)
+    {
+        List<BMainPollDisWaterOout> list = bMainPollDisWaterOoutService.selectBMainPollDisWaterOoutList(bMainPollDisWaterOout);
+        ExcelUtil<BMainPollDisWaterOout> util = new ExcelUtil<BMainPollDisWaterOout>(BMainPollDisWaterOout.class);
+        util.exportExcel(response, list, "排污许可水污染物一般排放口数据");
+    }
+
+    /**
+     * 获取排污许可水污染物一般排放口详细信息
+     */
+    @ApiOperation(value = "获取排污许可水污染物一般排放口详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisWaterOout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisWaterOoutService.getById(id));
+    }
+    /**
+     * 新增排污许可水污染物一般排放口
+     */
+    @ApiOperation(value = "新增排污许可水污染物一般排放口")
+    @Log(title = "排污许可水污染物一般排放口", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisWaterOout bMainPollDisWaterOout) {
+        return toAjax(bMainPollDisWaterOoutService.save(bMainPollDisWaterOout));
+    }
+    /**
+     * 修改排污许可水污染物一般排放口
+     */
+    @ApiOperation(value = "修改排污许可水污染物一般排放口")
+    @Log(title = "排污许可水污染物一般排放口", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisWaterOoutVo bMainPollDisWaterOoutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisWaterOoutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisWaterOoutVo.getOoutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisWaterOout bMainPollDisWaterOout = bMainPollDisWaterOoutService.getById(bMainPollDisWaterOoutVo.getOoutId());
+        if(ObjectUtil.isEmpty(bMainPollDisWaterOout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisWaterOoutVo.getOoutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisWaterOoutVo,bMainPollDisWaterOout);
+        return toAjax(bMainPollDisWaterOoutService.saveOrUpdate(bMainPollDisWaterOout));
+    }
+
+    /**
+     * 删除排污许可水污染物一般排放口
+     */
+    @ApiOperation(value = "删除排污许可水污染物一般排放口")
+    @RequiresPermissions("talroad:BMainPollDisWaterOout:remove")
+    @Log(title = "排污许可水污染物一般排放口", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisWaterOoutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisWaterSoutController.java

@@ -0,0 +1,125 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisWaterSout;
+import cn.cecep.talroad.service.IBMainPollDisWaterSoutService;
+import cn.cecep.talroad.vo.BMainPollDisWaterSoutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisWaterSoutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可水污染物特殊情况Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可水污染物特殊情况")
+@RestController
+@RequestMapping("/BMainPollDisWaterSout")
+public class BMainPollDisWaterSoutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisWaterSoutService bMainPollDisWaterSoutService;
+
+    /**
+     * 查询排污许可水污染物特殊情况列表
+     */
+    @ApiOperation(value = "查询排污许可水污染物特殊情况")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisWaterSout>> list(BMainPollDisWaterSoutQuery bMainPollDisWaterSout)
+    {
+        Page<BMainPollDisWaterSout> page = new Page<>(bMainPollDisWaterSout.getPageNum(), bMainPollDisWaterSout.getPageSize());
+        IPage<BMainPollDisWaterSout> list = bMainPollDisWaterSoutService.page(page, BMainPollDisWaterSoutQuery.createLambdaQueryWrapper(bMainPollDisWaterSout));
+
+        if(CollectionUtils.isNotEmpty(list.getRecords())){
+            list.getRecords().sort(Comparator.comparing(BMainPollDisWaterSout::getOutletCode, Comparator.naturalOrder()));
+        }
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出排污许可水污染物特殊情况列表
+     */
+    @ApiOperation(value = "导出排污许可水污染物特殊情况")
+    @Log(title = "排污许可水污染物特殊情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisWaterSout bMainPollDisWaterSout)
+    {
+        List<BMainPollDisWaterSout> list = bMainPollDisWaterSoutService.selectBMainPollDisWaterSoutList(bMainPollDisWaterSout);
+        ExcelUtil<BMainPollDisWaterSout> util = new ExcelUtil<BMainPollDisWaterSout>(BMainPollDisWaterSout.class);
+        util.exportExcel(response, list, "排污许可水污染物特殊情况数据");
+    }
+
+    /**
+     * 获取排污许可水污染物特殊情况详细信息
+     */
+    @ApiOperation(value = "获取排污许可水污染物特殊情况详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisWaterSout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisWaterSoutService.getById(id));
+    }
+    /**
+     * 新增排污许可水污染物特殊情况
+     */
+    @ApiOperation(value = "新增排污许可水污染物特殊情况")
+    @Log(title = "排污许可水污染物特殊情况", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisWaterSout bMainPollDisWaterSout) {
+        return toAjax(bMainPollDisWaterSoutService.save(bMainPollDisWaterSout));
+    }
+    /**
+     * 修改排污许可水污染物特殊情况
+     */
+    @ApiOperation(value = "修改排污许可水污染物特殊情况")
+    @Log(title = "排污许可水污染物特殊情况", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisWaterSoutVo bMainPollDisWaterSoutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisWaterSoutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisWaterSoutVo.getSoutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisWaterSout bMainPollDisWaterSout = bMainPollDisWaterSoutService.getById(bMainPollDisWaterSoutVo.getSoutId());
+        if(ObjectUtil.isEmpty(bMainPollDisWaterSout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisWaterSoutVo.getSoutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisWaterSoutVo,bMainPollDisWaterSout);
+        return toAjax(bMainPollDisWaterSoutService.saveOrUpdate(bMainPollDisWaterSout));
+    }
+
+    /**
+     * 删除排污许可水污染物特殊情况
+     */
+    @ApiOperation(value = "删除排污许可水污染物特殊情况")
+    @RequiresPermissions("talroad:BMainPollDisWaterSout:remove")
+    @Log(title = "排污许可水污染物特殊情况", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisWaterSoutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainPollDisWaterToutController.java

@@ -0,0 +1,116 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainPollDisWaterTout;
+import cn.cecep.talroad.service.IBMainPollDisWaterToutService;
+import cn.cecep.talroad.vo.BMainPollDisWaterToutVo;
+import cn.cecep.talroad.vo.query.BMainPollDisWaterToutQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 排污许可水污染物排放总计Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "排污许可--排污许可水污染物排放总计")
+@RestController
+@RequestMapping("/BMainPollDisWaterTout")
+public class BMainPollDisWaterToutController extends BasesController
+{
+    @Autowired
+    private IBMainPollDisWaterToutService bMainPollDisWaterToutService;
+
+    /**
+     * 查询排污许可水污染物排放总计列表
+     */
+    @ApiOperation(value = "查询排污许可水污染物排放总计")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainPollDisWaterTout>> list(BMainPollDisWaterToutQuery bMainPollDisWaterTout)
+    {
+        return AjaxResults.success(bMainPollDisWaterToutService.pullPage(bMainPollDisWaterTout));
+    }
+    
+
+    /**
+     * 导出排污许可水污染物排放总计列表
+     */
+    @ApiOperation(value = "导出排污许可水污染物排放总计")
+    @Log(title = "排污许可水污染物排放总计", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainPollDisWaterTout bMainPollDisWaterTout)
+    {
+        List<BMainPollDisWaterTout> list = bMainPollDisWaterToutService.selectBMainPollDisWaterToutList(bMainPollDisWaterTout);
+        ExcelUtil<BMainPollDisWaterTout> util = new ExcelUtil<BMainPollDisWaterTout>(BMainPollDisWaterTout.class);
+        util.exportExcel(response, list, "排污许可水污染物排放总计数据");
+    }
+
+    /**
+     * 获取排污许可水污染物排放总计详细信息
+     */
+    @ApiOperation(value = "获取排污许可水污染物排放总计详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainPollDisWaterTout> getInfo(@PathVariable("id") Long id) {
+        return AjaxResults.success(bMainPollDisWaterToutService.getById(id));
+    }
+    /**
+     * 新增排污许可水污染物排放总计
+     */
+    @ApiOperation(value = "新增排污许可水污染物排放总计")
+    @Log(title = "排污许可水污染物排放总计", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainPollDisWaterTout bMainPollDisWaterTout) {
+        return toAjax(bMainPollDisWaterToutService.save(bMainPollDisWaterTout));
+    }
+    /**
+     * 修改排污许可水污染物排放总计
+     */
+    @ApiOperation(value = "修改排污许可水污染物排放总计")
+    @Log(title = "排污许可水污染物排放总计", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainPollDisWaterToutVo bMainPollDisWaterToutVo) {
+        if(ObjectUtil.isEmpty(bMainPollDisWaterToutVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainPollDisWaterToutVo.getToutId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainPollDisWaterTout bMainPollDisWaterTout = bMainPollDisWaterToutService.getById(bMainPollDisWaterToutVo.getToutId());
+        if(ObjectUtil.isEmpty(bMainPollDisWaterTout)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainPollDisWaterToutVo.getToutId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainPollDisWaterToutVo,bMainPollDisWaterTout);
+        return toAjax(bMainPollDisWaterToutService.saveOrUpdate(bMainPollDisWaterTout));
+    }
+
+    /**
+     * 删除排污许可水污染物排放总计
+     */
+    @ApiOperation(value = "删除排污许可水污染物排放总计")
+    @RequiresPermissions("talroad:BMainPollDisWaterTout:remove")
+    @Log(title = "排污许可水污染物排放总计", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainPollDisWaterToutService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainProductionInorgGasController.java

@@ -0,0 +1,134 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainProductionInorgGas;
+import cn.cecep.talroad.service.IBMainProductionInorgGasService;
+import cn.cecep.talroad.service.IProductionManageService;
+import cn.cecep.talroad.vo.BMainProductionInorgGasVo;
+import cn.cecep.talroad.vo.BMainProductionOrganizGasVo;
+import cn.cecep.talroad.vo.query.BMainProductionInorgGasQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 废气无组织排放产治排信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-02-08*/
+@Api(tags = "废气无组织排放产治排信息")
+@RestController
+@RequestMapping("/bmainProductionInorgGas")
+public class BMainProductionInorgGasController extends BasesController
+{
+    @Autowired
+    private IBMainProductionInorgGasService bMainProductionInorgGasService;
+
+    /**
+     * 查询废气无组织排放产治排信息列表
+     */
+    @ApiOperation(value = "查询废气无组织排放产治排信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainProductionInorgGas>> list(BMainProductionInorgGasQuery bMainProductionInorgGas)
+    {
+        Page<BMainProductionInorgGas> page = new Page<>(bMainProductionInorgGas.getPageNum(), bMainProductionInorgGas.getPageSize());
+        IPage<BMainProductionInorgGas> list = bMainProductionInorgGasService.page(page, BMainProductionInorgGasQuery.createLambdaQueryWrapper(bMainProductionInorgGas));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出废气无组织排放产治排信息列表
+     */
+    @ApiOperation(value = "导出废气无组织排放产治排信息")
+    @Log(title = "废气无组织排放产治排信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainProductionInorgGas bMainProductionInorgGas)
+    {
+        List<BMainProductionInorgGas> list = bMainProductionInorgGasService.selectBMainProductionInorgGasList(bMainProductionInorgGas);
+        ExcelUtil<BMainProductionInorgGas> util = new ExcelUtil<BMainProductionInorgGas>(BMainProductionInorgGas.class);
+        util.exportExcel(response, list, "废气无组织排放产治排信息数据");
+    }
+
+    /**
+     * 获取废气无组织排放产治排信息详细信息
+     */
+    @ApiOperation(value = "获取废气无组织排放产治排信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainProductionInorgGas> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainProductionInorgGasService.getById(id));
+    }
+    /**
+     * 新增废气无组织排放产治排信息
+     */
+    @ApiOperation(value = "新增废气无组织排放产治排信息")
+    @Log(title = "废气无组织排放产治排信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainProductionInorgGas bMainProductionInorgGas) {
+        return toAjax(bMainProductionInorgGasService.save(bMainProductionInorgGas));
+    }
+    /**
+     * 修改废气无组织排放产治排信息
+     */
+    @ApiOperation(value = "修改废气无组织排放产治排信息")
+    @Log(title = "废气无组织排放产治排信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainProductionInorgGasVo bMainProductionInorgGasVo) {
+        if(ObjectUtil.isEmpty(bMainProductionInorgGasVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainProductionInorgGasVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainProductionInorgGas bMainProductionInorgGas = bMainProductionInorgGasService.getById(bMainProductionInorgGasVo.getId());
+        if(ObjectUtil.isEmpty(bMainProductionInorgGas)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainProductionInorgGasVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainProductionInorgGasVo,bMainProductionInorgGas);
+        return toAjax(bMainProductionInorgGasService.saveOrUpdate(bMainProductionInorgGas));
+    }
+
+    /**
+     * 删除废气无组织排放产治排信息
+     */
+    @ApiOperation(value = "删除废气无组织排放产治排信息")
+    @RequiresPermissions("talroad:bmainProductionInorgGas:remove")
+    @Log(title = "废气无组织排放产治排信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainProductionInorgGasService.removeByIds(Arrays.asList(ids)));
+    }
+
+    @ApiOperation(value = "获取弹框数据（数据趋势、视频监控）")
+    @GetMapping("/frameData")
+    public AjaxResults<IProductionManageService.FrameDataVo> frameData(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime,
+            @RequestParam("pageNum") Long pageNum,
+            @RequestParam("pageSize") Long pageSize
+    ) {
+        IProductionManageService.FrameDataVo data = bMainProductionInorgGasService.getFrameData(id, startTime, endTime, pageNum, pageSize);
+        return AjaxResults.success(data);
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainProductionOrganizGasController.java

@@ -0,0 +1,134 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainProductionOrganizGas;
+import cn.cecep.talroad.service.IBMainProductionOrganizGasService;
+import cn.cecep.talroad.service.IProductionManageService;
+import cn.cecep.talroad.vo.BMainProductionOrganizGasVo;
+import cn.cecep.talroad.vo.query.BMainProductionOrganizGasQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 废气有组织排放产治排信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-02-08*/
+@Api(tags = "废气有组织排放产治排信息")
+@RestController
+@RequestMapping("/bmainProductionOrganizGas")
+public class BMainProductionOrganizGasController extends BasesController
+{
+    @Autowired
+    private IBMainProductionOrganizGasService bMainProductionOrganizGasService;
+
+    /**
+     * 查询废气有组织排放产治排信息列表
+     */
+    @ApiOperation(value = "查询废气有组织排放产治排信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainProductionOrganizGas>> list(BMainProductionOrganizGasQuery bMainProductionOrganizGas)
+    {
+        Page<BMainProductionOrganizGas> page = new Page<>(bMainProductionOrganizGas.getPageNum(), bMainProductionOrganizGas.getPageSize());
+        IPage<BMainProductionOrganizGas> list = bMainProductionOrganizGasService.page(page, BMainProductionOrganizGasQuery.createLambdaQueryWrapper(bMainProductionOrganizGas));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出废气有组织排放产治排信息列表
+     */
+    @ApiOperation(value = "导出废气有组织排放产治排信息")
+    @Log(title = "废气有组织排放产治排信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainProductionOrganizGas bMainProductionOrganizGas)
+    {
+        List<BMainProductionOrganizGas> list = bMainProductionOrganizGasService.selectBMainProductionOrganizGasList(bMainProductionOrganizGas);
+        ExcelUtil<BMainProductionOrganizGas> util = new ExcelUtil<BMainProductionOrganizGas>(BMainProductionOrganizGas.class);
+        util.exportExcel(response, list, "废气有组织排放产治排信息数据");
+    }
+
+    /**
+     * 获取废气有组织排放产治排信息详细信息
+     */
+    @ApiOperation(value = "获取废气有组织排放产治排信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainProductionOrganizGas> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainProductionOrganizGasService.getById(id));
+    }
+    /**
+     * 新增废气有组织排放产治排信息
+     */
+    @ApiOperation(value = "新增废气有组织排放产治排信息")
+    @Log(title = "废气有组织排放产治排信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainProductionOrganizGas bMainProductionOrganizGas) {
+        return toAjax(bMainProductionOrganizGasService.save(bMainProductionOrganizGas));
+    }
+    /**
+     * 修改废气有组织排放产治排信息
+     */
+    @ApiOperation(value = "修改废气有组织排放产治排信息")
+    @Log(title = "废气有组织排放产治排信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainProductionOrganizGasVo bMainProductionOrganizGasVo) {
+        if(ObjectUtil.isEmpty(bMainProductionOrganizGasVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainProductionOrganizGasVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainProductionOrganizGas bMainProductionOrganizGas = bMainProductionOrganizGasService.getById(bMainProductionOrganizGasVo.getId());
+        if(ObjectUtil.isEmpty(bMainProductionOrganizGas)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainProductionOrganizGasVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainProductionOrganizGasVo,bMainProductionOrganizGas);
+        return toAjax(bMainProductionOrganizGasService.saveOrUpdate(bMainProductionOrganizGas));
+    }
+
+    /**
+     * 删除废气有组织排放产治排信息
+     */
+    @ApiOperation(value = "删除废气有组织排放产治排信息")
+    @RequiresPermissions("talroad:bmainProductionOrganizGas:remove")
+    @Log(title = "废气有组织排放产治排信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainProductionOrganizGasService.removeByIds(Arrays.asList(ids)));
+    }
+
+    @ApiOperation(value = "获取弹框数据（数据趋势、视频监控）")
+    @GetMapping("/frameData")
+    public AjaxResults<IProductionManageService.FrameDataVo> frameData(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime,
+            @RequestParam("pageNum") Long pageNum,
+            @RequestParam("pageSize") Long pageSize
+    ) {
+        IProductionManageService.FrameDataVo data = bMainProductionOrganizGasService.getFrameData(id, startTime, endTime, pageNum, pageSize);
+        return AjaxResults.success(data);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainProductionWaterController.java

@@ -0,0 +1,134 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainProductionWater;
+import cn.cecep.talroad.service.IBMainProductionWaterService;
+import cn.cecep.talroad.service.IProductionManageService;
+import cn.cecep.talroad.vo.BMainProductionOrganizGasVo;
+import cn.cecep.talroad.vo.BMainProductionWaterVo;
+import cn.cecep.talroad.vo.query.BMainProductionWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 废水排放产治排信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-02-08*/
+@Api(tags = "废水排放产治排信息")
+@RestController
+@RequestMapping("/bmainProductionWater")
+public class BMainProductionWaterController extends BasesController
+{
+    @Autowired
+    private IBMainProductionWaterService bMainProductionWaterService;
+
+    /**
+     * 查询废水排放产治排信息列表
+     */
+    @ApiOperation(value = "查询废水排放产治排信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainProductionWater>> list(BMainProductionWaterQuery bMainProductionWater)
+    {
+        Page<BMainProductionWater> page = new Page<>(bMainProductionWater.getPageNum(), bMainProductionWater.getPageSize());
+        IPage<BMainProductionWater> list = bMainProductionWaterService.page(page, BMainProductionWaterQuery.createLambdaQueryWrapper(bMainProductionWater));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出废水排放产治排信息列表
+     */
+    @ApiOperation(value = "导出废水排放产治排信息")
+    @Log(title = "废水排放产治排信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainProductionWater bMainProductionWater)
+    {
+        List<BMainProductionWater> list = bMainProductionWaterService.selectBMainProductionWaterList(bMainProductionWater);
+        ExcelUtil<BMainProductionWater> util = new ExcelUtil<BMainProductionWater>(BMainProductionWater.class);
+        util.exportExcel(response, list, "废水排放产治排信息数据");
+    }
+
+    /**
+     * 获取废水排放产治排信息详细信息
+     */
+    @ApiOperation(value = "获取废水排放产治排信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainProductionWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainProductionWaterService.getById(id));
+    }
+    /**
+     * 新增废水排放产治排信息
+     */
+    @ApiOperation(value = "新增废水排放产治排信息")
+    @Log(title = "废水排放产治排信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainProductionWater bMainProductionWater) {
+        return toAjax(bMainProductionWaterService.save(bMainProductionWater));
+    }
+    /**
+     * 修改废水排放产治排信息
+     */
+    @ApiOperation(value = "修改废水排放产治排信息")
+    @Log(title = "废水排放产治排信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainProductionWaterVo bMainProductionWaterVo) {
+        if(ObjectUtil.isEmpty(bMainProductionWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainProductionWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainProductionWater bMainProductionWater = bMainProductionWaterService.getById(bMainProductionWaterVo.getId());
+        if(ObjectUtil.isEmpty(bMainProductionWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainProductionWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainProductionWaterVo,bMainProductionWater);
+        return toAjax(bMainProductionWaterService.saveOrUpdate(bMainProductionWater));
+    }
+
+    /**
+     * 删除废水排放产治排信息
+     */
+    @ApiOperation(value = "删除废水排放产治排信息")
+    @RequiresPermissions("talroad:bmainProductionWater:remove")
+    @Log(title = "废水排放产治排信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bMainProductionWaterService.removeByIds(Arrays.asList(ids)));
+    }
+
+    @ApiOperation(value = "获取弹框数据（数据趋势、视频监控）")
+    @GetMapping("/frameData")
+    public AjaxResults<IProductionManageService.FrameDataVo> frameData(
+            @RequestParam("id") String id,
+            @RequestParam("startTime") String startTime,
+            @RequestParam("endTime") String endTime,
+            @RequestParam("pageNum") Long pageNum,
+            @RequestParam("pageSize") Long pageSize
+    ) {
+        IProductionManageService.FrameDataVo data = bMainProductionWaterService.getFrameData(id, startTime, endTime, pageNum, pageSize);
+        return AjaxResults.success(data);
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainSolidHazardousController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainSolidHazardous;
+import cn.cecep.talroad.service.IBMainSolidHazardousService;
+import cn.cecep.talroad.vo.BMainSolidHazardousVo;
+import cn.cecep.talroad.vo.query.BMainSolidHazardousQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固危废贮存信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-18*/
+@Api(tags = "产治排跟踪--固危废贮存信息")
+@RestController
+@RequestMapping("/BMainSolidHazardous")
+public class BMainSolidHazardousController extends BasesController
+{
+    @Autowired
+    private IBMainSolidHazardousService bMainSolidHazardousService;
+
+    /**
+     * 查询固危废贮存信息列表
+     */
+    @ApiOperation(value = "查询固危废贮存信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainSolidHazardous>> list(BMainSolidHazardousQuery bMainSolidHazardous)
+    {
+        Page<BMainSolidHazardous> page = new Page<>(bMainSolidHazardous.getPageNum(), bMainSolidHazardous.getPageSize());
+        IPage<BMainSolidHazardous> list = bMainSolidHazardousService.page(page, BMainSolidHazardousQuery.createLambdaQueryWrapper(bMainSolidHazardous));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出固危废贮存信息列表
+     */
+    @ApiOperation(value = "导出固危废贮存信息")
+    @Log(title = "固危废贮存信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainSolidHazardous bMainSolidHazardous)
+    {
+        List<BMainSolidHazardous> list = bMainSolidHazardousService.selectBMainSolidHazardousList(bMainSolidHazardous);
+        ExcelUtil<BMainSolidHazardous> util = new ExcelUtil<BMainSolidHazardous>(BMainSolidHazardous.class);
+        util.exportExcel(response, list, "固危废贮存信息数据");
+    }
+
+    /**
+     * 获取固危废贮存信息详细信息
+     */
+    @ApiOperation(value = "获取固危废贮存信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainSolidHazardous> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainSolidHazardousService.getById(id));
+    }
+    /**
+     * 新增固危废贮存信息
+     */
+    @ApiOperation(value = "新增固危废贮存信息")
+    @Log(title = "固危废贮存信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainSolidHazardous bMainSolidHazardous) {
+        return toAjax(bMainSolidHazardousService.save(bMainSolidHazardous));
+    }
+    /**
+     * 修改固危废贮存信息
+     */
+    @ApiOperation(value = "修改固危废贮存信息")
+    @Log(title = "固危废贮存信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainSolidHazardousVo bMainSolidHazardousVo) {
+        if(ObjectUtil.isEmpty(bMainSolidHazardousVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainSolidHazardousVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainSolidHazardous bMainSolidHazardous = bMainSolidHazardousService.getById(bMainSolidHazardousVo.getId());
+        if(ObjectUtil.isEmpty(bMainSolidHazardous)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainSolidHazardousVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainSolidHazardousVo,bMainSolidHazardous);
+        return toAjax(bMainSolidHazardousService.saveOrUpdate(bMainSolidHazardous));
+    }
+
+    /**
+     * 删除固危废贮存信息
+     */
+    @ApiOperation(value = "删除固危废贮存信息")
+    @RequiresPermissions("talroad:BMainSolidHazardous:remove")
+    @Log(title = "固危废贮存信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainSolidHazardousService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainSolidWasteOutputController.java

@@ -0,0 +1,127 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BMainSolidWasteOutput;
+import cn.cecep.talroad.service.IBMainSolidWasteOutputService;
+import cn.cecep.talroad.vo.BMainSolidWasteOutputVo;
+import cn.cecep.talroad.vo.EChartsVO;
+import cn.cecep.talroad.vo.query.BMainSolidWasteOutputQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固废产生与处理Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "基本档案--固废产生与处理")
+@RestController
+@RequestMapping("/bMainSolidWasteOutput")
+public class BMainSolidWasteOutputController extends BasesController
+{
+    @Autowired
+    private IBMainSolidWasteOutputService bMainSolidWasteOutputService;
+
+    /**
+     * 查询固废产生与处理列表
+     */
+    @ApiOperation(value = "查询固废产生与处理")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainSolidWasteOutput>> list(BMainSolidWasteOutputQuery bMainSolidWasteOutput)
+    {
+        Page<BMainSolidWasteOutput> page = new Page<>(bMainSolidWasteOutput.getPageNum(), bMainSolidWasteOutput.getPageSize());
+        IPage<BMainSolidWasteOutput> list = bMainSolidWasteOutputService.page(page, BMainSolidWasteOutputQuery.createLambdaQueryWrapper(bMainSolidWasteOutput));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "查询固废产生与处理曲线图数据")
+    @GetMapping("/charData")
+    public AjaxResults<EChartsVO> getCharData(BMainSolidWasteOutputQuery bMainSolidWasteOutput)
+    {
+        EChartsVO charData = bMainSolidWasteOutputService.getCharData(bMainSolidWasteOutput);
+        return AjaxResults.success(charData);
+    }
+
+    /**
+     * 导出固废产生与处理列表
+     */
+    @ApiOperation(value = "导出固废产生与处理")
+    @Log(title = "固废产生与处理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BMainSolidWasteOutputQuery bMainSolidWasteOutput)
+    {
+        List<BMainSolidWasteOutput> list = bMainSolidWasteOutputService.list(BMainSolidWasteOutputQuery.createLambdaQueryWrapper(bMainSolidWasteOutput));
+        ExcelUtil<BMainSolidWasteOutput> util = new ExcelUtil<BMainSolidWasteOutput>(BMainSolidWasteOutput.class);
+        util.exportExcel(response, list, "固废产生与处理数据");
+    }
+
+    /**
+     * 获取固废产生与处理详细信息
+     */
+    @ApiOperation(value = "获取固废产生与处理详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BMainSolidWasteOutput> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainSolidWasteOutputService.getById(id));
+    }
+    /**
+     * 新增固废产生与处理
+     */
+    @ApiOperation(value = "新增固废产生与处理")
+    @Log(title = "固废产生与处理", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainSolidWasteOutput bMainSolidWasteOutput) {
+        return toAjax(bMainSolidWasteOutputService.save(bMainSolidWasteOutput));
+    }
+    /**
+     * 修改固废产生与处理
+     */
+    @ApiOperation(value = "修改固废产生与处理")
+    @Log(title = "固废产生与处理", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainSolidWasteOutputVo bMainSolidWasteOutputVo) {
+        if(ObjectUtil.isEmpty(bMainSolidWasteOutputVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainSolidWasteOutputVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainSolidWasteOutput bMainSolidWasteOutput = bMainSolidWasteOutputService.getById(bMainSolidWasteOutputVo.getId());
+        if(ObjectUtil.isEmpty(bMainSolidWasteOutput)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainSolidWasteOutputVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainSolidWasteOutputVo,bMainSolidWasteOutput);
+        return toAjax(bMainSolidWasteOutputService.saveOrUpdate(bMainSolidWasteOutput));
+    }
+
+    /**
+     * 删除固废产生与处理
+     */
+    @ApiOperation(value = "删除固废产生与处理")
+    @RequiresPermissions("talroad:output:remove")
+    @Log(title = "固废产生与处理", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ids) {
+        return toAjax(bMainSolidWasteOutputService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainSysFeedbackController.java

@@ -0,0 +1,58 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.service.IBMainSysFeedbackService;
+import cn.cecep.talroad.vo.BMainSysFeedbackVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 系统使用反馈Controller 控制层
+ */
+@Api(tags = "系统使用反馈")
+@RestController
+@RequestMapping("/feedback")
+public class BMainSysFeedbackController extends BasesController
+{
+    @Autowired
+    private IBMainSysFeedbackService bMainSysFeedbackService;
+
+    /**
+     * 查询系统使用反馈列表
+     */
+    @ApiOperation(value = "查询系统使用反馈")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainSysFeedbackVo>> list(BMainSysFeedbackVo.SearchVo searchVo)
+    {
+        Page<BMainSysFeedbackVo> page = new Page<>(searchVo.getPageNum(), searchVo.getPageSize());
+        bMainSysFeedbackService.selectSysFeedbackList(page, searchVo);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperation(value = "获取系统使用反馈详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<BMainSysFeedbackVo> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(bMainSysFeedbackService.getInfo(id));
+    }
+    
+
+    /**
+     * 新增系统使用反馈
+     */
+    @ApiOperation(value = "新增系统使用反馈")
+    @Log(title = "系统使用反馈", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@Validated @RequestBody BMainSysFeedbackVo.AddForm addForm) {
+        bMainSysFeedbackService.add(addForm);
+        return AjaxResults.success();
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainThreeSupervisionEnforcController.java

@@ -0,0 +1,181 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BMainThreeSupervisionEnforcQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BMainThreeSupervisionEnforc;
+import cn.cecep.talroad.vo.BMainThreeSupervisionEnforcVo;
+import cn.cecep.talroad.service.IBMainThreeSupervisionEnforcService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 三监联动执法信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-29*/
+@Api(tags = "三监联动执法信息")
+@RestController
+@RequestMapping("/threeSupervision")
+public class BMainThreeSupervisionEnforcController extends BasesController
+{
+    @Autowired
+    private IBMainThreeSupervisionEnforcService bMainThreeSupervisionEnforcService;
+
+    /**
+     * 查询三监联动执法信息列表
+     */
+    @ApiOperation(value = "查询三监联动执法信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainThreeSupervisionEnforc>> list(BMainThreeSupervisionEnforcQuery bMainThreeSupervisionEnforc)
+    {
+        Page<BMainThreeSupervisionEnforc> page = new Page<>(bMainThreeSupervisionEnforc.getPageNum(), bMainThreeSupervisionEnforc.getPageSize());
+        IPage<BMainThreeSupervisionEnforc> list = bMainThreeSupervisionEnforcService.page(page, BMainThreeSupervisionEnforcQuery.createLambdaQueryWrapper(bMainThreeSupervisionEnforc));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出三监联动执法信息列表
+     */
+    @ApiOperation(value = "导出三监联动执法信息")
+    @Log(title = "三监联动执法信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BMainThreeSupervisionEnforcQuery bMainThreeSupervisionEnforc)
+    {
+        List<BMainThreeSupervisionEnforc> list = bMainThreeSupervisionEnforcService.list(BMainThreeSupervisionEnforcQuery.createLambdaQueryWrapper(bMainThreeSupervisionEnforc));
+        ExcelUtil<BMainThreeSupervisionEnforc> util = new ExcelUtil<BMainThreeSupervisionEnforc>(BMainThreeSupervisionEnforc.class);
+        util.exportExcel(response, list, "三监联动执法信息数据");
+    }
+
+    /**
+     * 导出三监联动执法信息列表
+     */
+    @ApiOperation(value = "发起部门下拉框")
+    @GetMapping("/initiatingDeptSelectList")
+    public List<BMainThreeSupervisionEnforc> initiatingDeptSelectList() {
+        QueryWrapper<BMainThreeSupervisionEnforc> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("distinct initiating_dept_id, initiating_dept_name")
+                        .orderByAsc("initiating_dept_name");
+        return bMainThreeSupervisionEnforcService.list(queryWrapper);
+    }
+
+    /**
+     * 获取三监联动执法信息详细信息
+     */
+    @ApiOperation(value = "获取三监联动执法信息详细信息")
+    @GetMapping(value = "/{taskId}")
+    public AjaxResults<BMainThreeSupervisionEnforcVo> getInfo(@PathVariable("taskId") String taskId) {
+        return AjaxResults.success(bMainThreeSupervisionEnforcService.selectById(taskId));
+    }
+    /**
+     * 新增三监联动执法信息
+     */
+    @ApiOperation(value = "新增三监联动执法信息")
+    @Log(title = "三监联动执法信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainThreeSupervisionEnforc bMainThreeSupervisionEnforc) {
+        return toAjax(bMainThreeSupervisionEnforcService.save(bMainThreeSupervisionEnforc));
+    }
+    /**
+     * 修改三监联动执法信息
+     */
+    @ApiOperation(value = "修改三监联动执法信息")
+    @Log(title = "三监联动执法信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainThreeSupervisionEnforcVo bMainThreeSupervisionEnforcVo) {
+        if(ObjectUtil.isEmpty(bMainThreeSupervisionEnforcVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainThreeSupervisionEnforcVo.getTaskId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainThreeSupervisionEnforc bMainThreeSupervisionEnforc = bMainThreeSupervisionEnforcService.getById(bMainThreeSupervisionEnforcVo.getTaskId());
+        if(ObjectUtil.isEmpty(bMainThreeSupervisionEnforc)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainThreeSupervisionEnforcVo.getTaskId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainThreeSupervisionEnforcVo,bMainThreeSupervisionEnforc);
+        return toAjax(bMainThreeSupervisionEnforcService.saveOrUpdate(bMainThreeSupervisionEnforc));
+    }
+
+    /**
+     * 删除三监联动执法信息
+     */
+    @ApiOperation(value = "删除三监联动执法信息")
+    @RequiresPermissions("talroad:enforc:remove")
+    @Log(title = "三监联动执法信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{taskIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] taskIds) {
+        return toAjax(bMainThreeSupervisionEnforcService.removeByIds(Arrays.asList(taskIds)));
+    }
+    @ApiOperation(value = "第三方三监联动执法信息列表")
+    @PostMapping("/get")
+    public Object get(@RequestBody Map data, HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGet(data,request.getHeader("Authorization"));
+    }
+    @ApiOperation(value = "第三方三监联动执法信息详情")
+    @GetMapping("/getXianHeInfo")
+    public Object getInfo(String taskId,HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGetInfo(taskId,request.getHeader("Authorization"));
+    }
+    @ApiOperation(value = "第三方企业核查列表")
+    @PostMapping("/getTaskAccount")
+    public Object getTaskAccount(@RequestBody Map data, HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGetTaskAccount(data,request.getHeader("Authorization"));
+    }
+    @ApiOperation(value = "第三方企业核查详情")
+    @GetMapping("/getTaskInfo")
+    public Object getTaskInfo(String taskId,HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGetTaskInfo(taskId,request.getHeader("Authorization"));
+    }
+    @ApiOperation(value = "第三方获取区县")
+    @GetMapping("/getCityCodeList")
+    public Object getCityCodeList(String pid,HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGetCityCodeList(pid,request.getHeader("Authorization"));
+    }
+    @ApiOperation(value = "第三方企业核查列表")
+    @PostMapping("/getCheckTaskAccount")
+    public Object getCheckTaskAccount(@RequestBody Map data, HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGetCheckTaskAccount(data,request.getHeader("Authorization"));
+    }
+    @ApiOperation(value = "第三方动态传递")
+    @PostMapping("/getAllUrl")
+    public Object getAllUrl(@RequestBody XianheInfo xianheInfo,HttpServletRequest request) {
+        return bMainThreeSupervisionEnforcService.xianheGetAllUrl(xianheInfo.getUrl()
+                ,xianheInfo.method,xianheInfo.param,request.getHeader("Authorization"));
+    }
+    @Data
+    static class XianheInfo{
+        private String url;
+        private String param;
+        private String method;
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainThreeSupervisionEnforcRecordController.java

@@ -0,0 +1,122 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BMainThreeSupervisionEnforcRecordQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BMainThreeSupervisionEnforcRecord;
+import cn.cecep.talroad.vo.BMainThreeSupervisionEnforcRecordVo;
+import cn.cecep.talroad.service.IBMainThreeSupervisionEnforcRecordService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 三监联动执法信息记录Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-03-29*/
+@Api(tags = "三监联动执法信息记录")
+@RestController
+@RequestMapping("/threeSupervision/record")
+public class BMainThreeSupervisionEnforcRecordController extends BasesController
+{
+    @Autowired
+    private IBMainThreeSupervisionEnforcRecordService bMainThreeSupervisionEnforcRecordService;
+
+    /**
+     * 查询三监联动执法信息记录列表
+     */
+    @ApiOperation(value = "查询三监联动执法信息记录")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainThreeSupervisionEnforcRecord>> list(BMainThreeSupervisionEnforcRecordQuery bMainThreeSupervisionEnforcRecord)
+    {
+        Page<BMainThreeSupervisionEnforcRecord> page = new Page<>(bMainThreeSupervisionEnforcRecord.getPageNum(), bMainThreeSupervisionEnforcRecord.getPageSize());
+        IPage<BMainThreeSupervisionEnforcRecord> list = bMainThreeSupervisionEnforcRecordService.page(page, BMainThreeSupervisionEnforcRecordQuery.createLambdaQueryWrapper(bMainThreeSupervisionEnforcRecord));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出三监联动执法信息记录列表
+     */
+    @ApiOperation(value = "导出三监联动执法信息记录")
+    @Log(title = "三监联动执法信息记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BMainThreeSupervisionEnforcRecord bMainThreeSupervisionEnforcRecord)
+    {
+        List<BMainThreeSupervisionEnforcRecord> list = bMainThreeSupervisionEnforcRecordService.selectBMainThreeSupervisionEnforcRecordList(bMainThreeSupervisionEnforcRecord);
+        ExcelUtil<BMainThreeSupervisionEnforcRecord> util = new ExcelUtil<BMainThreeSupervisionEnforcRecord>(BMainThreeSupervisionEnforcRecord.class);
+        util.exportExcel(response, list, "三监联动执法信息记录数据");
+    }
+
+    /**
+     * 获取三监联动执法信息记录详细信息
+     */
+    @ApiOperation(value = "获取三监联动执法信息记录详细信息")
+    @PostMapping(value = "/{recordId}")
+    public AjaxResults<BMainThreeSupervisionEnforcRecord> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bMainThreeSupervisionEnforcRecordService.getById(id));
+    }
+    /**
+     * 新增三监联动执法信息记录
+     */
+    @ApiOperation(value = "新增三监联动执法信息记录")
+    @Log(title = "三监联动执法信息记录", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BMainThreeSupervisionEnforcRecord bMainThreeSupervisionEnforcRecord) {
+        return toAjax(bMainThreeSupervisionEnforcRecordService.save(bMainThreeSupervisionEnforcRecord));
+    }
+    /**
+     * 修改三监联动执法信息记录
+     */
+    @ApiOperation(value = "修改三监联动执法信息记录")
+    @Log(title = "三监联动执法信息记录", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BMainThreeSupervisionEnforcRecordVo bMainThreeSupervisionEnforcRecordVo) {
+        if(ObjectUtil.isEmpty(bMainThreeSupervisionEnforcRecordVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bMainThreeSupervisionEnforcRecordVo.getRecordId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BMainThreeSupervisionEnforcRecord bMainThreeSupervisionEnforcRecord = bMainThreeSupervisionEnforcRecordService.getById(bMainThreeSupervisionEnforcRecordVo.getRecordId());
+        if(ObjectUtil.isEmpty(bMainThreeSupervisionEnforcRecord)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bMainThreeSupervisionEnforcRecordVo.getRecordId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bMainThreeSupervisionEnforcRecordVo,bMainThreeSupervisionEnforcRecord);
+        return toAjax(bMainThreeSupervisionEnforcRecordService.saveOrUpdate(bMainThreeSupervisionEnforcRecord));
+    }
+
+    /**
+     * 删除三监联动执法信息记录
+     */
+    @ApiOperation(value = "删除三监联动执法信息记录")
+    @RequiresPermissions("talroad:record:remove")
+    @Log(title = "三监联动执法信息记录", businessType = BusinessType.DELETE)
+    @PostMapping("/{recordIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] recordIds) {
+        return toAjax(bMainThreeSupervisionEnforcRecordService.removeByIds(Arrays.asList(recordIds)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BMainTwoRandomTaskController.java

@@ -0,0 +1,74 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BMainTwoRandomTask;
+import cn.cecep.talroad.service.IBMainTwoRandomTaskService;
+import cn.cecep.talroad.vo.BMainTwoRandomTaskVo;
+import cn.cecep.talroad.vo.query.BMainTwoRandomTaskQuery;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 移动执法信息-双随机任务Controller 控制层
+ */
+@Api(tags = "移动执法信息-双随机任务")
+@RestController
+@RequestMapping("/twoRandomTask")
+public class BMainTwoRandomTaskController extends BasesController
+{
+    @Autowired
+    private IBMainTwoRandomTaskService bMainTwoRandomTaskService;
+
+    /**
+     * 查询移动执法信息-双随机任务列表
+     */
+    @ApiOperation(value = "查询移动执法信息-双随机任务")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BMainTwoRandomTask>> list(BMainTwoRandomTaskQuery bMainTwoRandomTask)
+    {
+        Page<BMainTwoRandomTask> page = new Page<>(bMainTwoRandomTask.getPageNum(), bMainTwoRandomTask.getPageSize());
+        IPage<BMainTwoRandomTask> list = bMainTwoRandomTaskService.page(page, BMainTwoRandomTaskQuery.createLambdaQueryWrapper(bMainTwoRandomTask));
+        return AjaxResults.success(list);
+    }
+
+    /**
+     * 获取移动执法信息-双随机任务详细信息
+     */
+    @ApiOperation(value = "获取移动执法信息-双随机任务详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<BMainTwoRandomTaskVo> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(bMainTwoRandomTaskService.getInfo(id));
+    }
+
+    @ApiOperation(value = "获取任务类型下拉框数据")
+    @GetMapping("/taskTypeOptions")
+    public AjaxResults<List<String>> taskTypeOptions()
+    {
+        List<String> list = bMainTwoRandomTaskService.list(new QueryWrapper<BMainTwoRandomTask>().select("task_type").groupBy("task_type"))
+                .stream().map(BMainTwoRandomTask::getTaskType)
+                .collect(Collectors.toList());
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "获取任务状态下拉框数据")
+    @GetMapping("/taskStatusOptions")
+    public AjaxResults<List<String>> taskStatusOptions()
+    {
+        List<String> list = bMainTwoRandomTaskService.list(new QueryWrapper<BMainTwoRandomTask>().select("task_status").groupBy("task_status"))
+                .stream().map(BMainTwoRandomTask::getTaskStatus)
+                .collect(Collectors.toList());
+        return AjaxResults.success(list);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTablePwxkWaterAndOtherController.java

@@ -0,0 +1,240 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+//import cn.cecep.talroad.common.core.utils.poi.ExcelUtilNew;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableQueryInfo;
+import cn.cecep.talroad.service.BStatTablePwxkWaterAndOtherService;
+import cn.cecep.talroad.vo.*;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+@RestController
+@Api(value = "排污许可执行分析废水固废和其他",tags = "排污许可停机分析废水固废和其他")
+@RequestMapping("pwxkTable")
+public class BStatTablePwxkWaterAndOtherController {
+
+    @Autowired
+    private BStatTablePwxkWaterAndOtherService service;
+
+    @ApiOperation(value = "查询水处理行业生产线信息")
+    @PostMapping("/selectProductLine")
+    public AjaxResults<IPage<BStatTablePwxkWaterTreatmentLineVo>> selectProductLine(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectProductLine(query);
+    }
+
+    @ApiOperation(value = "查询生活污水进水信息")
+    @PostMapping("/selectLifeIn")
+    public AjaxResults<IPage<BStatTablePwxkWaterLifeInVo>> selectLifeIn(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectLifeIn(query);
+    }
+
+    @ApiOperation(value = "查询工业污水进水信息")
+    @PostMapping("/selectIndustryIn")
+    public AjaxResults<IPage<BStatTablePwxkWaterIndustryInVo>> selectIndustryIn(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectIndustryIn(query);
+    }
+    @ApiOperation(value = "查询污水处理厂进水监测要求信息")
+    @PostMapping("/selectTreatmentInAsk")
+    public AjaxResults<IPage<BStatTablePwxkWaterTreatmentInAskVo>> selectTreatmentInAsk(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectTreatmentInAsk(query);
+    }
+    @ApiOperation(value = "查询工业进水合计信息")
+    @PostMapping("/selectIndustryInTotal")
+    public AjaxResults<IPage<BStatTablePwxkWaterIndustryInTotalVo>> selectIndustryInTotal(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectIndustryInTotal(query);
+    }
+    @ApiOperation(value = "查询固废基础信息")
+    @PostMapping("/selectHazardousSolidWaste")
+    public AjaxResults<IPage<BMainHazardousSolidWasteVo>> selectHazardousSolidWaste(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectHazardousSolidWaste(query);
+    }
+    @ApiOperation(value = "查询固废自行贮存和处置利用信息")
+    @PostMapping("/selectHazardousSolidWasteFa")
+    public AjaxResults<IPage<BMainHazardousSolidWasteFaVo>> selectHazardousSolidWasteFa(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectHazardousSolidWasteFa(query);
+    }
+    @ApiOperation(value = "查询生产设施信息")
+    @PostMapping("/selectProductionFacilities")
+    public AjaxResults<IPage<BStatTablePwxkProductionFacilitiesVo>> selectProductionFacilities(@RequestBody BStatTablepPwxkWaterQuery query) {
+        //todo 待开发
+        return  service.selectProductionFacilities(query);
+    }
+    @ApiOperation(value = "查询产品信息")
+    @PostMapping("/selectProducts")
+    public AjaxResults<IPage<BStatTablePwxkProductsVo>> selectProducts(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectProducts(query);
+    }
+    @ApiOperation(value = "查询执行守法报告要求")
+    @PostMapping("/selectEnforceComplianceReportingRequirements")
+    public AjaxResults<IPage<BMainPollDisEnforcementVo>> selectEnforceComplianceReportingRequirements(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectEnforceComplianceReportingRequirements(query);
+    }
+    @ApiOperation(value = "查询信息公开要求")
+    @PostMapping("/selectPollDisInformation")
+    public AjaxResults<IPage<BMainPollDisInformationVo>> selectPollDisInformation(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectPollDisInformation(query);
+    }
+    @ApiOperation(value = "查询环境管理台账记录要求")
+    @PostMapping("/selectPollDisEmlRecord")
+    public AjaxResults<IPage<BMainPollDisEmlRecordVo>> selectBMainPollDisEmlRecord(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectBMainPollDisEmlRecord(query);
+    }
+    @ApiOperation(value = "查询改正规定")
+    @PostMapping("/selectPollDisNoiseRegulation")
+    public AjaxResults<IPage<BMainPollDisNoiseRegulationVo>> selectBMainPollDisNoiseRegulation(@RequestBody BStatTablepPwxkWaterQuery query) {
+        return service.selectBMainPollDisNoiseRegulation(query);
+    }
+
+
+    @ApiOperation("保存查询条件")
+    @PostMapping("/saveQueryContent")
+    public AjaxResults<Integer> saveQueryContent(@RequestBody BStatTableQueryInfo query) {
+        return service.saveQueryContent(query);
+    }
+
+
+    @ApiOperation(value = "导出水处理行业生产线信息")
+    @PostMapping("/exportProductLine")
+    public void exportProductLine(@RequestBody BStatTablepPwxkWaterQuery query, HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BStatTablePwxkWaterTreatmentLineVo>> iPageAjaxResults = service.selectProductLine(query);
+        ExcelUtil<BStatTablePwxkWaterTreatmentLineVo> excelUtil = new ExcelUtil<>(BStatTablePwxkWaterTreatmentLineVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出水处理行业生产线信息");
+    }
+
+    @ApiOperation(value = "导出生活污水进水信息")
+    @PostMapping("/exportLifeIn")
+    public void exportLifeIn(@RequestBody BStatTablepPwxkWaterQuery query
+            , HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BStatTablePwxkWaterLifeInVo>> iPageAjaxResults = service.selectLifeIn(query);
+        ExcelUtil<BStatTablePwxkWaterLifeInVo> excelUtil = new ExcelUtil<>(BStatTablePwxkWaterLifeInVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出生活污水进水信息");
+    }
+
+    @ApiOperation(value = "导出工业污水进水信息")
+    @PostMapping("/exportIndustryIn")
+    public void exportIndustryIn(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BStatTablePwxkWaterIndustryInVo>> iPageAjaxResults = service.selectIndustryIn(query);
+        ExcelUtil<BStatTablePwxkWaterIndustryInVo> excelUtil = new ExcelUtil<>(BStatTablePwxkWaterIndustryInVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出工业污水进水信息");
+    }
+    @ApiOperation(value = "导出污水处理厂进水监测要求信息")
+    @PostMapping("/exportTreatmentInAsk")
+    public void exportTreatmentInAsk(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                        HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BStatTablePwxkWaterTreatmentInAskVo>> iPageAjaxResults = service.selectTreatmentInAsk(query);
+        ExcelUtil<BStatTablePwxkWaterTreatmentInAskVo> excelUtil = new ExcelUtil<>(BStatTablePwxkWaterTreatmentInAskVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出污水处理厂进水监测要求信息");
+    }
+    @ApiOperation(value = "导出工业进水合计信息")
+    @PostMapping("/exportIndustryInTotal")
+    public void exportIndustryInTotal(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                          HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BStatTablePwxkWaterIndustryInTotalVo>> iPageAjaxResults = service.selectIndustryInTotal(query);
+        ExcelUtil<BStatTablePwxkWaterIndustryInTotalVo> excelUtil = new ExcelUtil<>(BStatTablePwxkWaterIndustryInTotalVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出污水处理厂进水监测要求信息");
+    }
+    @ApiOperation(value = "导出固废基础信息")
+    @PostMapping("/exportHazardousSolidWaste")
+    public void exportHazardousSolidWaste(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                    HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BMainHazardousSolidWasteVo>> iPageAjaxResults = service.selectHazardousSolidWaste(query);
+        ExcelUtil<BMainHazardousSolidWasteVo> excelUtil = new ExcelUtil<>(BMainHazardousSolidWasteVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出污水处理厂进水监测要求信息");
+    }
+//    @ApiOperation(value = "导出固废自行贮存和处置利用信息")
+//    @PostMapping("/exportHazardousSolidWasteFa")
+//    public void exportHazardousSolidWasteFa(@RequestBody BStatTablepPwxkWaterQuery query,
+//                                                                                        HttpServletResponse response) {
+//        query.setPageNum(1);
+//        query.setPageSize(Integer.MAX_VALUE);
+//        AjaxResults<IPage<BMainHazardousSolidWasteFaVo>> iPageAjaxResults = service.selectHazardousSolidWasteFa(query);
+//        System.out.println(iPageAjaxResults.getData().getRecords());
+//        ExcelUtilNew<BMainHazardousSolidWasteFaVo> excelUtil = new ExcelUtilNew<>(BMainHazardousSolidWasteFaVo.class);
+//        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出固废自行贮存和处置利用信息");
+//    }
+//    @ApiOperation(value = "导出生产设施信息")
+//    @PostMapping("/exportProductionFacilities")
+//    public void exportProductionFacilities(@RequestBody BStatTablepPwxkWaterQuery query,
+//                                                                                       HttpServletResponse response) {
+//        query.setPageNum(1);
+//        query.setPageSize(Integer.MAX_VALUE);
+//        AjaxResults<IPage<BStatTablePwxkProductionFacilitiesVo>> iPageAjaxResults = service.selectProductionFacilities(query);
+//        ExcelUtilNew<BStatTablePwxkProductionFacilitiesVo> excelUtil = new ExcelUtilNew<>(BStatTablePwxkProductionFacilitiesVo.class);
+//        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出生产设施信息");
+//    }
+    @ApiOperation(value = "导出产品信息")
+    @PostMapping("/exportProducts")
+    public void exportProducts(@RequestBody BStatTablepPwxkWaterQuery query, HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BStatTablePwxkProductsVo>> iPageAjaxResults = service.selectProducts(query);
+        ExcelUtil<BStatTablePwxkProductsVo> excelUtil = new ExcelUtil<>(BStatTablePwxkProductsVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出产品信息");
+    }
+    @ApiOperation(value = "导出执行守法报告要求")
+    @PostMapping("/exportReportingRequirements")
+    public void exportEnforceComplianceReportingRequirements(
+            @RequestBody BStatTablepPwxkWaterQuery query,
+            HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        query.setExportOperate(true);
+        AjaxResults<IPage<BMainPollDisEnforcementVo>> iPageAjaxResults = service.selectEnforceComplianceReportingRequirements(query);
+        ExcelUtil<BMainPollDisEnforcementVo> excelUtil = new ExcelUtil<>(BMainPollDisEnforcementVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出执行守法报告要求");
+    }
+    @ApiOperation(value = "导出信息公开要求")
+    @PostMapping("/exportPollDisInformation")
+    public void exportPollDisInformation(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                  HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BMainPollDisInformationVo>> iPageAjaxResults = service.selectPollDisInformation(query);
+        ExcelUtil<BMainPollDisInformationVo> excelUtil = new ExcelUtil<>(BMainPollDisInformationVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出信息公开要求");
+    }
+    @ApiOperation(value = "导出环境管理台账记录要求")
+    @PostMapping("/exportPollDisEmlRecord")
+    public void exportBMainPollDisEmlRecord(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                   HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BMainPollDisEmlRecordVo>> iPageAjaxResults = service.selectBMainPollDisEmlRecord(query);
+        ExcelUtil<BMainPollDisEmlRecordVo> excelUtil = new ExcelUtil<>(BMainPollDisEmlRecordVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出环境管理台账记录要求");
+    }
+    @ApiOperation(value = "导出改正规定")
+    @PostMapping("/exportPollDisNoiseRegulation")
+    public void exportBMainPollDisNoiseRegulation(@RequestBody BStatTablepPwxkWaterQuery query,
+                                                                                               HttpServletResponse response) {
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        query.setExportOperate(true);
+        AjaxResults<IPage<BMainPollDisNoiseRegulationVo>> iPageAjaxResults = service.selectBMainPollDisNoiseRegulation(query);
+        ExcelUtil<BMainPollDisNoiseRegulationVo> excelUtil = new ExcelUtil<>(BMainPollDisNoiseRegulationVo.class);
+        excelUtil.exportExcel(response,iPageAjaxResults.getData().getRecords(),"导出改正规定");
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgJbxxInfoController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTableZxbgQuery;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgJbxxInfoQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgJbxxInfo;
+import cn.cecep.talroad.vo.BStatTableZxbgJbxxInfoVo;
+import cn.cecep.talroad.service.IBStatTableZxbgJbxxInfoService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--企业基本信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-27*/
+@Api(tags = "固定源产排治--执行报告--企业基本信息")
+@RestController
+@RequestMapping("/execution/report/info")
+public class BStatTableZxbgJbxxInfoController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgJbxxInfoService bStatTableZxbgJbxxInfoService;
+
+    /**
+     * 查询固定源产排治--执行报告--企业基本信息列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--企业基本信息")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgJbxxInfo>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgJbxxInfoService.selectBStatTableZxbgJbxxInfoListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--企业基本信息列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--企业基本信息",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--企业基本信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(999999);
+        AjaxResults<IPage<BStatTableZxbgJbxxInfo>> iPageAjaxResults = bStatTableZxbgJbxxInfoService.selectBStatTableZxbgJbxxInfoListBy(query);
+        ExcelUtil<BStatTableZxbgJbxxInfo> util = new ExcelUtil<BStatTableZxbgJbxxInfo>(BStatTableZxbgJbxxInfo.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "执行报告--企业基本信息数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--企业基本信息详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--企业基本信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgJbxxInfo> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgJbxxInfoService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--企业基本信息
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--企业基本信息")
+    @Log(title = "固定源产排治--执行报告--企业基本信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgJbxxInfo bStatTableZxbgJbxxInfo) {
+        return toAjax(bStatTableZxbgJbxxInfoService.save(bStatTableZxbgJbxxInfo));
+    }
+    /**
+     * 修改固定源产排治--执行报告--企业基本信息
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--企业基本信息")
+    @Log(title = "固定源产排治--执行报告--企业基本信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgJbxxInfoVo bStatTableZxbgJbxxInfoVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgJbxxInfoVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgJbxxInfoVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgJbxxInfo bStatTableZxbgJbxxInfo = bStatTableZxbgJbxxInfoService.getById(bStatTableZxbgJbxxInfoVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgJbxxInfo)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgJbxxInfoVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgJbxxInfoVo,bStatTableZxbgJbxxInfo);
+        return toAjax(bStatTableZxbgJbxxInfoService.saveOrUpdate(bStatTableZxbgJbxxInfo));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--企业基本信息
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--企业基本信息")
+    @RequiresPermissions("talroad:info:remove")
+    @Log(title = "固定源产排治--执行报告--企业基本信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgJbxxInfoService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflAirController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgJbxxInfo;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflAirQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAir;
+import cn.cecep.talroad.vo.BStatTableZxbgPflAirVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflAirService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--废气实际排放量Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-27*/
+@Api(tags = "固定源产排治--执行报告--废气实际排放量")
+@RestController
+@RequestMapping("/execution/report/air")
+public class BStatTableZxbgPflAirController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflAirService bStatTableZxbgPflAirService;
+
+    /**
+     * 查询固定源产排治--执行报告--废气实际排放量列表
+     */
+    @ApiOperation(value = "查询--执行报告--废气实际排放量")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflAir>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflAirService.selectBStatTableZxbgPflAirListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--废气实际排放量列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--废气实际排放量",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--废气实际排放量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflAir>> iPageAjaxResults = bStatTableZxbgPflAirService.selectBStatTableZxbgPflAirListBy(query);
+        ExcelUtil<BStatTableZxbgPflAir> util = new ExcelUtil<BStatTableZxbgPflAir>(BStatTableZxbgPflAir.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "执行报告--废气实际排放量数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--废气实际排放量详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--废气实际排放量详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflAir> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflAirService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--废气实际排放量
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--废气实际排放量")
+    @Log(title = "固定源产排治--执行报告--废气实际排放量", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflAir bStatTableZxbgPflAir) {
+        return toAjax(bStatTableZxbgPflAirService.save(bStatTableZxbgPflAir));
+    }
+    /**
+     * 修改固定源产排治--执行报告--废气实际排放量
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--废气实际排放量")
+    @Log(title = "固定源产排治--执行报告--废气实际排放量", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflAirVo bStatTableZxbgPflAirVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflAir bStatTableZxbgPflAir = bStatTableZxbgPflAirService.getById(bStatTableZxbgPflAirVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAir)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflAirVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflAirVo,bStatTableZxbgPflAir);
+        return toAjax(bStatTableZxbgPflAirService.saveOrUpdate(bStatTableZxbgPflAir));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--废气实际排放量
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--废气实际排放量")
+    @RequiresPermissions("talroad:air:remove")
+    @Log(title = "固定源产排治--执行报告--废气实际排放量", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflAirService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflAirOtherController.java

@@ -0,0 +1,122 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAir;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.BStatTableZxbgPflAirOtherVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflAirOtherService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--废气其他排放总计Controller
+ *
+ * @author szhpt
+ * @date 2023-07-27*/
+@Api(tags = "固定源产排治--执行报告--废气其他排放总计")
+@RestController
+@RequestMapping("/execution/report/other")
+public class BStatTableZxbgPflAirOtherController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflAirOtherService bStatTableZxbgPflAirOtherService;
+
+    /**
+     * 查询固定源产排治--执行报告--废气其他排放总计列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--废气其他排放总计")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflAirOther>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflAirOtherService.selectBStatTableZxbgPflAirOtherListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--废气其他排放总计列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--废气其他排放总计",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--废气其他排放总计", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflAirOther>> iPageAjaxResults = bStatTableZxbgPflAirOtherService.selectBStatTableZxbgPflAirOtherListBy(query);
+        ExcelUtil<BStatTableZxbgPflAirOther> util = new ExcelUtil<BStatTableZxbgPflAirOther>(BStatTableZxbgPflAirOther.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "执行报告--废气其他排放总计数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--废气其他排放总计详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--废气其他排放总计详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflAirOther> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflAirOtherService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--废气其他排放总计
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--废气其他排放总计")
+    @Log(title = "固定源产排治--执行报告--废气其他排放总计", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflAirOther bStatTableZxbgPflAirOther) {
+        return toAjax(bStatTableZxbgPflAirOtherService.save(bStatTableZxbgPflAirOther));
+    }
+    /**
+     * 修改固定源产排治--执行报告--废气其他排放总计
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--废气其他排放总计")
+    @Log(title = "固定源产排治--执行报告--废气其他排放总计", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflAirOtherVo bStatTableZxbgPflAirOtherVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirOtherVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirOtherVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflAirOther bStatTableZxbgPflAirOther = bStatTableZxbgPflAirOtherService.getById(bStatTableZxbgPflAirOtherVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirOther)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflAirOtherVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflAirOtherVo,bStatTableZxbgPflAirOther);
+        return toAjax(bStatTableZxbgPflAirOtherService.saveOrUpdate(bStatTableZxbgPflAirOther));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--废气其他排放总计
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--废气其他排放总计")
+    @RequiresPermissions("talroad:other:remove")
+    @Log(title = "固定源产排治--执行报告--废气其他排放总计", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflAirOtherService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflAirOverproofController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflAirOverproofQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOverproof;
+import cn.cecep.talroad.vo.BStatTableZxbgPflAirOverproofVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflAirOverproofService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--废气超标排放信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-28*/
+@Api(tags = "固定源产排治--执行报告--废气超标排放信息")
+@RestController
+@RequestMapping("/execution/gas/overproof")
+public class BStatTableZxbgPflAirOverproofController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflAirOverproofService bStatTableZxbgPflAirOverproofService;
+
+    /**
+     * 查询固定源产排治--执行报告--废气超标排放信息列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--废气超标排放信息")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflAirOverproof>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflAirOverproofService.selectBStatTableZxbgPflAirOverproofListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--废气超标排放信息列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--废气超标排放信息",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--废气超标排放信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,  @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflAirOverproof>> iPageAjaxResults = bStatTableZxbgPflAirOverproofService.selectBStatTableZxbgPflAirOverproofListBy(query);
+        ExcelUtil<BStatTableZxbgPflAirOverproof> util = new ExcelUtil<BStatTableZxbgPflAirOverproof>(BStatTableZxbgPflAirOverproof.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--废气超标排放信息数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--废气超标排放信息详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--废气超标排放信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflAirOverproof> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflAirOverproofService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--废气超标排放信息
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--废气超标排放信息")
+    @Log(title = "固定源产排治--执行报告--废气超标排放信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflAirOverproof bStatTableZxbgPflAirOverproof) {
+        return toAjax(bStatTableZxbgPflAirOverproofService.save(bStatTableZxbgPflAirOverproof));
+    }
+    /**
+     * 修改固定源产排治--执行报告--废气超标排放信息
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--废气超标排放信息")
+    @Log(title = "固定源产排治--执行报告--废气超标排放信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflAirOverproofVo bStatTableZxbgPflAirOverproofVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirOverproofVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirOverproofVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflAirOverproof bStatTableZxbgPflAirOverproof = bStatTableZxbgPflAirOverproofService.getById(bStatTableZxbgPflAirOverproofVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirOverproof)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflAirOverproofVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflAirOverproofVo,bStatTableZxbgPflAirOverproof);
+        return toAjax(bStatTableZxbgPflAirOverproofService.saveOrUpdate(bStatTableZxbgPflAirOverproof));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--废气超标排放信息
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--废气超标排放信息")
+    @RequiresPermissions("talroad:overproof:remove")
+    @Log(title = "固定源产排治--执行报告--废气超标排放信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflAirOverproofService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflAirSpecialController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflWaterVoerproof;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflAirSpecialQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirSpecial;
+import cn.cecep.talroad.vo.BStatTableZxbgPflAirSpecialVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflAirSpecialService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--特殊时段废气排放量Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-31*/
+@Api(tags = "固定源产排治--执行报告--特殊时段废气排放量")
+@RestController
+@RequestMapping("/execution/report/special")
+public class BStatTableZxbgPflAirSpecialController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflAirSpecialService bStatTableZxbgPflAirSpecialService;
+
+    /**
+     * 查询固定源产排治--执行报告--特殊时段废气排放量列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--特殊时段废气排放量")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflAirSpecial>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflAirSpecialService.selectBStatTableZxbgPflAirSpecialListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--特殊时段废气排放量列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--特殊时段废气排放量")
+    @Log(title = "固定源产排治--执行报告--特殊时段废气排放量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflAirSpecial>> iPageAjaxResults = bStatTableZxbgPflAirSpecialService.selectBStatTableZxbgPflAirSpecialListBy(query);
+        ExcelUtil<BStatTableZxbgPflAirSpecial> util = new ExcelUtil<BStatTableZxbgPflAirSpecial>(BStatTableZxbgPflAirSpecial.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--特殊时段废气排放量数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--特殊时段废气排放量详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--特殊时段废气排放量详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflAirSpecial> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflAirSpecialService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--特殊时段废气排放量
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--特殊时段废气排放量")
+    @Log(title = "固定源产排治--执行报告--特殊时段废气排放量", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflAirSpecial bStatTableZxbgPflAirSpecial) {
+        return toAjax(bStatTableZxbgPflAirSpecialService.save(bStatTableZxbgPflAirSpecial));
+    }
+    /**
+     * 修改固定源产排治--执行报告--特殊时段废气排放量
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--特殊时段废气排放量")
+    @Log(title = "固定源产排治--执行报告--特殊时段废气排放量", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflAirSpecialVo bStatTableZxbgPflAirSpecialVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirSpecialVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirSpecialVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflAirSpecial bStatTableZxbgPflAirSpecial = bStatTableZxbgPflAirSpecialService.getById(bStatTableZxbgPflAirSpecialVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirSpecial)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflAirSpecialVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflAirSpecialVo,bStatTableZxbgPflAirSpecial);
+        return toAjax(bStatTableZxbgPflAirSpecialService.saveOrUpdate(bStatTableZxbgPflAirSpecial));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--特殊时段废气排放量
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--特殊时段废气排放量")
+    @RequiresPermissions("talroad:special:remove")
+    @Log(title = "固定源产排治--执行报告--特殊时段废气排放量", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflAirSpecialService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflAirStatController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflAirStatQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirStat;
+import cn.cecep.talroad.vo.BStatTableZxbgPflAirStatVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflAirStatService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--总计废气实际排放量Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-28*/
+@Api(tags = "固定源产排治--执行报告--总计废气实际排放量")
+@RestController
+@RequestMapping("/execution/report/stat")
+public class BStatTableZxbgPflAirStatController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflAirStatService bStatTableZxbgPflAirStatService;
+
+    /**
+     * 查询固定源产排治--执行报告--总计废气实际排放量列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--总计废气实际排放量")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflAirStat>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflAirStatService.selectBStatTableZxbgPflAirStatListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--总计废气实际排放量列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--总计废气实际排放量",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--总计废气实际排放量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,  @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflAirStat>> iPageAjaxResults = bStatTableZxbgPflAirStatService.selectBStatTableZxbgPflAirStatListBy(query);
+        ExcelUtil<BStatTableZxbgPflAirStat> util = new ExcelUtil<BStatTableZxbgPflAirStat>(BStatTableZxbgPflAirStat.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--总计废气实际排放量数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--总计废气实际排放量详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--总计废气实际排放量详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflAirStat> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflAirStatService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--总计废气实际排放量
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--总计废气实际排放量")
+    @Log(title = "固定源产排治--执行报告--总计废气实际排放量", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflAirStat bStatTableZxbgPflAirStat) {
+        return toAjax(bStatTableZxbgPflAirStatService.save(bStatTableZxbgPflAirStat));
+    }
+    /**
+     * 修改固定源产排治--执行报告--总计废气实际排放量
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--总计废气实际排放量")
+    @Log(title = "固定源产排治--执行报告--总计废气实际排放量", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflAirStatVo bStatTableZxbgPflAirStatVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirStatVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirStatVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflAirStat bStatTableZxbgPflAirStat = bStatTableZxbgPflAirStatService.getById(bStatTableZxbgPflAirStatVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflAirStat)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflAirStatVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflAirStatVo,bStatTableZxbgPflAirStat);
+        return toAjax(bStatTableZxbgPflAirStatService.saveOrUpdate(bStatTableZxbgPflAirStat));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--总计废气实际排放量
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--总计废气实际排放量")
+    @RequiresPermissions("talroad:stat:remove")
+    @Log(title = "固定源产排治--执行报告--总计废气实际排放量", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflAirStatService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflWaterController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflWaterQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflWater;
+import cn.cecep.talroad.vo.BStatTableZxbgPflWaterVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflWaterService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--废水实际排放量Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-28*/
+@Api(tags = "固定源产排治--执行报告--废水实际排放量")
+@RestController
+@RequestMapping("/execution/report/water")
+public class BStatTableZxbgPflWaterController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflWaterService bStatTableZxbgPflWaterService;
+
+    /**
+     * 查询固定源产排治--执行报告--废水实际排放量列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--废水实际排放量")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflWater>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflWaterService.selectBStatTableZxbgPflWaterListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--废水实际排放量列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--废水实际排放量",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--废水实际排放量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflWater>> iPageAjaxResults = bStatTableZxbgPflWaterService.selectBStatTableZxbgPflWaterListBy(query);
+        ExcelUtil<BStatTableZxbgPflWater> util = new ExcelUtil<BStatTableZxbgPflWater>(BStatTableZxbgPflWater.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--废水实际排放量数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--废水实际排放量详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--废水实际排放量详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflWaterService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--废水实际排放量
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--废水实际排放量")
+    @Log(title = "固定源产排治--执行报告--废水实际排放量", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflWater bStatTableZxbgPflWater) {
+        return toAjax(bStatTableZxbgPflWaterService.save(bStatTableZxbgPflWater));
+    }
+    /**
+     * 修改固定源产排治--执行报告--废水实际排放量
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--废水实际排放量")
+    @Log(title = "固定源产排治--执行报告--废水实际排放量", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflWaterVo bStatTableZxbgPflWaterVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflWater bStatTableZxbgPflWater = bStatTableZxbgPflWaterService.getById(bStatTableZxbgPflWaterVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflWaterVo,bStatTableZxbgPflWater);
+        return toAjax(bStatTableZxbgPflWaterService.saveOrUpdate(bStatTableZxbgPflWater));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--废水实际排放量
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--废水实际排放量")
+    @RequiresPermissions("talroad:water:remove")
+    @Log(title = "固定源产排治--执行报告--废水实际排放量", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflWaterVoerproofController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflWaterVoerproofQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflWaterVoerproof;
+import cn.cecep.talroad.vo.BStatTableZxbgPflWaterVoerproofVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflWaterVoerproofService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--废水超标排放信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-28*/
+@Api(tags = "固定源产排治--执行报告--废水超标排放信息")
+@RestController
+@RequestMapping("/execution/report/voerproof")
+public class BStatTableZxbgPflWaterVoerproofController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflWaterVoerproofService bStatTableZxbgPflWaterVoerproofService;
+
+    /**
+     * 查询固定源产排治--执行报告--废水超标排放信息列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--废水超标排放信息")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflWaterVoerproof>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflWaterVoerproofService.selectBStatTableZxbgPflWaterVoerproofListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--废水超标排放信息列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--废水超标排放信息",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--废水超标排放信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflWaterVoerproof>> iPageAjaxResults = bStatTableZxbgPflWaterVoerproofService.selectBStatTableZxbgPflWaterVoerproofListBy(query);
+        ExcelUtil<BStatTableZxbgPflWaterVoerproof> util = new ExcelUtil<BStatTableZxbgPflWaterVoerproof>(BStatTableZxbgPflWaterVoerproof.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--废水超标排放信息数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--废水超标排放信息详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--废水超标排放信息详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflWaterVoerproof> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflWaterVoerproofService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--废水超标排放信息
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--废水超标排放信息")
+    @Log(title = "固定源产排治--执行报告--废水超标排放信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflWaterVoerproof bStatTableZxbgPflWaterVoerproof) {
+        return toAjax(bStatTableZxbgPflWaterVoerproofService.save(bStatTableZxbgPflWaterVoerproof));
+    }
+    /**
+     * 修改固定源产排治--执行报告--废水超标排放信息
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--废水超标排放信息")
+    @Log(title = "固定源产排治--执行报告--废水超标排放信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflWaterVoerproofVo bStatTableZxbgPflWaterVoerproofVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflWaterVoerproofVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflWaterVoerproofVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflWaterVoerproof bStatTableZxbgPflWaterVoerproof = bStatTableZxbgPflWaterVoerproofService.getById(bStatTableZxbgPflWaterVoerproofVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflWaterVoerproof)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflWaterVoerproofVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflWaterVoerproofVo,bStatTableZxbgPflWaterVoerproof);
+        return toAjax(bStatTableZxbgPflWaterVoerproofService.saveOrUpdate(bStatTableZxbgPflWaterVoerproof));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--废水超标排放信息
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--废水超标排放信息")
+    @RequiresPermissions("talroad:voerproof:remove")
+    @Log(title = "固定源产排治--执行报告--废水超标排放信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflWaterVoerproofService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPflallWaterController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPflallWaterQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPflallWater;
+import cn.cecep.talroad.vo.BStatTableZxbgPflallWaterVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPflallWaterService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--总计废水实际排放量Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-28*/
+@Api(tags = "固定源产排治--执行报告--总计废水实际排放量")
+@RestController
+@RequestMapping("/execution/report/allwater")
+public class BStatTableZxbgPflallWaterController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPflallWaterService bStatTableZxbgPflallWaterService;
+
+    /**
+     * 查询固定源产排治--执行报告--总计废水实际排放量列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--总计废水实际排放量")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPflallWater>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPflallWaterService.selectBStatTableZxbgPflallWaterListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--总计废水实际排放量列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--总计废水实际排放量",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--总计废水实际排放量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,  @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPflallWater>> iPageAjaxResults = bStatTableZxbgPflallWaterService.selectBStatTableZxbgPflallWaterListBy(query);
+        ExcelUtil<BStatTableZxbgPflallWater> util = new ExcelUtil<BStatTableZxbgPflallWater>(BStatTableZxbgPflallWater.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--总计废水实际排放量数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--总计废水实际排放量详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--总计废水实际排放量详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPflallWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPflallWaterService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--总计废水实际排放量
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--总计废水实际排放量")
+    @Log(title = "固定源产排治--执行报告--总计废水实际排放量", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPflallWater bStatTableZxbgPflallWater) {
+        return toAjax(bStatTableZxbgPflallWaterService.save(bStatTableZxbgPflallWater));
+    }
+    /**
+     * 修改固定源产排治--执行报告--总计废水实际排放量
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--总计废水实际排放量")
+    @Log(title = "固定源产排治--执行报告--总计废水实际排放量", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPflallWaterVo bStatTableZxbgPflallWaterVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflallWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflallWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPflallWater bStatTableZxbgPflallWater = bStatTableZxbgPflallWaterService.getById(bStatTableZxbgPflallWaterVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPflallWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPflallWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPflallWaterVo,bStatTableZxbgPflallWater);
+        return toAjax(bStatTableZxbgPflallWaterService.saveOrUpdate(bStatTableZxbgPflallWater));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--总计废水实际排放量
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--总计废水实际排放量")
+    @RequiresPermissions("talroad:water:remove")
+    @Log(title = "固定源产排治--执行报告--总计废水实际排放量", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPflallWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgPfltotalWaterController.java

@@ -0,0 +1,124 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BStatTableZxbgPflAirOther;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgPfltotalWaterQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgPfltotalWater;
+import cn.cecep.talroad.vo.BStatTableZxbgPfltotalWaterVo;
+import cn.cecep.talroad.service.IBStatTableZxbgPfltotalWaterService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--废水正常排放总计（一般排放口）Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-28*/
+@Api(tags = "固定源产排治--执行报告--废水正常排放总计（一般排放口）")
+@RestController
+@RequestMapping("/execution/report/watertotal")
+public class BStatTableZxbgPfltotalWaterController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgPfltotalWaterService bStatTableZxbgPfltotalWaterService;
+
+    /**
+     * 查询固定源产排治--执行报告--废水正常排放总计（一般排放口）列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--废水正常排放总计（一般排放口）")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgPfltotalWater>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgPfltotalWaterService.selectBStatTableZxbgPfltotalWaterListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--废水正常排放总计（一般排放口）列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--废水正常排放总计（一般排放口）",produces = "application/octet-stream")
+    @Log(title = "固定源产排治--执行报告--废水正常排放总计（一般排放口）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgPfltotalWater>> iPageAjaxResults = bStatTableZxbgPfltotalWaterService.selectBStatTableZxbgPfltotalWaterListBy(query);
+        ExcelUtil<BStatTableZxbgPfltotalWater> util = new ExcelUtil<BStatTableZxbgPfltotalWater>(BStatTableZxbgPfltotalWater.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--废水正常排放总计（一般排放口）数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--废水正常排放总计（一般排放口）详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--废水正常排放总计（一般排放口）详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgPfltotalWater> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgPfltotalWaterService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--废水正常排放总计（一般排放口）
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--废水正常排放总计（一般排放口）")
+    @Log(title = "固定源产排治--执行报告--废水正常排放总计（一般排放口）", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgPfltotalWater bStatTableZxbgPfltotalWater) {
+        return toAjax(bStatTableZxbgPfltotalWaterService.save(bStatTableZxbgPfltotalWater));
+    }
+    /**
+     * 修改固定源产排治--执行报告--废水正常排放总计（一般排放口）
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--废水正常排放总计（一般排放口）")
+    @Log(title = "固定源产排治--执行报告--废水正常排放总计（一般排放口）", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgPfltotalWaterVo bStatTableZxbgPfltotalWaterVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgPfltotalWaterVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgPfltotalWaterVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgPfltotalWater bStatTableZxbgPfltotalWater = bStatTableZxbgPfltotalWaterService.getById(bStatTableZxbgPfltotalWaterVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgPfltotalWater)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgPfltotalWaterVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgPfltotalWaterVo,bStatTableZxbgPfltotalWater);
+        return toAjax(bStatTableZxbgPfltotalWaterService.saveOrUpdate(bStatTableZxbgPfltotalWater));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--废水正常排放总计（一般排放口）
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--废水正常排放总计（一般排放口）")
+    @RequiresPermissions("talroad:water:remove")
+    @Log(title = "固定源产排治--执行报告--废水正常排放总计（一般排放口）", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgPfltotalWaterService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgWrzlAbnormalitiesController.java

@@ -0,0 +1,123 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgWrzlAbnormalitiesQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgWrzlAbnormalities;
+import cn.cecep.talroad.vo.BStatTableZxbgWrzlAbnormalitiesVo;
+import cn.cecep.talroad.service.IBStatTableZxbgWrzlAbnormalitiesService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--污染治理设施异常情况Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-31*/
+@Api(tags = "固定源产排治--执行报告--污染治理设施异常情况")
+@RestController
+@RequestMapping("/execution/report/abnormalities")
+public class BStatTableZxbgWrzlAbnormalitiesController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgWrzlAbnormalitiesService bStatTableZxbgWrzlAbnormalitiesService;
+
+    /**
+     * 查询固定源产排治--执行报告--污染治理设施异常情况列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--污染治理设施异常情况")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgWrzlAbnormalities>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgWrzlAbnormalitiesService.selectBStatTableZxbgWrzlAbnormalitiesListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--污染治理设施异常情况列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--污染治理设施异常情况")
+    @Log(title = "固定源产排治--执行报告--污染治理设施异常情况", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgWrzlAbnormalities>> iPageAjaxResults = bStatTableZxbgWrzlAbnormalitiesService.selectBStatTableZxbgWrzlAbnormalitiesListBy(query);
+        ExcelUtil<BStatTableZxbgWrzlAbnormalities> util = new ExcelUtil<BStatTableZxbgWrzlAbnormalities>(BStatTableZxbgWrzlAbnormalities.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--污染治理设施异常情况数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--污染治理设施异常情况详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--污染治理设施异常情况详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgWrzlAbnormalities> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgWrzlAbnormalitiesService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--污染治理设施异常情况
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--污染治理设施异常情况")
+    @Log(title = "固定源产排治--执行报告--污染治理设施异常情况", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgWrzlAbnormalities bStatTableZxbgWrzlAbnormalities) {
+        return toAjax(bStatTableZxbgWrzlAbnormalitiesService.save(bStatTableZxbgWrzlAbnormalities));
+    }
+    /**
+     * 修改固定源产排治--执行报告--污染治理设施异常情况
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--污染治理设施异常情况")
+    @Log(title = "固定源产排治--执行报告--污染治理设施异常情况", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgWrzlAbnormalitiesVo bStatTableZxbgWrzlAbnormalitiesVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgWrzlAbnormalitiesVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgWrzlAbnormalitiesVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgWrzlAbnormalities bStatTableZxbgWrzlAbnormalities = bStatTableZxbgWrzlAbnormalitiesService.getById(bStatTableZxbgWrzlAbnormalitiesVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgWrzlAbnormalities)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgWrzlAbnormalitiesVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgWrzlAbnormalitiesVo,bStatTableZxbgWrzlAbnormalities);
+        return toAjax(bStatTableZxbgWrzlAbnormalitiesService.saveOrUpdate(bStatTableZxbgWrzlAbnormalities));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--污染治理设施异常情况
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--污染治理设施异常情况")
+    @RequiresPermissions("talroad:abnormalities:remove")
+    @Log(title = "固定源产排治--执行报告--污染治理设施异常情况", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgWrzlAbnormalitiesService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BStatTableZxbgWrzlTotalController.java

@@ -0,0 +1,123 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BStatTableZxbgWrzlTotalQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BStatTableZxbgWrzlTotal;
+import cn.cecep.talroad.vo.BStatTableZxbgWrzlTotalVo;
+import cn.cecep.talroad.service.IBStatTableZxbgWrzlTotalService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 固定源产排治--执行报告--污染治理设施正常情况汇总Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-07-31*/
+@Api(tags = "固定源产排治--执行报告--污染治理设施正常情况汇总")
+@RestController
+@RequestMapping("/execution/report/facilities")
+public class BStatTableZxbgWrzlTotalController extends BasesController
+{
+    @Autowired
+    private IBStatTableZxbgWrzlTotalService bStatTableZxbgWrzlTotalService;
+
+    /**
+     * 查询固定源产排治--执行报告--污染治理设施正常情况汇总列表
+     */
+    @ApiOperation(value = "查询固定源产排治--执行报告--污染治理设施正常情况汇总")
+    @PostMapping("/list")
+    public AjaxResults<IPage<BStatTableZxbgWrzlTotal>> list(@RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        return bStatTableZxbgWrzlTotalService.selectBStatTableZxbgWrzlTotalListBy(query);
+    }
+    
+
+    /**
+     * 导出固定源产排治--执行报告--污染治理设施正常情况汇总列表
+     */
+    @ApiOperation(value = "导出固定源产排治--执行报告--污染治理设施正常情况汇总")
+    @Log(title = "固定源产排治--执行报告--污染治理设施正常情况汇总", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BStatTablepPwxkWaterQuery query)
+    {
+        query.setPageNum(1);
+        query.setPageSize(9999999);
+        AjaxResults<IPage<BStatTableZxbgWrzlTotal>> iPageAjaxResults = bStatTableZxbgWrzlTotalService.selectBStatTableZxbgWrzlTotalListBy(query);
+        ExcelUtil<BStatTableZxbgWrzlTotal> util = new ExcelUtil<BStatTableZxbgWrzlTotal>(BStatTableZxbgWrzlTotal.class);
+        util.exportExcel(response, iPageAjaxResults.getData().getRecords(), "固定源产排治--执行报告--污染治理设施正常情况汇总数据");
+    }
+
+    /**
+     * 获取固定源产排治--执行报告--污染治理设施正常情况汇总详细信息
+     */
+    @ApiOperation(value = "获取固定源产排治--执行报告--污染治理设施正常情况汇总详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BStatTableZxbgWrzlTotal> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(bStatTableZxbgWrzlTotalService.getById(id));
+    }
+    /**
+     * 新增固定源产排治--执行报告--污染治理设施正常情况汇总
+     */
+    @ApiOperation(value = "新增固定源产排治--执行报告--污染治理设施正常情况汇总")
+    @Log(title = "固定源产排治--执行报告--污染治理设施正常情况汇总", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BStatTableZxbgWrzlTotal bStatTableZxbgWrzlTotal) {
+        return toAjax(bStatTableZxbgWrzlTotalService.save(bStatTableZxbgWrzlTotal));
+    }
+    /**
+     * 修改固定源产排治--执行报告--污染治理设施正常情况汇总
+     */
+    @ApiOperation(value = "修改固定源产排治--执行报告--污染治理设施正常情况汇总")
+    @Log(title = "固定源产排治--执行报告--污染治理设施正常情况汇总", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BStatTableZxbgWrzlTotalVo bStatTableZxbgWrzlTotalVo) {
+        if(ObjectUtil.isEmpty(bStatTableZxbgWrzlTotalVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(bStatTableZxbgWrzlTotalVo.getId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BStatTableZxbgWrzlTotal bStatTableZxbgWrzlTotal = bStatTableZxbgWrzlTotalService.getById(bStatTableZxbgWrzlTotalVo.getId());
+        if(ObjectUtil.isEmpty(bStatTableZxbgWrzlTotal)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", bStatTableZxbgWrzlTotalVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(bStatTableZxbgWrzlTotalVo,bStatTableZxbgWrzlTotal);
+        return toAjax(bStatTableZxbgWrzlTotalService.saveOrUpdate(bStatTableZxbgWrzlTotal));
+    }
+
+    /**
+     * 删除固定源产排治--执行报告--污染治理设施正常情况汇总
+     */
+    @ApiOperation(value = "删除固定源产排治--执行报告--污染治理设施正常情况汇总")
+    @RequiresPermissions("talroad:total:remove")
+    @Log(title = "固定源产排治--执行报告--污染治理设施正常情况汇总", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(bStatTableZxbgWrzlTotalService.removeByIds(Arrays.asList(ids)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasDevToElecController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BasDevToElec;
+import cn.cecep.talroad.service.IBasDevToElecService;
+import cn.cecep.talroad.vo.BasDevToElecVo;
+import cn.cecep.talroad.vo.query.BasDevToElecQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 有组织-分表计电设备对应Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "监测监控--有组织-分表计电设备对应")
+@RestController
+@RequestMapping("/basDevToElec")
+public class BasDevToElecController extends BasesController
+{
+    @Autowired
+    private IBasDevToElecService basDevToElecService;
+
+    /**
+     * 查询有组织-分表计电设备对应列表
+     */
+    @ApiOperation(value = "查询有组织-分表计电设备对应")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BasDevToElec>> list(BasDevToElecQuery basDevToElec)
+    {
+        Page<BasDevToElec> page = new Page<>(basDevToElec.getPageNum(), basDevToElec.getPageSize());
+        IPage<BasDevToElec> list = basDevToElecService.page(page, BasDevToElecQuery.createLambdaQueryWrapper(basDevToElec));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出有组织-分表计电设备对应列表
+     */
+    @ApiOperation(value = "导出有组织-分表计电设备对应")
+    @Log(title = "有组织-分表计电设备对应", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasDevToElec basDevToElec)
+    {
+        List<BasDevToElec> list = basDevToElecService.selectBasDevToElecList(basDevToElec);
+        ExcelUtil<BasDevToElec> util = new ExcelUtil<BasDevToElec>(BasDevToElec.class);
+        util.exportExcel(response, list, "有组织-分表计电设备对应数据");
+    }
+
+    /**
+     * 获取有组织-分表计电设备对应详细信息
+     */
+    @ApiOperation(value = "获取有组织-分表计电设备对应详细信息")
+    @PostMapping(value = "/{deviceId}")
+    public AjaxResults<BasDevToElec> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(basDevToElecService.getById(id));
+    }
+    /**
+     * 新增有组织-分表计电设备对应
+     */
+    @ApiOperation(value = "新增有组织-分表计电设备对应")
+    @Log(title = "有组织-分表计电设备对应", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasDevToElec basDevToElec) {
+        return toAjax(basDevToElecService.save(basDevToElec));
+    }
+    /**
+     * 修改有组织-分表计电设备对应
+     */
+    @ApiOperation(value = "修改有组织-分表计电设备对应")
+    @Log(title = "有组织-分表计电设备对应", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasDevToElecVo basDevToElecVo) {
+        if(ObjectUtil.isEmpty(basDevToElecVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(basDevToElecVo.getDeviceId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasDevToElec basDevToElec = basDevToElecService.getById(basDevToElecVo.getDeviceId());
+        if(ObjectUtil.isEmpty(basDevToElec)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basDevToElecVo.getDeviceId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basDevToElecVo,basDevToElec);
+        return toAjax(basDevToElecService.saveOrUpdate(basDevToElec));
+    }
+
+    /**
+     * 删除有组织-分表计电设备对应
+     */
+    @ApiOperation(value = "删除有组织-分表计电设备对应")
+    @RequiresPermissions("talroad:elec:remove")
+    @Log(title = "有组织-分表计电设备对应", businessType = BusinessType.DELETE)
+    @PostMapping("/{deviceIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] deviceIds) {
+        return toAjax(basDevToElecService.removeByIds(Arrays.asList(deviceIds)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasDeviceController.java

@@ -0,0 +1,532 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.domain.BasDevice;
+import cn.cecep.talroad.domain.BasParam;
+import cn.cecep.talroad.domain.BasProductionDeviceOperationLog;
+import cn.cecep.talroad.domain.PcFactory;
+import cn.cecep.talroad.enums.EnStatTimeType;
+import cn.cecep.talroad.service.IBasDeviceService;
+import cn.cecep.talroad.service.IBasParamService;
+import cn.cecep.talroad.service.IBasProductionDeviceOperationLogService;
+import cn.cecep.talroad.service.IPcFactoryService;
+import cn.cecep.talroad.util.CsvUtils;
+import cn.cecep.talroad.vo.*;
+import cn.cecep.talroad.vo.query.BasDeviceDCSSystemParamQuery;
+import cn.cecep.talroad.vo.query.BasDeviceQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.*;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.PrimitiveIterator;
+import java.util.stream.IntStream;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 设备信息(有组织)Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10
+ */
+@Api(tags = "基础信息--设备信息(有组织)")
+@RestController
+@RequestMapping("/basDevice")
+public class BasDeviceController extends BasesController {
+    @Autowired
+    private IBasDeviceService basDeviceService;
+    @Autowired
+    private IPcFactoryService pcFactoryService;
+
+    @Autowired
+    private IBasParamService paramService;
+    @Autowired
+    private IBasProductionDeviceOperationLogService basProductionDeviceOperationLogService;
+
+    @Autowired
+    private IPcFactoryService factoryService;
+
+    /**
+     * 查询设备信息(有组织)列表
+     */
+    @ApiOperation(value = "查询设备信息(有组织)")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BasDevice>> list(BasDeviceQuery basDevice) {
+        // 若未指定企业，则默认当前用户企业
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)){
+            if (StringUtils.isEmpty(basDevice.getFactoryId())) {
+                String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+                basDevice.setFactoryId(factoryId);
+            }
+        }
+        basDevice.setStatus(1L);
+        Page<BasDevice> page = new Page<>(basDevice.getPageNum(), basDevice.getPageSize());
+
+        QueryWrapper<BasDevice> lambdaQueryWrapper = BasDeviceQuery.createLambdaQueryWrapper(basDevice);
+
+        // 若未指定行业
+        if (StringUtils.isEmpty(basDevice.getIndustry())) {
+            lambdaQueryWrapper.in("industry", "GT,DL,JH,BL,SN,FS".split(","));
+        }
+
+        IPage<BasDevice> list = basDeviceService.page(page, lambdaQueryWrapper);
+        return AjaxResults.success(list);
+    }
+
+    /**
+     * DCS系统参数设置列表
+     */
+    @ApiOperation(value = "DCS系统参数设置列表")
+    @GetMapping("/listDCSSystemParam")
+    public AjaxResults<IPage<BasDeviceDCSSystemParamVo>> listDCSSystemParam(BasDeviceDCSSystemParamQuery query) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            query.setFactoryId(factoryId);
+        }
+        if (StringUtils.isNotEmpty(query.getFactoryId())) {
+            PcFactory pcFactory = pcFactoryService.getById(query.getFactoryId());
+            if(StringUtils.isBlank(pcFactory.getIndustryCategory())){
+                query.setIndustry("------");
+            }else{
+                query.setIndustry(pcFactory.getIndustryCategory());
+            }
+        }
+        IPage<BasDeviceDCSSystemParamVo> list = basDeviceService.listDCSSystemParam(query);
+
+        return AjaxResults.success(list);
+    }
+
+    /**
+     * 设备信息(有组织)下拉框
+     */
+    @ApiOperation(value = "设备信息(有组织)下拉框")
+    @GetMapping("/basDeviceSelect")
+    public AjaxResults<List<BasDevice>> basDeviceSelect(BasDeviceQuery basDevice) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basDevice.setFactoryId(factoryId);
+            basDevice.setStatus(1L);
+        }
+        List<BasDevice> list = basDeviceService.list(BasDeviceQuery.createLambdaQueryWrapper(basDevice));
+        return AjaxResults.success(list);
+    }
+
+    /**
+     * 工序下拉框
+     */
+    @ApiOperation(value = "工序下拉框")
+    @GetMapping("/workStepSelect")
+    public AjaxResults<List<String>> workStepSelect(BasDeviceQuery basDevice) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            PcFactory pcFactory = pcFactoryService.getById(factoryId);
+            basDevice.setFactoryId(factoryId);
+            basDevice.setIndustry(pcFactory.getIndustryCategory());
+        }
+        List<String> list = basDeviceService.groupByWorkStepSelect(basDevice.getFactoryId(), basDevice.getIndustry());
+        return AjaxResults.success(list);
+
+    }
+
+    /**
+     * 工序下拉框
+     */
+    @ApiOperation(value = "参数名称下拉框")
+    @GetMapping("/paramNameSelect")
+    public AjaxResults<List<String>> paramNameSelect(BasDeviceQuery basDevice) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            PcFactory pcFactory = pcFactoryService.getById(factoryId);
+            basDevice.setFactoryId(factoryId);
+            basDevice.setIndustry(pcFactory.getIndustryCategory());
+        }
+        List<String> list = basDeviceService.groupByParamNameSelect(basDevice.getFactoryId(), basDevice.getIndustry());
+        return AjaxResults.success(list);
+    }
+
+    /**
+     * 导出设备信息(有组织)列表
+     */
+    @ApiOperation(value = "导出设备信息(有组织)")
+    @Log(title = "设备信息(有组织)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody BasDeviceQuery basDevice) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            if (StringUtils.isEmpty(basDevice.getFactoryId())) {
+                String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+                basDevice.setFactoryId(factoryId);
+            }
+        }
+        basDevice.setStatus(1L);
+        QueryWrapper<BasDevice> lambdaQueryWrapper = BasDeviceQuery.createLambdaQueryWrapper(basDevice);
+        //lambdaQueryWrapper.notIn("type", "XK,EL,TC".split(","));
+        lambdaQueryWrapper.in("industry", "GT,DL,JH,BL,SN,FS".split(","));
+
+        lambdaQueryWrapper.eq(basDevice.getStatus() != null, "status", basDevice.getStatus());
+        List<BasDevice> list = basDeviceService.list(lambdaQueryWrapper);
+
+
+        List<BasDeviceExcelVo> basDeviceExcelVoList = new ArrayList<>();
+        PrimitiveIterator.OfInt iterator = IntStream.iterate(1, k -> k + 1).iterator();
+        list.forEach(e -> {
+            BasDeviceExcelVo basDeviceExcelVo = new BasDeviceExcelVo();
+            BeanUtil.copyProperties(e, basDeviceExcelVo);
+            basDeviceExcelVo.setSerialnumber(iterator.next());
+            basDeviceExcelVoList.add(basDeviceExcelVo);
+        });
+
+        ExcelUtil<BasDeviceExcelVo> util = new ExcelUtil<BasDeviceExcelVo>(BasDeviceExcelVo.class);
+        util.exportExcel(response, basDeviceExcelVoList, "生产设施坐标");
+    }
+
+    /**
+     * 导出设备信息(有组织)列表
+     */
+    @ApiOperation(value = "导出DCS系统参数设置")
+    @Log(title = "导出DCS系统参数设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportDCSSystemParam")
+    public void exportDCSSystemParam(HttpServletResponse response, @RequestBody BasDeviceDCSSystemParamQuery query) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            PcFactory pcFactory = pcFactoryService.getById(factoryId);
+            query.setPageNum(1);
+            query.setPageSize(Integer.MAX_VALUE);
+            query.setFactoryId(factoryId);
+            if (StringUtils.isBlank(pcFactory.getIndustryCategory())) {
+                query.setIndustry("------");
+            } else {
+                query.setIndustry(pcFactory.getIndustryCategory());
+            }
+        }
+        List<BasDeviceDCSSystemParamExcelVo> list = basDeviceService.exportDCSSystemParam(query);
+        List<BasDeviceDCSSystemParamExcelVo> basDeviceExcelVoList = new ArrayList<>();
+        PrimitiveIterator.OfInt iterator = IntStream.iterate(1, k -> k + 1).iterator();
+        list.forEach(e -> {
+            e.setSerialnumber(iterator.next());
+        });
+        ExcelUtil<BasDeviceDCSSystemParamExcelVo> util = new ExcelUtil<BasDeviceDCSSystemParamExcelVo>(BasDeviceDCSSystemParamExcelVo.class);
+        util.exportExcel(response, list, "DCS系统参数设置数据");
+    }
+
+    /**
+     * 获取设备信息(有组织)详细信息
+     */
+    @ApiOperation(value = "获取设备信息(有组织)详细信息")
+    @GetMapping(value = "/{deviceId}")
+    public AjaxResults<BasDevice> getInfo(@PathVariable("deviceId") String id) {
+        return AjaxResults.success(basDeviceService.getById(id));
+    }
+
+    /**
+     * 新增设备信息(有组织)
+     */
+    @ApiOperation(value = "新增设备信息(有组织)")
+    @Log(title = "设备信息(有组织)", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasDevice basDevice) {
+        return toAjax(basDeviceService.save(basDevice));
+    }
+
+    /**
+     * 修改设备信息(有组织)
+     */
+    @ApiOperation(value = "修改设备信息(有组织)")
+    @Log(title = "设备信息(有组织)", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasDeviceVo basDeviceVo) {
+        if (ObjectUtil.isEmpty(basDeviceVo)) {
+            throw new InvalidParameterException("参数为空");
+        }
+        if (ObjectUtil.isEmpty(basDeviceVo.getDeviceId())) {
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasDevice basDevice = basDeviceService.getById(basDeviceVo.getDeviceId());
+        if (ObjectUtil.isEmpty(basDevice)) {
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basDeviceVo.getDeviceId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basDeviceVo, basDevice);
+        return toAjax(basDeviceService.saveOrUpdate(basDevice));
+    }
+
+
+    /**
+     * 修改设备信息(有组织)
+     */
+    @ApiOperation(value = "批量修改设备信息(有组织)")
+    @Log(title = "批量分表计电--设备点位", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editBatch")
+    public AjaxResults<Boolean> editBatch(@RequestBody BasDeviceVo[] BasDeviceVoArr) {
+        if (BasDeviceVoArr == null || BasDeviceVoArr.length < 1) {
+            throw new InvalidParameterException("参数为空");
+        }
+        for(BasDeviceVo bs:BasDeviceVoArr){
+            bs.setLon(bs.getLonMap());
+            bs.setLat(bs.getLatMap());
+        }
+        basDeviceService.editBatch(BasDeviceVoArr);
+        return toAjax(true);
+    }
+
+    /**
+     * 删除设备信息(有组织)
+     */
+    @ApiOperation(value = "删除设备信息(有组织)")
+//    @RequiresPermissions("talroad:device:remove")
+    @Log(title = "设备信息(有组织)", businessType = BusinessType.DELETE)
+    @PostMapping("/remove/{deviceIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] deviceIds) {
+        return toAjax(basDeviceService.removeByIds(Arrays.asList(deviceIds)));
+    }
+
+    @GetMapping("/getDevicesByType")
+    @ApiOperation(value = "获取指定工厂某工序下所有设备", notes = "")
+    public AjaxResults<List<DeviceIdNameVO>> getDevicesByType(
+            @ApiParam(name = "factoryId", value = "工厂id", required = true) @RequestParam String factoryId,
+            @ApiParam(name = "deviceType", value = "设备类型(焦化:JL,烧结:SJJ,球团:SL,炼铁:GL,炼钢:ZL,白灰窑:LY,发电:FDJZ。ALL=全部)", required = false) @RequestParam(required = false) String deviceType
+    ) {
+        // 需要修改直接查询，不要进行BeanUtils.copyProperties
+
+        List<BasDevice> list = null;
+        if (StringUtils.isNotEmpty(deviceType)) {
+            list = basDeviceService.lambdaQuery().eq(BasDevice::getFactoryId, factoryId)
+                    .eq(!("ALL".equals(deviceType)), BasDevice::getType, deviceType)
+                    .in(BasDevice::getIndustry, Arrays.asList("GT", "BL", "FS", "DL", "JH", "SN"))
+                    .gt(BasDevice::getStatus, 0)
+                    .orderByAsc(BasDevice::getDeviceId).list();
+        } else {
+            list = basDeviceService.lambdaQuery().eq(BasDevice::getFactoryId, factoryId)
+                    .gt(BasDevice::getStatus, 0)
+                    .orderByAsc(BasDevice::getDeviceId).list();
+        }
+
+        List<DeviceIdNameVO> deviceIdNameVOS = new ArrayList<>();
+        list.forEach(a -> {
+            DeviceIdNameVO vo = new DeviceIdNameVO();
+            BeanUtils.copyProperties(a, vo);
+            deviceIdNameVOS.add(vo);
+        });
+        return AjaxResults.success(deviceIdNameVOS);
+    }
+
+    @Data
+    @ApiModel
+    public static class DeviceIdNameVO {
+        @ApiModelProperty(value = "设备ID")
+        private String deviceId;
+
+        @ApiModelProperty(value = "设备名称")
+        private String name;
+    }
+
+    @GetMapping("/getDeviceDataByType")
+    @ApiOperation(value = "设备数据查询")
+    public AjaxResults<IPage> getDeviceDataByType(
+            @ApiParam(name = "timeType", value = "时间类型（R:实时,H:小时,D:日,N:月,Y:年）", allowableValues = "R,H,D,N,Y") @RequestParam(required = false) String timeType,
+            @ApiParam(name = "industry", value = "行业", required = true, allowableValues = "GT,JH,SN,BL,DL,FS") @RequestParam String industry,
+            @ApiParam(name = "factoryId", value = "工厂id", required = true, defaultValue = "4001") @RequestParam String factoryId,
+            @ApiParam(name = "deviceId", value = "设备id(英文逗号分隔)", defaultValue = "DL40010001") @RequestParam(required = false) String deviceId,
+            @ApiParam(name = "deviceType", value = "设备类型。钢铁=(焦炉:JL,烧结机:SJJ,竖炉:SL,高炉:GL,转炉:ZL,炉窑:LY,发电:FDJZ，GLMQ:高炉煤气放散，ZLMQ:转炉煤气放散)，焦化=JL，水泥=SNY，玻璃:SCX，电力=(锅炉:GUL,发电机组:FDJZ)，焚烧:FS", required = true) @RequestParam String deviceType,
+            @ApiParam(name = "startTime", value = "开始时间。实时=yyyy-MM-dd HH:mm:ss，小时=yyyy-MM-dd HH:00，日=yyyy-MM-dd，月=yyyy-MM，年=yyyy", defaultValue = "2021-11-03 10:00:00", required = true) @RequestParam String startTime,
+            @ApiParam(name = "endTime", value = "结束时间。实时=yyyy-MM-dd HH:mm:ss，小时=yyyy-MM-dd HH:00，日=yyyy-MM-dd，月=yyyy-MM，年=yyyy", defaultValue = "2021-11-03 10:30:00", required = true) @RequestParam String endTime,
+            @ApiParam(name = "orderField", value = "排序字段(dataTime)") @RequestParam(required = false) String orderField,
+            @ApiParam(name = "orderType", value = "排序方向。asc=升序(默认),desc=降序") @RequestParam(required = false) String orderType,
+            @ApiParam(name = "pageNo", value = "当前页号(从1开始)", defaultValue = "1") @RequestParam(required = false) Integer pageNo,
+            @ApiParam(name = "pageSize", value = "每页条数", defaultValue = "20") @RequestParam(required = false) Integer pageSize
+    ) {
+        //检查分页是否生效
+        long start = System.currentTimeMillis();
+        Page page = new Page(pageNo, pageSize);
+        basDeviceService.getDeviceDataByType(timeType, industry, factoryId, deviceId, deviceType, startTime, endTime, orderField, orderType, page);
+        long end = System.currentTimeMillis();
+        logger.info("basDevice.getDeviceDataByType##设备数据查询耗时:" + (end - start) + "毫秒");
+        return AjaxResults.success(page);
+    }
+
+    @GetMapping("/getDeviceDataByType_Export")
+    @ApiOperation(value = "设备数据查询-导出CSV")
+    public void getDeviceDataByType_Export(
+            @ApiParam(name = "timeType", value = "时间类型（R:实时,H:小时,D:日,N:月,Y:年）", allowableValues = "R,H,D,N,Y") @RequestParam(required = false) String timeType,
+            @ApiParam(name = "industry", value = "行业", required = true, allowableValues = "GT,JH,SN,BL,DL,FS") @RequestParam String industry,
+            @ApiParam(name = "factoryId", value = "工厂id", required = true, defaultValue = "4001") @RequestParam String factoryId,
+            @ApiParam(name = "deviceId", value = "设备id(英文逗号分隔)", defaultValue = "DL40010001") @RequestParam(required = false) String deviceId,
+            @ApiParam(name = "deviceType", value = "设备类型。钢铁=(焦炉:JL,烧结机:SJJ,竖炉:SL,高炉:GL,转炉:ZL,炉窑:LY,发电:FDJZ，GLMQ:高炉煤气，ZLMQ:转炉煤气)，焦化=JL，水泥=SNY，玻璃:SCX，电力=(锅炉:GUL,发电机组:FDJZ)，焚烧:FS", required = true) @RequestParam String deviceType,
+            @ApiParam(name = "startTime", value = "开始时间。实时=yyyy-MM-dd HH:mm:ss，小时=yyyy-MM-dd HH:00，日=yyyy-MM-dd，月=yyyy-MM，年=yyyy", defaultValue = "2021-11-03 10:00:00", required = true) @RequestParam String startTime,
+            @ApiParam(name = "endTime", value = "结束时间。实时=yyyy-MM-dd HH:mm:ss，小时=yyyy-MM-dd HH:00，日=yyyy-MM-dd，月=yyyy-MM，年=yyyy", defaultValue = "2021-11-03 10:30:00", required = true) @RequestParam String endTime,
+            @ApiParam(name = "orderField", value = "排序字段(dataTime)") @RequestParam(required = false) String orderField,
+            @ApiParam(name = "orderType", value = "排序方向。asc=升序(默认),desc=降序") @RequestParam(required = false) String orderType,
+            @ApiParam(name = "pageNo", value = "当前页号(从1开始)", defaultValue = "1") @RequestParam(required = false) Integer pageNo,
+            @ApiParam(name = "pageSize", value = "每页条数", defaultValue = "20") @RequestParam(required = false) Integer pageSize,
+            HttpServletResponse response
+    ) throws Exception {
+        CsvUtils csvUtils = new CsvUtils();
+        List<Object> lstMonData;
+        String fileName;
+
+        //===== 初始化
+        if (StringUtils.isBlank(timeType))
+            timeType = EnStatTimeType.REAL.id();
+        fileName = String.format("DCS_%s%s_%s_%s_%s.csv", industry.toUpperCase(), factoryId, timeType, startTime, endTime);
+        fileName = fileName.replaceAll(" ", "-").replaceAll(":", "");
+
+        List<BasParam> basParams = paramService.list(new QueryWrapper<BasParam>().eq("industry", industry).eq("device_type", deviceType));
+        PcFactory pcFactory = factoryService.getById(factoryId.toString());
+
+        csvUtils.initMonDevData(timeType, pcFactory, basParams);
+
+        response.setContentType("multipart/form-data");
+        response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "utf-8"));
+        response.getOutputStream().write(csvUtils.getBufInBytes());
+        csvUtils.clearBuf();
+
+        //==== 查询并生成
+        AjaxResults<IPage> ajaxResults = getDeviceDataByType(timeType, industry, factoryId, deviceId, deviceType, startTime, endTime, orderField, orderType, pageNo, pageSize);
+        if (ajaxResults.getCode() == 200)    //成功
+        {
+            IPage data = ajaxResults.getData();
+            lstMonData = data.getRecords();
+
+            csvUtils.exportMonDevData(lstMonData);
+            response.getOutputStream().write(csvUtils.getBufInBytes());   //分段输出
+            csvUtils.clearBuf();
+        } else                        //失败
+        {
+            csvUtils.exportError("[" + ajaxResults.getCode() + "]" + ajaxResults.getMsg());
+        }
+        response.getOutputStream().write(csvUtils.getBufInBytes());
+        csvUtils.clearBuf();
+        response.flushBuffer();
+    }
+
+    @GetMapping("/getDeviceChart/{deviceId}/{startTime}/{endTime}")
+    @ApiOperation(value = "获取设备工况折线图", notes = "")
+    public AjaxResults<EChartsVO> getDeviceChart(@PathVariable(value = "deviceId") String deviceId,
+                                                 @PathVariable(value = "startTime") String startTime,
+                                                 @PathVariable(value = "endTime") String endTime) {
+        return AjaxResults.success(basDeviceService.getDeviceChart(deviceId, startTime, endTime));
+    }
+
+    @GetMapping("/getDeviceChart/v2")
+    @ApiOperation(value = "获取设备工况折线图")
+    public AjaxResults<EChartsVO> getDeviceChart2(@RequestParam(value = "deviceId") String deviceId,
+                                                  @RequestParam(value = "startTime") String startTime,
+                                                  @RequestParam(value = "endTime") String endTime,
+                                                  @RequestParam(value = "timeType", defaultValue = "R") String timeType) {
+        return AjaxResults.success(basDeviceService.getDeviceChart(deviceId, startTime, endTime, timeType));
+    }
+    @GetMapping("/getDeviceChart/v3")
+    @ApiOperation(value = "获取装备停限产设备工况折线图")
+    public AjaxResults<ChartVo> getDeviceChart3(@RequestParam(value = "deviceId") String deviceId,
+                                                  @RequestParam(value = "startTime") String startTime,
+                                                  @RequestParam(value = "endTime") String endTime,
+                                                  @RequestParam(value = "timeType", defaultValue = "R") String timeType) {
+        return AjaxResults.success(basDeviceService.getDeviceChart3(deviceId, startTime, endTime, timeType));
+    }
+    @GetMapping("/getDeviceChart/v5")
+    @ApiOperation(value = "获取CO设备工况折线图")
+    public AjaxResults<ChartVo> getDeviceChart5(@RequestParam(value = "deviceId") String deviceId,
+                                                  @RequestParam(value = "startTime") String startTime,
+                                                  @RequestParam(value = "endTime") String endTime,
+                                                  @RequestParam(value = "timeType", defaultValue = "R") String timeType) {
+        return AjaxResults.success(basDeviceService.getDeviceChart5(deviceId, startTime, endTime, timeType));
+    }
+    @GetMapping("/getDeviceChart/v6")
+    @ApiOperation(value = "获取CO设备工况折线图")
+    public AjaxResults<ChartVo> getDeviceChart6(@RequestParam(value = "deviceId") String deviceId,
+                                                  @RequestParam(value = "startTime") String startTime,
+                                                  @RequestParam(value = "endTime") String endTime,
+                                                  @RequestParam(value = "timeType", defaultValue = "R") String timeType) {
+        return AjaxResults.success(basDeviceService.getDeviceChart6(deviceId, startTime, endTime, timeType));
+    }
+
+    @GetMapping("/getDevicesByInsduty")
+    @ApiOperation(value = "获取指定企业、指定行业下所有设备", notes = "")
+    public AjaxResults<List<BasDeviceIndustryVo>> getDevicesByInsduty(
+            @ApiParam(name = "factoryId", value = "工厂id", required = true) @RequestParam String factoryId,
+            @ApiParam(name = "industry", value = "行业类型(焦化:JH,钢铁:GT,玻璃:BL,垃圾焚烧:FS,水泥:SN,电力:DL,分表计电:EL,排污许可生产、治理设备:XK。ALL=全部)", required = true) @RequestParam String industry
+    ) {
+        // 需要修改直接查询，不要进行BeanUtils.copyProperties
+        List<BasDevice> list = basDeviceService.lambdaQuery().eq(BasDevice::getFactoryId, factoryId)
+                .eq(!("ALL".equals(industry)), BasDevice::getIndustry, industry)
+                .gt(BasDevice::getStatus, 0)
+                .orderByAsc(BasDevice::getDeviceId).list();
+        List<BasDeviceIndustryVo> basDeviceIndustryVOs = new ArrayList<>();
+        list.forEach(a -> {
+            BasDeviceIndustryVo vo = new BasDeviceIndustryVo();
+            BeanUtils.copyProperties(a, vo);
+            basDeviceIndustryVOs.add(vo);
+        });
+        return AjaxResults.success(basDeviceIndustryVOs);
+    }
+
+    /**
+     * 操作日志
+     */
+    @ApiOperation(value = "操作日志")
+    @GetMapping("/editLogList")
+    public AjaxResults<IPage<BasProductionDeviceOperationLog>> editLogList(BasProductionDeviceOperationLogQuery basProductionDeviceOperationLogQuery) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basProductionDeviceOperationLogQuery.setFactoryId(factoryId);
+        }
+        Page<BasProductionDeviceOperationLog> page = new Page<>(basProductionDeviceOperationLogQuery.getPageNum(), basProductionDeviceOperationLogQuery.getPageSize());
+        IPage<BasProductionDeviceOperationLog> list = basProductionDeviceOperationLogService.page(page, basProductionDeviceOperationLogQuery.createLambdaQueryWrapper(basProductionDeviceOperationLogQuery));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "生产工况监测大屏-工况监控数量总览")
+    @GetMapping("/countOverview")
+    public AjaxResults<BasDeviceVo.CountOverview> countOverview() {
+        BasDeviceVo.CountOverview countOverview = basDeviceService.getCountOverview();
+        return AjaxResults.success(countOverview);
+    }
+
+    @ApiOperation(value = "煤气放散分析大屏-煤气放散数量")
+    @GetMapping("/coal/countOverview")
+    public AjaxResults<BasDeviceVo.CoalCountOverview> coalCountOverview() {
+        BasDeviceVo.CoalCountOverview countOverview = basDeviceService.getCoalCountOverview();
+        return AjaxResults.success(countOverview);
+    }
+
+    @ApiOperation(value = "煤气放散分析大屏-煤气放散清单")
+    @GetMapping("/coal/diffuse/list")
+    public AjaxResults<List<BasDeviceVo.CoalDiffuse>> coalDiffuseList(
+            @ApiParam(value = "设备名称", name = "deviceName") @RequestParam(value = "deviceName", required = false) String deviceName,
+            @ApiParam(value = "当前状态 1正常放散，2异常放散，3未放散，4离线", name = "status") @RequestParam(value = "status", required = false) String status
+    ) {
+        List<BasDeviceVo.CoalDiffuse> list = basDeviceService.getCoalDiffuseList(deviceName, status);
+        return AjaxResults.success(list);
+    }
+
+}
+

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasDeviceParamController.java

@@ -0,0 +1,171 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.domain.BasDcsOperationLog;
+import cn.cecep.talroad.domain.BasDeviceParam;
+import cn.cecep.talroad.service.IBasDcsOperationLogService;
+import cn.cecep.talroad.service.IBasDeviceParamService;
+import cn.cecep.talroad.vo.BasDeviceParamVo;
+import cn.cecep.talroad.vo.query.BasDcsOperationLogQuery;
+import cn.cecep.talroad.vo.query.BasDeviceParamQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 各设备的监测参数属性Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10
+ */
+@Api(tags = "基础信息--各设备的监测参数属性")
+@RestController
+@RequestMapping("/basDeviceParam")
+public class BasDeviceParamController extends BasesController {
+    @Autowired
+    private IBasDeviceParamService basDeviceParamService;
+    @Autowired
+    private IBasDcsOperationLogService basDcsOperationLogService;
+
+    /**
+     * 查询各设备的监测参数属性列表
+     */
+    @ApiOperation(value = "查询各设备的监测参数属性")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BasDeviceParam>> list(BasDeviceParamQuery basDeviceParam) {
+        Page<BasDeviceParam> page = new Page<>(basDeviceParam.getPageNum(), basDeviceParam.getPageSize());
+        basDeviceParam.setIsStatus("1");
+        IPage<BasDeviceParam> list = basDeviceParamService.page(page, BasDeviceParamQuery.createLambdaQueryWrapper(basDeviceParam));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出各设备的监测参数属性列表
+     */
+    @ApiOperation(value = "导出各设备的监测参数属性")
+    @Log(title = "各设备的监测参数属性", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasDeviceParam basDeviceParam) {
+        basDeviceParam.setIsStatus("1");
+        List<BasDeviceParam> list = basDeviceParamService.selectBasDeviceParamList(basDeviceParam);
+        ExcelUtil<BasDeviceParam> util = new ExcelUtil<BasDeviceParam>(BasDeviceParam.class);
+        util.exportExcel(response, list, "各设备的监测参数属性数据");
+    }
+
+    /**
+     * 获取各设备的监测参数属性详细信息
+     */
+    @ApiOperation(value = "获取各设备的监测参数属性详细信息")
+    @PostMapping(value = "/{id}")
+    public AjaxResults<BasDeviceParam> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(basDeviceParamService.getById(id));
+    }
+
+    /**
+     * 新增各设备的监测参数属性
+     */
+    @ApiOperation(value = "新增各设备的监测参数属性")
+    @Log(title = "各设备的监测参数属性", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasDeviceParam basDeviceParam) {
+        return toAjax(basDeviceParamService.save(basDeviceParam));
+    }
+
+    /**
+     * 修改各设备的监测参数属性
+     */
+    @ApiOperation(value = "修改各设备的监测参数属性")
+    @Log(title = "各设备的监测参数属性", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasDeviceParamVo basDeviceParamVo) {
+        if (ObjectUtil.isEmpty(basDeviceParamVo)) {
+            throw new InvalidParameterException("参数为空");
+        }
+        if (ObjectUtil.isEmpty(basDeviceParamVo.getId())) {
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasDeviceParam basDeviceParam = basDeviceParamService.getById(basDeviceParamVo.getId());
+        if (ObjectUtil.isEmpty(basDeviceParam)) {
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basDeviceParamVo.getId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basDeviceParamVo, basDeviceParam);
+        return toAjax(basDeviceParamService.saveOrUpdate(basDeviceParam));
+    }
+
+    /**
+     * 批量修改各设备的监测参数属性
+     */
+    @ApiOperation(value = "批量修改各设备的监测参数属性")
+    @Log(title = "批量各设备的监测参数属性", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editBatch")
+    public AjaxResults<Boolean> editBatch(@RequestBody BasDeviceParamVo[] basDeviceParamVoArr) {
+        if (basDeviceParamVoArr == null || basDeviceParamVoArr.length < 1) {
+            throw new InvalidParameterException("参数为空");
+        }
+
+        basDeviceParamService.editBatch(basDeviceParamVoArr);
+        return toAjax(true);
+    }
+
+    /**
+     * 删除各设备的监测参数属性
+     */
+    @ApiOperation(value = "删除各设备的监测参数属性")
+    @RequiresPermissions("talroad:param:remove")
+    @Log(title = "各设备的监测参数属性", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] ids) {
+        return toAjax(basDeviceParamService.removeByIds(Arrays.asList(ids)));
+    }
+
+
+    /**
+     * 操作日志
+     */
+    @ApiOperation(value = "操作日志")
+    @GetMapping("/editLogList")
+    public AjaxResults<IPage<BasDcsOperationLog>> editLogList(BasDcsOperationLogQuery query) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            query.setFactoryId(factoryId);
+        }
+        Page<BasDcsOperationLog> page = new Page<>(query.getPageNum(), query.getPageSize());
+        IPage<BasDcsOperationLog> list = basDcsOperationLogService.page(page, query.createLambdaQueryWrapper(query));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 操作日志
+     */
+    @ApiOperation(value = "设置参数信息")
+    @GetMapping("/setParamInfo")
+    public AjaxResults<Integer> setParamInfo() {
+            basDeviceParamService.setParamInfo();
+        return AjaxResults.success(1);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasDeviceSiteController.java

@@ -0,0 +1,317 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.domain.*;
+import cn.cecep.talroad.enums.BasDeviceSiteTypeEnum;
+import cn.cecep.talroad.service.IBasDeviceService;
+import cn.cecep.talroad.service.IBasDeviceSiteService;
+import cn.cecep.talroad.service.IMonElecOperationLogService;
+import cn.cecep.talroad.vo.*;
+import cn.cecep.talroad.vo.export.AmVideoDevFiExport;
+import cn.cecep.talroad.vo.export.BasDeviceSiteExport;
+import cn.cecep.talroad.vo.query.AmVideoDevFiQuery;
+import cn.cecep.talroad.vo.query.BasDeviceQuery;
+import cn.cecep.talroad.vo.query.BasDeviceSiteQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+@Api(tags = "设备点位表")
+@RestController
+@RequestMapping("/deviceSite")
+public class BasDeviceSiteController extends BasesController {
+
+    @Autowired
+    private IBasDeviceSiteService basDeviceSiteService;
+    @Autowired
+    private IBasDeviceService basDeviceService;
+    @Autowired
+    private IMonElecOperationLogService monElecOperationLogService;
+
+    @ApiOperation(value = "设备点位列表")
+    @GetMapping("/list")
+    public AjaxResults<List<BasDeviceSite>> list(String deviceId) {
+        List<BasDeviceSite> list = basDeviceSiteService.list(new QueryWrapper<BasDeviceSite>()
+                .eq(StringUtils.isNotEmpty(deviceId), "device_id", deviceId));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "站点名称下拉框")
+    @GetMapping("/stationNameSelect")
+    public AjaxResults<List<BasDeviceSiteExport>> stationNameSelect(BasDeviceSiteQuery basDeviceSiteQuery) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if (ObjectUtil.equal(roleId, 10L)) {
+            basDeviceSiteQuery.setIsStatus("1");
+        }
+        QueryWrapper<BasDeviceSite> lambdaQueryWrapper = BasDeviceSiteQuery.createSingLambdaQueryWrapperQiye(basDeviceSiteQuery);
+        lambdaQueryWrapper.orderByAsc("mam.name");
+        List<BasDeviceSiteExport> list = basDeviceSiteService.selectBasDeviceSiteExportListT(lambdaQueryWrapper);
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "设施名称下拉框")
+    @GetMapping("/deviceNameSelect")
+    public AjaxResults<List<BasDeviceSiteExport>> deviceNameSelect(BasDeviceQuery basDeviceQuery) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if (ObjectUtil.equal(roleId, 10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basDeviceQuery.setIndustry("XK");
+            basDeviceQuery.setIsStatus("1");
+        }
+        QueryWrapper<BasDevice> lambdaQueryWrapper = BasDeviceQuery.createLambdaQueryWrapper(basDeviceQuery);
+        lambdaQueryWrapper.orderByAsc("pollutant_name");
+        List<BasDeviceSiteExport> list = basDeviceSiteService.selectBasDeviceList(lambdaQueryWrapper);
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "设备类型下拉框")
+    @GetMapping("/deviceTypeSelect")
+    public AjaxResults<List<BasDeviceSiteDeviceTypeVo>> deviceTypeSelect() {
+        List<BasDeviceSiteDeviceTypeVo> basDeviceSiteDeviceTypeVoList = new ArrayList<>();
+        for (BasDeviceSiteTypeEnum item : BasDeviceSiteTypeEnum.values()) {
+            basDeviceSiteDeviceTypeVoList.add(new BasDeviceSiteDeviceTypeVo(item.getCode(), item.getName()));
+        }
+        return AjaxResults.success(basDeviceSiteDeviceTypeVoList);
+    }
+
+    @ApiOperation(value = "分表计电--设备功率设备点位列表")
+    @GetMapping("/listPower")
+    public AjaxResults<IPage<BasDeviceSite>> listPower(BasDeviceSiteQuery basDeviceSiteQuery) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basDeviceSiteQuery.setFactoryId(factoryId);
+        }
+        Page<BasDeviceSite> page = new Page<>(basDeviceSiteQuery.getPageNum(), basDeviceSiteQuery.getPageSize());
+        if (StringUtils.isNotBlank(basDeviceSiteQuery.getDeviceName())) {
+            // 先去反查设备
+            List<BasDevice> basDeviceList = basDeviceService.list(new QueryWrapper<BasDevice>().eq("name", basDeviceSiteQuery.getDeviceName()));
+            List<String> deviceIds = basDeviceList.stream().map(BasDevice::getDeviceId).collect(Collectors.toList());
+            basDeviceSiteQuery.setDeviceIds(deviceIds);
+        }
+        IPage<BasDeviceSite> list = basDeviceSiteService.page(page, BasDeviceSiteQuery.createSingLambdaQueryWrapper(basDeviceSiteQuery));
+        List<BasDeviceSite> records = list.getRecords();
+        if (!CollectionUtils.isEmpty(records)) {
+            List<String> deviceIdList = records.stream().map(BasDeviceSite::getDeviceId).collect(Collectors.toList());
+            List<BasDevice> basDeviceList = basDeviceService.list(new QueryWrapper<BasDevice>().in("device_id", deviceIdList));
+            Map<String, String> deviceIdNameMap = basDeviceList.stream().collect(Collectors.toMap(BasDevice::getDeviceId, BasDevice::getName));
+            records.forEach(item -> {
+                item.setDeviceName(deviceIdNameMap.get(item.getDeviceId()));
+            });
+        }
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "设备点位列表-企业端")
+    @GetMapping("/listFactory")
+    public AjaxResults<IPage<BasDeviceSiteExport>> listFactory(BasDeviceSiteQuery basDeviceSite) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if (ObjectUtil.equal(roleId, 10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basDeviceSite.setFactoryId(factoryId);
+            basDeviceSite.setIsStatus("1");
+        }
+        Page<BasDeviceSite> page = new Page<>(basDeviceSite.getPageNum(), basDeviceSite.getPageSize());
+        IPage<BasDeviceSiteExport> list = basDeviceSiteService.selectDeviceNameById(page, BasDeviceSiteQuery.createLambdaQueryWrapper(basDeviceSite));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "导出设备列表-企业端")
+    @GetMapping("/exportFactory")
+    @Log(title = "导出设备列表-企业端", businessType = BusinessType.EXPORT)
+    public void exportFactory(HttpServletResponse response, BasDeviceSiteQuery basDeviceSite) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if (ObjectUtil.equal(roleId, 10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basDeviceSite.setFactoryId(factoryId);
+            basDeviceSite.setIsStatus("1");
+        }
+        List<BasDeviceSiteExport> list = basDeviceSiteService.selectBasDeviceSiteExportList(BasDeviceSiteQuery.createLambdaQueryWrapper(basDeviceSite));
+        ExcelUtil<BasDeviceSiteExport> util = new ExcelUtil<BasDeviceSiteExport>(BasDeviceSiteExport.class);
+        util.exportExcel(response, list, "视频监控数据");
+    }
+
+    @ApiOperation(value = "修改视频监控-企业端")
+    @Log(title = "视频监控", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editFactory")
+    public AjaxResults<Boolean> editFactory(@RequestBody List<BasDeviceSiteExport> basDeviceSiteVo) {
+        if (basDeviceSiteVo.size() == 0) {
+            throw new InvalidParameterException("没有修改的内容");
+        }
+        List<BasDeviceSite> saveList = new ArrayList<BasDeviceSite>();
+        List<BasDeviceSiteExport> saveExportList = new ArrayList<BasDeviceSiteExport>();
+        for (BasDeviceSiteExport avdi : basDeviceSiteVo) {
+            BasDeviceSite basDeviceSite = basDeviceSiteService.getById(avdi.getId());
+            BasDeviceSiteExport basDeviceSiteExport = basDeviceSiteService.getByExport(avdi.getId());
+            if (ObjectUtil.isEmpty(basDeviceSite)) {
+                throw new CommonException(StrUtil.format("根据id{}查询不到数据", avdi.getId()));
+            }
+            basDeviceSite.setDeviceId(avdi.getDeviceId());
+            basDeviceSite.setPointLat(avdi.getPointLat());
+            basDeviceSite.setPointLng(avdi.getPointLng());
+            saveList.add(basDeviceSite);
+            saveExportList.add(basDeviceSiteExport);
+        }
+        basDeviceSiteService.saveLog(basDeviceSiteVo, saveExportList);
+        //赋值
+        return toAjax(basDeviceSiteService.saveOrUpdateBatch(saveList));
+    }
+
+    @ApiOperation(value = "操作日志列表-视频设备绑定排污可设备信息")
+    @PostMapping("/getBasDeviceSiteCoordinateOperationLogList")
+    public AjaxResults<IPage<BasDeviceSiteCoordinateOperationLog>> getBasDeviceSiteCoordinateOperationLogList(BasDeviceSiteQuery basDeviceSite) {
+        try {
+            IPage<BasDeviceSiteCoordinateOperationLog> list = basDeviceSiteService.getBasDeviceSiteCoordinateOperationLogList(basDeviceSite);
+            return AjaxResults.success(list);
+        } catch (Exception e) {
+            return AjaxResults.error("操作日志列表获取失败！");
+        }
+    }
+
+
+    /**
+     * 获取分表计电--设备点位详细信息
+     */
+    @ApiOperation(value = "获取分表计电--设备点位详细信息")
+    @GetMapping(value = "/{id}")
+    public AjaxResults<BasDeviceSite> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(basDeviceSiteService.getById(id));
+    }
+
+    /**
+     * 导出分表计电--设备点位列表
+     */
+    @ApiOperation(value = "导出分表计电--设备点位")
+    @Log(title = "导出分表计电--设备点位", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasDeviceSite basDeviceSite) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            basDeviceSite.setFactoryId(factoryId);
+        }
+        List<BasDeviceSiteExcelVo> list = basDeviceSiteService.selectExportBasDeviceList(basDeviceSite);
+
+        PrimitiveIterator.OfInt iterator = IntStream.iterate(1, k -> k + 1).iterator();
+        list.forEach(e -> {
+            e.setSerialnumber(iterator.next());
+            if (e.getType() != null) {
+                e.setType(BasDeviceSiteTypeEnum.GOVERNANCE.getNameByCode(e.getType()));
+            }
+        });
+
+        ExcelUtil<BasDeviceSiteExcelVo> util = new ExcelUtil<BasDeviceSiteExcelVo>(BasDeviceSiteExcelVo.class);
+        util.exportExcel(response, list, "分表记电系统参数设置");
+    }
+
+    /**
+     * 新增设分表计电--设备点位
+     */
+    @ApiOperation(value = "新增分表计电--设备点位")
+    @Log(title = "分表计电--设备点位", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasDeviceSite basDeviceSite) {
+        return toAjax(basDeviceSiteService.save(basDeviceSite));
+    }
+
+    /**
+     * 修改分表计电--设备点位
+     */
+    @ApiOperation(value = "修改分表计电--设备点位")
+    @Log(title = "分表计电--设备点位", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasDeviceSiteVo basDeviceSiteVo) {
+        if (ObjectUtil.isEmpty(basDeviceSiteVo)) {
+            throw new InvalidParameterException("参数为空");
+        }
+        if (ObjectUtil.isEmpty(basDeviceSiteVo.getDeviceId())) {
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasDeviceSite basDeviceSite = basDeviceSiteService.getById(basDeviceSiteVo.getId());
+        if (ObjectUtil.isEmpty(basDeviceSite)) {
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basDeviceSiteVo.getDeviceId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basDeviceSiteVo, basDeviceSite);
+        return toAjax(basDeviceSiteService.saveOrUpdate(basDeviceSite));
+    }
+
+    /**
+     * 修改分表计电--设备点位
+     *
+     */
+    @ApiOperation(value = "批量修改分表计电--设备点位")
+    @Log(title = "批量分表计电--设备点位", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/editBatch")
+    public AjaxResults<Boolean> editBatch(@RequestBody BasDeviceSiteVo[] basDeviceSiteVoArr) {
+        if (basDeviceSiteVoArr == null || basDeviceSiteVoArr.length < 1) {
+            throw new InvalidParameterException("参数为空");
+        }
+        basDeviceSiteService.editBatch(basDeviceSiteVoArr);
+        return toAjax(true);
+    }
+
+    /**
+     * 删除分表计电--设备点位
+     */
+    @ApiOperation(value = "删除分表计电--设备点位")
+//    @RequiresPermissions("talroad:device:remove")
+    @Log(title = "分表计电--设备点位", businessType = BusinessType.DELETE)
+    @PostMapping("/remove/{deviceIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] deviceIds) {
+        return toAjax(basDeviceSiteService.removeByIds(Arrays.asList(deviceIds)));
+    }
+
+    /**
+     * 操作日志
+     */
+    @ApiOperation(value = "操作日志")
+    @GetMapping("/editLogList")
+    public AjaxResults<IPage<MonElecOperationLog>> editLogList(MonElecOperationLogQuery monElecOperationLogQuery) {
+        Long roleId = SecurityUtils.getLoginUser().getSysUser().getRoles().get(0).getRoleId();
+        if(ObjectUtil.equal(roleId,10L)) {
+            String factoryId = SecurityUtils.getLoginUser().getSysUser().getFactoryId();
+            monElecOperationLogQuery.setFactoryId(factoryId);
+        }
+        Page<MonElecOperationLog> page = new Page<>(monElecOperationLogQuery.getPageNum(), monElecOperationLogQuery.getPageSize());
+        IPage<MonElecOperationLog> list = monElecOperationLogService.page(page, monElecOperationLogQuery.createLambdaQueryWrapper(monElecOperationLogQuery));
+        return AjaxResults.success(list);
+    }
+
+    @ApiOperation(value = "分表计电大屏-分表计电数量总览")
+    @GetMapping("/countOverview")
+    public AjaxResults<BasDeviceSiteVo.CountOverview> countOverview() {
+        BasDeviceSiteVo.CountOverview countOverview = basDeviceSiteService.getCountOverview();
+        return AjaxResults.success(countOverview);
+    }
+
+    @ApiOperation(value = "分表计电大屏-分表计电点位分布")
+    @GetMapping("/scatter")
+    public AjaxResults<EChartsVO> scatterChart(@ApiParam(name = "type", value = "1:按区域, 2:按行业") @RequestParam("type") String type) {
+        EChartsVO chartsVO = basDeviceSiteService.getScatterChart(type);
+        return AjaxResults.success(chartsVO);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasElecDeviceController.java

@@ -0,0 +1,119 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BasElecDevice;
+import cn.cecep.talroad.service.IBasElecDeviceService;
+import cn.cecep.talroad.vo.BasElecDeviceVo;
+import cn.cecep.talroad.vo.query.BasElecDeviceQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 分表计电设备信息Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "监测监控--分表计电设备信息")
+@RestController
+@RequestMapping("/basElecDevice")
+public class BasElecDeviceController extends BasesController
+{
+    @Autowired
+    private IBasElecDeviceService basElecDeviceService;
+
+    /**
+     * 查询分表计电设备信息列表
+     */
+    @ApiOperation(value = "查询分表计电设备信息")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BasElecDevice>> list(BasElecDeviceQuery basElecDevice)
+    {
+        Page<BasElecDevice> page = new Page<>(basElecDevice.getPageNum(), basElecDevice.getPageSize());
+        IPage<BasElecDevice> list = basElecDeviceService.page(page, BasElecDeviceQuery.createLambdaQueryWrapper(basElecDevice));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出分表计电设备信息列表
+     */
+    @ApiOperation(value = "导出分表计电设备信息")
+    @Log(title = "分表计电设备信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasElecDevice basElecDevice)
+    {
+        List<BasElecDevice> list = basElecDeviceService.selectBasElecDeviceList(basElecDevice);
+        ExcelUtil<BasElecDevice> util = new ExcelUtil<BasElecDevice>(BasElecDevice.class);
+        util.exportExcel(response, list, "分表计电设备信息数据");
+    }
+
+    /**
+     * 获取分表计电设备信息详细信息
+     */
+    @ApiOperation(value = "获取分表计电设备信息详细信息")
+    @PostMapping(value = "/{elecDeviceId}")
+    public AjaxResults<BasElecDevice> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(basElecDeviceService.getById(id));
+    }
+    /**
+     * 新增分表计电设备信息
+     */
+    @ApiOperation(value = "新增分表计电设备信息")
+    @Log(title = "分表计电设备信息", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasElecDevice basElecDevice) {
+        return toAjax(basElecDeviceService.save(basElecDevice));
+    }
+    /**
+     * 修改分表计电设备信息
+     */
+    @ApiOperation(value = "修改分表计电设备信息")
+    @Log(title = "分表计电设备信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasElecDeviceVo basElecDeviceVo) {
+        if(ObjectUtil.isEmpty(basElecDeviceVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(basElecDeviceVo.getElecDeviceId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasElecDevice basElecDevice = basElecDeviceService.getById(basElecDeviceVo.getElecDeviceId());
+        if(ObjectUtil.isEmpty(basElecDevice)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basElecDeviceVo.getElecDeviceId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basElecDeviceVo,basElecDevice);
+        return toAjax(basElecDeviceService.saveOrUpdate(basElecDevice));
+    }
+
+    /**
+     * 删除分表计电设备信息
+     */
+    @ApiOperation(value = "删除分表计电设备信息")
+    @RequiresPermissions("talroad:device:remove")
+    @Log(title = "分表计电设备信息", businessType = BusinessType.DELETE)
+    @PostMapping("/{elecDeviceIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] elecDeviceIds) {
+        return toAjax(basElecDeviceService.removeByIds(Arrays.asList(elecDeviceIds)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasParamController.java

@@ -0,0 +1,127 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+import cn.cecep.talroad.domain.BasParam;
+import cn.cecep.talroad.service.IBasParamService;
+import cn.cecep.talroad.vo.BasParamVo;
+import cn.cecep.talroad.vo.query.BasParamQuery;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.security.InvalidParameterException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 监测参数汇总(有组织)Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-01-10*/
+@Api(tags = "基础信息--监测参数汇总(有组织)")
+@RestController
+@RequestMapping("/basParam")
+public class BasParamController extends BasesController
+{
+    @Autowired
+    private IBasParamService basParamService;
+
+    /**
+     * 查询监测参数汇总(有组织)列表
+     */
+    @ApiOperation(value = "查询监测参数汇总(有组织)")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BasParam>> list(BasParamQuery basParam)
+    {
+        Page<BasParam> page = new Page<>(basParam.getPageNum(), basParam.getPageSize());
+        IPage<BasParam> list = basParamService.page(page, BasParamQuery.createLambdaQueryWrapper(basParam));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出监测参数汇总(有组织)列表
+     */
+    @ApiOperation(value = "导出监测参数汇总(有组织)")
+    @Log(title = "监测参数汇总(有组织)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasParam basParam)
+    {
+        List<BasParam> list = basParamService.selectBasParamList(basParam);
+        ExcelUtil<BasParam> util = new ExcelUtil<BasParam>(BasParam.class);
+        util.exportExcel(response, list, "监测参数汇总(有组织)数据");
+    }
+
+    /**
+     * 获取监测参数汇总(有组织)详细信息
+     */
+    @ApiOperation(value = "获取监测参数汇总(有组织)详细信息")
+    @GetMapping(value = "/{paramId}")
+    public AjaxResults<BasParam> getInfo(@PathVariable("id") String id) {
+        return AjaxResults.success(basParamService.getById(id));
+    }
+    /**
+     * 新增监测参数汇总(有组织)
+     */
+    @ApiOperation(value = "新增监测参数汇总(有组织)")
+    @Log(title = "监测参数汇总(有组织)", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasParam basParam) {
+        return toAjax(basParamService.save(basParam));
+    }
+    /**
+     * 修改监测参数汇总(有组织)
+     */
+    @ApiOperation(value = "修改监测参数汇总(有组织)")
+    @Log(title = "监测参数汇总(有组织)", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasParamVo basParamVo) {
+        if(ObjectUtil.isEmpty(basParamVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(basParamVo.getParamId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasParam basParam = basParamService.getById(basParamVo.getParamId());
+        if(ObjectUtil.isEmpty(basParam)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basParamVo.getParamId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basParamVo,basParam);
+        return toAjax(basParamService.saveOrUpdate(basParam));
+    }
+
+    /**
+     * 删除监测参数汇总(有组织)
+     */
+    @ApiOperation(value = "删除监测参数汇总(有组织)")
+    @RequiresPermissions("talroad:param:remove")
+    @Log(title = "监测参数汇总(有组织)", businessType = BusinessType.DELETE)
+    @PostMapping("/{paramIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] paramIds) {
+        return toAjax(basParamService.removeByIds(Arrays.asList(paramIds)));
+    }
+
+    @GetMapping("/monitoringParam")
+    @ApiOperation(value = "DCS监测数据表头数据")
+    public AjaxResults<Map<String, Object>>  getMonitoringParam(){
+        Map<String, Object> data = basParamService.getMonitroingParam();
+        return AjaxResults.success(data);
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BasThresholdConfigController.java

@@ -0,0 +1,122 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.BasThresholdConfigQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.BasThresholdConfig;
+import cn.cecep.talroad.vo.BasThresholdConfigVo;
+import cn.cecep.talroad.service.IBasThresholdConfigService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 关联分析-阈值设置Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-05-18*/
+@Api(tags = "关联分析-阈值设置")
+@RestController
+@RequestMapping("/thresholdConfig")
+public class BasThresholdConfigController extends BasesController
+{
+    @Autowired
+    private IBasThresholdConfigService basThresholdConfigService;
+
+    /**
+     * 查询关联分析-阈值设置列表
+     */
+    @ApiOperation(value = "查询关联分析-阈值设置")
+    @GetMapping("/list")
+    public AjaxResults<IPage<BasThresholdConfig>> list(BasThresholdConfigQuery basThresholdConfig)
+    {
+        Page<BasThresholdConfig> page = new Page<>(basThresholdConfig.getPageNum(), basThresholdConfig.getPageSize());
+        IPage<BasThresholdConfig> list = basThresholdConfigService.page(page, BasThresholdConfigQuery.createLambdaQueryWrapper(basThresholdConfig));
+        return AjaxResults.success(list);
+    }
+
+
+    /**
+     * 导出关联分析-阈值设置列表
+     */
+    @ApiOperation(value = "导出关联分析-阈值设置")
+    @Log(title = "关联分析-阈值设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasThresholdConfig basThresholdConfig)
+    {
+        List<BasThresholdConfig> list = basThresholdConfigService.selectBasThresholdConfigList(basThresholdConfig);
+        ExcelUtil<BasThresholdConfig> util = new ExcelUtil<BasThresholdConfig>(BasThresholdConfig.class);
+        util.exportExcel(response, list, "关联分析-阈值设置数据");
+    }
+
+    /**
+     * 获取关联分析-阈值设置详细信息
+     */
+    @ApiOperation(value = "获取关联分析-阈值设置详细信息")
+    @PostMapping(value = "/{dataId}")
+    public AjaxResults<BasThresholdConfig> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(basThresholdConfigService.getById(id));
+    }
+    /**
+     * 新增关联分析-阈值设置
+     */
+    @ApiOperation(value = "新增关联分析-阈值设置")
+    @Log(title = "关联分析-阈值设置", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody BasThresholdConfig basThresholdConfig) {
+        return toAjax(basThresholdConfigService.save(basThresholdConfig));
+    }
+    /**
+     * 修改关联分析-阈值设置
+     */
+    @ApiOperation(value = "修改关联分析-阈值设置")
+    @Log(title = "关联分析-阈值设置", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody BasThresholdConfigVo basThresholdConfigVo) {
+        if(ObjectUtil.isEmpty(basThresholdConfigVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(basThresholdConfigVo.getDataId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        BasThresholdConfig basThresholdConfig = basThresholdConfigService.getById(basThresholdConfigVo.getDataId());
+        if(ObjectUtil.isEmpty(basThresholdConfig)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", basThresholdConfigVo.getDataId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(basThresholdConfigVo,basThresholdConfig);
+        return toAjax(basThresholdConfigService.saveOrUpdate(basThresholdConfig));
+    }
+
+    /**
+     * 删除关联分析-阈值设置
+     */
+    @ApiOperation(value = "删除关联分析-阈值设置")
+    @RequiresPermissions("talroad:thresholdConfig:remove")
+    @Log(title = "关联分析-阈值设置", businessType = BusinessType.DELETE)
+    @PostMapping("/{dataIds}")
+    public AjaxResults<Boolean> remove(@PathVariable Long[] dataIds) {
+        return toAjax(basThresholdConfigService.removeByIds(Arrays.asList(dataIds)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BaseControlConcentStandardsController.java

@@ -0,0 +1,92 @@
+package cn.cecep.talroad.controller;
+import cn.cecep.talroad.common.core.utils.StringUtils;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BaseControlConcentStandards;
+import cn.cecep.talroad.domain.MonDevFsHour;
+import cn.cecep.talroad.service.BaseControlConcentStandardsService;
+
+import cn.cecep.talroad.vo.BaseControlConcentStandardsVo;
+import cn.cecep.talroad.vo.query.BaseControlConcentStandardsQuery;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.jsonwebtoken.lang.Collections;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+* (base_control_concent_standards)表控制层
+*
+* @author xxxxx
+*/
+@Api(tags ="管控浓度标准设置")
+@RestController
+@RequestMapping("/controlConcentSt")
+public class BaseControlConcentStandardsController {
+/**
+* 服务对象
+*/
+@Resource
+private BaseControlConcentStandardsService baseControlConcentStandardsService;
+
+    /**
+    * 查询列表
+    *
+    * @param query 查询条件
+    * @return 单条数据
+    */
+    @ApiOperation("获取列表")
+    @GetMapping("/selectList")
+    public AjaxResults<IPage<BaseControlConcentStandardsVo>> selectList(BaseControlConcentStandardsQuery query) {
+    return baseControlConcentStandardsService.selectList(query);
+    }
+    @ApiOperation("导出文件")
+    @GetMapping("/export")
+    public void export(HttpServletResponse response,  BaseControlConcentStandardsQuery query) {
+//        query = new BaseControlConcentStandardsQuery();
+        query.setPageNum(1);
+        query.setPageSize(Integer.MAX_VALUE);
+        AjaxResults<IPage<BaseControlConcentStandardsVo>> iPageAjaxResults = baseControlConcentStandardsService.selectList(query);
+        if(iPageAjaxResults.getCode()==200){
+            List<BaseControlConcentStandardsVo> records = iPageAjaxResults.getData().getRecords();
+            ExcelUtil<BaseControlConcentStandardsVo> util = new ExcelUtil<>(BaseControlConcentStandardsVo.class);
+            util.hideColumnNative(2,1,0);
+            util.exportExcel(response, records, "管控浓度标准设置");
+        }
+    }
+    @PostMapping("/import")
+    @ResponseBody
+    public AjaxResults<Boolean> importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<BaseControlConcentStandards> util = new ExcelUtil<>(BaseControlConcentStandards.class);
+        List<BaseControlConcentStandards> voList = util.importExcel(file.getInputStream());
+        List<BaseControlConcentStandards> data = voList.stream().filter(v -> StringUtils.isNotEmpty(v.getIncludeCalculations())).collect(Collectors.toList());
+        if(Collections.isEmpty(data)){
+            return AjaxResults.success(true);
+        }
+        baseControlConcentStandardsService.importData(data);
+        return AjaxResults.success(true);
+    }
+
+    @ApiOperation("更新建议排放量小时均值")
+    @PostMapping("/updateAdviceEmissionAvg")
+    public AjaxResults updateAdviceEmissionAvg() {
+        baseControlConcentStandardsService.updateAdviceEmissionAvg();
+        return AjaxResults.success();
+    }
+    @GetMapping("/addPollutant")
+    public AjaxResults addPollutant(@RequestParam String code, @RequestParam Integer type) {
+       Integer integer= baseControlConcentStandardsService.addPollutant(code,type);
+        return AjaxResults.success(integer);
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/BaseRegionalControlObjectivesController.java

@@ -0,0 +1,61 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.domain.BaseRegionalControlObjectives;
+import cn.cecep.talroad.vo.BaseRegionalControlObjectivesVo;
+import cn.cecep.talroad.service.BaseRegionalControlObjectivesService;
+import cn.cecep.talroad.vo.query.BaseRegionalControlObjectivesQuery;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+* (base_regional_control_objectives)表控制层---自动生成
+*
+* @author 李祥厚
+*/
+@Api(tags = "区域管控目标")
+@RestController
+@RequestMapping("/regionalControlObj")
+public class BaseRegionalControlObjectivesController {
+
+   private static final ReentrantLock lock=new ReentrantLock();
+/**
+* 服务对象
+*/
+@Resource
+private BaseRegionalControlObjectivesService baseRegionalControlObjectivesService;
+
+    /**
+    * 通过主键查询单条数据
+    *
+    * @param query 主键
+    * @return 列表数据
+    */
+    @ApiOperation(value = "查询区域管控目标列表")
+    @GetMapping("/selectList")
+    public AjaxResults<IPage<BaseRegionalControlObjectivesVo>>
+                    selectList(BaseRegionalControlObjectivesQuery query) {
+        return baseRegionalControlObjectivesService.selectList(query);
+    }
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param data
+     * @return 列表数据
+     */
+    @ApiOperation(value = "区域管控目标保存")
+    @PostMapping("/save")
+    public AjaxResults<Boolean> saveList(@RequestBody List<BaseRegionalControlObjectives> data) {
+        lock.lock();
+        AjaxResults<Boolean> save = baseRegionalControlObjectivesService.save(data);
+        lock.unlock();
+        return save;
+    }
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/EarlyWarningController.java

@@ -0,0 +1,144 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.domain.R;
+import cn.cecep.talroad.common.core.exception.CommonException;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.security.utils.SecurityUtils;
+import cn.cecep.talroad.feign.BaseRegionService;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.cecep.talroad.vo.query.EarlyWarningQuery;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.common.security.annotation.RequiresPermissions;
+
+import cn.cecep.talroad.common.core.web.controller.BasesController;
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.domain.EarlyWarning;
+import cn.cecep.talroad.vo.EarlyWarningVo;
+import cn.cecep.talroad.service.IEarlyWarningService;
+
+
+/**
+ * * 开发公司：中节能天融科技有限公司
+ * 管控浓度超标预警Controller 控制层
+ *
+ * @author szhpt
+ * @date 2023-04-24*/
+@Api(tags = "管控浓度超标预警")
+@RestController
+@RequestMapping("/earlyWarning")
+public class EarlyWarningController extends BasesController
+{
+    @Autowired
+    private IEarlyWarningService earlyWarningService;
+
+    @Autowired
+    @Qualifier("baseRegionService")
+    private BaseRegionService baseRegionService;
+    /**
+     * 查询管控浓度超标预警列表
+     */
+    @ApiOperation(value = "查询管控浓度超标预警")
+    @GetMapping("/list")
+    public AjaxResults<IPage<EarlyWarning>> list(EarlyWarningQuery earlyWarning)
+    {
+        String regionCode = SecurityUtils.getLoginUser().getSysUser().getRegionCode();
+        List<String> regionCodes=new ArrayList<>();
+        R<List<String>> r = baseRegionService.getRegionCodeListChild(regionCode);
+        if(r.getCode()==200){
+            regionCodes=r.getData();
+        }
+        earlyWarning.setRegionCodes(regionCodes);
+        Page<EarlyWarning> page = new Page<>(earlyWarning.getPageNum(), earlyWarning.getPageSize());
+        IPage<EarlyWarning> list = earlyWarningService.page(page, EarlyWarningQuery.createLambdaQueryWrapper(earlyWarning));
+        return AjaxResults.success(list);
+    }
+    
+
+    /**
+     * 导出管控浓度超标预警列表
+     */
+    @ApiOperation(value = "导出管控浓度超标预警")
+    @Log(title = "管控浓度超标预警", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody EarlyWarningQuery earlyWarning)
+    {
+        String regionCode = SecurityUtils.getLoginUser().getSysUser().getRegionCode();
+        List<String> regionCodes=new ArrayList<>();
+        R<List<String>> r = baseRegionService.getRegionCodeListChild(regionCode);
+        if(r.getCode()==200){
+            regionCodes=r.getData();
+        }
+        earlyWarning.setRegionCodes(regionCodes);
+        List<EarlyWarning> list = earlyWarningService.selectEarlyWarningList(earlyWarning);
+        ExcelUtil<EarlyWarning> util = new ExcelUtil<EarlyWarning>(EarlyWarning.class);
+        util.exportExcel(response, list, "管控浓度超标预警数据");
+    }
+
+    /**
+     * 获取管控浓度超标预警详细信息
+     */
+    @ApiOperation(value = "获取管控浓度超标预警详细信息")
+    @PostMapping(value = "/{ewId}")
+    public AjaxResults<EarlyWarning> getInfo(@PathVariable("id") Integer id) {
+        return AjaxResults.success(earlyWarningService.getById(id));
+    }
+    /**
+     * 新增管控浓度超标预警
+     */
+    @ApiOperation(value = "新增管控浓度超标预警")
+    @Log(title = "管控浓度超标预警", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResults<Boolean> add(@RequestBody EarlyWarning earlyWarning) {
+        return toAjax(earlyWarningService.save(earlyWarning));
+    }
+    /**
+     * 修改管控浓度超标预警
+     */
+    @ApiOperation(value = "修改管控浓度超标预警")
+    @Log(title = "管控浓度超标预警", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public AjaxResults<Boolean> edit(@RequestBody EarlyWarningVo earlyWarningVo) {
+        if(ObjectUtil.isEmpty(earlyWarningVo)){
+            throw new InvalidParameterException("参数为空");
+        }
+        if(ObjectUtil.isEmpty(earlyWarningVo.getEwId())){
+            throw new InvalidParameterException("参数id为空");
+        }
+        EarlyWarning earlyWarning = earlyWarningService.getById(earlyWarningVo.getEwId());
+        if(ObjectUtil.isEmpty(earlyWarning)){
+            throw new CommonException(StrUtil.format("根据id{}查询不到数据", earlyWarningVo.getEwId()));
+        }
+        //赋值
+        BeanUtil.copyProperties(earlyWarningVo,earlyWarning);
+        return toAjax(earlyWarningService.saveOrUpdate(earlyWarning));
+    }
+
+    /**
+     * 删除管控浓度超标预警
+     */
+    @ApiOperation(value = "删除管控浓度超标预警")
+    @RequiresPermissions("talroad:warning:remove")
+    @Log(title = "管控浓度超标预警", businessType = BusinessType.DELETE)
+    @PostMapping("/{ewIds}")
+    public AjaxResults<Boolean> remove(@PathVariable String[] ewIds) {
+        return toAjax(earlyWarningService.removeByIds(Arrays.asList(ewIds)));
+    }
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/ElectricityMeterController.java

@@ -0,0 +1,138 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.utils.DateUtils;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.mapper.BasElecProCepMapMapper;
+import cn.cecep.talroad.service.ElectricityMeterService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import cn.cecep.talroad.domain.BasElecProCepMap;
+/**
+ * @className: ElectricityMeterController
+ * @description: 分表计电定时任务
+ * @author: Mr.Yanghongtao
+ * @date: 2023/03/30 5:21 PM
+ * @Company: Copyright© [2023/03/30 5:21 PM] by [Mr.Yanghongtao]
+ **/
+@RestController
+@RequestMapping("electricityMeterController")
+@Slf4j
+public class ElectricityMeterController {
+
+    @Autowired
+    ElectricityMeterService electricityMeterServiceImpl;
+
+    @Autowired
+    private BasElecProCepMapMapper basElecProCepMapMapper;
+
+    /**
+     * @Author: Mr.Yanghongtao
+     * @data: 2023/4/2 6:32 PM
+     * @Deseription: 按照规则，15分钟执行一次，但是数据接入可能会慢一些，所以定时任务执行时间往后延长2分钟 02 17 32 47 执行，
+     * @Params: dateTime  yyyy-MM-dd HH-02:00 |  yyyy-MM-dd HH-17:00 | yyyy-MM-dd HH-32:00 | yyyy-MM-dd HH-47:00
+     * @Params: deviceType 1-生产设施，2-治理设施
+     * @Return: cn.cecep.talroad.common.core.web.domain.AjaxResults
+     * @Throws:
+     */
+    @ApiOperation(value = "统计设备运行状态")
+    @GetMapping("/statisticsDeviceRunningState")
+    @Log(title = "统计设备运行状态-每15分钟一次", businessType = BusinessType.UPDATE)
+    public AjaxResults statisticsDeviceRunningState(@RequestParam(name = "dateTime") String dateTime) {
+        try {
+
+            // 查询一下生产设施和治理设施的对应关系
+            List<BasElecProCepMap> isStatus = basElecProCepMapMapper.selectList(new QueryWrapper<BasElecProCepMap>().eq("is_status", 1));
+            // key生产设施ID
+            Map<String, List<String>> cepAndProIds = isStatus.stream()
+                    .collect(Collectors.groupingBy(BasElecProCepMap::getCepDeviceId,
+                            Collectors.mapping(BasElecProCepMap::getProDeviceId, Collectors.toList())));
+
+            electricityMeterServiceImpl.statisticsDeviceRunningState(dateTime,"0",cepAndProIds);
+            electricityMeterServiceImpl.statisticsDeviceRunningState(dateTime,"1",cepAndProIds);
+        } catch (ParseException e) {
+            throw new RuntimeException("传入时间格式错误！");
+        } catch (Exception e) {
+            log.error("统计设备运行状态-每15分钟一次执行失败,异常日志：{}",e);
+        }
+        return AjaxResults.success();
+    }
+
+    @ApiOperation(value = "统计设备运行状态-每日一次")
+    @GetMapping("/statisticsDeviceRunningTime")
+    @Log(title = "统计设备运行状态-每日一次", businessType = BusinessType.UPDATE)
+    public AjaxResults statisticsDeviceRunningTime(
+            @RequestParam(value = "startTime",required = false) String startTime,
+            @RequestParam(value = "endTime",required = false) String endTime
+    ) {
+       try {
+           electricityMeterServiceImpl.statisticsDeviceRunningTime(startTime,endTime);
+       } catch (Exception e) {
+           log.error("统计设备运行状态-每日一次执行失败,异常日志：{}",e);
+       }
+        return AjaxResults.success();
+    }
+
+    @ApiOperation(value = "统计设备运行状态-每月一次")
+    @GetMapping("/statisticsDeviceRunningTimeByMonth")
+    @Log(title = "统计设备运行状态-每月一次", businessType = BusinessType.UPDATE)
+    public AjaxResults statisticsDeviceRunningTimeByMonth(
+            @RequestParam(value = "startTime",required = false) String startTime,
+            @RequestParam(value = "endTime",required = false) String endTime
+    ) {
+        try {
+            electricityMeterServiceImpl.statisticsDeviceRunningTimeByMonth(startTime,endTime);
+        } catch (Exception e) {
+            log.error("统计设备运行状态-每月一次执行失败,异常日志：{}",e);
+        }
+        return AjaxResults.success();
+    }
+
+    @ApiOperation(value = "统计设备用电数据，每小时一次")
+    @GetMapping("/statisticsDeviceUsePowerCount")
+    @Log(title = "统计设备用电数据-每小时一次", businessType = BusinessType.UPDATE)
+    public AjaxResults statisticsDeviceUsePowerCount(
+            @RequestParam(value = "startTime",required = false) String startTime,
+            @RequestParam(value = "endTime",required = false) String endTime
+    ) {
+        try {
+            electricityMeterServiceImpl.statisticsDeviceUsePowerCount(startTime,endTime);
+        } catch (Exception e) {
+            log.error("统计设备用电数据-每小时一次执行失败,异常日志：{}",e);
+        }
+        return AjaxResults.success();
+    }
+
+    @ApiOperation(value = "统计设备用电数据，每日统计一次")
+    @GetMapping("/statisticsDeviceUsePowerCountByDay")
+    @Log(title = "统计设备用电数据-每日一次", businessType = BusinessType.UPDATE)
+    public AjaxResults statisticsDeviceUsePowerCountByDay(
+            @RequestParam(value = "startTime",required = false) String startTime,
+            @RequestParam(value = "endTime",required = false) String endTime
+    ) {
+      try {
+            electricityMeterServiceImpl.statisticsDeviceUsePowerCountByDay(startTime,endTime);
+        } catch (Exception e) {
+            log.error("统计设备用电数据-每日一次执行失败,异常日志：{}",e);
+        }
+        return AjaxResults.success();
+    }
+
+
+}

szhpt-fixed-task/src/main/java/cn/cecep/talroad/controller/EmissionsStatController.java

@@ -0,0 +1,76 @@
+package cn.cecep.talroad.controller;
+
+import cn.cecep.talroad.common.core.utils.poi.ExcelUtil;
+import cn.cecep.talroad.common.core.web.domain.AjaxResults;
+import cn.cecep.talroad.common.log.annotation.Log;
+import cn.cecep.talroad.common.log.enums.BusinessType;
+import cn.cecep.talroad.service.EmissionsStatService;
+import cn.cecep.talroad.vo.EmissionsStatVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Api(tags = "排放量汇总统计controller")
+@RestController
+@RequestMapping("/emissionsStat")
+public class EmissionsStatController {
+
+    @Autowired
+    private EmissionsStatService emissionsStatService;
+
+    @ApiOperation(value = "获取监测点排放量统计")
+    @GetMapping("/point/list")
+    public AjaxResults<IPage<EmissionsStatVo.PointRow>> pointList(EmissionsStatVo.PointSearch search) {
+        IPage<EmissionsStatVo.PointRow> page = new Page<>(search.getPageNum(), search.getPageSize());
+        List<EmissionsStatVo.PointRow> rows = emissionsStatService.getPointList(page, search);
+        page.setRecords(rows);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperation(value = "导出监测点排放量统计")
+    @Log(title = "导出监测点排放量统计", businessType = BusinessType.EXPORT)
+    @PostMapping("/point/export")
+    public void pointExport(HttpServletResponse response, @RequestBody EmissionsStatVo.PointSearch search) {
+        ExcelUtil<EmissionsStatVo.PointRow> util = new ExcelUtil<>(EmissionsStatVo.PointRow.class);
+        util.exportExcel(response, pointList(search).getData().getRecords(), "导出监测点排放量统计");
+    }
+
+    @ApiOperation(value = "获取企业排放量统计")
+    @GetMapping("/factory/list")
+    public AjaxResults<IPage<EmissionsStatVo.FactoryRow>> factoryList(EmissionsStatVo.FactorySearch search) {
+        IPage<EmissionsStatVo.FactoryRow> page = new Page<>(search.getPageNum(), search.getPageSize());
+        List<EmissionsStatVo.FactoryRow> rows = emissionsStatService.getFactoryList(page, search);
+        page.setRecords(rows);
+        return AjaxResults.success(page);
+    }
+
+    @ApiOperation(value = "导出企业排放量统计")
+    @Log(title = "导出企业排放量统计", businessType = BusinessType.EXPORT)
+    @PostMapping("/factory/export")
+    public void factoryExport(HttpServletResponse response, @RequestBody EmissionsStatVo.FactorySearch search) {
+        ExcelUtil<EmissionsStatVo.FactoryRow> util = new ExcelUtil<>(EmissionsStatVo.FactoryRow.class);
+        util.exportExcel(response, factoryList(search).getData().getRecords(), "导出企业排放量统计");
+    }
+
+    @ApiOperation(value = "获取区域排放量统计")
+    @GetMapping("/region/list")
+    public AjaxResults<EmissionsStatVo.Region> regionList(EmissionsStatVo.RegionSearch search) {
+        EmissionsStatVo.Region region = emissionsStatService.getRegionStat(search);
+        return AjaxResults.success(region);
+    }
+
+    @ApiOperation(value = "导出区域排放量统计")
+    @Log(title = "导出区域排放量统计", businessType = BusinessType.EXPORT)
+    @PostMapping("/region/export")
+    public void regionExport(HttpServletResponse response, @RequestBody EmissionsStatVo.RegionSearch search) {
+        ExcelUtil<EmissionsStatVo.RegionRow> util = new ExcelUtil<>(EmissionsStatVo.RegionRow.class);
+        util.exportExcel(response, regionList(search).getData().getRows(), "导出区域排放量统计");
+    }
+
+}