命名统一

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/firedevice/entity/HardwareFireDevice.java

@@ -1,4 +1,4 @@
-package com.zd.algorithm.api.firedevice.entity;
+package com.zd.algorithm.api.fire.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/firedevice/entity/HardwareFireDeviceLog.java

@@ -1,4 +1,4 @@
-package com.zd.algorithm.api.firedevice.entity;
+package com.zd.algorithm.api.fire.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zd.model.annotation.Excel;

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/firedevice/entity/vo/HardwareFireDeviceVO.java

@@ -1,6 +1,6 @@
-package com.zd.algorithm.api.firedevice.entity.vo;
+package com.zd.algorithm.api.fire.entity.vo;
 
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDevice;
+import com.zd.algorithm.api.fire.entity.HardwareFireDevice;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/controller/FireDeviceController.java

@@ -1,12 +1,12 @@
-package com.zd.alg.firedevice.controller;
+package com.zd.alg.fire.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.firedevice.service.IFireDeviceLogService;
-import com.zd.alg.firedevice.service.IFireDeviceService;
-import com.zd.alg.firedevice.utils.FireDeviceStatusTask;
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDevice;
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.alg.fire.service.IFireDeviceLogService;
+import com.zd.alg.fire.service.IFireDeviceService;
+import com.zd.alg.fire.utils.FireDeviceStatusTask;
+import com.zd.algorithm.api.fire.entity.HardwareFireDevice;
+import com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog;
+import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.exception.ServiceException;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/mapper/FireDeviceLogMapper.java

@@ -1,7 +1,7 @@
-package com.zd.alg.firedevice.mapper;
+package com.zd.alg.fire.mapper;
 
 
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog;
+import com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/mapper/FireDeviceMapper.java

@@ -1,7 +1,7 @@
-package com.zd.alg.firedevice.mapper;
+package com.zd.alg.fire.mapper;
 
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDevice;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.algorithm.api.fire.entity.HardwareFireDevice;
+import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/service/IFireDeviceLogService.java

@@ -1,8 +1,6 @@
-package com.zd.alg.firedevice.service;
+package com.zd.alg.fire.service;
 
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDevice;
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/service/IFireDeviceService.java

@@ -1,7 +1,7 @@
-package com.zd.alg.firedevice.service;
+package com.zd.alg.fire.service;
 
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDevice;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.algorithm.api.fire.entity.HardwareFireDevice;
+import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
 
 import java.util.List;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/service/impl/FireDeviceLogServiceImpl.java

@@ -1,12 +1,12 @@
-package com.zd.alg.firedevice.service.impl;
+package com.zd.alg.fire.service.impl;
 
 
-import com.zd.alg.firedevice.mapper.FireDeviceLogMapper;
-import com.zd.alg.firedevice.mapper.FireDeviceMapper;
-import com.zd.alg.firedevice.service.IFireDeviceLogService;
-import com.zd.alg.firedevice.utils.FireDeviceStatusTask;
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.alg.fire.mapper.FireDeviceLogMapper;
+import com.zd.alg.fire.mapper.FireDeviceMapper;
+import com.zd.alg.fire.service.IFireDeviceLogService;
+import com.zd.alg.fire.utils.FireDeviceStatusTask;
+import com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog;
+import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.SaveUtil;
 import com.zd.common.core.utils.StringUtils;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 灭火设备日志 Service业务层处理

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/service/impl/FireDeviceServiceImpl.java

@@ -1,14 +1,13 @@
-package com.zd.alg.firedevice.service.impl;
+package com.zd.alg.fire.service.impl;
 
 
-import com.zd.alg.firedevice.mapper.FireDeviceMapper;
-import com.zd.alg.firedevice.service.IFireDeviceService;
-import com.zd.alg.firedevice.utils.FireDeviceStatusTask;
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDevice;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.alg.fire.mapper.FireDeviceMapper;
+import com.zd.alg.fire.service.IFireDeviceService;
+import com.zd.alg.fire.utils.FireDeviceStatusTask;
+import com.zd.algorithm.api.fire.entity.HardwareFireDevice;
+import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
-import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.SaveUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/utils/FireDeviceStatusTask.java

@@ -1,15 +1,14 @@
-package com.zd.alg.firedevice.utils;
+package com.zd.alg.fire.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.zd.alg.firedevice.service.IFireDeviceService;
+import com.zd.alg.fire.service.IFireDeviceService;
 import com.zd.alg.mqtt.MqttSend;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO;
 import com.zd.common.core.redis.RedisService;
 import com.zd.model.constant.MqttConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

zd-modules/zd-algorithm/src/main/java/com/zd/alg/firedevice/utils/FireLaborUtil.java

