调整包的路径

gyj-iot-boot/gyjiot-gateway/gyjiot-mq/src/main/java/com/fastbee/mq/ruleEngine/SceneContext.java → gyj-iot-boot/gyjiot-gateway/gyjiot-mq/src/main/java/com/gyjiot/mq/ruleEngine/SceneContext.java

@@ -7,8 +7,6 @@ import com.gyjiot.common.core.redis.RedisCache;
 import com.gyjiot.common.core.redis.RedisKeyBuilder;
 import com.gyjiot.common.core.thingsModel.SceneThingsModelItem;
 import com.gyjiot.common.core.thingsModel.ThingsModelSimpleItem;
-import com.gyjiot.common.exception.ServiceException;
-import com.gyjiot.common.utils.DateUtils;
 import com.gyjiot.common.utils.StringUtils;
 import com.gyjiot.common.utils.spring.SpringUtils;
 import com.gyjiot.iot.model.ScriptTemplate;
@@ -17,12 +15,10 @@ import com.gyjiot.iot.service.IDeviceService;
 import com.gyjiot.iot.service.IDeviceUserService;
 import com.gyjiot.mq.service.IFunctionInvoke;
 import lombok.Data;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static java.util.regex.Pattern.compile;
 

gyj-iot-boot/gyjiot-gateway/gyjiot-mq/src/main/java/com/fastbee/mq/service/impl/DeviceOtherMsgHandler.java → gyj-iot-boot/gyjiot-gateway/gyjiot-mq/src/main/java/com/gyjiot/mq/service/impl/DeviceOtherMsgHandler.java

@@ -6,7 +6,6 @@ import com.gyjiot.mq.model.ReportDataBo;
 import com.gyjiot.mq.service.IDataHandler;
 import com.gyjiot.mq.service.IMqttMessagePublish;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

gyj-iot-boot/gyjiot-gateway/gyjiot-mq/src/main/java/com/fastbee/mq/service/impl/FunctionInvokeImpl.java → gyj-iot-boot/gyjiot-gateway/gyjiot-mq/src/main/java/com/gyjiot/mq/service/impl/FunctionInvokeImpl.java

@@ -1,32 +1,23 @@
 package com.gyjiot.mq.service.impl;
 
-import com.gyjiot.common.core.mq.DeviceReplyBo;
 import com.gyjiot.common.core.mq.InvokeReqDto;
 import com.gyjiot.common.core.mq.MQSendMessageBo;
-import com.gyjiot.common.core.mq.MessageReplyBo;
-import com.gyjiot.common.core.protocol.modbus.ModbusCode;
-import com.gyjiot.common.core.redis.RedisCache;
-import com.gyjiot.common.core.redis.RedisKeyBuilder;
 import com.gyjiot.common.enums.ThingsModelType;
 import com.gyjiot.common.utils.bean.BeanUtils;
 import com.gyjiot.iot.util.SnowflakeIdWorker;
-import com.gyjiot.mq.redischannel.producer.MessageProducer;
 import com.gyjiot.mq.service.IFunctionInvoke;
 import com.gyjiot.mq.service.IMqttMessagePublish;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author gyj.iot
  * @date 2022/12/5 11:34
  *
  *
- * 
+ *
  */
 @Slf4j
 @Service

gyj-iot-boot/gyjiot-open-api/src/main/java/com/gyjiot/data/controller/runtime/DeviceRuntimeController.java

@@ -5,7 +5,6 @@ import com.gyjiot.common.core.controller.BaseController;
 import com.gyjiot.common.core.domain.AjaxResult;
 import com.gyjiot.common.core.mq.InvokeReqDto;
 import com.gyjiot.common.core.page.TableDataInfo;
-import com.gyjiot.common.core.redis.RedisCache;
 import com.gyjiot.common.enums.ThingsModelType;
 import com.gyjiot.common.exception.ServiceException;
 import com.gyjiot.common.utils.StringUtils;
@@ -16,13 +15,11 @@ import com.gyjiot.mq.service.IFunctionInvoke;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 设备运行时数据controller

gyj-iot-boot/gyjiot-open-api/src/main/java/com/gyjiot/data/service/impl/DeviceJob.java

@@ -15,7 +15,6 @@ import com.gyjiot.sip.mapper.SipDeviceChannelMapper;
 import com.gyjiot.sip.mapper.SipDeviceMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 

