应用远程更新功能模块完成

service-eg/service-eg-biz/pom.xml

@@ -16,10 +16,14 @@
             <artifactId>common-cloud-starter</artifactId>
         </dependency>
 
-        <!-- WebSocket：ADB 局域网透传（浏览器 ←WS→ 服务端 ←TCP→ 设备） -->
+        <!-- MQTT：远程升级指令下发（与终端 connectWithDevice 订阅主题对齐） -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
+            <artifactId>spring-boot-starter-integration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
         </dependency>
 
         <dependency>

service-eg/service-eg-biz/src/main/java/com/usky/eg/adb/EgDeviceAdbConfiguration.java

@@ -0,0 +1,10 @@
+package com.usky.eg.adb;
+
+import com.usky.eg.mqtt.EgMqttProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties({EgDeviceAdbProperties.class, EgMqttProperties.class})
+public class EgDeviceAdbConfiguration {
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/adb/EgDeviceAdbProperties.java

@@ -0,0 +1,75 @@
+package com.usky.eg.adb;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 服务端调用官方 platform-tools adb（需在 PATH 或可执行路径配置）。
+ */
+@ConfigurationProperties(prefix = "eg.adb")
+public class EgDeviceAdbProperties {
+
+    /**
+     * adb 可执行文件名或绝对路径，默认依赖系统 PATH 中的 adb
+     */
+    private String executable = "adb";
+
+    /**
+     * connect / disconnect / tcpip 等命令超时（秒）
+     */
+    private long commandTimeoutSeconds = 45L;
+
+    /**
+     * screencap 超时（秒）
+     */
+    private long screenshotTimeoutSeconds = 60L;
+
+    /**
+     * tcpip 失败时是否先执行一次 adb connect 再重试 tcpip
+     */
+    private boolean tcpipRetryAfterConnect = true;
+
+    /**
+     * 截屏前是否先执行 adb connect（避免仅调 screenshot 时 adb 侧尚无该 serial，报 device not found）
+     */
+    private boolean screenshotConnectFirst = true;
+
+    public String getExecutable() {
+        return executable;
+    }
+
+    public void setExecutable(String executable) {
+        this.executable = executable;
+    }
+
+    public long getCommandTimeoutSeconds() {
+        return commandTimeoutSeconds;
+    }
+
+    public void setCommandTimeoutSeconds(long commandTimeoutSeconds) {
+        this.commandTimeoutSeconds = commandTimeoutSeconds;
+    }
+
+    public long getScreenshotTimeoutSeconds() {
+        return screenshotTimeoutSeconds;
+    }
+
+    public void setScreenshotTimeoutSeconds(long screenshotTimeoutSeconds) {
+        this.screenshotTimeoutSeconds = screenshotTimeoutSeconds;
+    }
+
+    public boolean isTcpipRetryAfterConnect() {
+        return tcpipRetryAfterConnect;
+    }
+
+    public void setTcpipRetryAfterConnect(boolean tcpipRetryAfterConnect) {
+        this.tcpipRetryAfterConnect = tcpipRetryAfterConnect;
+    }
+
+    public boolean isScreenshotConnectFirst() {
+        return screenshotConnectFirst;
+    }
+
+    public void setScreenshotConnectFirst(boolean screenshotConnectFirst) {
+        this.screenshotConnectFirst = screenshotConnectFirst;
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/controller/web/EgDeviceAdbController.java

@@ -0,0 +1,97 @@
+package com.usky.eg.controller.web;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.eg.service.EgDeviceAdbService;
+import com.usky.eg.service.EgDeviceRemoteUpgradeMqttService;
+import com.usky.eg.service.vo.EgDeviceAdbEndpointVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeBatchResultVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeVO;
+import com.usky.eg.service.vo.EgDeviceAdbResultVO;
+import com.usky.eg.service.vo.EgDeviceAdbTcpipVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 服务端官方 adb：部署机需安装 Android Platform Tools（adb 在 PATH），且网络可达设备。
+ * <p>
+ * 网关前缀一般为 /service-eg，完整路径示例：POST /service-eg/egDevice/adb/connect
+ */
+@RestController
+@RequestMapping("/egDevice/adb")
+public class EgDeviceAdbController {
+
+    @Autowired
+    private EgDeviceAdbService egDeviceAdbService;
+
+    @Autowired
+    private EgDeviceRemoteUpgradeMqttService egDeviceRemoteUpgradeMqttService;
+
+    @PostMapping("/connect")
+    public ApiResult<EgDeviceAdbResultVO> connect(@RequestBody EgDeviceAdbEndpointVO vo) {
+        EgDeviceAdbResultVO r = egDeviceAdbService.connect(vo.getDeviceIp(), vo.getDevicePort());
+        return ApiResult.success(r);
+    }
+
+    @PostMapping("/disconnect")
+    public ApiResult<EgDeviceAdbResultVO> disconnect(@RequestBody EgDeviceAdbEndpointVO vo) {
+        EgDeviceAdbResultVO r = egDeviceAdbService.disconnect(vo.getDeviceIp(), vo.getDevicePort());
+        return ApiResult.success(r);
+    }
+
+    @PostMapping("/tcpip")
+    public ApiResult<EgDeviceAdbResultVO> tcpip(@RequestBody EgDeviceAdbTcpipVO vo) {
+        EgDeviceAdbResultVO r = egDeviceAdbService.tcpip(vo.getDeviceIp(), vo.getDevicePort(), vo.getPort());
+        return ApiResult.success(r);
+    }
+
+    /**
+     * 远程升级：仅通过 MQTT 向 Broker 发布下行指令，由终端 {@code connectWithDevice} 订阅后在设备侧自行下载安装
+     * 单台：{@code fileUrl} 必填；{@code deviceId} 或 {@code deviceCode} 至少其一。
+     * 批量：非空 {@code items}，每项含 {@code deviceId} 或 {@code deviceCode}，并与同级 {@code fileUrl}、可选 {@code launchPackage} 共用。
+     * 完整路径示例：POST /service-eg/egDevice/adb/remoteUpgrade
+     */
+    @PostMapping("/remoteUpgrade")
+    public ApiResult<?> remoteUpgrade(@RequestBody EgDeviceAdbRemoteUpgradeVO vo) {
+        if (vo.getItems() != null && !vo.getItems().isEmpty()) {
+            EgDeviceAdbRemoteUpgradeBatchResultVO batch = egDeviceRemoteUpgradeMqttService.publishRemoteUpgradeBatch(
+                    vo.getItems(), vo.getFileUrl(), vo.getLaunchPackage());
+            return ApiResult.success(batch);
+        }
+        EgDeviceAdbResultVO r = egDeviceRemoteUpgradeMqttService.publishRemoteUpgrade(vo);
+        return ApiResult.success(r);
+    }
+
+    /**
+     * 原始 PNG 二进制，无 JSON 封装（前端 responseType: blob）。
+     * 使用 {@link HttpServletResponse} 写出流，避免全局 ApiResult 包装器把返回值当成 JSON 再强转为 byte[] 导致 ClassCastException。
+     */
+    @GetMapping(value = "/screenshot", produces = MediaType.IMAGE_PNG_VALUE)
+    public void screenshot(@RequestParam("deviceIp") String deviceIp,
+                           @RequestParam("devicePort") Integer devicePort,
+                           HttpServletResponse response) throws IOException {
+        try {
+            byte[] png = egDeviceAdbService.screenshot(deviceIp, devicePort);
+            response.setStatus(HttpServletResponse.SC_OK);
+            response.setContentType(MediaType.IMAGE_PNG_VALUE);
+            response.setHeader(HttpHeaders.CACHE_CONTROL, "no-store, no-cache");
+            response.setContentLength(png.length);
+            response.getOutputStream().write(png);
+            response.getOutputStream().flush();
+        } catch (BusinessException e) {
+            String msg = e.getMessage() != null ? e.getMessage() : "Bad Request";
+            byte[] err = msg.getBytes(StandardCharsets.UTF_8);
+            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            response.setContentType(MediaType.TEXT_PLAIN_VALUE);
+            response.setContentLength(err.length);
+            response.getOutputStream().write(err);
+            response.getOutputStream().flush();
+        }
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/mqtt/EgMqttOutboundConfig.java

@@ -0,0 +1,67 @@
+package com.usky.eg.mqtt;
+
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.annotation.MessagingGateway;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
+import org.springframework.integration.mqtt.support.MqttHeaders;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.handler.annotation.Header;
+
+/**
+ * 出站 MQTT（发布远程升级下行指令）。
+ */
+@Configuration
+public class EgMqttOutboundConfig {
+
+    public static final String CHANNEL_NAME_OUT = "egMqttOutboundChannel";
+    public static final String DEFAULT_TOPIC = "eg/default";
+
+    @Autowired
+    private EgMqttProperties egMqttProperties;
+
+    @Bean
+    public MqttPahoClientFactory egMqttPahoClientFactory() {
+        DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
+        MqttConnectOptions options = new MqttConnectOptions();
+        options.setServerURIs(new String[]{egMqttProperties.getUrl()});
+        String user = egMqttProperties.getUsername();
+        if (user != null && !user.isEmpty()) {
+            options.setUserName(user);
+        }
+        String pwd = egMqttProperties.getPassword();
+        if (pwd != null && !pwd.isEmpty()) {
+            options.setPassword(pwd.toCharArray());
+        }
+        factory.setConnectionOptions(options);
+        return factory;
+    }
+
+    @Bean(name = CHANNEL_NAME_OUT)
+    public MessageChannel egMqttOutboundChannel() {
+        return new DirectChannel();
+    }
+
+    @Bean
+    @ServiceActivator(inputChannel = CHANNEL_NAME_OUT)
+    public MessageHandler egMqttOutbound(MqttPahoClientFactory egMqttPahoClientFactory) {
+        String clientId = "service-eg-mqtt-out-" + System.currentTimeMillis();
+        MqttPahoMessageHandler handler = new MqttPahoMessageHandler(clientId, egMqttPahoClientFactory);
+        handler.setAsync(true);
+        handler.setDefaultTopic(DEFAULT_TOPIC);
+        return handler;
+    }
+
+    @MessagingGateway(defaultRequestChannel = CHANNEL_NAME_OUT)
+    public interface EgMqttPublishGateway {
+
+        void sendToMqtt(@Header(MqttHeaders.TOPIC) String topic, @Header(MqttHeaders.QOS) int qos, String payload);
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/mqtt/EgMqttProperties.java

@@ -0,0 +1,81 @@
+package com.usky.eg.mqtt;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 远程升级 MQTT 下发（服务端发布，终端 {@code connectWithDevice} 订阅）。
+ * <p>
+ * 配置前缀 {@code eg.mqtt}；{@link com.usky.eg.controller.web.EgDeviceAdbController#remoteUpgrade} 仅通过本配置连接 Broker 并发布。
+ */
+@ConfigurationProperties(prefix = "eg.mqtt")
+public class EgMqttProperties {
+
+    /** 例如 tcp://47.98.201.73:1883 */
+    private String url = "tcp://47.98.201.73:1883";
+
+    private String username = "usky";
+
+    private String password = "usky";
+
+    /**
+     * 发布主题模板，须包含占位符 {@code {deviceId}}，与终端 {@code deviceId: getSerial()} 一致。
+     * 示例：usky/device/{deviceId}/command
+     */
+    private String commandTopicTemplate = "usky/device/{deviceId}/command";
+
+    /** 发布 QoS，0/1/2 */
+    private int qos = 1;
+
+    /**
+     * 下发 JSON 中 {@code type} 字段，终端可在 {@code onCommand} 里按类型分支。
+     */
+    private String commandType = "egRemoteUpgrade";
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getCommandTopicTemplate() {
+        return commandTopicTemplate;
+    }
+
+    public void setCommandTopicTemplate(String commandTopicTemplate) {
+        this.commandTopicTemplate = commandTopicTemplate;
+    }
+
+    public int getQos() {
+        return qos;
+    }
+
+    public void setQos(int qos) {
+        this.qos = qos;
+    }
+
+    public String getCommandType() {
+        return commandType;
+    }
+
+    public void setCommandType(String commandType) {
+        this.commandType = commandType;
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/EgDeviceAdbService.java

@@ -0,0 +1,20 @@
+package com.usky.eg.service;
+
+import com.usky.eg.service.vo.EgDeviceAdbResultVO;
+
+/**
+ * 服务端调用官方 adb（部署机需安装 Android Platform Tools 且能访问设备网段）
+ */
+public interface EgDeviceAdbService {
+
+    EgDeviceAdbResultVO connect(String deviceIp, Integer devicePort);
+
+    EgDeviceAdbResultVO disconnect(String deviceIp, Integer devicePort);
+
+    EgDeviceAdbResultVO tcpip(String deviceIp, Integer devicePort, Integer listenPort);
+
+    /**
+     * exec-out screencap -p 原始 PNG 字节；调用方需保证已与设备建立 adb 会话（通常先 connect）
+     */
+    byte[] screenshot(String deviceIp, Integer devicePort);
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/EgDeviceRemoteUpgradeMqttService.java

@@ -0,0 +1,19 @@
+package com.usky.eg.service;
+
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeBatchItemVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeBatchResultVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeVO;
+import com.usky.eg.service.vo.EgDeviceAdbResultVO;
+
+import java.util.List;
+
+/**
+ * 通过 MQTT 向终端下发远程升级参数（终端 {@code onCommand} 接收后自行下载安装）。
+ */
+public interface EgDeviceRemoteUpgradeMqttService {
+
+    EgDeviceAdbResultVO publishRemoteUpgrade(EgDeviceAdbRemoteUpgradeVO vo);
+
+    EgDeviceAdbRemoteUpgradeBatchResultVO publishRemoteUpgradeBatch(List<EgDeviceAdbRemoteUpgradeBatchItemVO> items,
+                                                                    String fileUrl, String launchPackage);
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/impl/EgDeviceAdbServiceImpl.java

@@ -0,0 +1,325 @@
+package com.usky.eg.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.eg.adb.EgDeviceAdbProperties;
+import com.usky.eg.service.EgDeviceAdbService;
+import com.usky.eg.service.vo.EgDeviceAdbResultVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 通过 {@link ProcessBuilder} 调用本机 PATH 中的官方 adb。
+ */
+@Slf4j
+@Service
+public class EgDeviceAdbServiceImpl implements EgDeviceAdbService {
+
+    private static final int BUFFER = 16384;
+
+    /**
+     * Windows 下 adb 常输出系统本地编码（如 GBK），勿固定按 UTF-8 解码以免日志/接口里出现乱码。
+     */
+    private static final Charset ADB_CONSOLE_CHARSET = Charset.defaultCharset();
+
+    private static final String NETWORK_TIMEOUT_HINT =
+            " 【排查】运行本服务的机器须与设备网络互通并能访问目标 TCP 端口（常见 5555）；"
+                    + "检查防火墙/安全组/跨网段路由；确认手机「无线调试」已开启且端口与请求一致；"
+                    + "Android 11+ 有时需先用系统界面配对，端口可能不是 5555；"
+                    + "错误 10060 表示连接超时，多为网络不可达或端口未监听。";
+
+    @Autowired
+    private EgDeviceAdbProperties properties;
+
+    @Override
+    public EgDeviceAdbResultVO connect(String deviceIp, Integer devicePort) {
+        validateEndpoint(deviceIp, devicePort);
+        String endpoint = toEndpoint(deviceIp, devicePort);
+        try {
+            String out = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                    Arrays.asList(properties.getExecutable(), "connect", endpoint));
+            return EgDeviceAdbResultVO.ok(out);
+        } catch (Exception e) {
+            log.warn("adb connect failed: {}", endpoint, e);
+            return EgDeviceAdbResultVO.fail(e.getMessage() != null ? e.getMessage() : e.toString());
+        }
+    }
+
+    @Override
+    public EgDeviceAdbResultVO disconnect(String deviceIp, Integer devicePort) {
+        validateEndpoint(deviceIp, devicePort);
+        String endpoint = toEndpoint(deviceIp, devicePort);
+        try {
+            String out = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                    Arrays.asList(properties.getExecutable(), "disconnect", endpoint));
+            return EgDeviceAdbResultVO.ok(out);
+        } catch (Exception e) {
+            log.warn("adb disconnect failed: {}", endpoint, e);
+            return EgDeviceAdbResultVO.fail(e.getMessage() != null ? e.getMessage() : e.toString());
+        }
+    }
+
+    @Override
+    public EgDeviceAdbResultVO tcpip(String deviceIp, Integer devicePort, Integer listenPort) {
+        validateEndpoint(deviceIp, devicePort);
+        if (listenPort == null || listenPort < 1 || listenPort > 65535) {
+            throw new BusinessException("port 无效（tcpip 监听端口）");
+        }
+        String serial = toSerial(deviceIp, devicePort);
+        EgDeviceAdbResultVO first = runTcpipOnce(serial, listenPort);
+        if (EgDeviceAdbResultVO.STATUS_SUCCESS.equals(first.getStatus())) {
+            return first;
+        }
+        if (!properties.isTcpipRetryAfterConnect()) {
+            return first;
+        }
+        log.info("adb tcpip 首次失败，尝试 connect 后重试: {}", serial);
+        EgDeviceAdbResultVO c = connect(deviceIp, devicePort);
+        if (!EgDeviceAdbResultVO.STATUS_SUCCESS.equals(c.getStatus())) {
+            return EgDeviceAdbResultVO.fail("tcpip 失败且自动 connect 未成功: " + first.getDetail() + " | connect: " + c.getDetail());
+        }
+        return runTcpipOnce(serial, listenPort);
+    }
+
+    private EgDeviceAdbResultVO runTcpipOnce(String serial, int listenPort) {
+        try {
+            String out = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                    Arrays.asList(properties.getExecutable(), "-s", serial, "tcpip", String.valueOf(listenPort)));
+            return EgDeviceAdbResultVO.ok(out);
+        } catch (Exception e) {
+            log.warn("adb tcpip failed: {} {}", serial, listenPort, e);
+            return EgDeviceAdbResultVO.fail(e.getMessage() != null ? e.getMessage() : e.toString());
+        }
+    }
+
+    @Override
+    public byte[] screenshot(String deviceIp, Integer devicePort) {
+        validateEndpoint(deviceIp, devicePort);
+        String serial = toSerial(deviceIp, devicePort);
+        if (properties.isScreenshotConnectFirst()) {
+            try {
+                ensureAdbDeviceOnline(deviceIp, devicePort);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new BusinessException("设备未就绪，无法截屏: " + e.getMessage());
+            } catch (IOException e) {
+                throw new BusinessException("设备未就绪，无法截屏: " + e.getMessage());
+            }
+        }
+        List<String> cmd = Arrays.asList(
+                properties.getExecutable(),
+                "-s", serial,
+                "exec-out", "screencap", "-p");
+        try {
+            byte[] png = runAdbBinaryStdout(cmd, properties.getScreenshotTimeoutSeconds());
+            checkPng(png);
+            return png;
+        } catch (Exception e) {
+            log.warn("adb screencap failed: {}", serial, e);
+            throw new BusinessException("截屏失败: " + e.getMessage()
+                    + "（请确认设备已开无线调试、端口正确，或先调用 /egDevice/adb/connect）");
+        }
+    }
+
+    /**
+     * 让本机 adb 真正识别该 serial：执行 connect、校验 {@code adb devices} 为 {@code device} 状态。
+     * 若仅“假装 connect”或忽略失败，会继续出现 {@code device 'ip:port' not found}。
+     */
+    private void ensureAdbDeviceOnline(String deviceIp, int devicePort) throws IOException, InterruptedException {
+        String serial = toSerial(deviceIp, devicePort);
+        String endpoint = toEndpoint(deviceIp, devicePort);
+
+        String connectOut = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                Arrays.asList(properties.getExecutable(), "connect", endpoint));
+        if (connectOutputIndicatesFailure(connectOut)) {
+            throw new IOException(withTimeoutHint("adb connect 输出表明失败: " + connectOut));
+        }
+
+        if (waitUntilDeviceOnline(serial, 3, 400)) {
+            Thread.sleep(200);
+            return;
+        }
+
+        log.warn("首次 connect 后 devices 仍未就绪，重试 connect: {}", endpoint);
+        connectOut = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                Arrays.asList(properties.getExecutable(), "connect", endpoint));
+        if (connectOutputIndicatesFailure(connectOut)) {
+            throw new IOException(withTimeoutHint("adb connect（重试）失败: " + connectOut));
+        }
+        if (!waitUntilDeviceOnline(serial, 5, 500)) {
+            String devicesList = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                    Arrays.asList(properties.getExecutable(), "devices", "-l"));
+            throw new IOException(withTimeoutHint("adb devices 中无可用设备 " + serial
+                    + "。connect 输出: " + connectOut + "；当前列表:\n" + devicesList));
+        }
+        Thread.sleep(200);
+    }
+
+    private boolean waitUntilDeviceOnline(String serial, int attempts, long gapMs) throws IOException, InterruptedException {
+        for (int i = 0; i < attempts; i++) {
+            if (i > 0) {
+                Thread.sleep(gapMs);
+            }
+            String list = runAdbMergedOutput(properties.getCommandTimeoutSeconds(),
+                    Arrays.asList(properties.getExecutable(), "devices"));
+            String state = findSerialState(list, serial);
+            if ("device".equals(state)) {
+                return true;
+            }
+            if ("unauthorized".equals(state)) {
+                throw new IOException("设备已发现但未授权调试，请在设备上点「允许 USB 调试」: " + serial);
+            }
+            if ("offline".equals(state)) {
+                log.warn("设备当前为 offline: {}", serial);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 解析 {@code adb devices}，返回 serial 对应第二列状态；未找到返回 null
+     */
+    private static String findSerialState(String devicesOutput, String serial) {
+        if (devicesOutput == null) {
+            return null;
+        }
+        for (String raw : devicesOutput.split("\\r?\\n")) {
+            String line = raw.trim();
+            if (line.isEmpty() || line.startsWith("List of devices")) {
+                continue;
+            }
+            String[] parts = line.split("\\s+");
+            if (parts.length >= 2 && serial.equals(parts[0])) {
+                return parts[1];
+            }
+        }
+        return null;
+    }
+
+    private static boolean connectOutputIndicatesFailure(String connectOut) {
+        if (connectOut == null || connectOut.isEmpty()) {
+            return false;
+        }
+        String s = connectOut.toLowerCase();
+        return s.contains("cannot connect")
+                || s.contains("failed to connect")
+                || s.contains("unable to connect")
+                || s.contains("connection refused")
+                || s.contains("10061")
+                || s.contains("10060")
+                || s.contains("timed out")
+                || connectOut.contains("连接尝试失败")
+                || connectOut.contains("没有正确答复");
+    }
+
+    private static String withTimeoutHint(String message) {
+        if (message == null) {
+            return NETWORK_TIMEOUT_HINT.trim();
+        }
+        String m = message;
+        String lower = m.toLowerCase();
+        if (lower.contains("10060") || lower.contains("10061") || lower.contains("cannot connect")
+                || lower.contains("timed out") || m.contains("连接尝试失败") || m.contains("没有正确答复")) {
+            return m + NETWORK_TIMEOUT_HINT;
+        }
+        return m;
+    }
+
+    /**
+     * adb 文本类输出（stdout/stderr）按 JVM 默认字符集解码
+     */
+    private static String decodeAdbConsole(byte[] raw) {
+        if (raw == null || raw.length == 0) {
+            return "";
+        }
+        return new String(raw, ADB_CONSOLE_CHARSET).trim();
+    }
+
+    private static void validateEndpoint(String deviceIp, Integer devicePort) {
+        if (StringUtils.isBlank(deviceIp)) {
+            throw new BusinessException("deviceIp 不能为空");
+        }
+        if (devicePort == null || devicePort < 1 || devicePort > 65535) {
+            throw new BusinessException("devicePort 无效");
+        }
+    }
+
+    private static String toEndpoint(String deviceIp, int devicePort) {
+        return deviceIp.trim() + ":" + devicePort;
+    }
+
+    private static String toSerial(String deviceIp, int devicePort) {
+        return toEndpoint(deviceIp, devicePort);
+    }
+
+    /**
+     * 合并 stdout/stderr，非 0 退出码抛出异常（文本类命令）
+     */
+    private String runAdbMergedOutput(long timeoutSeconds, List<String> command) throws IOException, InterruptedException {
+        ProcessBuilder pb = new ProcessBuilder(command);
+        pb.redirectErrorStream(true);
+        Process p = pb.start();
+        byte[] raw = readAll(p.getInputStream());
+        String text = decodeAdbConsole(raw);
+        boolean finished = p.waitFor(timeoutSeconds, TimeUnit.SECONDS);
+        if (!finished) {
+            p.destroyForcibly();
+            throw new IOException("adb 执行超时（" + timeoutSeconds + "s）");
+        }
+        int code = p.exitValue();
+        if (code != 0) {
+            throw new IOException(withTimeoutHint("adb 退出码 " + code + (text.isEmpty() ? "" : (": " + text))));
+        }
+        return text.isEmpty() ? "OK" : text;
+    }
+
+    private byte[] runAdbBinaryStdout(List<String> command, long timeoutSeconds) throws IOException, InterruptedException {
+        ProcessBuilder pb = new ProcessBuilder(command);
+        pb.redirectErrorStream(false);
+        Process p = pb.start();
+        byte[] out = readAll(p.getInputStream());
+        byte[] err = readAll(p.getErrorStream());
+        boolean finished = p.waitFor(timeoutSeconds, TimeUnit.SECONDS);
+        if (!finished) {
+            p.destroyForcibly();
+            throw new IOException("adb 执行超时（" + timeoutSeconds + "s）");
+        }
+        int code = p.exitValue();
+        String errStr = err.length == 0 ? "" : decodeAdbConsole(err);
+        if (code != 0) {
+            throw new IOException(withTimeoutHint("adb 退出码 " + code + (errStr.isEmpty() ? "" : (": " + errStr))));
+        }
+        if (out.length == 0 && !errStr.isEmpty()) {
+            throw new IOException(withTimeoutHint(errStr));
+        }
+        return out;
+    }
+
+    private static byte[] readAll(InputStream in) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        byte[] buf = new byte[BUFFER];
+        int n;
+        while ((n = in.read(buf)) != -1) {
+            bos.write(buf, 0, n);
+        }
+        return bos.toByteArray();
+    }
+
+    private static void checkPng(byte[] data) {
+        if (data == null || data.length < 24) {
+            throw new BusinessException("截屏数据无效（过小）");
+        }
+        if (data[0] != (byte) 0x89 || data[1] != 0x50 || data[2] != 0x4E || data[3] != 0x47) {
+            throw new BusinessException("截屏数据不是有效的 PNG");
+        }
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/impl/EgDeviceRemoteUpgradeMqttServiceImpl.java

@@ -0,0 +1,173 @@
+package com.usky.eg.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.eg.mqtt.EgMqttOutboundConfig.EgMqttPublishGateway;
+import com.usky.eg.mqtt.EgMqttProperties;
+import com.usky.eg.service.EgDeviceRemoteUpgradeMqttService;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeBatchItemVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeBatchResultVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeItemResultVO;
+import com.usky.eg.service.vo.EgDeviceAdbRemoteUpgradeVO;
+import com.usky.eg.service.vo.EgDeviceAdbResultVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Slf4j
+@Service
+public class EgDeviceRemoteUpgradeMqttServiceImpl implements EgDeviceRemoteUpgradeMqttService {
+
+    @Autowired
+    private EgMqttPublishGateway mqttPublishGateway;
+
+    @Autowired
+    private EgMqttProperties mqttProperties;
+
+    @Override
+    public EgDeviceAdbResultVO publishRemoteUpgrade(EgDeviceAdbRemoteUpgradeVO vo) {
+        if (vo == null) {
+            return EgDeviceAdbResultVO.fail("请求体为空");
+        }
+        if (StringUtils.isBlank(vo.getFileUrl())) {
+            throw new BusinessException("fileUrl 不能为空");
+        }
+        String urlTrim = vo.getFileUrl().trim();
+        if (!urlTrim.startsWith("http://") && !urlTrim.startsWith("https://")) {
+            throw new BusinessException("fileUrl 须为 http 或 https 地址");
+        }
+        String deviceId = resolveDeviceId(vo.getDeviceId(), vo.getDeviceCode());
+        if (StringUtils.isBlank(deviceId)) {
+            throw new BusinessException("MQTT 下发须指定 deviceId 或 deviceCode（与终端 connectWithDevice.deviceId 一致）");
+        }
+        String topic = buildTopic(deviceId);
+        String cmdId = UUID.randomUUID().toString();
+        String payload = buildPayload(cmdId, urlTrim, vo.getLaunchPackage(),
+                vo.getDeviceCode(), vo.getDeviceIp(), vo.getDevicePort());
+        return publishOne(topic, payload, cmdId);
+    }
+
+    @Override
+    public EgDeviceAdbRemoteUpgradeBatchResultVO publishRemoteUpgradeBatch(List<EgDeviceAdbRemoteUpgradeBatchItemVO> items,
+                                                                           String fileUrl, String launchPackage) {
+        if (items == null || items.isEmpty()) {
+            throw new BusinessException("items 不能为空");
+        }
+        if (StringUtils.isBlank(fileUrl)) {
+            throw new BusinessException("fileUrl 不能为空");
+        }
+        String urlTrim = fileUrl.trim();
+        if (!urlTrim.startsWith("http://") && !urlTrim.startsWith("https://")) {
+            throw new BusinessException("fileUrl 须为 http 或 https 地址");
+        }
+        List<EgDeviceAdbRemoteUpgradeItemResultVO> rows = new ArrayList<>(items.size());
+        int success = 0;
+        int fail = 0;
+        int index = 0;
+        for (EgDeviceAdbRemoteUpgradeBatchItemVO item : items) {
+            EgDeviceAdbResultVO r;
+            String mqttTopic = null;
+            String mqttCmdId = null;
+            if (item == null) {
+                r = EgDeviceAdbResultVO.fail("请求项为空");
+            } else {
+                String deviceId = resolveDeviceId(item.getDeviceId(), item.getDeviceCode());
+                if (StringUtils.isBlank(deviceId)) {
+                    r = EgDeviceAdbResultVO.fail("须指定 deviceId 或 deviceCode");
+                } else {
+                    try {
+                        String topic = buildTopic(deviceId);
+                        String cmdId = UUID.randomUUID().toString();
+                        String payload = buildPayload(cmdId, urlTrim, launchPackage,
+                                item.getDeviceCode(), item.getDeviceIp(), item.getDevicePort());
+                        r = publishOne(topic, payload, cmdId);
+                        mqttTopic = topic;
+                        mqttCmdId = cmdId;
+                    } catch (BusinessException e) {
+                        r = EgDeviceAdbResultVO.fail(e.getMessage() != null ? e.getMessage() : "参数错误");
+                    } catch (Exception e) {
+                        log.warn("mqtt remote upgrade publish failed index={} deviceId={}", index, deviceId, e);
+                        r = EgDeviceAdbResultVO.fail(e.getMessage() != null ? e.getMessage() : e.toString());
+                    }
+                }
+            }
+            if (EgDeviceAdbResultVO.STATUS_SUCCESS.equals(r.getStatus())) {
+                success++;
+            } else {
+                fail++;
+            }
+            String code = item != null ? item.getDeviceCode() : null;
+            String ip = item != null ? item.getDeviceIp() : null;
+            String port = item != null ? item.getDevicePort() : null;
+            String routeId = item != null ? resolveDeviceId(item.getDeviceId(), item.getDeviceCode()) : null;
+            rows.add(new EgDeviceAdbRemoteUpgradeItemResultVO(index++, code, ip, port, routeId, mqttTopic, mqttCmdId, r));
+        }
+        return new EgDeviceAdbRemoteUpgradeBatchResultVO(items.size(), success, fail, rows);
+    }
+
+    private EgDeviceAdbResultVO publishOne(String topic, String payload, String cmdId) {
+        try {
+            int qos = clampQos(mqttProperties.getQos());
+            mqttPublishGateway.sendToMqtt(topic, qos, payload);
+            log.info("mqtt remote upgrade published topic={} cmdId={}", topic, cmdId);
+            return EgDeviceAdbResultVO.ok("topic=" + topic + "; cmdId=" + cmdId);
+        } catch (Exception e) {
+            log.warn("mqtt publish failed topic={} cmdId={}", topic, cmdId, e);
+            return EgDeviceAdbResultVO.fail(e.getMessage() != null ? e.getMessage() : e.toString());
+        }
+    }
+
+    private String buildPayload(String cmdId, String fileUrl, String launchPackage,
+                                String deviceCode, String deviceIp, String devicePort) {
+        JSONObject o = new JSONObject();
+        o.put("id", cmdId);
+        o.put("type", mqttProperties.getCommandType() != null ? mqttProperties.getCommandType() : "egRemoteUpgrade");
+        o.put("fileUrl", fileUrl.trim());
+        if (StringUtils.isNotBlank(launchPackage)) {
+            o.put("launchPackage", launchPackage.trim());
+        }
+        if (StringUtils.isNotBlank(deviceCode)) {
+            o.put("deviceCode", deviceCode.trim());
+        }
+        if (StringUtils.isNotBlank(deviceIp)) {
+            o.put("deviceIp", deviceIp.trim());
+        }
+        if (StringUtils.isNotBlank(devicePort)) {
+            o.put("devicePort", devicePort.trim());
+        }
+        return o.toJSONString();
+    }
+
+    private static String resolveDeviceId(String deviceId, String deviceCode) {
+        if (StringUtils.isNotBlank(deviceId)) {
+            return deviceId.trim();
+        }
+        if (StringUtils.isNotBlank(deviceCode)) {
+            return deviceCode.trim();
+        }
+        return null;
+    }
+
+    private String buildTopic(String deviceId) {
+        String template = mqttProperties.getCommandTopicTemplate();
+        if (StringUtils.isBlank(template) || !template.contains("{deviceId}")) {
+            throw new BusinessException("eg.mqtt.command-topic-template 须为非空且包含占位符 {deviceId}");
+        }
+        return template.replace("{deviceId}", deviceId);
+    }
+
+    private static int clampQos(int qos) {
+        if (qos < 0) {
+            return 0;
+        }
+        if (qos > 2) {
+            return 2;
+        }
+        return qos;
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbEndpointVO.java

@@ -0,0 +1,13 @@
+package com.usky.eg.service.vo;
+
+import lombok.Data;
+
+/**
+ * adb connect / disconnect 请求体
+ */
+@Data
+public class EgDeviceAdbEndpointVO {
+
+    private String deviceIp;
+    private Integer devicePort;
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbRemoteUpgradeBatchItemVO.java

@@ -0,0 +1,19 @@
+package com.usky.eg.service.vo;
+
+import lombok.Data;
+
+/**
+ * 批量远程升级中的单台设备：设备标识与连接信息；MQTT 模式须含 {@link #deviceId} 或 {@link #deviceCode}。
+ * 安装包与启动参数与 {@link EgDeviceAdbRemoteUpgradeVO} 中 {@code fileUrl}、{@code launchPackage} 同级。
+ */
+@Data
+public class EgDeviceAdbRemoteUpgradeBatchItemVO {
+
+    /** MQTT 路由用，未传时使用 {@link #deviceCode} */
+    private String deviceId;
+
+    private String deviceCode;
+    private String deviceIp;
+    /** 无线调试端口，缺省由服务端按 5555 处理 */
+    private String devicePort;
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbRemoteUpgradeBatchResultVO.java

@@ -0,0 +1,21 @@
+package com.usky.eg.service.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 批量远程升级汇总结果。
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EgDeviceAdbRemoteUpgradeBatchResultVO {
+
+    private int total;
+    private int successCount;
+    private int failCount;
+    private List<EgDeviceAdbRemoteUpgradeItemResultVO> items;
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbRemoteUpgradeItemResultVO.java

@@ -0,0 +1,34 @@
+package com.usky.eg.service.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 批量远程升级中单条设备的结果（与请求 {@code items} 下标对应）。
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EgDeviceAdbRemoteUpgradeItemResultVO {
+
+    /** 与请求体 {@code items} 数组下标一致，从 0 开始 */
+    private int index;
+    private String deviceCode;
+    private String deviceIp;
+    private String devicePort;
+    /**
+     * MQTT 下发时：用于路由的主题中的设备标识（与请求 deviceId 或 deviceCode 解析结果一致）。
+     */
+    private String mqttRouteDeviceId;
+    /** MQTT 下发成功时填充 */
+    private String mqttTopic;
+    /** MQTT 下发成功时填充，与下行 JSON 中 {@code id} 一致 */
+    private String mqttCmdId;
+    private EgDeviceAdbResultVO result;
+
+    public EgDeviceAdbRemoteUpgradeItemResultVO(int index, String deviceCode, String deviceIp, String devicePort,
+                                                EgDeviceAdbResultVO result) {
+        this(index, deviceCode, deviceIp, devicePort, null, null, null, result);
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbRemoteUpgradeVO.java

@@ -0,0 +1,36 @@
+package com.usky.eg.service.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * MQTT 远程升级请求体：向 Broker 发布下行 JSON（终端 {@code onCommand} 接收后自行下载安装）。
+ * <p>
+ * {@code fileUrl} 必填（http/https）。须指定 {@code deviceId} 或与终端序列号一致的 {@code deviceCode}，用于主题
+ * {@code eg.mqtt.command-topic-template} 中的占位符 {@code {deviceId}}。
+ * {@code deviceIp}、{@code devicePort} 可选，会一并写入下行 JSON 供终端展示或日志。
+ * <p>
+ * 批量：当 {@code items} 非空时，与本对象同级的 {@code fileUrl}、{@code launchPackage} 对所有设备共用；
+ * 忽略顶层 {@code deviceCode}、{@code deviceIp}、{@code devicePort}。{@code items} 每项见 {@link EgDeviceAdbRemoteUpgradeBatchItemVO}。
+ */
+@Data
+public class EgDeviceAdbRemoteUpgradeVO {
+
+    /** 非空且非空列表时启用批量模式 */
+    private List<EgDeviceAdbRemoteUpgradeBatchItemVO> items;
+
+    /**
+     * 与终端 {@code connectWithDevice({ deviceId: getSerial() })} 一致；
+     * 未传时与 {@link #deviceCode} 等价（二选一至少填一个）。
+     */
+    private String deviceId;
+
+    private String deviceCode;
+    private String deviceIp;
+    /** 可选，写入下行 JSON */
+    private String devicePort;
+    private String fileUrl;
+    /** 可选，写入下行 JSON，终端安装成功后自行拉起 */
+    private String launchPackage;
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbResultVO.java

@@ -0,0 +1,29 @@
+package com.usky.eg.service.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 官方 adb 文本类命令的统一返回（与前端约定 status）
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EgDeviceAdbResultVO {
+
+    public static final String STATUS_SUCCESS = "SUCCESS";
+    public static final String STATUS_FAIL = "FAIL";
+
+    private String status;
+    /** adb 标准输出/合并日志摘要，便于排查 */
+    private String detail;
+
+    public static EgDeviceAdbResultVO ok(String detail) {
+        return new EgDeviceAdbResultVO(STATUS_SUCCESS, detail == null ? "" : detail.trim());
+    }
+
+    public static EgDeviceAdbResultVO fail(String detail) {
+        return new EgDeviceAdbResultVO(STATUS_FAIL, detail == null ? "" : detail.trim());
+    }
+}

service-eg/service-eg-biz/src/main/java/com/usky/eg/service/vo/EgDeviceAdbTcpipVO.java

@@ -0,0 +1,15 @@
+package com.usky.eg.service.vo;
+
+import lombok.Data;
+
+/**
+ * adb tcpip 请求体（对应 adb -s ip:devicePort tcpip <port>）
+ */
+@Data
+public class EgDeviceAdbTcpipVO {
+
+    private String deviceIp;
+    private Integer devicePort;
+    /** tcpip 命令中的监听端口参数，例如 5555 */
+    private Integer port;
+}

service-eg/service-eg-biz/src/main/resources/bootstrap.yml

@@ -23,3 +23,69 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+# SmartFace 人脸识别配置
+smartface:
+  # 启用人脸识别功能
+  enabled: true
+  # 是否延迟加载模型（true=首次使用时加载，false=启动时加载）
+  # 如果模型文件还未准备好，建议设置为true，避免启动失败
+  lazy-load: true
+  # 人脸检测配置
+  detection:
+    # 模型类型: MTCNN, RETINA_FACE, YOLOV5_FACE_320, YOLOV5_FACE_640
+    model-type: MTCNN
+    # 人脸检测模型路径（留空，将自动从classpath复制到临时目录）
+    model-path:
+    # 置信度阈值
+    confidence-threshold: 0.5
+    # NMS阈值
+    nms-threshold: 0.4
+    # 设备类型: CPU, GPU
+    device: CPU
+  # 人脸识别配置
+  recognition:
+    # 模型类型: INSIGHT_FACE_IRSE50_MODEL, INSIGHT_FACE_MOBILE_FACENET_MODEL, FACE_NET_MODEL
+    model-type: INSIGHT_FACE_IRSE50_MODEL
+    # 人脸识别模型路径（留空，将自动从classpath复制到临时目录）
+    model-path:
+    # 是否裁剪人脸
+    crop-face: true
+    # 是否启用人脸对齐
+    align: true
+    # 相似度阈值（0-1之间，推荐0.62）
+    similarity-threshold: 0.62
+    # 设备类型: CPU, GPU
+    device: CPU
+  # 向量数据库配置
+  vector-db:
+    # 数据库类型: SQLITE, MILVUS
+    type: SQLITE
+    # SQLite数据库文件路径
+    sqlite-path: ./data/face_db.sqlite
+    # Milvus配置（如果使用Milvus）
+    milvus:
+      host: 127.0.0.1
+      port: 19530
+      collection-name: face_collection
+
+# 服务端调用官方 adb（platform-tools 需在 PATH）；详见 EgDeviceAdbController：/egDevice/adb/connect 等
+eg:
+  adb:
+    executable: adb
+    command-timeout-seconds: 45
+    screenshot-timeout-seconds: 60
+    tcpip-retry-after-connect: true
+    # 截屏前先 adb connect，避免服务端 adb 未登记设备 serial
+    screenshot-connect-first: true
+
+  # 远程升级仅 MQTT 下发（与终端 connectWithDevice 订阅主题一致）
+  mqtt:
+    url: tcp://47.98.201.73:1883
+    username: usky
+    password: usky
+    # 须含 {deviceId}，与终端 deviceId（如 getSerial()）一致
+    command-topic-template: usky/device/{deviceId}/command
+    qos: 1
+    # 下行 JSON 的 type 字段，终端 onCommand 可按此分支
+    command-type: egRemoteUpgrade

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseBuildMapper.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseBuildMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseBuild">
-        <id column="id" property="id" />
-        <result column="build_num" property="buildNum" />
-        <result column="build_name" property="buildName" />
-        <result column="address" property="address" />
-        <result column="model_address" property="modelAddress" />
-        <result column="above_floor" property="aboveFloor" />
-        <result column="under_floor" property="underFloor" />
-        <result column="build_area" property="buildArea" />
-        <result column="cover_area" property="coverArea" />
-        <result column="fire_rating" property="fireRating" />
-        <result column="use_character" property="useCharacter" />
-        <result column="build_structure" property="buildStructure" />
-        <result column="fireproof_coat" property="fireproofCoat" />
-        <result column="build_high" property="buildHigh" />
-        <result column="high_type" property="highType" />
-        <result column="complete_year" property="completeYear" />
-        <result column="safe_person" property="safePerson" />
-        <result column="manage_person" property="managePerson" />
-        <result column="fire_risk" property="fireRisk" />
-        <result column="fire_control_room" property="fireControlRoom" />
-        <result column="build_inside" property="buildInside" />
-        <result column="build_plan" property="buildPlan" />
-        <result column="facility_id" property="facilityId" />
-        <result column="company_id" property="companyId" />
-        <result column="under_space" property="underSpace" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
-        <result column="delete_flag" property="deleteFlag" />
-        <result column="fire_facility_system" property="fireFacilitySystem" />
-        <result column="other_system" property="otherSystem" />
-        <result column="other_facilities" property="otherFacilities" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseCompanyAttach1Mapper.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseCompanyAttach1Mapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseCompanyAttach1">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="company_code" property="companyCode" />
-        <result column="detachment_name" property="detachmentName" />
-        <result column="govern_body" property="governBody" />
-        <result column="main_attribute_type" property="mainAttributeType" />
-        <result column="main_attribute" property="mainAttribute" />
-        <result column="son_attribute" property="sonAttribute" />
-        <result column="fixed_assets" property="fixedAssets" />
-        <result column="employee_num" property="employeeNum" />
-        <result column="business_max_num" property="businessMaxNum" />
-        <result column="cover_area" property="coverArea" />
-        <result column="build_area" property="buildArea" />
-        <result column="auto_fire_facilities" property="autoFireFacilities" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="geography" property="geography" />
-        <result column="refuge_floor" property="refugeFloor" />
-        <result column="refuge_floor_num" property="refugeFloorNum" />
-        <result column="refuge_floor_area" property="refugeFloorArea" />
-        <result column="refuge_floor_position" property="refugeFloorPosition" />
-        <result column="remarks" property="remarks" />
-        <result column="plan_name" property="planName" />
-        <result column="plan_url" property="planUrl" />
-        <result column="build_num" property="buildNum" />
-        <result column="superior_fire_jurisdiction" property="superiorFireJurisdiction" />
-        <result column="actual_company_id" property="actualCompanyId" />
-        <result column="gl_id" property="glId" />
-        <result column="determine_key_time" property="determineKeyTime" />
-        <result column="cancel_key_time" property="cancelKeyTime" />
-        <result column="operation_type" property="operationType" />
-        <result column="old_company_id" property="oldCompanyId" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-        <result column="registered_capital" property="registeredCapital" />
-        <result column="business_status" property="businessStatus" />
-        <result column="paid_capital" property="paidCapital" />
-        <result column="registrar" property="registrar" />
-        <result column="completed_time" property="completedTime" />
-        <result column="fire_rating" property="fireRating" />
-        <result column="building_height" property="buildingHeight" />
-        <result column="building_structure" property="buildingStructure" />
-        <result column="construction" property="construction" />
-        <result column="birth_cert" property="birthCert" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseCompanyAttach2Mapper.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseCompanyAttach2Mapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseCompanyAttach2">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="company_code" property="companyCode" />
-        <result column="volunteer_fireman_num" property="volunteerFiremanNum" />
-        <result column="self_rescue_measures" property="selfRescueMeasures" />
-        <result column="peripheral_fire_facilities" property="peripheralFireFacilities" />
-        <result column="historical_disaster" property="historicalDisaster" />
-        <result column="adjacent_east" property="adjacentEast" />
-        <result column="adjacent_south" property="adjacentSouth" />
-        <result column="adjacent_west" property="adjacentWest" />
-        <result column="adjacent_north" property="adjacentNorth" />
-        <result column="safety_exits_num" property="safetyExitsNum" />
-        <result column="fire_lane_num" property="fireLaneNum" />
-        <result column="fire_lane_position" property="fireLanePosition" />
-        <result column="sparse_elevator_num" property="sparseElevatorNum" />
-        <result column="fire_elevator_num" property="fireElevatorNum" />
-        <result column="gas_type" property="gasType" />
-        <result column="archives_person" property="archivesPerson" />
-        <result column="archives_input_person" property="archivesInputPerson" />
-        <result column="filing_person" property="filingPerson" />
-        <result column="filing_person_name" property="filingPersonName" />
-        <result column="data_exchange_mark" property="dataExchangeMark" />
-        <result column="data_exchange_time" property="dataExchangeTime" />
-        <result column="supervi_modify_time" property="superviModifyTime" />
-        <result column="corps_id" property="corpsId" />
-        <result column="police_data" property="policeData" />
-        <result column="row_version" property="rowVersion" />
-        <result column="manage_company" property="manageCompany" />
-        <result column="sfhjhdw" property="sfhjhdw" />
-        <result column="high_risk" property="highRisk" />
-        <result column="sfwbqy" property="sfwbqy" />
-        <result column="hjhjzsl" property="hjhjzsl" />
-        <result column="lgacc" property="lgacc" />
-        <result column="lgacc_name" property="lgaccName" />
-        <result column="bzdzkglid" property="bzdzkglid" />
-        <result column="qrtime" property="qrtime" />
-        <result column="qracc" property="qracc" />
-        <result column="determine_key_name" property="determineKeyName" />
-        <result column="qryj" property="qryj" />
-        <result column="qryjjms" property="qryjjms" />
-        <result column="scrksj" property="scrksj" />
-        <result column="law_id" property="lawId" />
-        <result column="reserve_field1" property="reserveField1" />
-        <result column="reserve_field2" property="reserveField2" />
-        <result column="reserve_field3" property="reserveField3" />
-        <result column="reserve_field4" property="reserveField4" />
-        <result column="bdp_audit" property="bdpAudit" />
-        <result column="union_key" property="unionKey" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseCompanyPersonMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseCompanyPersonMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseCompanyPerson">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="company_code" property="companyCode" />
-        <result column="company_name" property="companyName" />
-        <result column="fire_control_phone" property="fireControlPhone" />
-        <result column="fire_duty_name" property="fireDutyName" />
-        <result column="fire_duty_idcard" property="fireDutyIdcard" />
-        <result column="fire_duty_phone" property="fireDutyPhone" />
-        <result column="fire_manage_name" property="fireManageName" />
-        <result column="fire_manage_idcard" property="fireManageIdcard" />
-        <result column="fire_manage_phone" property="fireManagePhone" />
-        <result column="part_time_fire_name" property="partTimeFireName" />
-        <result column="part_time_fire_idcard" property="partTimeFireIdcard" />
-        <result column="part_time_fire_phone" property="partTimeFirePhone" />
-        <result column="delegate_name" property="delegateName" />
-        <result column="delegate_idcard" property="delegateIdcard" />
-        <result column="delegate_phone" property="delegatePhone" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseDeviceAttributeMapper.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseDeviceAttributeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseDeviceAttribute">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="device_id" property="deviceId" />
-        <result column="ports" property="ports" />
-        <result column="port_type" property="portType" />
-        <result column="system_type" property="systemType" />
-        <result column="level_type" property="levelType" />
-        <result column="high_level_name" property="highLevelName" />
-        <result column="low_level_name" property="lowLevelName" />
-        <result column="port_code" property="portCode" />
-        <result column="port_name" property="portName" />
-        <result column="analog_quantity_parameter" property="analogQuantityParameter" />
-        <result column="analog_alarm_upper" property="analogAlarmUpper" />
-        <result column="analog_alarm_lower" property="analogAlarmLower" />
-        <result column="range" property="range" />
-        <result column="range_upper" property="rangeUpper" />
-        <result column="range_lower" property="rangeLower" />
-        <result column="output" property="output" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseDeviceMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseDeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseDevice">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="device_name" property="deviceName" />
-        <result column="install_address" property="installAddress" />
-        <result column="device_type" property="deviceType" />
-        <result column="product_id" property="productId" />
-        <result column="floor" property="floor" />
-        <result column="sim_num" property="simNum" />
-        <result column="communicat_mode" property="communicatMode" />
-        <result column="model_position" property="modelPosition" />
-        <result column="fire_zone" property="fireZone" />
-        <result column="magnification" property="magnification" />
-        <result column="analytic_method" property="analyticMethod" />
-        <result column="install_time" property="installTime" />
-        <result column="install_person" property="installPerson" />
-        <result column="enable" property="enable" />
-        <result column="company_id" property="companyId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseDeviceStatusMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseDeviceStatusMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseDeviceStatus">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="device_status" property="deviceStatus" />
-        <result column="report_time" property="reportTime" />
-        <result column="company_id" property="companyId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseRegionStatisticMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseRegionStatisticMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseRegionStatistic">
-        <id column="id" property="id" />
-        <result column="region_name" property="regionName" />
-        <result column="region_area" property="regionArea" />
-        <result column="region_resident" property="regionResident" />
-        <result column="street_town_num" property="streetTownNum" />
-        <result column="large_build_num" property="largeBuildNum" />
-        <result column="key_company_num" property="keyCompanyNum" />
-        <result column="hospital_num" property="hospitalNum" />
-        <result column="school_num" property="schoolNum" />
-        <result column="fire_rescue_num" property="fireRescueNum" />
-        <result column="mini_fire_num" property="miniFireNum" />
-        <result column="full_time_num" property="fullTimeNum" />
-        <result column="prior_mini_num" property="priorMiniNum" />
-        <result column="community_mini_num" property="communityMiniNum" />
-        <result column="create_time" property="createTime" />
-        <result column="creator_by" property="creatorBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_by" property="updateBy" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseStreetTownMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseStreetTownMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseStreetTown">
-        <id column="id" property="id" />
-        <result column="street_town_name" property="streetTownName" />
-        <result column="economize" property="economize" />
-        <result column="market" property="market" />
-        <result column="district_county" property="districtCounty" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BaseUserCompanyMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BaseUserCompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseUserCompany">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="company_id" property="companyId" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BscEnterpriseAutonomyMapper.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BscEnterpriseAutonomyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BscEnterpriseAutonomy">
-        <id column="id" property="id"/>
-        <result column="enterprise_autonomy" property="enterpriseAutonomy"/>
-        <result column="iot_device" property="iotDevice"/>
-        <result column="patrol_inspection" property="patrolInspection"/>
-        <result column="street_company" property="streetCompany"/>
-        <result column="create_time" property="createTime"/>
-        <result column="rpn" property="rpn"/>
-    </resultMap>
-
-    <select id="deviceStatusCount" resultType="com.usky.fire.service.vo.DataCountVo">
-        SELECT
-        a.street_town as listName,
-        c.device_status as listType,
-        COUNT(*) as listCount
-        FROM
-        base_company AS a
-        JOIN base_device AS b ON a.company_id = b.company_id
-        JOIN base_device_status AS c ON b.device_code = c.device_code
-        <where>
-            a.`enable` = 0
-            and b.`enable` = 1
-            <if test="streetTownList != null and streetTownList.size() > 0">
-                AND a.street_town in
-                <foreach item="item" collection="streetTownList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        GROUP BY
-        a.street_town,
-        device_status
-    </select>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BscEnterpriseScreenMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BscEnterpriseScreenMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BscEnterpriseScreen">
-        <id column="id" property="id" />
-        <result column="patrol_inspection" property="patrolInspection" />
-        <result column="post_inspect" property="postInspect" />
-        <result column="fire_alarm" property="fireAlarm" />
-        <result column="reserve_plan" property="reservePlan" />
-        <result column="hidden_danger" property="hiddenDanger" />
-        <result column="build_score" property="buildScore" />
-        <result column="company_id" property="companyId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BscEnterpriseStreetTownMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BscEnterpriseStreetTownMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BscEnterpriseStreetTown">
-        <id column="id" property="id" />
-        <result column="enterprise_autonomy" property="enterpriseAutonomy" />
-        <result column="iot_device" property="iotDevice" />
-        <result column="patrol_inspection" property="patrolInspection" />
-        <result column="street_company" property="streetCompany" />
-        <result column="street_town" property="streetTown" />
-        <result column="create_time" property="createTime" />
-        <result column="rpn" property="rpn" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/BscLawTrendMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.BscLawTrendMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BscLawTrend">
-        <id column="id" property="id" />
-        <result column="month_law" property="monthLaw" />
-        <result column="adstra_license" property="adstraLicense" />
-        <result column="report_complaint" property="reportComplaint" />
-        <result column="complaint_handle" property="complaintHandle" />
-        <result column="enforce_report_complaint" property="enforceReportComplaint" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DataJinganAnalysisMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DataJinganAnalysisMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DataJinganAnalysis">
-        <id column="id" property="id" />
-        <result column="app_key" property="appKey" />
-        <result column="timestamp" property="timestamp" />
-        <result column="format" property="format" />
-        <result column="v" property="v" />
-        <result column="sign_method" property="signMethod" />
-        <result column="pid" property="pid" />
-        <result column="bid" property="bid" />
-        <result column="fid" property="fid" />
-        <result column="supervise_id" property="superviseId" />
-        <result column="supervise_code" property="superviseCode" />
-        <result column="status" property="status" />
-        <result column="content" property="content" />
-        <result column="type" property="type" />
-        <result column="device_id" property="deviceId" />
-        <result column="aid" property="aid" />
-        <result column="loop_number" property="loopNumber" />
-        <result column="position_number" property="positionNumber" />
-        <result column="mainframe_id" property="mainframeId" />
-        <result column="sign" property="sign" />
-        <result column="company_code" property="companyCode" />
-        <result column="handle_by" property="handleBy" />
-        <result column="handle_time" property="handleTime" />
-        <result column="handle_content" property="handleContent" />
-        <result column="handle_phone" property="handlePhone" />
-        <result column="handle_status" property="handleStatus" />
-        <result column="dept_id" property="deptId" />
-        <result column="tenant_id" property="tenantId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DataJinganPersonMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DataJinganPersonMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DataJinganPerson">
-        <id column="id" property="id" />
-        <result column="app_key" property="appKey" />
-        <result column="timestamp" property="timestamp" />
-        <result column="format" property="format" />
-        <result column="version" property="version" />
-        <result column="sign_method" property="signMethod" />
-        <result column="artificial_id" property="artificialId" />
-        <result column="pid" property="pid" />
-        <result column="artificial_code" property="artificialCode" />
-        <result column="company_id" property="companyId" />
-        <result column="content" property="content" />
-        <result column="status" property="status" />
-        <result column="sign" property="sign" />
-        <result column="company_code" property="companyCode" />
-        <result column="handle_by" property="handleBy" />
-        <result column="handle_time" property="handleTime" />
-        <result column="handle_content" property="handleContent" />
-        <result column="handle_phone" property="handlePhone" />
-        <result column="handle_status" property="handleStatus" />
-        <result column="dept_id" property="deptId" />
-        <result column="tenant_id" property="tenantId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DataRtMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DataRtMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DataRt">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="company_id" property="companyId" />
-        <result column="system_type" property="systemType" />
-        <result column="device_name" property="deviceName" />
-        <result column="device_code" property="deviceCode" />
-        <result column="device_type" property="deviceType" />
-        <result column="ports" property="ports" />
-        <result column="port_code" property="portCode" />
-        <result column="port_name" property="portName" />
-        <result column="port_data" property="portData" />
-        <result column="data_time" property="dataTime" />
-        <result column="content" property="content" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemAtlDisagreeMapper.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemAtlDisagreeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemAtlDisagree">
-        <id column="id" property="id" />
-        <result column="disagree_id" property="disagreeId" />
-        <result column="project_code" property="projectCode" />
-        <result column="source_paper_id" property="sourcePaperId" />
-        <result column="source_paper_type" property="sourcePaperType" />
-        <result column="document_number1" property="documentNumber1" />
-        <result column="document_number2" property="documentNumber2" />
-        <result column="document_number3" property="documentNumber3" />
-        <result column="document_number4" property="documentNumber4" />
-        <result column="document_number" property="documentNumber" />
-        <result column="public_security" property="publicSecurity" />
-        <result column="paper_title" property="paperTitle" />
-        <result column="company_name" property="companyName" />
-        <result column="inspect_request" property="inspectRequest" />
-        <result column="inspect_company" property="inspectCompany" />
-        <result column="inspect_time" property="inspectTime" />
-        <result column="legal_provision" property="legalProvision" />
-        <result column="disagree_content" property="disagreeContent" />
-        <result column="reconsider_company" property="reconsiderCompany" />
-        <result column="people_court" property="peopleCourt" />
-        <result column="filling_time" property="fillingTime" />
-        <result column="approver_account" property="approverAccount" />
-        <result column="approver_name" property="approverName" />
-        <result column="approval_time" property="approvalTime" />
-        <result column="approval_opinion" property="approvalOpinion" />
-        <result column="whether_service" property="whetherService" />
-        <result column="service_mode" property="serviceMode" />
-        <result column="source_paper_version" property="sourcePaperVersion" />
-        <result column="competent_company" property="competentCompany" />
-        <result column="entered_account" property="enteredAccount" />
-        <result column="entered_name" property="enteredName" />
-        <result column="entered_time" property="enteredTime" />
-        <result column="entered_ip" property="enteredIp" />
-        <result column="update_account" property="updateAccount" />
-        <result column="update_name" property="updateName" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_ip" property="updateIp" />
-        <result column="delete_flag" property="deleteFlag" />
-        <result column="alternate_field1" property="alternateField1" />
-        <result column="alternate_field2" property="alternateField2" />
-        <result column="alternate_field3" property="alternateField3" />
-        <result column="alternate_field4" property="alternateField4" />
-        <result column="alternate_field5" property="alternateField5" />
-        <result column="row_version" property="rowVersion" />
-        <result column="csdz" property="csdz" />
-        <result column="spb_id" property="spbId" />
-        <result column="is_read" property="isRead" />
-        <result column="read_time" property="readTime" />
-        <result column="bdp_audit" property="bdpAudit" />
-        <result column="union_key" property="unionKey" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemAtlInspectVoucherMapper.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemAtlInspectVoucherMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemAtlInspectVoucher">
-        <id column="id" property="id" />
-        <result column="voucher_id" property="voucherId" />
-        <result column="project_code" property="projectCode" />
-        <result column="voucher_type" property="voucherType" />
-        <result column="source_paper_id" property="sourcePaperId" />
-        <result column="source_paper_type" property="sourcePaperType" />
-        <result column="document_number1" property="documentNumber1" />
-        <result column="document_number2" property="documentNumber2" />
-        <result column="document_number3" property="documentNumber3" />
-        <result column="document_number4" property="documentNumber4" />
-        <result column="document_number" property="documentNumber" />
-        <result column="paper_title" property="paperTitle" />
-        <result column="declare_company" property="declareCompany" />
-        <result column="project_name" property="projectName" />
-        <result column="material_code" property="materialCode" />
-        <result column="material_name" property="materialName" />
-        <result column="whether_complies" property="whetherComplies" />
-        <result column="whether_accept" property="whetherAccept" />
-        <result column="whether_correct" property="whetherCorrect" />
-        <result column="correct_content" property="correctContent" />
-        <result column="whether_review" property="whetherReview" />
-        <result column="inspect_time_limit" property="inspectTimeLimit" />
-        <result column="time_limit_content" property="timeLimitContent" />
-        <result column="annex_content" property="annexContent" />
-        <result column="declare_person" property="declarePerson" />
-        <result column="accept_person" property="acceptPerson" />
-        <result column="accept_time" property="acceptTime" />
-        <result column="version_code" property="versionCode" />
-        <result column="accept_company" property="acceptCompany" />
-        <result column="approver_account" property="approverAccount" />
-        <result column="approver_name" property="approverName" />
-        <result column="approval_time" property="approvalTime" />
-        <result column="creator" property="creator" />
-        <result column="creator_name" property="creatorName" />
-        <result column="create_time" property="createTime" />
-        <result column="create_ip" property="createIp" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_name" property="updateName" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_ip" property="updateIp" />
-        <result column="delete_flag" property="deleteFlag" />
-        <result column="alternate_field1" property="alternateField1" />
-        <result column="alternate_field2" property="alternateField2" />
-        <result column="alternate_field3" property="alternateField3" />
-        <result column="alternate_field4" property="alternateField4" />
-        <result column="alternate_field5" property="alternateField5" />
-        <result column="row_version" property="rowVersion" />
-        <result column="project_address" property="projectAddress" />
-        <result column="accept_situation" property="acceptSituation" />
-        <result column="accepted_code" property="acceptedCode" />
-        <result column="company_abbreviate" property="companyAbbreviate" />
-        <result column="declare_time" property="declareTime" />
-        <result column="is_read" property="isRead" />
-        <result column="read_time" property="readTime" />
-        <result column="union_key" property="unionKey" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemBuildScoreMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemBuildScoreMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemBuildScore">
-        <id column="id" property="id" />
-        <result column="weight_name" property="weightName" />
-        <result column="risk_id" property="riskId" />
-        <result column="risk_max" property="riskMax" />
-        <result column="build_score" property="buildScore" />
-        <result column="weight_proportion" property="weightProportion" />
-        <result column="enable" property="enable" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemBuildScoreRecordMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemBuildScoreRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemBuildScoreRecord">
-        <id column="id" property="id" />
-        <result column="build_score" property="buildScore" />
-        <result column="score_date" property="scoreDate" />
-        <result column="company_id" property="companyId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemBuildScoreRiskMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemBuildScoreRiskMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemBuildScoreRisk">
-        <id column="id" property="id" />
-        <result column="risk_type_name" property="riskTypeName" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemEnforceReportComplaintMapper.xml

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemEnforceReportComplaintMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemEnforceReportComplaint">
-        <id column="id" property="id" />
-        <result column="report_id" property="reportId" />
-        <result column="serial_number" property="serialNumber" />
-        <result column="report_person" property="reportPerson" />
-        <result column="report_phone" property="reportPhone" />
-        <result column="work_order_status" property="workOrderStatus" />
-        <result column="report_method" property="reportMethod" />
-        <result column="report_method_other" property="reportMethodOther" />
-        <result column="report_record" property="reportRecord" />
-        <result column="report_source" property="reportSource" />
-        <result column="report_address" property="reportAddress" />
-        <result column="repeat_report" property="repeatReport" />
-        <result column="report_content" property="reportContent" />
-        <result column="report_time" property="reportTime" />
-        <result column="report_register_time" property="reportRegisterTime" />
-        <result column="register_person" property="registerPerson" />
-        <result column="accept_time" property="acceptTime" />
-        <result column="accept_person" property="acceptPerson" />
-        <result column="work_order_type" property="workOrderType" />
-        <result column="work_order_level" property="workOrderLevel" />
-        <result column="govern_company" property="governCompany" />
-        <result column="govern_area" property="governArea" />
-        <result column="handling_opinion" property="handlingOpinion" />
-        <result column="accept_period" property="acceptPeriod" />
-        <result column="complete_period" property="completePeriod" />
-        <result column="dispatch_time" property="dispatchTime" />
-        <result column="dispatch_person" property="dispatchPerson" />
-        <result column="advance_contact" property="advanceContact" />
-        <result column="advance_contact_status" property="advanceContactStatus" />
-        <result column="no_contact_reason" property="noContactReason" />
-        <result column="advance_contact_person" property="advanceContactPerson" />
-        <result column="contact_time" property="contactTime" />
-        <result column="fire_place" property="firePlace" />
-        <result column="fire_type" property="fireType" />
-        <result column="contact_submit_time" property="contactSubmitTime" />
-        <result column="contact_submit_person" property="contactSubmitPerson" />
-        <result column="advance_contact_situation" property="advanceContactSituation" />
-        <result column="fact_find" property="factFind" />
-        <result column="partial_affirm_reason" property="partialAffirmReason" />
-        <result column="false_reason" property="falseReason" />
-        <result column="scene_inspect" property="sceneInspect" />
-        <result column="appeal_affirm" property="appealAffirm" />
-        <result column="no_policy_basis" property="noPolicyBasis" />
-        <result column="appeal_overtop" property="appealOvertop" />
-        <result column="appeal_other" property="appealOther" />
-        <result column="reply_key_point" property="replyKeyPoint" />
-        <result column="reply_mode" property="replyMode" />
-        <result column="satisfied_type" property="satisfiedType" />
-        <result column="make_public" property="makePublic" />
-        <result column="whether_solve" property="whetherSolve" />
-        <result column="complete_report" property="completeReport" />
-        <result column="leader_instruct" property="leaderInstruct" />
-        <result column="remark" property="remark" />
-        <result column="enable" property="enable" />
-        <result column="type_id1" property="typeId1" />
-        <result column="type_id2" property="typeId2" />
-        <result column="type_id3" property="typeId3" />
-        <result column="type_id4" property="typeId4" />
-        <result column="type_id5" property="typeId5" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="street_town" property="streetTown" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemEnforceReportLabelAttributeMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemEnforceReportLabelAttributeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemEnforceReportLabelAttribute">
-        <id column="id" property="id" />
-        <result column="label_id" property="labelId" />
-        <result column="attribute" property="attribute" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemEnforceReportLabelMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemEnforceReportLabelMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemEnforceReportLabel">
-        <id column="id" property="id" />
-        <result column="fid" property="fid" />
-        <result column="label_name" property="labelName" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFileLabelMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemFileLabelMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFileLabel">
-        <id column="id" property="id" />
-        <result column="fid" property="fid" />
-        <result column="label_name" property="labelName" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireInspectMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemFireInspectMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireInspect">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="person_id" property="personId" />
-        <result column="plan_time" property="planTime" />
-        <result column="inspect_result" property="inspectResult" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireInspectPersonMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemFireInspectPersonMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireInspectPerson">
-        <id column="id" property="id" />
-        <result column="person_name" property="personName" />
-        <result column="person_position" property="personPosition" />
-        <result column="link_phone" property="linkPhone" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireLabelAttributeMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemFireLabelAttributeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireLabelAttribute">
-        <id column="id" property="id" />
-        <result column="label_id" property="labelId" />
-        <result column="attribute" property="attribute" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireStatisticsMapper.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemFireStatisticsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireStatistics">
-        <id column="id" property="id" />
-        <result column="fire_number" property="fireNumber" />
-        <result column="fill_time" property="fillTime" />
-        <result column="user_name" property="userName" />
-        <result column="brief_report" property="briefReport" />
-        <result column="fire_case_url" property="fireCaseUrl" />
-        <result column="fire_rescue_form" property="fireRescueForm" />
-        <result column="mobilization_desc" property="mobilizationDesc" />
-        <result column="fire_time_text" property="fireTimeText" />
-        <result column="fire_time" property="fireTime" />
-        <result column="fire_address" property="fireAddress" />
-        <result column="company_code" property="companyCode" />
-        <result column="owner_name" property="ownerName" />
-        <result column="fire_build_spread" property="fireBuildSpread" />
-        <result column="flash_over" property="flashOver" />
-        <result column="door_window_open" property="doorWindowOpen" />
-        <result column="fire_process" property="fireProcess" />
-        <result column="direct_property_loss" property="directPropertyLoss" />
-        <result column="burned_area" property="burnedArea" />
-        <result column="affected_house" property="affectedHouse" />
-        <result column="victim_number" property="victimNumber" />
-        <result column="death_toll" property="deathToll" />
-        <result column="injured_number" property="injuredNumber" />
-        <result column="major_fire" property="majorFire" />
-        <result column="file_case" property="fileCase" />
-        <result column="investigate_number" property="investigateNumber" />
-        <result column="suggest_handle_number" property="suggestHandleNumber" />
-        <result column="review_status" property="reviewStatus" />
-        <result column="last_reviewer" property="lastReviewer" />
-        <result column="modify_reason" property="modifyReason" />
-        <result column="under_investiga" property="underInvestiga" />
-        <result column="returnee" property="returnee" />
-        <result column="fire_grade" property="fireGrade" />
-        <result column="minor_injurie_number" property="minorInjurieNumber" />
-        <result column="seriously_injure_number" property="seriouslyInjureNumber" />
-        <result column="site_disposal_expense" property="siteDisposalExpense" />
-        <result column="personal_injury_death" property="personalInjuryDeath" />
-        <result column="direct_economic_loss" property="directEconomicLoss" />
-        <result column="subordinate_fire_brigade" property="subordinateFireBrigade" />
-        <result column="subordinate_brigade" property="subordinateBrigade" />
-        <result column="subordinate_detachment" property="subordinateDetachment" />
-        <result column="subordinate_corps" property="subordinateCorps" />
-        <result column="subordinate_district" property="subordinateDistrict" />
-        <result column="administrative_division" property="administrativeDivision" />
-        <result column="type_id1" property="typeId1" />
-        <result column="type_id2" property="typeId2" />
-        <result column="type_id3" property="typeId3" />
-        <result column="type_id4" property="typeId4" />
-        <result column="type_id5" property="typeId5" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="district" property="district" />
-        <result column="street" property="street" />
-    </resultMap>
-
-    <update id="updateList" parameterType="java.util.List">
-        <foreach collection="list" item="item" index="index" separator=";">
-            UPDATE dem_fire_statistics
-            SET longitude = #{item.longitude},latitude = #{item.latitude},district = #{item.district},street = #{item.street}
-            WHERE fire_number = #{item.id}
-        </foreach>
-    </update>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireTypicalCaseMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemFireTypicalCaseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireTypicalCase">
-        <id column="id" property="id" />
-        <result column="case_brief" property="caseBrief" />
-        <result column="region_type" property="regionType" />
-        <result column="file_url" property="fileUrl" />
-        <result column="create_time" property="createTime" />
-        <result column="creator_by" property="creatorBy" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemGridMemberMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemGridMemberMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemGridMember">
-        <id column="id" property="id" />
-        <result column="grid_area" property="gridArea" />
-        <result column="street_town" property="streetTown" />
-        <result column="grid_grade" property="gridGrade" />
-        <result column="senior_grid" property="seniorGrid" />
-        <result column="map_grid_name" property="mapGridName" />
-        <result column="grid_personnel" property="gridPersonnel" />
-        <result column="grid_phone" property="gridPhone" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="update_time" property="updateTime" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemHighRiseMapper.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemHighRiseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemHighRise">
-        <id column="id" property="id" />
-        <result column="to_do_ptersonnel" property="toDoPtersonnel" />
-        <result column="build_name" property="buildName" />
-        <result column="build_secondary_name" property="buildSecondaryName" />
-        <result column="address" property="address" />
-        <result column="many_ownership" property="manyOwnership" />
-        <result column="birth_cert" property="birthCert" />
-        <result column="principal_property_owner" property="principalPropertyOwner" />
-        <result column="credit_code" property="creditCode" />
-        <result column="property_service" property="propertyService" />
-        <result column="property_num" property="propertyNum" />
-        <result column="property_service_name" property="propertyServiceName" />
-        <result column="property_credit_code" property="propertyCreditCode" />
-        <result column="lproperty_andline_num" property="lpropertyAndlineNum" />
-        <result column="property_project_leader" property="propertyProjectLeader" />
-        <result column="property_leader_phone" property="propertyLeaderPhone" />
-        <result column="fire_service_maintain" property="fireServiceMaintain" />
-        <result column="maintain_num" property="maintainNum" />
-        <result column="maintain_name" property="maintainName" />
-        <result column="maintain_credit_code" property="maintainCreditCode" />
-        <result column="maintain_project_leader" property="maintainProjectLeader" />
-        <result column="maintain_leader_phone" property="maintainLeaderPhone" />
-        <result column="fire_service_check" property="fireServiceCheck" />
-        <result column="check_num" property="checkNum" />
-        <result column="check_name" property="checkName" />
-        <result column="check_credit_code" property="checkCreditCode" />
-        <result column="check_project_leader" property="checkProjectLeader" />
-        <result column="check_leader_phone" property="checkLeaderPhone" />
-        <result column="fire_service_estimate" property="fireServiceEstimate" />
-        <result column="estimate_num" property="estimateNum" />
-        <result column="estimate_name" property="estimateName" />
-        <result column="estimate_credit_code" property="estimateCreditCode" />
-        <result column="estimate_project_leader" property="estimateProjectLeader" />
-        <result column="estimate_leader_phone" property="estimateLeaderPhone" />
-        <result column="control_room" property="controlRoom" />
-        <result column="control_room_address" property="controlRoomAddress" />
-        <result column="certificate_num" property="certificateNum" />
-        <result column="pump_room_address" property="pumpRoomAddress" />
-        <result column="combiner_address" property="combinerAddress" />
-        <result column="build_high" property="buildHigh" />
-        <result column="complete_year" property="completeYear" />
-        <result column="under_floor" property="underFloor" />
-        <result column="above_floor" property="aboveFloor" />
-        <result column="build_type" property="buildType" />
-        <result column="birth_cert_register" property="birthCertRegister" />
-        <result column="birth_cert_use" property="birthCertUse" />
-        <result column="functional_purpose" property="functionalPurpose" />
-        <result column="other_desc" property="otherDesc" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemInspectListMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemInspectListMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemInspectList">
-        <id column="id" property="id" />
-        <result column="inspect_code" property="inspectCode" />
-        <result column="device_id" property="deviceId" />
-        <result column="alarm_id" property="alarmId" />
-        <result column="company_id" property="companyId" />
-        <result column="handler" property="handler" />
-        <result column="handling_time" property="handlingTime" />
-        <result column="handling_content" property="handlingContent" />
-        <result column="handler_phone" property="handlerPhone" />
-        <result column="handling_status" property="handlingStatus" />
-        <result column="site_photo1" property="sitePhoto1" />
-        <result column="site_photo2" property="sitePhoto2" />
-        <result column="site_photo3" property="sitePhoto3" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemLargeSecurityManageMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemLargeSecurityManageMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemLargeSecurityManage">
-        <id column="id" property="id" />
-        <result column="security_tips_name" property="securityTipsName" />
-        <result column="security_tips_content" property="securityTipsContent" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemLawSituationMapper.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemLawSituationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemLawSituation">
-        <id column="id" property="id" />
-        <result column="punished_person" property="punishedPerson" />
-        <result column="counterpart_name" property="counterpartName" />
-        <result column="counterpart_type" property="counterpartType" />
-        <result column="social_credit_code" property="socialCreditCode" />
-        <result column="registration_number" property="registrationNumber" />
-        <result column="organization_code" property="organizationCode" />
-        <result column="tax_registration_number" property="taxRegistrationNumber" />
-        <result column="company_certificate_number" property="companyCertificateNumber" />
-        <result column="organization_registration_number" property="organizationRegistrationNumber" />
-        <result column="legal_representative" property="legalRepresentative" />
-        <result column="representative_document_type" property="representativeDocumentType" />
-        <result column="representative_document_number" property="representativeDocumentNumber" />
-        <result column="document_type" property="documentType" />
-        <result column="document_number" property="documentNumber" />
-        <result column="punishment_decision_number" property="punishmentDecisionNumber" />
-        <result column="illegal_facts_content" property="illegalFactsContent" />
-        <result column="illegal_acts_type" property="illegalActsType" />
-        <result column="illegal_facts" property="illegalFacts" />
-        <result column="punishment_basis" property="punishmentBasis" />
-        <result column="punishment_type" property="punishmentType" />
-        <result column="punishment_content" property="punishmentContent" />
-        <result column="penalty_amount" property="penaltyAmount" />
-        <result column="illegal_income" property="illegalIncome" />
-        <result column="revocation_license" property="revocationLicense" />
-        <result column="punishment_decision_time" property="punishmentDecisionTime" />
-        <result column="punishment_validity_date" property="punishmentValidityDate" />
-        <result column="publicity_deadline" property="publicityDeadline" />
-        <result column="punishment_authority" property="punishmentAuthority" />
-        <result column="authority_credit_code" property="authorityCreditCode" />
-        <result column="data_source_company" property="dataSourceCompany" />
-        <result column="company_credit_code" property="companyCreditCode" />
-        <result column="remarks" property="remarks" />
-        <result column="information_matters" property="informationMatters" />
-        <result column="union_key" property="unionKey" />
-        <result column="enable" property="enable" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemLawStatisticsMapper.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemLawStatisticsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemLawStatistics">
-        <id column="id" property="id" />
-        <result column="law_id" property="lawId" />
-        <result column="company_code" property="companyCode" />
-        <result column="include_branch" property="includeBranch" />
-        <result column="include_police_station" property="includePoliceStation" />
-        <result column="police_station_summary" property="policeStationSummary" />
-        <result column="amount_to" property="amountTo" />
-        <result column="mixed_deploy" property="mixedDeploy" />
-        <result column="data_time" property="dataTime" />
-        <result column="data_exchange_unit" property="dataExchangeUnit" />
-        <result column="inspect_person_number" property="inspectPersonNumber" />
-        <result column="inspect_company" property="inspectCompany" />
-        <result column="fire_hazard" property="fireHazard" />
-        <result column="temporary_seizure" property="temporarySeizure" />
-        <result column="correction_notice" property="correctionNotice" />
-        <result column="relieve_temporary_seizure" property="relieveTemporarySeizure" />
-        <result column="inspect_certificate" property="inspectCertificate" />
-        <result column="inspect_opinions" property="inspectOpinions" />
-        <result column="revoke_approval" property="revokeApproval" />
-        <result column="rectificate_fire_hazard" property="rectificateFireHazard" />
-        <result column="spot_check" property="spotCheck" />
-        <result column="job_inspect" property="jobInspect" />
-        <result column="enforce_inspect" property="enforceInspect" />
-        <result column="other_inspect" property="otherInspect" />
-        <result column="review" property="review" />
-        <result column="hold_inspect" property="holdInspect" />
-        <result column="spot_check1" property="spotCheck1" />
-        <result column="job_before_inspect" property="jobBeforeInspect" />
-        <result column="hold_before_inspect" property="holdBeforeInspect" />
-        <result column="enforce_inspect1" property="enforceInspect1" />
-        <result column="other_inspect2" property="otherInspect2" />
-        <result column="review1" property="review1" />
-        <result column="fire_train_class" property="fireTrainClass" />
-        <result column="train_education" property="trainEducation" />
-        <result column="accept_review_items" property="acceptReviewItems" />
-        <result column="review_opinions" property="reviewOpinions" />
-        <result column="accept_items" property="acceptItems" />
-        <result column="accept_opinions" property="acceptOpinions" />
-        <result column="design_filing" property="designFiling" />
-        <result column="design_illegal_notice" property="designIllegalNotice" />
-        <result column="complete_protection_record" property="completeProtectionRecord" />
-        <result column="design_review_opinions" property="designReviewOpinions" />
-        <result column="review_build_area" property="reviewBuildArea" />
-        <result column="progress_construction" property="progressConstruction" />
-        <result column="inconformity_access_system" property="inconformityAccessSystem" />
-        <result column="site_inspect_qualified" property="siteInspectQualified" />
-        <result column="site_inspect_unqualified" property="siteInspectUnqualified" />
-        <result column="sampling_inspect_qualified" property="samplingInspectQualified" />
-        <result column="sampling_inspect_unqualified" property="samplingInspectUnqualified" />
-        <result column="removal_replace" property="removalReplace" />
-        <result column="product_cases" property="productCases" />
-        <result column="fire_accident_check" property="fireAccidentCheck" />
-        <result column="accept_review_application" property="acceptReviewApplication" />
-        <result column="fire_verificate" property="fireVerificate" />
-        <result column="fire_review_conclusion" property="fireReviewConclusion" />
-        <result column="fire_simple_verificate" property="fireSimpleVerificate" />
-        <result column="case_transfer_notice" property="caseTransferNotice" />
-        <result column="fire_site_announce" property="fireSiteAnnounce" />
-        <result column="occurrences_number" property="occurrencesNumber" />
-        <result column="warn_number" property="warnNumber" />
-        <result column="fine_person" property="finePerson" />
-        <result column="fine_company" property="fineCompany" />
-        <result column="fine_amount" property="fineAmount" />
-        <result column="order_three_stops" property="orderThreeStops" />
-        <result column="detention" property="detention" />
-        <result column="operation_decision" property="operationDecision" />
-        <result column="confiscate_property" property="confiscateProperty" />
-        <result column="confiscate_property_rmb" property="confiscatePropertyRmb" />
-        <result column="illegal_income" property="illegalIncome" />
-        <result column="punishment_decision" property="punishmentDecision" />
-        <result column="collecte_fines" property="collecteFines" />
-        <result column="penalty_number" property="penaltyNumber" />
-        <result column="penalty_warn" property="penaltyWarn" />
-        <result column="penalty_individual" property="penaltyIndividual" />
-        <result column="penalty_company" property="penaltyCompany" />
-        <result column="penalty_amount" property="penaltyAmount" />
-        <result column="in_time" property="inTime" />
-        <result column="delete_flag" property="deleteFlag" />
-        <result column="record_status" property="recordStatus" />
-        <result column="data_submit_time" property="dataSubmitTime" />
-        <result column="data_receive_time" property="dataReceiveTime" />
-        <result column="operate_describe" property="operateDescribe" />
-        <result column="row_version" property="rowVersion" />
-        <result column="bdp_audit" property="bdpAudit" />
-        <result column="organize_abbreviat" property="organizeAbbreviat" />
-        <result column="union_key" property="unionKey" />
-        <result column="chg_time" property="chgTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemMicroStationMapper.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemMicroStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemMicroStation">
-        <id column="id" property="id" />
-        <result column="branch_name" property="branchName" />
-        <result column="squadron" property="squadron" />
-        <result column="station_name" property="stationName" />
-        <result column="company_nature" property="companyNature" />
-        <result column="address" property="address" />
-        <result column="location" property="location" />
-        <result column="fixed_phone" property="fixedPhone" />
-        <result column="charge_name" property="chargeName" />
-        <result column="charge_phone" property="chargePhone" />
-        <result column="remark" property="remark" />
-        <result column="station_type" property="stationType" />
-        <result column="longitude" property="longitude" />
-        <result column="dimension" property="dimension" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="branch_id" property="branchId" />
-        <result column="squadron_id" property="squadronId" />
-        <result column="number" property="number" />
-        <result column="call_status" property="callStatus" />
-        <result column="belong_flag" property="belongFlag" />
-        <result column="call_period" property="callPeriod" />
-        <result column="primary_company_nature" property="primaryCompanyNature" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewDeadlineNoticeMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemNewDeadlineNoticeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewDeadlineNotice">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="check_time" property="checkTime" />
-        <result column="content4" property="content4" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewDisagreeUseMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemNewDisagreeUseMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewDisagreeUse">
-        <id column="id" property="id" />
-        <result column="rescue_name" property="rescueName" />
-        <result column="document1" property="document1" />
-        <result column="document2" property="document2" />
-        <result column="document3" property="document3" />
-        <result column="document4" property="document4" />
-        <result column="document" property="document" />
-        <result column="applicant_company" property="applicantCompany" />
-        <result column="facility_name" property="facilityName" />
-        <result column="facility_address" property="facilityAddress" />
-        <result column="check_time" property="checkTime" />
-        <result column="fire_safety" property="fireSafety" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewImmediateNoticeMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemNewImmediateNoticeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewImmediateNotice">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="content4" property="content4" />
-        <result column="check_time" property="checkTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewInspectRecordMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemNewInspectRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewInspectRecord">
-        <id column="id" property="id" />
-        <result column="document_number" property="documentNumber" />
-        <result column="remark" property="remark" />
-        <result column="delete_flag" property="deleteFlag" />
-        <result column="enter_by" property="enterBy" />
-        <result column="enter_time" property="enterTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="project_num" property="projectNum" />
-        <result column="sponsor_name" property="sponsorName" />
-        <result column="company_name" property="companyName" />
-        <result column="company_id" property="companyId" />
-        <result column="company_address" property="companyAddress" />
-        <result column="inspection_result" property="inspectionResult" />
-        <result column="enforce_inspect_person" property="enforceInspectPerson" />
-        <result column="check_time" property="checkTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewLawMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemNewLawMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewLaw">
-        <id column="id" property="id" />
-        <result column="law_name" property="lawName" />
-        <result column="document_transmission" property="documentTransmission" />
-        <result column="company_name" property="companyName" />
-        <result column="check_type" property="checkType" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemNewSeizureLetterMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemNewSeizureLetterMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemNewSeizureLetter">
-        <id column="id" property="id" />
-        <result column="document_number" property="documentNumber" />
-        <result column="seizure_company" property="seizureCompany" />
-        <result column="seizure_address" property="seizureAddress" />
-        <result column="check_time" property="checkTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemOnDutyMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemOnDutyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemOnDuty">
-        <id column="id" property="id" />
-        <result column="duty_id" property="dutyId" />
-        <result column="duty_time" property="dutyTime" />
-        <result column="company_id" property="companyId" />
-        <result column="person_id" property="personId" />
-        <result column="person_name" property="personName" />
-        <result column="duty_type_id" property="dutyTypeId" />
-        <result column="time_stamp" property="timeStamp" />
-        <result column="organizate_name" property="organizateName" />
-        <result column="organizate_abbreviate" property="organizateAbbreviate" />
-        <result column="organizate_address" property="organizateAddress" />
-        <result column="link_phone" property="linkPhone" />
-        <result column="organizate_rank" property="organizateRank" />
-        <result column="position_name" property="positionName" />
-        <result column="position_rank" property="positionRank" />
-        <result column="full_name" property="fullName" />
-        <result column="ry_id" property="ryId" />
-        <result column="ry_xh" property="ryXh" />
-        <result column="yhzh" property="yhzh" />
-        <result column="zh_id" property="zhId" />
-        <result column="sjszjg" property="sjszjg" />
-        <result column="jlzt" property="jlzt" />
-        <result column="yddh" property="yddh" />
-        <result column="jgjc" property="jgjc" />
-        <result column="jgtree" property="jgtree" />
-        <result column="id_number" property="idNumber" />
-        <result column="person_rank" property="personRank" />
-        <result column="union_key" property="unionKey" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemPoliceInfoMapper.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemPoliceInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemPoliceInfo">
-        <id column="id" property="id" />
-        <result column="gis_x" property="gisX" />
-        <result column="gis_y" property="gisY" />
-        <result column="sjc" property="sjc" />
-        <result column="police_id" property="policeId" />
-        <result column="branch" property="branch" />
-        <result column="time_slot" property="timeSlot" />
-        <result column="notice_arrival_time" property="noticeArrivalTime" />
-        <result column="notice_effluent_time" property="noticeEffluentTime" />
-        <result column="notice_control_time" property="noticeControlTime" />
-        <result column="notice_quench_time" property="noticeQuenchTime" />
-        <result column="notice_return_time" property="noticeReturnTime" />
-        <result column="area" property="area" />
-        <result column="case_type" property="caseType" />
-        <result column="address" property="address" />
-        <result column="filing_time" property="filingTime" />
-        <result column="filing_date" property="filingDate" />
-        <result column="handle_object" property="handleObject" />
-        <result column="case_type_code" property="caseTypeCode" />
-        <result column="case_level" property="caseLevel" />
-        <result column="squadron" property="squadron" />
-        <result column="district" property="district" />
-        <result column="case_code" property="caseCode" />
-        <result column="case_status" property="caseStatus" />
-        <result column="case_nature" property="caseNature" />
-        <result column="notice_time" property="noticeTime" />
-        <result column="arrival_time" property="arrivalTime" />
-        <result column="effluent_time" property="effluentTime" />
-        <result column="control_time" property="controlTime" />
-        <result column="quench_time" property="quenchTime" />
-        <result column="return_time" property="returnTime" />
-        <result column="supplement" property="supplement" />
-        <result column="dispatch_vehicle" property="dispatchVehicle" />
-        <result column="case_area" property="caseArea" />
-        <result column="bdp_audit" property="bdpAudit" />
-        <result column="squadron_id" property="squadronId" />
-        <result column="street_town" property="streetTown" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="yxx" property="yxx" />
-        <result column="qrqk" property="qrqk" />
-        <result column="fair_is" property="fairIs" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemPoliceRecordMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemPoliceRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemPoliceRecord">
-        <id column="id" property="id" />
-        <result column="record_id" property="recordId" />
-        <result column="case_info_id" property="caseInfoId" />
-        <result column="handle_code" property="handleCode" />
-        <result column="case_code" property="caseCode" />
-        <result column="handle_start_time" property="handleStartTime" />
-        <result column="handle_end_time" property="handleEndTime" />
-        <result column="time_stamp" property="timeStamp" />
-        <result column="squadron" property="squadron" />
-        <result column="record_status" property="recordStatus" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemReformReviewMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemReformReviewMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReformReview">
-        <id column="id" property="id" />
-        <result column="reform_id" property="reformId" />
-        <result column="reform_time" property="reformTime" />
-        <result column="reform_person" property="reformPerson" />
-        <result column="reform_remark" property="reformRemark" />
-        <result column="reform_path1" property="reformPath1" />
-        <result column="reform_path2" property="reformPath2" />
-        <result column="reform_path3" property="reformPath3" />
-        <result column="reform_path4" property="reformPath4" />
-        <result column="reform_path5" property="reformPath5" />
-        <result column="review_time" property="reviewTime" />
-        <result column="review_person" property="reviewPerson" />
-        <result column="review_remark" property="reviewRemark" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemReportDataMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemReportDataMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReportData">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="company_code" property="companyCode" />
-        <result column="fire_risk" property="fireRisk" />
-        <result column="base_situation" property="baseSituation" />
-        <result column="exist_problem" property="existProblem" />
-        <result column="index_analysis" property="indexAnalysis" />
-        <result column="overall_score" property="overallScore" />
-        <result column="equipment_state" property="equipmentState" />
-        <result column="equipment_statistic" property="equipmentStatistic" />
-        <result column="law_enforce" property="lawEnforce" />
-        <result column="fire_situation" property="fireSituation" />
-        <result column="statistic_period" property="statisticPeriod" />
-        <result column="statistic_month" property="statisticMonth" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemReportGradeMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemReportGradeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReportGrade">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="total_grade" property="totalGrade" />
-        <result column="build_integrity" property="buildIntegrity" />
-        <result column="facility_status" property="facilityStatus" />
-        <result column="self_manage" property="selfManage" />
-        <result column="law_enforce" property="lawEnforce" />
-        <result column="fire_risk" property="fireRisk" />
-        <result column="statistic_period" property="statisticPeriod" />
-        <result column="statistic_month" property="statisticMonth" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemReportInfoMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemReportInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemReportInfo">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="company_code" property="companyCode" />
-        <result column="report_name" property="reportName" />
-        <result column="report_path" property="reportPath" />
-        <result column="create_time" property="createTime" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="statistics_time" property="statisticsTime" />
-        <result column="report_status" property="reportStatus" />
-        <result column="send_time" property="sendTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemWaterSourceMaintainMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemWaterSourceMaintainMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemWaterSourceMaintain">
-        <id column="id" property="id" />
-        <result column="detachment" property="detachment" />
-        <result column="squadron" property="squadron" />
-        <result column="describe" property="describe" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="delete_flag" property="deleteFlag" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemWaterSourceMapper.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DemWaterSourceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemWaterSource">
-        <id column="id" property="id" />
-        <result column="water_id" property="waterId" />
-        <result column="water_name" property="waterName" />
-        <result column="water_address" property="waterAddress" />
-        <result column="water_type_code" property="waterTypeCode" />
-        <result column="water_type" property="waterType" />
-        <result column="organizate_id" property="organizateId" />
-        <result column="organizate_name" property="organizateName" />
-        <result column="water_form" property="waterForm" />
-        <result column="available_status" property="availableStatus" />
-        <result column="available_status_name" property="availableStatusName" />
-        <result column="nature" property="nature" />
-        <result column="water_nature" property="waterNature" />
-        <result column="gis_x" property="gisX" />
-        <result column="gis_y" property="gisY" />
-        <result column="build_time" property="buildTime" />
-        <result column="record_status" property="recordStatus" />
-        <result column="sjc" property="sjc" />
-        <result column="remark" property="remark" />
-        <result column="gis_x_baidu" property="gisXBaidu" />
-        <result column="gis_y_baidu" property="gisYBaidu" />
-        <result column="pipe_company" property="pipeCompany" />
-        <result column="set_form" property="setForm" />
-        <result column="hydrant_set_form" property="hydrantSetForm" />
-        <result column="contact_mode" property="contactMode" />
-        <result column="pipe_form" property="pipeForm" />
-        <result column="pipe_water" property="pipeWater" />
-        <result column="pipe_diameter" property="pipeDiameter" />
-        <result column="pipe_pressure" property="pipePressure" />
-        <result column="interface_form" property="interfaceForm" />
-        <result column="hydrant_interface" property="hydrantInterface" />
-        <result column="water_company" property="waterCompany" />
-        <result column="fire_name" property="fireName" />
-        <result column="fire_abbreviat" property="fireAbbreviat" />
-        <result column="branch_id" property="branchId" />
-        <result column="branch_name" property="branchName" />
-        <result column="branch_abbreviat" property="branchAbbreviat" />
-        <result column="bdp_audit" property="bdpAudit" />
-        <result column="union_key" property="unionKey" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DeviceAlertMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DeviceAlertMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DeviceAlert">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="create_time" property="createTime" />
-        <result column="send_time" property="sendTime" />
-        <result column="address" property="address" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="remark" property="remark" />
-        <result column="send_content" property="sendContent" />
-        <result column="del_flag" property="delFlag" />
-        <result column="electric" property="electric" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DeviceInfoMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DeviceInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DeviceInfo">
-        <id column="id" property="id" />
-        <result column="device_code" property="deviceCode" />
-        <result column="create_time" property="createTime" />
-        <result column="send_time" property="sendTime" />
-        <result column="address" property="address" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="remark" property="remark" />
-        <result column="send_content" property="sendContent" />
-        <result column="del_flag" property="delFlag" />
-        <result column="electric" property="electric" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DeviceMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.DeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.Device">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="code" property="code" />
-        <result column="device_type" property="deviceType" />
-        <result column="create_time" property="createTime" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="device_flag" property="deviceFlag" />
-        <result column="del_flag" property="delFlag" />
-        <result column="firm" property="firm" />
-        <result column="device_describe" property="deviceDescribe" />
-        <result column="address" property="address" />
-        <result column="device_duty" property="deviceDuty" />
-        <result column="property" property="property" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/JcjAjxxMapper.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.JcjAjxxMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.JcjAjxx">
-        <id column="ID" property="id" />
-        <result column="GIS_X" property="gisX" />
-        <result column="GIS_Y" property="gisY" />
-        <result column="SJC" property="sjc" />
-        <result column="zgzd" property="zgzd" />
-        <result column="ajsjd" property="ajsjd" />
-        <result column="tzdcsj" property="tzdcsj" />
-        <result column="tzcssj" property="tzcssj" />
-        <result column="tzkzsj" property="tzkzsj" />
-        <result column="tzxmsj" property="tzxmsj" />
-        <result column="tzfdsj" property="tzfdsj" />
-        <result column="qy" property="qy" />
-        <result column="ajlx" property="ajlx" />
-        <result column="afdz" property="afdz" />
-        <result column="lasj" property="lasj" />
-        <result column="larq" property="larq" />
-        <result column="czdx" property="czdx" />
-        <result column="ajlxdm" property="ajlxdm" />
-        <result column="ajdj" property="ajdj" />
-        <result column="zhongdui" property="zhongdui" />
-        <result column="qx" property="qx" />
-        <result column="ajbh" property="ajbh" />
-        <result column="ajzt" property="ajzt" />
-        <result column="ajxz" property="ajxz" />
-        <result column="tzsj" property="tzsj" />
-        <result column="dcsj" property="dcsj" />
-        <result column="cssj" property="cssj" />
-        <result column="kzsj" property="kzsj" />
-        <result column="xmsj" property="xmsj" />
-        <result column="fdsj" property="fdsj" />
-        <result column="bcxx" property="bcxx" />
-        <result column="cdcl" property="cdcl" />
-        <result column="ajqy" property="ajqy" />
-        <result column="BDP_AUDIT" property="bdpAudit" />
-        <result column="ZGJGBH" property="zgjgbh" />
-        <result column="STREETTOWN" property="streettown" />
-        <result column="created" property="created" />
-        <result column="updated" property="updated" />
-        <result column="yxx" property="yxx" />
-        <result column="qrqk" property="qrqk" />
-        <result column="fair_is" property="fairIs" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/MhPostInspectMapper.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.MhPostInspectMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.MhPostInspect">
-        <id column="id" property="id"/>
-        <result column="inspect_code" property="inspectCode"/>
-        <result column="inspect_time" property="inspectTime"/>
-        <result column="reply_time" property="replyTime"/>
-        <result column="spent_time" property="spentTime"/>
-        <result column="inspect_status" property="inspectStatus"/>
-        <result column="company_id" property="companyId"/>
-        <result column="company_code" property="companyCode"/>
-        <result column="creator" property="creator"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_person" property="updatePerson"/>
-        <result column="update_time" property="updateTime"/>
-    </resultMap>
-    <select id="inspectStatistics" resultType="com.usky.fire.domain.BaseCompanyPerson">
-        SELECT
-        company_id,
-        COUNT(*) AS inspect_count,
-        SUM(inspect_status) AS answer_count,
-        MAX(inspect_time) AS inspect_time
-        FROM
-        mh_post_inspect
-        <where>
-            <if test="companyIdList != null and companyIdList.size() > 0">
-                AND company_id in
-                <foreach item="item" collection="companyIdList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        GROUP BY
-        company_id
-        ORDER BY
-        inspect_time DESC
-    </select>
-
-    <select id="mhPostInspectStatistics" resultType="java.lang.Integer">
-        SELECT
-        ${find}
-        FROM
-        mh_post_inspect
-        <where>
-            <if test="companyIdList != null and companyIdList.size() > 0">
-                AND company_id in
-                <foreach item="item" collection="companyIdList" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="inspectStatus != null">
-                AND inspect_status = #{inspectStatus}
-            </if>
-            <if test="startTime != null and startTime !='' and endTime != null and endTime !=''">
-                AND inspect_time BETWEEN #{startTime} and #{endTime}
-            </if>
-            <if test="companyId != null and companyId!= 0">
-                AND company_id = #{companyId}
-            </if>
-        </where>
-    </select>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionAbnormalMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionAbnormalMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionAbnormal">
-        <id column="id" property="id" />
-        <result column="site_nubmber" property="siteNubmber" />
-        <result column="site_type" property="siteType" />
-        <result column="area_name" property="areaName" />
-        <result column="site_name" property="siteName" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="plan_type" property="planType" />
-        <result column="site_status" property="siteStatus" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="create_time" property="createTime" />
-        <result column="plan_id" property="planId" />
-        <result column="plan_son_id" property="planSonId" />
-        <result column="site_id" property="siteId" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="company_id" property="companyId" />
-        <result column="creator" property="creator" />
-        <result column="remarks" property="remarks" />
-        <result column="route_id" property="routeId" />
-        <result column="abnormal_status" property="abnormalStatus" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionAreaMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionAreaMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionArea">
-        <id column="id" property="id" />
-        <result column="area_name" property="areaName" />
-        <result column="area_fid" property="areaFid" />
-        <result column="dept_id" property="deptId" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionAttendanceMapper.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionAttendanceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionAttendance">
-        <id column="id" property="id"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="tenant_id" property="tenantId"/>
-        <result column="operator" property="operator"/>
-        <result column="operator_id" property="operatorId"/>
-        <result column="operate_date" property="operateDate"/>
-        <result column="sign_in_type" property="signInType"/>
-        <result column="operate_code" property="operateCode"/>
-        <result column="device_code" property="deviceCode"/>
-        <result column="image_path" property="imagePath"/>
-        <result column="longitude" property="longitude"/>
-        <result column="latitude" property="latitude"/>
-        <result column="remarks" property="remarks"/>
-        <result column="identification_number" property="identificationNumber"/>
-    </resultMap>
-
-    <select id="signIn" resultType="java.lang.Integer">
-    SELECT COUNT(*) AS total_sign_outs
-    FROM (
-        SELECT a.operator_id
-        FROM patrol_inspection_attendance a
-        INNER JOIN (
-            SELECT operator_id, MAX(operate_date) AS latest_date
-            FROM patrol_inspection_attendance
-            GROUP BY operator_id
-        ) b ON a.operator_id = b.operator_id AND a.operate_date = b.latest_date
-        WHERE a.sign_in_type = 0 AND tenant_id = #{tenantId}
-    ) c;
-</select>
-
-    <select id="signOut" resultType="java.lang.Integer">
-    SELECT COUNT(*) AS total_sign_outs
-    FROM (
-        SELECT a.operator_id
-        FROM patrol_inspection_attendance a
-        INNER JOIN (
-            SELECT operator_id, MAX(operate_date) AS latest_date
-            FROM patrol_inspection_attendance
-            GROUP BY operator_id
-        ) b ON a.operator_id = b.operator_id AND a.operate_date = b.latest_date
-        WHERE a.sign_in_type = 1 AND tenant_id = #{tenantId}
-    ) c;
-</select>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionContentMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionContentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionContent">
-        <id column="id" property="id" />
-        <result column="content_title" property="contentTitle" />
-        <result column="content_describe" property="contentDescribe" />
-        <result column="submission_method" property="submissionMethod" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
-        <result column="company_id" property="companyId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionContentOptionMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionContentOptionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionContentOption">
-        <id column="id" property="id" />
-        <result column="option_name" property="optionName" />
-        <result column="content_id" property="contentId" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionEventMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionEventMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionEvent">
-        <id column="id" property="id" />
-        <result column="personnel_id" property="personnelId" />
-        <result column="personnel_name" property="personnelName" />
-        <result column="event_name" property="eventName" />
-        <result column="event_type" property="eventType" />
-        <result column="event_level" property="eventLevel" />
-        <result column="event_category" property="eventCategory" />
-        <result column="event_image" property="eventImage" />
-        <result column="handle_status" property="handleStatus" />
-        <result column="device_id" property="deviceId" />
-        <result column="handle_name" property="handleName" />
-        <result column="handle_time" property="handleTime" />
-        <result column="handle_image" property="handleImage" />
-        <result column="handle_content" property="handleContent" />
-        <result column="remark" property="remark" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="dept_id" property="deptId" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPersonnelMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionPersonnelMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPersonnel">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="area_id" property="areaId" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
-        <result column="company_id" property="companyId" />
-        <result column="operate_type" property="operateType" />
-        <result column="document_info" property="documentInfo" />
-        <result column="nation" property="nation" />
-        <result column="edu_level" property="eduLevel" />
-        <result column="register_residence" property="registerResidence" />
-        <result column="residence" property="residence" />
-        <result column="physics_card" property="physicsCard" />
-        <result column="id_card" property="idCard" />
-        <result column="full_name" property="fullName" />
-        <result column="whether_employ" property="whetherEmploy" />
-        <result column="birth_date" property="birthDate" />
-        <result column="sex" property="sex" />
-        <result column="phone_number" property="phoneNumber" />
-        <result column="main_position" property="mainPosition" />
-        <result column="service_content" property="serviceContent" />
-        <result column="dispatch_company" property="dispatchCompany" />
-        <result column="security_company" property="securityCompany" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPlanMapper.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlan">
-        <id column="id" property="id"/>
-        <result column="plan_name" property="planName"/>
-        <result column="start_date" property="startDate"/>
-        <result column="end_date" property="endDate"/>
-        <result column="area_id" property="areaId"/>
-        <result column="plan_type" property="planType"/>
-        <result column="plan_cycle" property="planCycle"/>
-        <result column="plan_frequency" property="planFrequency"/>
-        <result column="lap_time" property="lapTime"/>
-        <result column="interval_time" property="intervalTime"/>
-        <result column="plan_describe" property="planDescribe"/>
-        <result column="create_time" property="createTime"/>
-        <result column="creator" property="creator"/>
-        <result column="enable" property="enable"/>
-        <result column="tenant_id" property="tenantId"/>
-        <result column="company_id" property="companyId"/>
-        <result column="rest_day" property="restDay"/>
-        <result column="week_count" property="weekCount"/>
-        <result column="route_id" property="routeId" />
-    </resultMap>
-    <select id="planSiteCount" resultType="int">
-        SELECT
-        count(1)
-        FROM
-        patrol_inspection_plan_son AS p
-        JOIN patrol_inspection_plan_site_son AS ps ON p.id = ps.plan_id
-        <where>
-            ps.site_id =#{siteId}
-            AND p.inspection_date = #{inspectionDate}
-            AND p.personnel_id in
-            <foreach item="item" collection="personnelIdList" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </where>
-    </select>
-    <select id="selectNoPlanList" resultType="com.usky.fire.domain.PatrolInspectionPlan">
-        select
-        *
-        from patrol_inspection_plan
-        <where>
-            enable = 1
-            and id in
-            <foreach item="item" collection="planIdList" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </where>
-    </select>
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPlanScheduleMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanScheduleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSchedule">
-        <id column="id" property="id" />
-        <result column="plan_id" property="planId" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="personnel_id" property="personnelId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPlanSiteMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanSiteMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSite">
-        <id column="id" property="id" />
-        <result column="plan_id" property="planId" />
-        <result column="site_id" property="siteId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPlanSiteSonMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanSiteSonMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSiteSon">
-        <id column="id" property="id"/>
-        <result column="plan_id" property="planId"/>
-        <result column="site_id" property="siteId"/>
-        <result column="inspection_status" property="inspectionStatus"/>
-        <result column="create_time" property="createTime"/>
-    </resultMap>
-
-    <select id="planSonSiteCout" resultType="int">
-        SELECT
-        COUNT(*)
-        FROM
-        patrol_inspection_area AS pia
-        JOIN patrol_inspection_plan_son AS pips ON pia.id = pips.area_id
-        JOIN patrol_inspection_plan_site_son AS pipss ON pips.id = pipss.plan_id
-        <where>
-            pia.company_id = 1
-            AND pia. ENABLE = 1
-            AND pips.interval_time BETWEEN #{startTime}
-            AND #{endTime}
-            <if test="inspectionStatus != null and inspectionStatus!=0">
-                AND pipss.inspection_status = #{inspectionStatus}
-            </if>
-        </where>
-    </select>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPlanSonMapper.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionPlanSonMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionPlanSon">
-        <id column="id" property="id" />
-        <result column="plan_id" property="planId" />
-        <result column="inspection_date" property="inspectionDate" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="personnel_id" property="personnelId" />
-        <result column="area_id" property="areaId" />
-        <result column="plan_type" property="planType" />
-        <result column="plan_cycle" property="planCycle" />
-        <result column="plan_frequency" property="planFrequency" />
-        <result column="lap_time" property="lapTime" />
-        <result column="interval_time" property="intervalTime" />
-        <result column="plan_describe" property="planDescribe" />
-        <result column="completion" property="completion" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="alternate_field" property="alternateField" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="company_id" property="companyId" />
-    </resultMap>
-
-    <select id="selectInspectionPlanSonData" resultType="com.usky.fire.domain.PatrolInspectionPlanSon">
-        select
-        *
-        from patrol_inspection_plan_son
-        <where>
-            and concat(inspection_date,' ',end_time) &lt; #{datetime1}
-            and CONCAT(inspection_date,' ',end_time) > #{datetime2}
-        </where>
-    </select>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionRecordMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionRecordMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionRecord">
-        <id column="id" property="id" />
-        <result column="site_nubmber" property="siteNubmber" />
-        <result column="site_type" property="siteType" />
-        <result column="area_name" property="areaName" />
-        <result column="site_name" property="siteName" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="plan_type" property="planType" />
-        <result column="site_status" property="siteStatus" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="create_time" property="createTime" />
-        <result column="plan_id" property="planId" />
-        <result column="plan_son_id" property="planSonId" />
-        <result column="site_id" property="siteId" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="company_id" property="companyId" />
-        <result column="remarks" property="remarks" />
-        <result column="route_id" property="routeId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionRecordOptionMapper.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionRecordOptionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionRecordOption">
-        <id column="id" property="id" />
-        <result column="record_id" property="recordId" />
-        <result column="content_option_id" property="contentOptionId" />
-        <result column="remarks" property="remarks" />
-        <result column="content" property="content" />
-        <result column="content_id" property="contentId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionSiteContentMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionSiteContentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionSiteContent">
-        <id column="id" property="id" />
-        <result column="site_id" property="siteId" />
-        <result column="content_id" property="contentId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionSiteMapper.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionSiteMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionSite">
-        <id column="id" property="id" />
-        <result column="site_name" property="siteName" />
-        <result column="site_nubmber" property="siteNubmber" />
-        <result column="site_describe" property="siteDescribe" />
-        <result column="site_type" property="siteType" />
-        <result column="collector" property="collector" />
-        <result column="collect_time" property="collectTime" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="area_id" property="areaId" />
-        <result column="picture_url" property="pictureUrl" />
-        <result column="create_time" property="createTime" />
-        <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
-        <result column="distance_range" property="distanceRange" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="company_id" property="companyId" />
-    </resultMap>
-
-    <select id="selectSiteCount" resultType="java.lang.Integer">
-        select count(*)
-        from patrol_inspection_site AS a
-        <where>
-            <if test="ids != null">
-                and a.area_id in #{ids}
-            </if>
-        </where>
-    </select>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionTypeMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.PatrolInspectionTypeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.PatrolInspectionType">
-        <id column="id" property="id" />
-        <result column="type_code" property="typeCode" />
-        <result column="type_name" property="typeName" />
-        <result column="tenant_id" property="tenantId" />
-        <result column="dept_id" property="deptId" />
-        <result column="remarks" property="remarks" />
-        <result column="delete_flag" property="deleteFlag" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/ReportIndexConfigMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.ReportIndexConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.ReportIndexConfig">
-        <id column="id" property="id" />
-        <result column="report_id" property="reportId" />
-        <result column="index_name" property="indexName" />
-        <result column="index_code" property="indexCode" />
-        <result column="index_grade" property="indexGrade" />
-        <result column="senior_index" property="seniorIndex" />
-        <result column="index_weight" property="indexWeight" />
-        <result column="index_desc" property="indexDesc" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="tenant_id" property="tenantId" />
-    </resultMap>
-
-</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/ReportIndexResultMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.fire.mapper.ReportIndexResultMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.fire.domain.ReportIndexResult">
-        <id column="id" property="id" />
-        <result column="index_code" property="indexCode" />
-        <result column="index_name" property="indexName" />
-        <result column="object_id" property="objectId" />
-        <result column="index_score" property="indexScore" />
-        <result column="index_data" property="indexData" />
-        <result column="create_date" property="createDate" />
-        <result column="score_type" property="scoreType" />
-        <result column="score_desc" property="scoreDesc" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="tenant_id" property="tenantId" />
-    </resultMap>
-
-</mapper>