refactor(fire-check): 优化消防检查模块代码结构和消息发送逻辑

feat(fire-check): 添加消防检查门面实现类
2026-06-23 09:45:41 +08:00 · 2026-06-22 11:28:52 +08:00
33 changed files with 229 additions and 374 deletions
--- a/start/src/main/resources/templates/fireCheck.html
+++ b/start/src/main/resources/templates/fireCheck.html
@ -1,4 +1,4 @@
-<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/7/28 16:48:49) App/fireCheck"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>秦港安全监管平台</title><script>(function () {
+<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/6/15 17:02:37) App/fireCheck"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>秦港安全监管平台</title><script>(function () {
      const APP_ENV = {
        antd: {
          'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
        redirect: '',
        FRAMEWORK: APP_ENV.antd
      };
-    })();</script><script defer="defer" src="/fireCheck/static/js/201.9d4d48ed85dbd20c30f6.js"></script><script defer="defer" src="/fireCheck/static/js/514.cbbdb1f566e234e3ebed.js"></script><script defer="defer" src="/fireCheck/static/js/main.e0c5ce72dc8c82f0bb1b.js"></script><link href="/fireCheck/static/css/main.4351c3e506121e95b980.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/7/28 16:48:49) App/fireCheck Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
+    })();</script><script defer="defer" src="/fireCheck/static/js/201.a64808ef21f0f31301fd.js"></script><script defer="defer" src="/fireCheck/static/js/514.df5c4abca1ad6efc80a4.js"></script><script defer="defer" src="/fireCheck/static/js/main.8fead917278fdc3194ac.js"></script><link href="/fireCheck/static/css/main.4351c3e506121e95b980.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0-alpha-1 Env/production (2026/6/15 17:02:37) App/fireCheck Version/main Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
--- a/start/src/main/resources/templates/fireCheck/static/jjb.config.js
+++ b/start/src/main/resources/templates/fireCheck/static/jjb.config.js
@ -1 +1 @@
-module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"fireCheck",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8088",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
+module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"fireCheck",contextInject:{appKey:"",fileUrl:"https://jpfz.qhdsafety.com/gbsFileTest/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8088",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
--- a/start/src/main/resources/templates/fireCheck/static/js/201.a64808ef21f0f31301fd.js
+++ b/start/src/main/resources/templates/fireCheck/static/js/201.a64808ef21f0f31301fd.js
--- a/start/src/main/resources/templates/fireCheck/static/js/201.a64808ef21f0f31301fd.js.LICENSE.txt
+++ b/start/src/main/resources/templates/fireCheck/static/js/201.a64808ef21f0f31301fd.js.LICENSE.txt
--- a/start/src/main/resources/templates/fireCheck/static/js/514.cbbdb1f566e234e3ebed.js
+++ b/start/src/main/resources/templates/fireCheck/static/js/514.cbbdb1f566e234e3ebed.js
--- a/start/src/main/resources/templates/fireCheck/static/js/514.df5c4abca1ad6efc80a4.js
+++ b/start/src/main/resources/templates/fireCheck/static/js/514.df5c4abca1ad6efc80a4.js
--- a/start/src/main/resources/templates/fireCheck/static/js/514.df5c4abca1ad6efc80a4.js.LICENSE.txt
+++ b/start/src/main/resources/templates/fireCheck/static/js/514.df5c4abca1ad6efc80a4.js.LICENSE.txt
--- a/start/src/main/resources/templates/fireCheck/static/js/main.8fead917278fdc3194ac.js
+++ b/start/src/main/resources/templates/fireCheck/static/js/main.8fead917278fdc3194ac.js
--- a/start/src/main/resources/templates/fireCheck/static/js/main.8fead917278fdc3194ac.js.LICENSE.txt
+++ b/start/src/main/resources/templates/fireCheck/static/js/main.8fead917278fdc3194ac.js.LICENSE.txt
--- a/web-adapter/src/main/java/com/zcloud/fire/check/facade/ZcloudFireCheckFacadeImpl.java
+++ b/web-adapter/src/main/java/com/zcloud/fire/check/facade/ZcloudFireCheckFacadeImpl.java
@ -0,0 +1,215 @@
+package com.zcloud.fire.check.facade;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jjb.saas.message.client.message.facede.MessageFacade;
+import com.jjb.saas.message.client.message.request.MessageSendCmd;
+import com.jjb.saas.message.client.message.request.MessageTargetCmd;
+import com.zcloud.fire.check.domain.config.MessageConfig;
+import com.zcloud.fire.check.persistence.dataobject.FireCheckListDO;
+import com.zcloud.fire.check.persistence.dataobject.FireCheckListUserDO;
+import com.zcloud.fire.check.persistence.dataobject.UserDO;
+import com.zcloud.fire.check.persistence.mapper.FireCheckListMapper;
+import com.zcloud.fire.check.persistence.mapper.FireCheckListUserMapper;
+import com.zcloud.fire.check.persistence.repository.UserRepository;
+import com.zcloud.gbscommon.utils.UuidUtil;
+import com.zcloud.gbscommon.zloudfirecheck.facade.ZcloudFireCheckFacade;
+import com.zcloud.gbscommon.zloudfirecheck.request.FireCheckQry;
+import com.zcloud.gbscommon.zloudfirecheck.response.FireCheckListByUserCO;
+import com.zcloud.gbscommon.zloudfirecheck.response.FireCheckWorkChangeCmd;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@DubboService
+@AllArgsConstructor
+@Slf4j
+public class ZcloudFireCheckFacadeImpl implements ZcloudFireCheckFacade {
+    @Resource
+    private final FireCheckListMapper fireCheckListMapper;
+    @Resource
+    private final FireCheckListUserMapper fireCheckListUserMapper;
+    @Resource
+    private final UserRepository userRepository;
+    @DubboReference
+    private MessageFacade messageFacade;
+    @Resource
+    private final MessageConfig messageConfig;
+
+    @Override
+    public MultiResponse<FireCheckListByUserCO> listManagerByUserId(FireCheckQry fireCheckQry) {
+        if (fireCheckQry == null || fireCheckQry.getUserId() == null || fireCheckQry.getCorpinfoId() == null) {
+            return MultiResponse.of(Collections.emptyList());
+        }
+        QueryWrapper<FireCheckListUserDO> listUserQueryWrapper = new QueryWrapper<>();
+        listUserQueryWrapper.eq("user_id", fireCheckQry.getUserId());
+        listUserQueryWrapper.eq("corpinfo_id", fireCheckQry.getCorpinfoId());
+        List<FireCheckListUserDO> fireCheckListUserList = fireCheckListUserMapper.selectList(listUserQueryWrapper);
+        if (CollUtil.isEmpty(fireCheckListUserList)) {
+            return MultiResponse.of(Collections.emptyList());
+        }
+        Set<String> fireCheckIdSet = fireCheckListUserList.stream()
+                .map(FireCheckListUserDO::getFireCheckId)
+                .filter(StringUtils::isNotEmpty)
+                .collect(Collectors.toSet());
+        if (CollUtil.isEmpty(fireCheckIdSet)) {
+            return MultiResponse.of(Collections.emptyList());
+        }
+        QueryWrapper<FireCheckListDO> listQueryWrapper = new QueryWrapper<>();
+        listQueryWrapper.in("fire_check_id", fireCheckIdSet);
+        listQueryWrapper.eq("corpinfo_id", fireCheckQry.getCorpinfoId());
+        List<FireCheckListDO> fireCheckListList = fireCheckListMapper.selectList(listQueryWrapper);
+        if (CollUtil.isEmpty(fireCheckListList)) {
+            return MultiResponse.of(Collections.emptyList());
+        }
+        List<FireCheckListByUserCO> result = fireCheckListList.stream()
+                .map(this::buildFireCheckListByUserCO)
+                .collect(Collectors.toList());
+        return MultiResponse.of(result);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public SingleResponse updateRiskWorkChange(FireCheckWorkChangeCmd fireCheckWorkChangeCmd) {
+        if (fireCheckWorkChangeCmd == null
+                || StringUtils.isEmpty(fireCheckWorkChangeCmd.getFireCheckId())
+                || fireCheckWorkChangeCmd.getOldUserId() == null
+                || fireCheckWorkChangeCmd.getUserId() == null) {
+            return SingleResponse.buildFailure("PARAM_ERROR", "交接参数不完整");
+        }
+        QueryWrapper<FireCheckListUserDO> listUserQueryWrapper = new QueryWrapper<>();
+        listUserQueryWrapper.eq("fire_check_id", fireCheckWorkChangeCmd.getFireCheckId());
+        listUserQueryWrapper.eq("user_id", fireCheckWorkChangeCmd.getOldUserId());
+        List<FireCheckListUserDO> fireCheckListUserList = fireCheckListUserMapper.selectList(listUserQueryWrapper);
+        if (CollUtil.isEmpty(fireCheckListUserList)) {
+            return SingleResponse.buildFailure("DATA_NOT_FOUND", "未查询到待交接的消防检查工作");
+        }
+        QueryWrapper<FireCheckListUserDO> existsQueryWrapper = new QueryWrapper<>();
+        existsQueryWrapper.eq("fire_check_id", fireCheckWorkChangeCmd.getFireCheckId());
+        existsQueryWrapper.eq("user_id", fireCheckWorkChangeCmd.getUserId());
+        Long existsCount = fireCheckListUserMapper.selectCount(existsQueryWrapper);
+        if (existsCount != null && existsCount > 0) {
+            return SingleResponse.buildFailure("DATA_EXISTS", "新责任人已存在于该消防检查工作中");
+        }
+
+        UserDO newUser = getNewUser(fireCheckWorkChangeCmd.getUserId());
+        for (FireCheckListUserDO fireCheckListUserDO : fireCheckListUserList) {
+            fireCheckListUserDO.setUserId(fireCheckWorkChangeCmd.getUserId());
+            fireCheckListUserDO.setDepartmentId(resolveDepartmentId(fireCheckWorkChangeCmd, newUser));
+            fireCheckListUserDO.setCorpinfoId(resolveCorpinfoId(fireCheckWorkChangeCmd, newUser));
+            fireCheckListUserMapper.updateById(fireCheckListUserDO);
+        }
+
+        FireCheckListDO fireCheckListDO = getFireCheckList(fireCheckWorkChangeCmd.getFireCheckId());
+        sendWorkChangeMessage(fireCheckWorkChangeCmd, fireCheckListDO);
+        return SingleResponse.buildSuccess();
+    }
+
+    private FireCheckListByUserCO buildFireCheckListByUserCO(FireCheckListDO fireCheckListDO) {
+        FireCheckListByUserCO result = new FireCheckListByUserCO();
+        result.setFireCheckId(fireCheckListDO.getFireCheckId());
+        result.setWorkProject("消防检查");
+        result.setWorkContent(buildWorkContent(fireCheckListDO));
+        return result;
+    }
+
+    private String buildWorkContent(FireCheckListDO fireCheckListDO) {
+        if (fireCheckListDO == null) {
+            return "";
+        }
+        if (StringUtils.isNotEmpty(fireCheckListDO.getFireCheckName())
+                && StringUtils.isNotEmpty(fireCheckListDO.getFireCheckTypeName())) {
+            return fireCheckListDO.getFireCheckName() + "（" + fireCheckListDO.getFireCheckTypeName() + "）";
+        }
+        if (StringUtils.isNotEmpty(fireCheckListDO.getFireCheckName())) {
+            return fireCheckListDO.getFireCheckName();
+        }
+        return StringUtils.defaultString(fireCheckListDO.getFireCheckTypeName());
+    }
+
+    private UserDO getNewUser(Long userId) {
+        List<UserDO> userList = userRepository.getListById(Collections.singletonList(userId));
+        if (CollUtil.isEmpty(userList)) {
+            return null;
+        }
+        return userList.get(0);
+    }
+
+    private Long resolveDepartmentId(FireCheckWorkChangeCmd fireCheckWorkChangeCmd, UserDO newUser) {
+        if (fireCheckWorkChangeCmd.getDeptId() != null) {
+            return fireCheckWorkChangeCmd.getDeptId();
+        }
+        if (newUser != null) {
+            return newUser.getDepartmentId();
+        }
+        return null;
+    }
+
+    private Long resolveCorpinfoId(FireCheckWorkChangeCmd fireCheckWorkChangeCmd, UserDO newUser) {
+        if (fireCheckWorkChangeCmd.getCorpId() != null) {
+            return fireCheckWorkChangeCmd.getCorpId();
+        }
+        if (newUser != null) {
+            return newUser.getCorpinfoId();
+        }
+        return null;
+    }
+
+    private FireCheckListDO getFireCheckList(String fireCheckId) {
+        QueryWrapper<FireCheckListDO> listQueryWrapper = new QueryWrapper<>();
+        listQueryWrapper.eq("fire_check_id", fireCheckId);
+        return fireCheckListMapper.selectOne(listQueryWrapper);
+    }
+
+    private void sendWorkChangeMessage(FireCheckWorkChangeCmd fireCheckWorkChangeCmd, FireCheckListDO fireCheckListDO) {
+        try {
+            MessageSendCmd messageSendCmd = new MessageSendCmd();
+            messageSendCmd.setBusinessId(UuidUtil.get32UUID());
+            MessageTargetCmd messageTargetCmd = new MessageTargetCmd();
+            messageTargetCmd.setUserId(fireCheckWorkChangeCmd.getUserId());
+            messageSendCmd.setTargetCmd(messageTargetCmd);
+            messageSendCmd.setSourceCode(messageConfig.getFireCheckPending());
+            messageSendCmd.setNeedTokenEnum(false);
+            messageSendCmd.setParams(buildSendParams(fireCheckWorkChangeCmd, fireCheckListDO));
+            log.info("消防检查工作交接发送消息参数:{}", JSONUtil.toJsonStr(messageSendCmd));
+            SingleResponse<Boolean> response = messageFacade.send(messageSendCmd);
+            log.info("消防检查工作交接发送消息结果:{}", JSONUtil.toJsonStr(response));
+            if (response == null || !response.isSuccess() || !Boolean.TRUE.equals(response.getData())) {
+                log.warn("消防检查工作交接消息发送未成功, fireCheckId:{}, userId:{}", fireCheckWorkChangeCmd.getFireCheckId(), fireCheckWorkChangeCmd.getUserId());
+            }
+        } catch (Exception e) {
+            log.error("消防检查工作交接发送消息失败", e);
+        }
+    }
+
+    private Map<String, Object> buildSendParams(FireCheckWorkChangeCmd fireCheckWorkChangeCmd, FireCheckListDO fireCheckListDO) {
+        String fireCheckName = fireCheckListDO == null ? "" : StringUtils.defaultString(fireCheckListDO.getFireCheckName());
+        String fireCheckTypeName = fireCheckListDO == null ? "" : StringUtils.defaultString(fireCheckListDO.getFireCheckTypeName());
+        return Stream.of(
+                        new Object[]{"FirefightinglistName", fireCheckName},
+                        new Object[]{"checkPeriod", fireCheckTypeName},
+                        new Object[]{"oldUserId", fireCheckWorkChangeCmd.getOldUserId()},
+                        new Object[]{"newUserId", fireCheckWorkChangeCmd.getUserId()},
+                        new Object[]{"newUserName", StringUtils.defaultString(fireCheckWorkChangeCmd.getUserName())},
+                        new Object[]{"workProject", "消防检查"},
+                        new Object[]{"workContent", buildWorkContent(fireCheckListDO)}
+                )
+                .filter(item -> Objects.nonNull(item[1]))
+                .collect(Collectors.toMap(item -> String.valueOf(item[0]), item -> item[1], (left, right) -> right));
+    }
+}
--- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java
+++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FireCheckListController.java
@ -10,7 +10,6 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.fire.check.api.FireCheckListServiceI;
 import com.zcloud.fire.check.dto.*;
 import com.zcloud.fire.check.dto.clientobject.FireCheckListCO;
-import com.zcloud.fire.check.dto.clientobject.FireCheckListScreenCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@ -99,12 +98,5 @@ public class FireCheckListController {
    public PageResponse<FireCheckListCO> mainCheckListRecordList(@RequestBody FireCheckListRecordPageQry qry) {
        return fireCheckListService.checkListRecordList(qry);
    }
-
-     @ApiOperation("可视化大屏-消防点检列表")
-    @PostMapping("/screen/list")
-    public PageResponse<FireCheckListScreenCO> screenList(@RequestBody(required = false) FireCheckListScreenQry qry) {
-        return fireCheckListService.screenList(qry);
-    }
-
 }

--- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java
+++ b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java
@ -5,10 +5,11 @@ import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.dto.SingleResponse;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.fire.check.api.FirePointServiceI;
 import com.zcloud.fire.check.dto.*;
 import com.zcloud.fire.check.dto.clientobject.FirePointCO;
-import com.zcloud.fire.check.dto.clientobject.FirePointDeviceCO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@ -17,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;

 /**
 * web-adapter
@ -50,8 +52,6 @@ public class FirePointController {
        return firePointService.listPage(qry);
    }

-
-
    @ApiOperation("根据消防区域获取消防点位所有")
    @GetMapping("/listByFireRegionId/{fireRegionId}")
    public MultiResponse<FirePointCO> listByFireRegionId(@PathVariable("fireRegionId") String fireRegionId) {
@ -96,10 +96,5 @@ public class FirePointController {
        firePointService.exportFirePointPage(ids,httpServletResponse);
    }

-    @ApiOperation("可视化大屏-消防点位设备列表")
-    @PostMapping("/deviceList")
-    public PageResponse<FirePointDeviceCO> deviceList(@RequestBody FirePointDeviceQry qry) {
-        return firePointService.listDevice(qry);
-    }
 }

--- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckListQueryExe.java
@ -76,41 +76,6 @@ public class FireCheckListQueryExe {
    private MessageFacade messageFacade;
    private MessageConfig messageConfig;

-    public PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry) {
-        if (qry == null) {
-            qry = new FireCheckListScreenQry();
-        }
-        Map<String, Object> params = PageQueryHelper.toHashMap(qry);
-        PageResponse<FireCheckListDO> pageResponse = fireCheckListRepository.screenList(params);
-        List<FireCheckListScreenCO> result = new ArrayList<>();
-        for (FireCheckListDO item : pageResponse.getData()) {
-            FireCheckListScreenCO co = new FireCheckListScreenCO();
-            BeanUtils.copyProperties(item, co);
-            Long checkCycleCount = parseLong(item.getCheckCycleCount());
-            co.setCheckCycleCount(checkCycleCount);
-            FireCheckListE info = new FireCheckListE();
-            info.getCheckRecordPeriod(item.getFireCheckType(), LocalDateTime.now());
-            co.setCheckStartTime(info.getPeriodStart());
-            co.setCheckEndTime(info.getPeriodEnd());
-            if (checkCycleCount > 0) {
-                co.setCheckStatus(2);
-                co.setCheckStatusName("已检查");
-            } else {
-                co.setCheckStatus(1);
-                co.setCheckStatusName("未检查");
-            }
-            result.add(co);
-        }
-        return PageResponse.of(result, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
-    }
-
-    private Long parseLong(String value) {
-        if (StringUtils.isEmpty(value)) {
-            return 0L;
-        }
-        return Long.valueOf(value);
-    }
-
    /**
     * 分页
     *
--- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FirePointQueryExe.java
@ -1,20 +1,16 @@
 package com.zcloud.fire.check.command.query;

 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.nacos.api.config.annotation.NacosValue;
 import com.zcloud.fire.check.command.convertor.FirePointCoConvertor;
-import com.zcloud.fire.check.domain.enums.CorpTypeEnum;
 import com.zcloud.fire.check.domain.config.PointConfig;
 import com.zcloud.fire.check.domain.model.FirePointE;
-import com.zcloud.fire.check.dto.FirePointDeviceQry;
 import com.zcloud.fire.check.dto.FirePointPageQry;
 import com.zcloud.fire.check.dto.clientobject.FirePointCO;
-import com.zcloud.fire.check.dto.clientobject.FirePointDeviceCO;
-import com.zcloud.fire.check.persistence.dataobject.FirePointDeviceCountDO;
+import com.zcloud.fire.check.dto.clientobject.FireRegionCO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointDO;
 import com.zcloud.fire.check.persistence.repository.FireCheckRecordPointRepository;
 import com.zcloud.fire.check.persistence.repository.FireDeviceRepository;
@ -133,26 +129,5 @@ public class FirePointQueryExe {
        List<FirePointCO> examCenterCOS = firePointCoConvertor.converDOsToCOs(pageResponse);
        return MultiResponse.of(examCenterCOS);
    }
-
-    public PageResponse<FirePointDeviceCO> listDevice(FirePointDeviceQry qry) {
-        Map<String, Object> params = PageQueryHelper.toHashMap(qry);
-        if (ObjectUtil.isNotEmpty(params.get("enterpriseType"))) {
-            List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
-            if (CollUtil.isNotEmpty(enterpriseType)) {
-                params.put("type", enterpriseType);
-            }
-        }
-        List<Integer> inType = (List<Integer>) params.get("inType");
-        if (CollUtil.isNotEmpty(inType)) {
-            params.put("type", inType);
-        }
-        PageResponse<FirePointDeviceCountDO> pageResponse = firePointRepository.listDevice(params);
-        List<FirePointDeviceCO> list = pageResponse.getData().stream().map(item -> {
-            FirePointDeviceCO co = new FirePointDeviceCO();
-            BeanUtils.copyProperties(item, co);
-            return co;
-        }).collect(Collectors.toList());
-        return PageResponse.of(list, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
-    }
 }

--- a/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/service/FireCheckListServiceImpl.java
@ -29,11 +29,6 @@ public class FireCheckListServiceImpl implements FireCheckListServiceI {
    private final FireCheckListRemoveExe fireCheckListRemoveExe;
    private final FireCheckListQueryExe fireCheckListQueryExe;

-    @Override
-    public PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry) {
-        return fireCheckListQueryExe.screenList(qry);
-    }
-
    @Override
    public PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry) {
        return fireCheckListQueryExe.execute(qry);
--- a/web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java
+++ b/web-app/src/main/java/com/zcloud/fire/check/service/FirePointServiceImpl.java
@ -9,12 +9,10 @@ import com.zcloud.fire.check.command.FirePointRemoveExe;
 import com.zcloud.fire.check.command.FirePointUpdateExe;
 import com.zcloud.fire.check.command.query.FirePointQueryExe;
 import com.zcloud.fire.check.dto.FirePointAddCmd;
-import com.zcloud.fire.check.dto.FirePointDeviceQry;
 import com.zcloud.fire.check.dto.FirePointPageQry;
 import com.zcloud.fire.check.dto.FirePointUpdateCmd;
 import com.zcloud.fire.check.dto.FirePointUpdateDepartmentCmd;
 import com.zcloud.fire.check.dto.clientobject.FirePointCO;
-import com.zcloud.fire.check.dto.clientobject.FirePointDeviceCO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;

@ -81,10 +79,5 @@ public class FirePointServiceImpl implements FirePointServiceI {
        return firePointQueryExe.listByFireRegionId(fireRegionId);

    }
-
-    @Override
-    public PageResponse<FirePointDeviceCO> listDevice(FirePointDeviceQry qry) {
-        return firePointQueryExe.listDevice(qry);
-    }
 }

--- a/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/api/FireCheckListServiceI.java
@ -15,8 +15,6 @@ import java.util.Map;
 * @Date 2025-11-28 10:32:09
 */
 public interface FireCheckListServiceI {
-    PageResponse<FireCheckListScreenCO> screenList(FireCheckListScreenQry qry);
-
    PageResponse<FireCheckListCO> listPage(FireCheckListPageQry qry);

    SingleResponse<FireCheckListCO> add(FireCheckListAddCmd cmd);
--- a/web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/api/FirePointServiceI.java
@ -4,12 +4,10 @@ import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.SingleResponse;
 import com.zcloud.fire.check.dto.FirePointAddCmd;
-import com.zcloud.fire.check.dto.FirePointDeviceQry;
 import com.zcloud.fire.check.dto.FirePointPageQry;
 import com.zcloud.fire.check.dto.FirePointUpdateCmd;
 import com.zcloud.fire.check.dto.FirePointUpdateDepartmentCmd;
 import com.zcloud.fire.check.dto.clientobject.FirePointCO;
-import com.zcloud.fire.check.dto.clientobject.FirePointDeviceCO;

 import javax.servlet.http.HttpServletResponse;

@ -37,7 +35,5 @@ public interface FirePointServiceI {
    void exportFirePointPage(Long[] ids, HttpServletResponse httpServletResponse);

    MultiResponse<FirePointCO> listByFireRegionId(String fireRegionId);
-
-    PageResponse<FirePointDeviceCO> listDevice(FirePointDeviceQry qry);
 }

--- a/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListScreenQry.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FireCheckListScreenQry.java
@ -1,18 +0,0 @@
-package com.zcloud.fire.check.dto;
-
-import com.alibaba.cola.dto.PageQuery;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 可视化大屏消防点检列表查询
- */
-@Data
-public class FireCheckListScreenQry extends PageQuery {
-
-    @ApiModelProperty(value = "企业id", name = "corpinfoId")
-    private Long corpinfoId;
-
-    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
-    private Integer portArea;
-}
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointDeviceQry.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointDeviceQry.java
@ -1,32 +0,0 @@
-package com.zcloud.fire.check.dto;
-
-import com.alibaba.cola.dto.PageQuery;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 消防点位设备查询参数
- */
-@Data
-public class FirePointDeviceQry extends PageQuery {
-
-    @ApiModelProperty(value = "企业id", name = "corpinfoId")
-    private Long corpinfoId;
-
-    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
-    private Integer portArea;
-
-    @ApiModelProperty(value = "消防设备类型", name = "fireDeviceType")
-    private String fireDeviceType;
-
-    @ApiModelProperty(value = "关键字", name = "vagueKey")
-    private String vagueKey;
-
-    @ApiModelProperty(value = "企业类型列表", name = "inType")
-    private List<Integer> inType;
-
-    @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType")
-    private Integer enterpriseType;
-}
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListScreenCO.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FireCheckListScreenCO.java
@ -1,73 +0,0 @@
-package com.zcloud.fire.check.dto.clientobject;
-
-import com.alibaba.cola.dto.ClientObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * 可视化大屏消防点检列表
- */
-@Data
-public class FireCheckListScreenCO extends ClientObject {
-
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @ApiModelProperty(value = "业务主键id")
-    private String fireCheckId;
-
-    @ApiModelProperty(value = "企业id")
-    private Long corpinfoId;
-
-    @ApiModelProperty(value = "消防点检表名字")
-    private String fireCheckName;
-
-    @ApiModelProperty(value = "消防点检表类型")
-    private String fireCheckType;
-
-    @ApiModelProperty(value = "消防点检表类型名称")
-    private String fireCheckTypeName;
-
-    @ApiModelProperty(value = "启用状态，0:启用,1:禁用")
-    private Integer state;
-
-    @ApiModelProperty(value = "检查照片上传方式，1:相机拍照,2:相册获取")
-    private Integer photoUploadMethod;
-
-
-
-    @ApiModelProperty(value = "负责人，逗号分隔")
-    private String userName;
-
-    @ApiModelProperty(value = "点位数")
-    private Long firePointCount;
-
-    @ApiModelProperty(value = "检查状态，1:未检查,2:已检查")
-    private Integer checkStatus;
-
-    @ApiModelProperty(value = "检查状态名称")
-    private String checkStatusName;
-
-
-    @ApiModelProperty(value = "周期内检查次数")
-    private Long checkCycleCount;
-
-    @ApiModelProperty(value = "周期开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime checkStartTime;
-
-    @ApiModelProperty(value = "周期结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime checkEndTime;
-
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
-}
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java
+++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java
@ -1,20 +0,0 @@
-package com.zcloud.fire.check.dto.clientobject;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 消防点位设备数量
- */
-@Data
-public class FirePointDeviceCO extends FirePointCO {
-
-    @ApiModelProperty(value = "消防设备类型")
-    private String fireDeviceType;
-
-    @ApiModelProperty(value = "消防设备类型名称")
-    private String fireDeviceTypeName;
-
-    @ApiModelProperty(value = "数量")
-    private Long deviceCount;
-}
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/CorpInfoDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/CorpInfoDO.java
@ -52,9 +52,6 @@ public class CorpInfoDO extends BaseDO {
    @ApiModelProperty(value = "所属区域")
    private String companyArea;

-    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西")
-    private Integer portArea;
-
    //规模
    @ApiModelProperty(value = "规模")
    private String scale;
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FireCheckListDO.java
@ -70,14 +70,6 @@ public class FireCheckListDO extends BaseDO {
    @TableField(exist = false)
    private String checkCycleCount;

-    @ApiModelProperty(value = "点位数")
-    @TableField(exist = false)
-    private Long firePointCount;
-
-    @ApiModelProperty(value = "港区")
-    @TableField(exist = false)
-    private Integer portArea;
-
    public FireCheckListDO(String fireCheckId) {
        this.fireCheckId = fireCheckId;
    }
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java
@ -1,16 +0,0 @@
-package com.zcloud.fire.check.persistence.dataobject;
-
-import lombok.Data;
-
-/**
- * 消防点位设备数量
- */
-@Data
-public class FirePointDeviceCountDO extends FirePointDO {
-
-    private String fireDeviceType;
-
-    private String fireDeviceTypeName;
-
-    private Long deviceCount;
-}
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FireCheckListMapper.java
@ -28,8 +28,6 @@ import java.util.Map;
 })
 public interface FireCheckListMapper extends BaseMapper<FireCheckListDO> {

-    IPage<FireCheckListDO> screenList(IPage<FireCheckListDO> iPage, Map<String, Object> params, DateTimeE dateTimeE);
-
    FireCheckListDO getInfoById(Long id);

    IPage<FireCheckListDO> listPage(IPage<FireCheckListDO> iPage, Map<String, Object> params, String menuPerms);
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/mapper/FirePointMapper.java
@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jjb.saas.framework.datascope.annotation.DataScope;
 import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
-import com.zcloud.fire.check.persistence.dataobject.FirePointDeviceCountDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO;
 import org.apache.ibatis.annotations.Mapper;
@ -36,7 +35,5 @@ public interface FirePointMapper extends BaseMapper<FirePointDO> {
    List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);

    Long getFirePointCount(Map<String, Object> params);
-
-    IPage<FirePointDeviceCountDO> listDevice(IPage<FirePointDeviceCountDO> iPage, Map<String, Object> params);
 }

--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FireCheckListRepository.java
@ -18,8 +18,6 @@ import java.util.Map;
 * @Date 2025-11-28 10:32:09
 */
 public interface FireCheckListRepository extends BaseRepository<FireCheckListDO> {
-    PageResponse<FireCheckListDO> screenList(Map<String, Object> params);
-
    PageResponse<FireCheckListDO> listPage(Map<String, Object> params);

    FireCheckListDO getInfoById(Long id);
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/FirePointRepository.java
@ -3,7 +3,6 @@ package com.zcloud.fire.check.persistence.repository;
 import com.alibaba.cola.dto.PageResponse;
 import com.jjb.saas.framework.repository.repo.BaseRepository;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
-import com.zcloud.fire.check.persistence.dataobject.FirePointDeviceCountDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointDO;

 import javax.validation.constraints.NotEmpty;
@ -41,6 +40,5 @@ public interface FirePointRepository extends BaseRepository<FirePointDO> {
    List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds);

    FirePointDO getInfoByCode(@NotEmpty(message = "消防点位编码不能为空") String firePointCode);
-    PageResponse<FirePointDeviceCountDO> listDevice(Map<String, Object> params);
 }

--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FireCheckListRepositoryImpl.java
@ -39,15 +39,6 @@ public class FireCheckListRepositoryImpl extends BaseRepositoryImpl<FireCheckLis
    private final FireCheckListMapper fireCheckListMapper;
    private final CorpInfoRepository corpInfoRepository;

-    @Override
-    public PageResponse<FireCheckListDO> screenList(Map<String, Object> params) {
-        IPage<FireCheckListDO> iPage = new Query<FireCheckListDO>().getPage(params);
-        FireCheckListE fireCheckListE = new FireCheckListE();
-        DateTimeE dateTimeE = fireCheckListE.getCheckRecordInterval(null);
-        IPage<FireCheckListDO> result = fireCheckListMapper.screenList(iPage, params, dateTimeE);
-        return PageHelper.pageToResponse(result, result.getRecords());
-    }
-
    @Override
    public PageResponse<FireCheckListDO> listPage(Map<String, Object> params) {
        IPage<FireCheckListDO> iPage = new Query<FireCheckListDO>().getPage(params);
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/repository/impl/FirePointRepositoryImpl.java
@ -11,7 +11,6 @@ import com.zcloud.fire.check.domain.enums.FireRegionStateEnum;
 import com.zcloud.fire.check.domain.enums.MenuEnum;
 import com.zcloud.fire.check.domain.enums.UserTypeEnum;
 import com.zcloud.fire.check.persistence.dataobject.DataStatisticDO;
-import com.zcloud.fire.check.persistence.dataobject.FirePointDeviceCountDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointDO;
 import com.zcloud.fire.check.persistence.dataobject.FirePointStatisticDO;
 import com.zcloud.fire.check.persistence.dataobject.FireRegionDO;
@ -137,12 +136,5 @@ public class FirePointRepositoryImpl extends BaseRepositoryImpl<FirePointMapper,
    public List<DataStatisticDO> countByCorpinfoIds(List<Long> corpinfoIds) {
        return firePointMapper.countByCorpinfoIds(corpinfoIds);
    }
-
-    @Override
-    public PageResponse<FirePointDeviceCountDO> listDevice(Map<String, Object> params) {
-        IPage<FirePointDeviceCountDO> iPage = new Query<FirePointDeviceCountDO>().getPage(params);
-        IPage<FirePointDeviceCountDO> result = firePointMapper.listDevice(iPage, params);
-        return PageHelper.pageToResponse(result, result.getRecords());
-    }
 }

--- a/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/FireCheckListMapper.xml
@ -3,43 +3,6 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

 <mapper namespace="com.zcloud.fire.check.persistence.mapper.FireCheckListMapper">
-    <select id="screenList" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckListDO">
-        select
-            cl.*,
-            ci.port_area as portArea,
-            GROUP_CONCAT(DISTINCT u.name) AS userName,
-            COUNT(DISTINCT cli.fire_point_id) AS firePointCount,
-            COUNT(DISTINCT cr.id) AS checkCycleCount
-        from fire_check_list cl
-                 left join corp_info ci on cl.corpinfo_id = ci.id and ci.delete_enum = 'FALSE'
-                 left join fire_check_list_user fclu on cl.fire_check_id = fclu.fire_check_id and fclu.delete_enum = 'FALSE'
-                 left join user u on fclu.user_id = u.id and u.delete_enum = 'FALSE'
-                 left join fire_check_list_item cli on cl.fire_check_id = cli.fire_check_id and cli.delete_enum = 'FALSE'
-                 left join fire_check_record cr on cl.fire_check_id = cr.fire_check_id
-                    and cr.delete_enum = 'FALSE'
-                    and cr.finished_flag = 1
-                    and (
-                        (cl.fire_check_type = 'fireCheckPeriod0001' and cr.check_time <![CDATA[>=]]> #{dateTimeE.dayStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.dayEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0002' and cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0003' and cr.check_time <![CDATA[>=]]> #{dateTimeE.tenDaysStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.tenDaysEndTime})
-                        or (cl.fire_check_type = 'FireCheckPeriod0004' and cr.check_time <![CDATA[>=]]> #{dateTimeE.monthlyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.monthlyEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0005' and cr.check_time <![CDATA[>=]]> #{dateTimeE.quarterlyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.quarterlyEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0006' and cr.check_time <![CDATA[>=]]> #{dateTimeE.yearlyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.yearlyEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0007' and cr.check_time <![CDATA[>=]]> #{dateTimeE.halfYearStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.halfYearEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0008' and cr.check_time <![CDATA[>=]]> #{dateTimeE.halfMonthStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.halfMonthEndTime})
-                        or (cl.fire_check_type = 'fireCheckPeriod0009' and cr.check_time <![CDATA[>=]]> #{dateTimeE.weeklyStartTime} and cr.check_time <![CDATA[<=]]> #{dateTimeE.weeklyEndTime})
-                    )
-        where cl.delete_enum = 'FALSE' and cl.state = 0
-        <if test="params.corpinfoId != null">
-            and cl.corpinfo_id = #{params.corpinfoId}
-        </if>
-        <if test="params.portArea != null">
-            and ci.port_area = #{params.portArea}
-        </if>
-        group by cl.fire_check_id
-        order by cl.create_time desc
-    </select>
-
    <select id="getInfoById" resultType="com.zcloud.fire.check.persistence.dataobject.FireCheckListDO">
        select cl.*,
               fclu.department_id as departmentId ,
@ -62,7 +25,7 @@
        d.name AS departmentName,
        GROUP_CONCAT(DISTINCT u.name) AS userName
        FROM fire_check_list cl
-        LEFT JOIN fire_check_list_user fclu on cl.fire_check_id = fclu.fire_check_id and fclu.delete_enum='FALSE'
+        LEFT JOIN fire_check_list_user fclu on cl.fire_check_id = fclu.fire_check_id
        LEFT JOIN department d ON fclu.department_id = d.id AND d.delete_enum = 'FALSE'
        LEFT JOIN user u ON fclu.user_id = u.id AND u.delete_enum = 'FALSE'
        WHERE cl.delete_enum = 'FALSE'
--- a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
@ -101,41 +101,5 @@
        and c.use_flag = 1
        and p.delete_enum = 'FALSE'
    </select>
-    <select id="listDevice" resultType="com.zcloud.fire.check.persistence.dataobject.FirePointDeviceCountDO">
-        select
-            p.*,
-            d.fire_device_type as fireDeviceType,
-            d.fire_device_type_name as fireDeviceTypeName,
-            count(d.fire_device_id) as deviceCount
-        from fire_point p
-                 inner join fire_device d on d.fire_point_id = p.fire_point_id and d.delete_enum = 'FALSE'
-                 left join corp_info c on p.corpinfo_id = c.id and c.delete_enum = 'FALSE'
-        where p.delete_enum = 'FALSE'
-        <if test="params.corpinfoId != null">
-            and p.corpinfo_id = #{params.corpinfoId}
-        </if>
-        <if test="params.portArea != null">
-            and c.port_area = #{params.portArea}
-        </if>
-        <if test="params.fireDeviceType != null and params.fireDeviceType != ''">
-            and d.fire_device_type = #{params.fireDeviceType}
-        </if>
-        <if test="params.vagueKey != null and params.vagueKey != ''">
-            and (
-                p.fire_point_name like concat('%', #{params.vagueKey}, '%')
-                or p.fire_point_code like concat('%', #{params.vagueKey}, '%')
-                or d.fire_device_code like concat('%', #{params.vagueKey}, '%')
-                or d.fire_device_type_name like concat('%', #{params.vagueKey}, '%')
-            )
-        </if>
-        <if test="params.inType != null and !params.inType.isEmpty()">
-            and c.type in
-            <foreach collection="params.inType" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        group by p.id, d.fire_device_type, d.fire_device_type_name
-        order by p.fire_point_name asc, d.fire_device_type_name asc
-    </select>
 </mapper>
Author	SHA1	Message	Date
zhaokai	40b2707990	refactor(fire-check): 优化消防检查模块代码结构和消息发送逻辑	2026-06-23 09:45:41 +08:00
zhaokai	f32954afe7	feat(fire-check): 添加消防检查门面实现类	2026-06-22 11:28:52 +08:00