gyj-iot-boot/gyjiot-open-api/src/main/java/com/gyjiot/data/service/impl/DeviceJobServiceImpl.java

@@ -5,8 +5,6 @@ import com.gyjiot.common.exception.job.TaskException;
 import com.gyjiot.iot.domain.DeviceJob;
 import com.gyjiot.iot.mapper.DeviceJobMapper;
 import com.gyjiot.iot.service.IDeviceJobService;
-import com.gyjiot.iot.service.IDeviceService;
-import com.gyjiot.iot.service.cache.IDeviceCache;
 import com.gyjiot.data.quartz.CronUtils;
 import com.gyjiot.data.quartz.ScheduleUtils;
 import com.gyjiot.quartz.domain.SysJob;
@@ -17,17 +15,15 @@ import org.quartz.JobKey;
 import org.quartz.Scheduler;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
  * 定时任务调度信息 服务层
- * 
+ *
  * @author ji-sheng-hua
  */
 @Service
@@ -68,7 +64,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 获取quartz调度器的计划任务列表
-     * 
+     *
      * @param job 调度信息
      * @return
      */
@@ -80,7 +76,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 通过调度任务ID查询调度信息
-     * 
+     *
      * @param jobId 调度任务ID
      * @return 调度任务对象信息
      */
@@ -92,7 +88,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 暂停任务
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -112,7 +108,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 恢复任务
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -132,7 +128,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 删除任务后，所对应的trigger也将被删除
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -151,7 +147,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 批量删除调度信息
-     * 
+     *
      * @param jobIds 需要删除的任务ID
      * @return 结果
      */
@@ -228,7 +224,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 任务调度状态修改
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -250,7 +246,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 立即运行任务
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -268,7 +264,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 新增任务
-     * 
+     *
      * @param deviceJob 调度信息 调度信息
      */
     @Override
@@ -285,7 +281,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 更新任务的时间表达式
-     * 
+     *
      * @param deviceJob 调度信息
      */
     @Override
@@ -303,7 +299,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 更新任务
-     * 
+     *
      * @param deviceJob 任务对象
      * @param jobGroup 任务组名
      */
@@ -322,7 +318,7 @@ public class DeviceJobServiceImpl implements IDeviceJobService
 
     /**
      * 校验cron表达式是否有效
-     * 
+     *
      * @param cronExpression 表达式
      * @return 结果
      */

gyj-iot-boot/gyjiot-plugs/gyjiot-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -3,8 +3,8 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gyjiot.generator.mapper.GenTableColumnMapper">
-    
-    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+
+    <resultMap type="com.gyjiot.generator.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -28,24 +28,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
-	
+
 	<sql id="selectGenTableColumnVo">
         select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
     </sql>
-	
+
     <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
         <include refid="selectGenTableColumnVo"/>
         where table_id = #{tableId}
         order by sort
     </select>
-    
+
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
 		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
 		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
 		order by ordinal_position
 	</select>
-    
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
+
+    <insert id="insertGenTableColumn" parameterType="com.gyjiot.generator.domain.GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
         insert into gen_table_column (
 			<if test="tableId != null and tableId != ''">table_id,</if>
 			<if test="columnName != null and columnName != ''">column_name,</if>
@@ -88,8 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sysdate()
          )
     </insert>
-	 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
+
+    <update id="updateGenTableColumn" parameterType="com.gyjiot.generator.domain.GenTableColumn">
         update gen_table_column
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
@@ -111,14 +111,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteGenTableColumnByIds" parameterType="Long">
-        delete from gen_table_column where table_id in 
+        delete from gen_table_column where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>
     </delete>
-    
+
     <delete id="deleteGenTableColumns">
-        delete from gen_table_column where column_id in 
+        delete from gen_table_column where column_id in
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item.columnId}
         </foreach>
@@ -154,4 +154,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-</mapper>
+</mapper>

gyj-iot-boot/gyjiot-plugs/gyjiot-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gyjiot.generator.mapper.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
+	<resultMap type="com.gyjiot.generator.domain.GenTable" id="GenTableResult">
 	    <id     property="tableId"        column="table_id"          />
 		<result property="dataName"        column="data_name"          />
 		<result property="tableName"      column="table_name"        />
@@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="remark"         column="remark"            />
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
-	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
+
+	<resultMap type="com.gyjiot.generator.domain.GenTableColumn" id="GenTableColumnResult">
         <id     property="columnId"       column="column_id"      />
         <result property="tableId"        column="table_id"       />
         <result property="columnName"     column="column_name"    />