@@ -1,8 +1,7 @@
-package com.zd.alg.firedevice.utils;
+package com.zd.alg.fire.utils;
 
 import com.alibaba.fastjson.JSONObject;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**

zd-modules/zd-algorithm/src/main/java/com/zd/alg/mqtt/MqttConfig.java

@@ -1,12 +1,9 @@
 package com.zd.alg.mqtt;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zd.alg.firedevice.service.IFireDeviceLogService;
-import com.zd.alg.firedevice.service.IFireDeviceService;
-import com.zd.alg.firedevice.utils.FireDeviceStatusTask;
-import com.zd.alg.firedevice.utils.FireLaborUtil;
-import com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog;
-import com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO;
+import com.zd.alg.fire.service.IFireDeviceLogService;
+import com.zd.alg.fire.utils.FireDeviceStatusTask;
+import com.zd.alg.fire.utils.FireLaborUtil;
 import com.zd.common.core.redis.RedisService;
 import com.zd.model.constant.MqttConstants;
 import org.apache.commons.lang3.StringUtils;
@@ -28,8 +25,6 @@ import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.integration.mqtt.support.MqttHeaders;
 import org.springframework.messaging.*;
 
-import java.util.Date;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**

zd-modules/zd-algorithm/src/main/resources/mapper/firedevice/FireDeviceLogMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zd.alg.firedevice.mapper.FireDeviceLogMapper">
+<mapper namespace="com.zd.alg.fire.mapper.FireDeviceLogMapper">
 
-    <resultMap type="com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog" id="LabFireDeviceLogResult">
+    <resultMap type="com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog" id="LabFireDeviceLogResult">
         <result property="id" column="id"/>
         <result property="deptName" column="dept_name"/>
         <result property="deptId" column="dept_id"/>
@@ -30,7 +30,7 @@
         from hardware_fire_device_log
     </sql>
 
-    <select id="selectLabFireDeviceLogList" parameterType="com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog"
+    <select id="selectLabFireDeviceLogList" parameterType="com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog"
             resultMap="LabFireDeviceLogResult">
         <include refid="selectFireDeviceLog"/>
         <where>
@@ -53,7 +53,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertLabFireDeviceLog" parameterType="com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog" useGeneratedKeys="true"
+    <insert id="insertLabFireDeviceLog" parameterType="com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog" useGeneratedKeys="true"
             keyProperty="id">
         insert into hardware_fire_device_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -78,7 +78,7 @@
         </trim>
     </insert>
 
-    <update id="updateLabFireDeviceLog" parameterType="com.zd.algorithm.api.firedevice.entity.HardwareFireDeviceLog">
+    <update id="updateLabFireDeviceLog" parameterType="com.zd.algorithm.api.fire.entity.HardwareFireDeviceLog">
         update hardware_fire_device_log
         <trim prefix="SET" suffixOverrides=",">
             <if test="deptName != null">dept_name = #{deptName},</if>

zd-modules/zd-algorithm/src/main/resources/mapper/firedevice/FireDeviceMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zd.alg.firedevice.mapper.FireDeviceMapper">
+<mapper namespace="com.zd.alg.fire.mapper.FireDeviceMapper">
 
-    <resultMap type="com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO" id="LabFireDeviceResult">
+    <resultMap type="com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO" id="LabFireDeviceResult">
         <result property="id" column="id"/>
         <result property="deptName" column="dept_name"/>
         <result property="deptId" column="dept_id"/>
@@ -44,7 +44,7 @@
                  LEFT JOIN sys_dept sd on ls.build_id = sd.dept_id and ls.id = fd.subject_id
     </sql>
 
-    <select id="selectHardwareFireDeviceList" parameterType="com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO"
+    <select id="selectHardwareFireDeviceList" parameterType="com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO"
             resultMap="LabFireDeviceResult">
         <include refid="selectFireDeviceVo"/>
         <where>
@@ -68,7 +68,7 @@
         where id = #{id}
     </select>
 
-    <insert id="insertHardwareFireDevice" parameterType="com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO" useGeneratedKeys="true"
+    <insert id="insertHardwareFireDevice" parameterType="com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO" useGeneratedKeys="true"
             keyProperty="id">
         insert into hardware_fire_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -101,7 +101,7 @@
         </trim>
     </insert>
 
-    <update id="updateHardwareFireDevice" parameterType="com.zd.algorithm.api.firedevice.entity.vo.HardwareFireDeviceVO">
+    <update id="updateHardwareFireDevice" parameterType="com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO">
         update hardware_fire_device
         <trim prefix="SET" suffixOverrides=",">
             <if test="deptName != null">dept_name = #{deptName},</if>