@@ -53,12 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
-	
+
 	<sql id="selectGenTableVo">
         select table_id, data_name, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
-    
-    <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
+
+    <select id="selectGenTableList" parameterType="com.gyjiot.generator.domain.GenTable" resultMap="GenTableResult">
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="tableName != null and tableName != ''">
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</where>
 	</select>
 
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+	<select id="selectDbTableList" parameterType="com.gyjiot.generator.domain.GenTable" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_schema = (select database())
 		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
@@ -95,22 +95,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
         order by create_time desc
 	</select>
-	
+
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
 		and table_name in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
  			#{name}
-        </foreach> 
-	</select>
-	
-	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
-		and table_name = #{tableName}
+        </foreach>
 	</select>
-	
+
+<!--	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">-->
+<!--		select table_name, table_comment, create_time, update_time from information_schema.tables-->
+<!--		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())-->
+<!--		and table_name = #{tableName}-->
+<!--	</select>-->
+
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
 	    SELECT t.table_id, t.data_name, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		where t.table_id = #{tableId} order by c.sort
 	</select>
-	
+
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
 	    SELECT t.table_id, t.data_name, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		where t.table_name = #{tableName} order by c.sort
 	</select>
-	
+
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
 	    SELECT t.table_id, t.data_name, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by c.sort
 	</select>
 
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+	<insert id="insertGenTable" parameterType="com.gyjiot.generator.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (
 			<if test="dataName != null">data_name,</if>
 			<if test="tableName != null">table_name,</if>
@@ -170,8 +170,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			sysdate()
          )
     </insert>
-    
-    <update id="updateGenTable" parameterType="GenTable">
+
+    <update id="updateGenTable" parameterType="com.gyjiot.generator.domain.GenTable">
         update gen_table
         <set>
             <if test="dataName != null">data_name = #{dataName},</if>
@@ -195,9 +195,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where table_id = #{tableId}
     </update>
-    
+
     <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
+        delete from gen_table where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>
@@ -207,4 +207,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select table_name from gen_table where data_name = #{dataName,jdbcType=VARCHAR}
 	</select>
 
-</mapper>
+</mapper>

gyj-iot-boot/gyjiot-plugs/gyjiot-quartz/src/main/java/com/fastbee/quartz/service/impl/SysJobServiceImpl.java → gyj-iot-boot/gyjiot-plugs/gyjiot-quartz/src/main/java/com/gyjiot/quartz/service/impl/SysJobServiceImpl.java

@@ -1,7 +1,7 @@
 package com.gyjiot.quartz.service.impl;
 
 import java.util.List;
-import javax.annotation.PostConstruct;
+
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;
@@ -19,7 +19,7 @@ import com.gyjiot.quartz.util.ScheduleUtils;
 
 /**
  * 定时任务调度信息 服务层
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -47,7 +47,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 获取quartz调度器的计划任务列表
-     * 
+     *
      * @param job 调度信息
      * @return
      */
@@ -59,7 +59,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 通过调度任务ID查询调度信息
-     * 
+     *
      * @param jobId 调度任务ID
      * @return 调度任务对象信息
      */
@@ -71,7 +71,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 暂停任务
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -91,7 +91,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 恢复任务
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -111,7 +111,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 删除任务后，所对应的trigger也将被删除
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -130,7 +130,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 批量删除调度信息
-     * 
+     *
      * @param jobIds 需要删除的任务ID
      * @return 结果
      */
@@ -147,7 +147,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 任务调度状态修改
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -169,7 +169,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 立即运行任务
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -194,7 +194,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 新增任务
-     * 
+     *
      * @param job 调度信息 调度信息
      */
     @Override
@@ -212,7 +212,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 更新任务的时间表达式
-     * 
+     *
      * @param job 调度信息
      */
     @Override
@@ -230,7 +230,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 更新任务
-     * 
+     *
      * @param job 任务对象
      * @param jobGroup 任务组名
      */
@@ -249,7 +249,7 @@ public class SysJobServiceImpl implements ISysJobService
 
     /**
      * 校验cron表达式是否有效
-     * 
+     *
      * @param cronExpression 表达式
      * @return 结果
      */

gyj-iot-boot/gyjiot-plugs/gyjiot-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gyjiot.quartz.mapper.SysJobLogMapper">
 
-	<resultMap type="SysJobLog" id="SysJobLogResult">
+	<resultMap type="com.gyjiot.quartz.domain.SysJobLog" id="SysJobLogResult">
 		<id     property="jobLogId"       column="job_log_id"      />
 		<result property="jobName"        column="job_name"        />
 		<result property="jobGroup"       column="job_group"       />
@@ -14,13 +14,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="exceptionInfo"  column="exception_info"  />
 		<result property="createTime"     column="create_time"     />
 	</resultMap>
-	
+
 	<sql id="selectJobLogVo">
-        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time 
+        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
 		from sys_job_log
     </sql>
-	
-	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
+
+	<select id="selectJobLogList" parameterType="com.gyjiot.quartz.domain.SysJobLog" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
@@ -43,32 +43,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 		</where>
 	</select>
-	
+
 	<select id="selectJobLogAll" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 	</select>
-	
+
 	<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
 		<include refid="selectJobLogVo"/>
 		where job_log_id = #{jobLogId}
 	</select>
-	
+
 	<delete id="deleteJobLogById" parameterType="Long">
  		delete from sys_job_log where job_log_id = #{jobLogId}
  	</delete>
- 	
+
  	<delete id="deleteJobLogByIds" parameterType="Long">
  		delete from sys_job_log where job_log_id in
  		<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
  			#{jobLogId}
-        </foreach> 
+        </foreach>
  	</delete>
- 	
+
  	<update id="cleanJobLog">
         truncate table sys_job_log
     </update>
- 	
- 	<insert id="insertJobLog" parameterType="SysJobLog">
+
+ 	<insert id="insertJobLog" parameterType="com.gyjiot.quartz.domain.SysJobLog">
  		insert into sys_job_log(
  			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>
@@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 
-</mapper> 
+</mapper>

gyj-iot-boot/gyjiot-plugs/gyjiot-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gyjiot.quartz.mapper.SysJobMapper">
 
-	<resultMap type="SysJob" id="SysJobResult">
+	<resultMap type="com.gyjiot.quartz.domain.SysJob" id="SysJobResult">
 		<id     property="jobId"          column="job_id"          />
 		<result property="jobName"        column="job_name"        />
 		<result property="jobGroup"       column="job_group"       />
@@ -19,13 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"     column="update_time"     />
 		<result property="remark"         column="remark"          />
 	</resultMap>
-	
+
 	<sql id="selectJobVo">
-        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
+        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
 		from sys_job
     </sql>
-	
-	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
+
+	<select id="selectJobList" parameterType="com.gyjiot.quartz.domain.SysJob" resultMap="SysJobResult">
 		<include refid="selectJobVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
@@ -42,28 +42,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 		</where>
 	</select>
-	
+
 	<select id="selectJobAll" resultMap="SysJobResult">
 		<include refid="selectJobVo"/>
 	</select>
-	
+
 	<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
 		<include refid="selectJobVo"/>
 		where job_id = #{jobId}
 	</select>
-	
+
 	<delete id="deleteJobById" parameterType="Long">
  		delete from sys_job where job_id = #{jobId}
  	</delete>
- 	
+
  	<delete id="deleteJobByIds" parameterType="Long">
  		delete from sys_job where job_id in
  		<foreach collection="array" item="jobId" open="(" separator="," close=")">
  			#{jobId}
-        </foreach> 
+        </foreach>
  	</delete>
- 	
- 	<update id="updateJob" parameterType="SysJob">
+
+ 	<update id="updateJob" parameterType="com.gyjiot.quartz.domain.SysJob">
  		update sys_job
  		<set>
  			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
@@ -79,8 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where job_id = #{jobId}
 	</update>
- 	
- 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
+
+ 	<insert id="insertJob" parameterType="com.gyjiot.quartz.domain.SysJob" useGeneratedKeys="true" keyProperty="jobId">
  		insert into sys_job(
  			<if test="jobId != null and jobId != 0">job_id,</if>
  			<if test="jobName != null and jobName != ''">job_name,</if>
@@ -108,4 +108,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)
 	</insert>
 
-</mapper> 
+</mapper>

gyj-iot-boot/gyjiot-server/mqtt-broker/src/main/java/com/gyjiot/mqtt/manager/MqttRemoteManager.java

@@ -9,7 +9,6 @@ import com.gyjiot.mqtt.model.PushMessageBo;
 import com.gyjiot.mqttclient.PubMqttClient;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.*;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;