Merge branch 'refs/heads/dev_zc' into dev_io_zc

# Conflicts:
#	example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/entity/CarPassGather.java
#	example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/listener/CarMessageListener.java
#	example/mqtt-car/src/main/resources/application-dev.yml
#	example/mqtt-car/src/main/resources/application-prod.yml

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/controller/ServerController.java

@@ -50,12 +50,10 @@ public class ServerController {
 	}
 
 	//手动触发抬杆
-	@PostMapping("/gpio_out")
-	public boolean gpio_out(@RequestBody JSONObject js) {
+	@PostMapping("/openFloodgate")
+	public boolean openFloodgate(@RequestBody JSONObject js) {
 		String sn = js.getString("sn");
-		Integer io = js.getInteger("io");
-		Integer value = js.getInteger("value");
-		return service.gpio_out(sn, io, value);
+		return service.openFloodgate(sn);
 	}
 
 	@PostMapping("/set_io_lock_status")
@@ -63,7 +61,7 @@ public class ServerController {
 		String sn = js.getString("sn");
 		Integer status = js.getInteger("status");
 		Integer ioout = js.getInteger("ioout");
-		boolean publish = service.set_io_lock_status(sn, status,ioout);
+		boolean publish = service.locked(sn, status,ioout);
 		JSONObject jsonObject = new JSONObject();
 		if (publish) {
 			jsonObject.put("code", 200);
@@ -73,7 +71,7 @@ public class ServerController {
 		return jsonObject;
 	}
 
-	//开闸
+	//常开
 	@PostMapping("/set_io_lock_open")
 	public JSONObject lockOpen(@RequestBody JSONObject js) {
 		String sn = js.getString("sn");
@@ -87,7 +85,7 @@ public class ServerController {
 		return jsonObject;
 	}
 
-	//关闸
+	//常关
 	@PostMapping("/set_io_lock_close")
 	public JSONObject lockClose(@RequestBody JSONObject js) {
 		String sn = js.getString("sn");

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/entity/Equipment.java

@@ -10,8 +10,8 @@ import java.io.Serial;
 import java.io.Serializable;
 
 @Data
-@TableName("sys_io_lock_equipment")
-public class IoLockEquipment implements Serializable {
+@TableName("sys_equipment")
+public class Equipment implements Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
@@ -21,6 +21,9 @@ public class IoLockEquipment implements Serializable {
 	@TableId(type = IdType.AUTO)
 	private Long id;
 
+	/** 所属产品Id */
+	private Long productId;
+
 	/** 设备名称 */
 	private String name;
 
@@ -33,6 +36,15 @@ public class IoLockEquipment implements Serializable {
 	/** 设备密码 */
 	private String password;
 
+	/** 设备区域 */
+	private Long spaceId;
+
+	/** 设备位置 */
+	private Long pointId;
+
+	/** 对接状态(0未对接 1对接成功) */
+	private Long state;
+
 	/** 设备状态(0在线 1离线) */
 	private String flag;
 

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/listener/CarMessageListener.java

@@ -47,21 +47,28 @@ public class CarMessageListener {
 	@Autowired
 	RedisService redisService;
 
-//	@Autowired
-//	ICarParkRecordService carParkRecordService;
-//
-//	@Autowired
-//	ICarPassRecordService carPassRecordService;
-//
-//	@Autowired
-//	ICarParkItemService carParkItemService;
-//
-//	@Autowired
-//	ICarPassGatherService carPassGatherService;
+	@Autowired
+	ICarParkRecordService carParkRecordService;
 
-//	private static String key = "1234567898765432";
+	@Autowired
+	ICarPassRecordService carPassRecordService;
 
-//	private String jinjiangUrl = "http://127.0.0.1:6609/";
+	@Autowired
+	ICarParkItemService carParkItemService;
+
+	@Autowired
+	ICarPassGatherService carPassGatherService;
+
+	@Autowired
+	private ServerService service;
+
+
+	private static String key = "1234567898765432";
+
+	//xa、jl、td、xj
+	private String jinjiangUrl = "http://127.0.0.1:6609/";
+	//zr
+//	private String jinjiangUrl = "http://192.168.155.42:6609/";
 
 	/**
 	 * 心跳
@@ -74,7 +81,7 @@ public class CarMessageListener {
 		String sn = topicVars.get("sn");
 		log.info("接收到来自客户端 [{}] 的心跳消息 -> Topic: {}", sn, topic);
 
-		// 更新客户端的最后心跳
+        // 更新客户端的最后心跳
 		redisService.setCacheObject(CacheConstants.EQUIPMENT_HEARTBEAT + sn, FlagEnums.ONLINE.getCode(), CacheConstants.OFFLINE_THRESHOLD, TimeUnit.MILLISECONDS);
 	}
 
@@ -84,7 +91,7 @@ public class CarMessageListener {
 	 * @param topic
 	 * @param message
 	 */
-	/*@MqttServerFunction("device/${sn}/message/down/white_list_operator/reply")
+	@MqttServerFunction("device/${sn}/message/down/white_list_operator/reply")
 	@Transactional(rollbackFor = Exception.class)
 	public void white_list_operator_reply(String topic, byte[] message) {
 		log.info("接收到车牌下发消息 -> Topic: {}, message: {}", topic, new String(message));
@@ -104,7 +111,7 @@ public class CarMessageListener {
 			carParkRecord.setSync("1");
 		}
 		carParkRecordService.updateByClientId(carParkRecord);
-	}*/
+	}
 
 	/**
 	 * 车牌入场出场识别监听
@@ -116,98 +123,98 @@ public class CarMessageListener {
 	public void ivs_result(String topic, Map<String, String> topicVars, byte[] message) throws Exception {
 		String sn = topicVars.get("sn");
 		log.info("接收到车辆识别消息 -> Topic: {}", topic);
-//
-//		//如果开启了锁杆，且车位满了
-//		CarParkItem carParkItem = carParkItemService.selectBySn(sn);
-//		long count = carPassGatherService.count(new QueryWrapper<CarPassGather>().eq("park_id", carParkItem.getParkId()));
-//		if (StrUtil.equals(carParkItem.getWay(), "0") //入场
-//			&& carParkItem.getAutoLock() == 1 //开启了锁杆
-//			&& count >= carParkItem.getCarsNum()) { //车位满了
-//			log.info("车位满了，不记录入场数据");
-//			return;
-//		}
-//
-//		String data = new String(message, StandardCharsets.UTF_8);
-//		JSONObject jsonObject = JSONObject.parseObject(data);
-//		JSONObject payload = jsonObject.getJSONObject("payload");
-//		String id = jsonObject.getString("id");
-//		JSONObject alarmInfoPlate = payload.getJSONObject("AlarmInfoPlate");
-//		JSONObject result = alarmInfoPlate.getJSONObject("result");
-//		JSONObject plateResult = result.getJSONObject("PlateResult");
-//		JSONObject carBrand = plateResult.getJSONObject("car_brand");
-//		String license = plateResult.getString("license");
-//		String colorType = plateResult.getString("colorType");
-//		String str = "";
-//		if ("5".equals(colorType)) {
-//			str = AESUtil.decrptyAES_ECB(license, key).substring(0, 20);
-//		} else {
-//			str = AESUtil.decrptyAES_ECB(license, key).substring(0, 18);
-//		}
-//
-//		license = AESUtil.UTF8decode(str);
-//		log.info("解密前车牌：{}，解谜后的车牌:{}", plateResult.getString("license"), license);
-//
-//		//保存通行记录
-//		CarPassRecord record = new CarPassRecord();
-//		record.setCarColor(plateResult.getString("carColor"));
-//		record.setColorType(colorType);
-//		record.setDirection(plateResult.getString("direction"));
-//		record.setLicense(license);
-//		record.setDataType("0");
-//		Map<String, Object> paramMap = new HashMap<>();
-//		paramMap.put("url", plateResult.getString("full_image_content"));
-//		String repose = HttpUtil.createPost(jinjiangUrl + "file/uploadMinioCarBase64")
-//			.body(JSON.toJSONString(paramMap))
-//			.execute()
-//			.body();
-//		log.info("imgRsp:{}", repose);
-//		JSONObject imgRsp = JSONObject.parseObject(repose);
-//		if (null != imgRsp && imgRsp.getInteger("code") == 200) {
-//			record.setUrl(imgRsp.getJSONObject("data").getString("url"));
-//		}
-//		if (plateResult.containsKey("start_time")) {
-//			log.info("拿到了时间：{}", plateResult.getLong("start_time"));
-//			record.setPassTime(DateUtil.date(plateResult.getLong("start_time")));
-//		} else {
-//			log.info("没有拿到时间，默认当前时间");
-//			record.setPassTime(DateUtil.date(new Date()));
-//		}
-//		record.setSn(sn);
-//		record.setUniqueNo(id);
-//		record.setParkId(carParkItem.getParkId());
-//		record.setTriggerType(plateResult.getString("triggerType"));
-//		record.setType(carBrand.getString("type"));
-//		carPassRecordService.save(record);
-//
-//		//保存/删除在场数据
-//		boolean isExist = carPassGatherService.exists(new QueryWrapper<CarPassGather>().eq("license", license).eq("park_id", carParkItem.getParkId()));
-//		//入场新增数据
-//		if (StrUtil.equals(carParkItem.getWay(), "0") && !isExist) {
-//			CarPassGather carPassGather = new CarPassGather();
-//			carPassGather.setLicense(license);
-//			carPassGather.setParkId(carParkItem.getParkId());
-//			carPassGather.setArea(carParkItem.getArea());
-//			carPassGather.setJoinTime(record.getPassTime());
-//			carPassGather.setSn(sn);
-//			carPassGatherService.save(carPassGather);
-//
-//			//最后一辆车进场
-//			if (carParkItem.getAutoLock() == 1 && (count + 1) >= carParkItem.getCarsNum()) {
-//				List<String> snList = carParkItemService.selectSnByParkId(carParkItem.getParkId());
-//				for (String s : snList) {
-//					service.locked(s, 2, 0);
-//				}
-//			}
-//		} else if (StrUtil.equals(carParkItem.getWay(), "1") && isExist) {//出场删除数据
-//			carPassGatherService.deleteByLicense(license);
-//			//出去一辆车，有空位
-//			if (carParkItem.getAutoLock() == 1 && count == carParkItem.getCarsNum()) {
-//				List<String> snList = carParkItemService.selectSnByParkId(carParkItem.getParkId());
-//				for (String s : snList) {
-//					service.locked(s, 0, 0);
-//				}
-//			}
-//		}
+
+		//如果开启了锁杆，且车位满了
+		CarParkItem carParkItem = carParkItemService.selectBySn(sn);
+		long count = carPassGatherService.count(new QueryWrapper<CarPassGather>().eq("park_id", carParkItem.getParkId()));
+		if (StrUtil.equals(carParkItem.getWay(), "0") //入场
+			&& carParkItem.getAutoLock() == 1 //开启了锁杆
+			&& count >= carParkItem.getCarsNum()) { //车位满了
+			log.info("车位满了，不记录入场数据");
+			return;
+		}
+
+		String data = new String(message, StandardCharsets.UTF_8);
+		JSONObject jsonObject = JSONObject.parseObject(data);
+		JSONObject payload = jsonObject.getJSONObject("payload");
+		String id = jsonObject.getString("id");
+		JSONObject alarmInfoPlate = payload.getJSONObject("AlarmInfoPlate");
+		JSONObject result = alarmInfoPlate.getJSONObject("result");
+		JSONObject plateResult = result.getJSONObject("PlateResult");
+		JSONObject carBrand = plateResult.getJSONObject("car_brand");
+		String license = plateResult.getString("license");
+		String colorType = plateResult.getString("colorType");
+		String str = "";
+		if ("5".equals(colorType)) {
+			str = AESUtil.decrptyAES_ECB(license, key).substring(0, 20);
+		} else {
+			str = AESUtil.decrptyAES_ECB(license, key).substring(0, 18);
+		}
+
+		license = AESUtil.UTF8decode(str);
+		log.info("解密前车牌：{}，解谜后的车牌:{}", plateResult.getString("license"), license);
+
+		//保存通行记录
+		CarPassRecord record = new CarPassRecord();
+		record.setCarColor(plateResult.getString("carColor"));
+		record.setColorType(colorType);
+		record.setDirection(plateResult.getString("direction"));
+		record.setLicense(license);
+		record.setDataType("0");
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("url", plateResult.getString("full_image_content"));
+		String repose = HttpUtil.createPost(jinjiangUrl + "file/uploadMinioCarBase64")
+			.body(JSON.toJSONString(paramMap))
+			.execute()
+			.body();
+		log.info("imgRsp:{}", repose);
+		JSONObject imgRsp = JSONObject.parseObject(repose);
+		if (null != imgRsp && imgRsp.getInteger("code") == 200) {
+			record.setUrl(imgRsp.getJSONObject("data").getString("url"));
+		}
+		if (plateResult.containsKey("start_time")) {
+			log.info("拿到了时间：{}", plateResult.getLong("start_time"));
+			record.setPassTime(DateUtil.date(plateResult.getLong("start_time")));
+		} else {
+			log.info("没有拿到时间，默认当前时间");
+			record.setPassTime(DateUtil.date(new Date()));
+		}
+		record.setSn(sn);
+		record.setUniqueNo(id);
+		record.setParkId(carParkItem.getParkId());
+		record.setTriggerType(plateResult.getString("triggerType"));
+		record.setType(carBrand.getString("type"));
+		carPassRecordService.save(record);
+
+		//保存/删除在场数据
+		boolean isExist = carPassGatherService.exists(new QueryWrapper<CarPassGather>().eq("license", license).eq("park_id", carParkItem.getParkId()));
+		//入场新增数据
+		if (StrUtil.equals(carParkItem.getWay(), "0") && !isExist) {
+			CarPassGather carPassGather = new CarPassGather();
+			carPassGather.setLicense(license);
+			carPassGather.setParkId(carParkItem.getParkId());
+			carPassGather.setArea(carParkItem.getArea());
+			carPassGather.setJoinTime(record.getPassTime());
+			carPassGather.setSn(sn);
+			carPassGatherService.save(carPassGather);
+
+			//最后一辆车进场
+			if (carParkItem.getAutoLock() == 1 && (count + 1) >= carParkItem.getCarsNum()) {
+				List<String> snList = carParkItemService.selectSnByParkId(carParkItem.getParkId());
+				for (String s : snList) {
+					service.locked(s, 2, 0);
+				}
+			}
+		} else if (StrUtil.equals(carParkItem.getWay(), "1") && isExist) {//出场删除数据
+			carPassGatherService.deleteByLicense(license);
+			//出去一辆车，有空位
+			if (carParkItem.getAutoLock() == 1 && count == carParkItem.getCarsNum()) {
+				List<String> snList = carParkItemService.selectSnByParkId(carParkItem.getParkId());
+				for (String s : snList) {
+					service.locked(s, 0, 0);
+				}
+			}
+		}
 	}
 
 	/**
@@ -216,7 +223,7 @@ public class CarMessageListener {
 	 * @param topic
 	 * @param message
 	 */
-	/*@MqttServerFunction("device/${sn}/message/up/ivs_result_offline")
+	@MqttServerFunction("device/${sn}/message/up/ivs_result_offline")
 	public void ivs_result_offline(String topic, Map<String, String> topicVars, byte[] message) throws Exception {
 		String sn = topicVars.get("sn");
 		log.info("接收到车辆离线识别消息 -> Topic: {}", topic);
@@ -271,7 +278,7 @@ public class CarMessageListener {
 		record.setTriggerType(plateResult.getString("triggerType"));
 		record.setType(carBrand.getString("type"));
 		carPassRecordService.save(record);
-	}*/
+	}
 
 	/**
 	 * IO输出事件监听
@@ -313,19 +320,6 @@ public class CarMessageListener {
 		JSONObject jsonObject = JSONObject.parseObject(data);
 	}
 
-	/**
-	 * 发布获取IO状态监听
-	 *
-	 * @param topic
-	 * @param message
-	 */
-	@MqttServerFunction("device/${sn}/message/down/get_io_status/reply")
-	public void get_io_status(String topic, byte[] message) {
-		log.info("发布获取IO状态监听消息 -> Topic: {}, message: {}", topic, new String(message));
-		String data = new String(message, StandardCharsets.UTF_8);
-		JSONObject jsonObject = JSONObject.parseObject(data);
-	}
-
 
 	/**
 	 * 订阅离线数据数量

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/listener/MqttConnectStatusListener2.java

@@ -16,10 +16,13 @@
 
 package org.dromara.mica.mqtt.server.listener;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.mica.mqtt.core.server.event.IMqttConnectStatusListener;
 import org.dromara.mica.mqtt.server.constant.CacheConstants;
+import org.dromara.mica.mqtt.server.entity.Equipment;
 import org.dromara.mica.mqtt.server.enums.FlagEnums;
+import org.dromara.mica.mqtt.server.mapper.EquipmentMapper;
 import org.dromara.mica.mqtt.server.redis.RedisService;
 import org.dromara.mica.mqtt.server.service.IEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +30,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.tio.core.ChannelContext;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * mqtt 连接状态
  *

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/mapper/EquipmentMapper.java

@@ -2,9 +2,10 @@ package org.dromara.mica.mqtt.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.dromara.mica.mqtt.server.entity.IoLockEquipment;
+import org.dromara.mica.mqtt.server.entity.CarInfo;
+import org.dromara.mica.mqtt.server.entity.Equipment;
 
 @Mapper
-public interface EquipmentMapper extends BaseMapper<IoLockEquipment> {
+public interface EquipmentMapper extends BaseMapper<Equipment> {
 
 }

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/service/IEquipmentService.java

@@ -1,15 +1,15 @@
 package org.dromara.mica.mqtt.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.dromara.mica.mqtt.server.entity.IoLockEquipment;
+import org.dromara.mica.mqtt.server.entity.Equipment;
 
 import java.util.List;
 
-public interface IEquipmentService extends IService<IoLockEquipment> {
+public interface IEquipmentService extends IService<Equipment> {
 
-	IoLockEquipment selectEquipmentBySn(String sn);
+	Equipment selectEquipmentBySn(String sn);
 
-	List<IoLockEquipment> selectAllSnFlag();
+	List<Equipment> selectAllSnFlag();
 
 	void updateFlag(String sn, String flag);
 }

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/service/impl/EquipmentServiceImpl.java

@@ -2,7 +2,7 @@ package org.dromara.mica.mqtt.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.dromara.mica.mqtt.server.entity.IoLockEquipment;
+import org.dromara.mica.mqtt.server.entity.Equipment;
 import org.dromara.mica.mqtt.server.mapper.EquipmentMapper;
 import org.dromara.mica.mqtt.server.service.IEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,25 +11,25 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, IoLockEquipment> implements IEquipmentService {
+public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment> implements IEquipmentService {
 
 	@Autowired
 	EquipmentMapper equipmentMapper;
 
 	@Override
-	public IoLockEquipment selectEquipmentBySn(String sn) {
-		return equipmentMapper.selectOne(new QueryWrapper<IoLockEquipment>().eq("sequence", sn).last("limit 1"));
+	public Equipment selectEquipmentBySn(String sn) {
+		return equipmentMapper.selectOne(new QueryWrapper<Equipment>().eq("sequence", sn).eq("product_id", 4L).last("limit 1"));
 	}
 
 	@Override
-	public List<IoLockEquipment> selectAllSnFlag() {
-		return equipmentMapper.selectList(new QueryWrapper<IoLockEquipment>().select("sequence", "flag"));
+	public List<Equipment> selectAllSnFlag() {
+		return equipmentMapper.selectList(new QueryWrapper<Equipment>().eq("product_id", 4L).select("sequence", "flag"));
 	}
 
 	@Override
 	public void updateFlag(String sn, String flag) {
-		IoLockEquipment equipment = new IoLockEquipment();
+		Equipment equipment = new Equipment();
 		equipment.setFlag(flag);
-		equipmentMapper.update(equipment, new QueryWrapper<IoLockEquipment>().eq("sequence", sn));
+		equipmentMapper.update(equipment, new QueryWrapper<Equipment>().eq("sequence", sn).eq("product_id", 4L));
 	}
 }

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/service/impl/ServerService.java

@@ -62,7 +62,8 @@ public class ServerService {
 		return result;
 	}
 
-	public boolean gpio_out(String sn, Integer io, Integer value) {
+
+	public boolean openFloodgate(String sn) {
 		String operUrl = "device/%s/message/down/gpio_out";
 		String topic = String.format(operUrl, sn);
 		OpenFloodgatePO openFloodgatePO = new OpenFloodgatePO();
@@ -70,26 +71,16 @@ public class ServerService {
 		openFloodgatePO.setId(uuid);
 		openFloodgatePO.setSn(sn);
 		openFloodgatePO.setName("gpio_out");
-		openFloodgatePO.setTimestamp(System.currentTimeMillis() / 1000);
-		openFloodgatePO.setPayload(this.buildGpioOut(io, value));
+		LocalDateTime now = LocalDateTime.now();
+		long timestamp = now.atZone(ZoneId.systemDefault()).toEpochSecond();
+		openFloodgatePO.setTimestamp(timestamp);
+		openFloodgatePO.setPayload(this.buildPayloadOpen());
 		boolean result = server.publish(sn,topic, JSON.toJSONString(openFloodgatePO).getBytes(StandardCharsets.UTF_8));
-		log.info("gpio_out设备编码:{},result:{},请求体{}", sn,result,openFloodgatePO);
+		log.info("抬杠设备编码:{},result:{},请求体{}", sn,result,openFloodgatePO);
 		return result;
 	}
 
-
-	private JSONObject buildGpioOut(Integer io, Integer value) {
-		JSONObject body = new JSONObject();
-		body.put("delay", 500);
-		body.put("io", io);
-		body.put("value", value);
-		JSONObject payload = new JSONObject();
-		payload.put("type", "gpio_out");
-		payload.put("body", body);
-		return payload;
-	}
-
-	public boolean set_io_lock_status(String sn, Integer status, Integer ioout) {
+	public boolean locked(String sn, Integer status, Integer ioout) {
 		String operUrl = "device/%s/message/down/set_io_lock_status";
 		String topic = String.format(operUrl, sn);
 		DeviceIOLockRequestPO deviceIOLockRequestPO = new DeviceIOLockRequestPO();
@@ -98,7 +89,19 @@ public class ServerService {
 		deviceIOLockRequestPO.setSn(sn);
 		deviceIOLockRequestPO.setName("set_io_lock_status");
 		deviceIOLockRequestPO.setPayload(this.buildPayloadLocked(status, ioout));
-		return server.publish(sn,topic, JSON.toJSONString(deviceIOLockRequestPO).getBytes(StandardCharsets.UTF_8));
+		boolean result = server.publish(sn,topic, JSON.toJSONString(deviceIOLockRequestPO).getBytes(StandardCharsets.UTF_8));
+		return result;
+	}
+
+	private JSONObject buildPayloadOpen() {
+		JSONObject body = new JSONObject();
+		body.put("delay", 10000);
+		body.put("io", 0);
+		body.put("value",2);
+		JSONObject payload = new JSONObject();
+		payload.put("type", "gpio_out");
+		payload.put("body", body);
+		return payload;
 	}
 
 	private JSONObject buildPayloadLocked(Integer status, Integer ioout) {
@@ -114,28 +117,52 @@ public class ServerService {
 	}
 
 	public boolean lockOpen(String sn) {
-		String operUrl = "device/%s/message/down/gpio_out";
+		String operUrl = "device/%s/message/down/set_io_lock_status";
 		String topic = String.format(operUrl, sn);
-		OpenFloodgatePO openFloodgatePO = new OpenFloodgatePO();
-		String uuid = "open_" + UuidUtil.getUuid();
-		openFloodgatePO.setId(uuid);
-		openFloodgatePO.setSn(sn);
-		openFloodgatePO.setName("gpio_out");
-		openFloodgatePO.setTimestamp(System.currentTimeMillis() / 1000);
-		openFloodgatePO.setPayload(this.buildGpioOut(0, 2));
-		return server.publish(sn,topic, JSON.toJSONString(openFloodgatePO).getBytes(StandardCharsets.UTF_8));
+
+		//通道1解锁
+		DeviceIOLockRequestPO deviceIOLockRequestPO = new DeviceIOLockRequestPO();
+		String uuid = "lockOpen_" + UuidUtil.getUuid();
+		deviceIOLockRequestPO.setId(uuid);
+		deviceIOLockRequestPO.setSn(sn);
+		deviceIOLockRequestPO.setName("set_io_lock_status");
+		deviceIOLockRequestPO.setPayload(this.buildPayloadLocked(0, 1));
+		boolean result = server.publish(sn,topic, JSON.toJSONString(deviceIOLockRequestPO).getBytes(StandardCharsets.UTF_8));
+
+		//通道0 锁定
+
+		DeviceIOLockRequestPO po = new DeviceIOLockRequestPO();
+		po.setId("lockOpen_" + UuidUtil.getUuid());
+		po.setSn(sn);
+		po.setName("set_io_lock_status");
+		po.setPayload(this.buildPayloadLocked(1, 0));
+		boolean result2 = server.publish(sn,topic, JSON.toJSONString(po).getBytes(StandardCharsets.UTF_8));
+
+		return (result && result2);
 	}
 
 	public boolean lockClose(String sn) {
-		String operUrl = "device/%s/message/down/gpio_out";
+		String operUrl = "device/%s/message/down/set_io_lock_status";
 		String topic = String.format(operUrl, sn);
-		OpenFloodgatePO openFloodgatePO = new OpenFloodgatePO();
-		String uuid = "open_" + UuidUtil.getUuid();
-		openFloodgatePO.setId(uuid);
-		openFloodgatePO.setSn(sn);
-		openFloodgatePO.setName("gpio_out");
-		openFloodgatePO.setTimestamp(System.currentTimeMillis() / 1000);
-		openFloodgatePO.setPayload(this.buildGpioOut(1, 2));
-		return server.publish(sn,topic, JSON.toJSONString(openFloodgatePO).getBytes(StandardCharsets.UTF_8));
+
+		//通道0解锁
+		DeviceIOLockRequestPO deviceIOLockRequestPO = new DeviceIOLockRequestPO();
+		String uuid = "lockOpen_" + UuidUtil.getUuid();
+		deviceIOLockRequestPO.setId(uuid);
+		deviceIOLockRequestPO.setSn(sn);
+		deviceIOLockRequestPO.setName("set_io_lock_status");
+		deviceIOLockRequestPO.setPayload(this.buildPayloadLocked(0, 0));
+		boolean result = server.publish(sn,topic, JSON.toJSONString(deviceIOLockRequestPO).getBytes(StandardCharsets.UTF_8));
+
+		//通道1 锁定
+
+		DeviceIOLockRequestPO po = new DeviceIOLockRequestPO();
+		po.setId("lockOpen_" + UuidUtil.getUuid());
+		po.setSn(sn);
+		po.setName("set_io_lock_status");
+		po.setPayload(this.buildPayloadLocked(1, 1));
+		boolean result2 = server.publish(sn,topic, JSON.toJSONString(po).getBytes(StandardCharsets.UTF_8));
+
+		return (result && result2);
 	}
 }

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/task/HeartbeatOnLineTask.java

@@ -1,9 +1,11 @@
 package org.dromara.mica.mqtt.server.task;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.mica.mqtt.server.constant.CacheConstants;
-import org.dromara.mica.mqtt.server.entity.IoLockEquipment;
+import org.dromara.mica.mqtt.server.entity.Equipment;
 import org.dromara.mica.mqtt.server.enums.FlagEnums;
+import org.dromara.mica.mqtt.server.mapper.EquipmentMapper;
 import org.dromara.mica.mqtt.server.redis.RedisService;
 import org.dromara.mica.mqtt.server.service.IEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,28 +30,32 @@ public class HeartbeatOnLineTask {
 
 	@Scheduled(fixedRate = 15 * 1000)
 	public void run() {
-		log.info("===========心跳检测=============");
-		//查询车辆摄像头的编码和在线状态
-		List<IoLockEquipment> equipment = equipmentService.selectAllSnFlag();
+		// 添加异常捕获，防止单个任务异常导致定时任务线程阻塞
+		try {
+			log.info("===========心跳检测=============");
+			//查询车辆摄像头的编码和在线状态
+			List<Equipment> equipment = equipmentService.selectAllSnFlag();
 
-		for (IoLockEquipment equip : equipment) {
-			//缓存中有该设备心跳key
-			if (redisService.hasKey(CacheConstants.EQUIPMENT_HEARTBEAT + equip.getSequence())) {
-				String flag = redisService.getCacheObject(CacheConstants.EQUIPMENT_HEARTBEAT + equip.getSequence());
-				//有心跳，但是和数据库设备在线状态不一致
-				if (!StrUtil.equals(flag, equip.getFlag())) {
-					log.info("设备：{}，flag:{}", equip.getSequence(), flag);
-					equipmentService.updateFlag(equip.getSequence(), flag);
-				}
-			} else {
-				//没有心跳上传，且设备在线,将设备置为离线
-				if (StrUtil.equals(FlagEnums.ONLINE.getCode(), equip.getFlag())) {
-					log.info("设备：{}，无心跳离线", equip.getSequence());
-					equipmentService.updateFlag(equip.getSequence(), FlagEnums.OFFLINE.getCode());
+			for (Equipment equip : equipment) {
+				//缓存中有该设备心跳key
+				if (redisService.hasKey(CacheConstants.EQUIPMENT_HEARTBEAT + equip.getSequence())) {
+					String flag = redisService.getCacheObject(CacheConstants.EQUIPMENT_HEARTBEAT + equip.getSequence());
+					//有心跳，但是和数据库设备在线状态不一致
+					if (!StrUtil.equals(flag, equip.getFlag())) {
+						log.info("设备：{}，flag:{}", equip.getSequence(), flag);
+						equipmentService.updateFlag(equip.getSequence(), flag);
+					}
+				} else {
+					//没有心跳上传，且设备在线,将设备置为离线
+					if (StrUtil.equals(FlagEnums.ONLINE.getCode(), equip.getFlag())) {
+						log.info("设备：{}，无心跳离线", equip.getSequence());
+						equipmentService.updateFlag(equip.getSequence(), FlagEnums.OFFLINE.getCode());
+					}
 				}
 			}
-
+		} catch (Exception e) {
+			// 捕获所有异常并记录日志，确保定时任务能继续执行
+			log.error("HeartbeatOnLineTask 定时任务执行异常", e);
 		}
-
 	}
 }

example/mqtt-car/src/main/java/org/dromara/mica/mqtt/server/task/PlatePublishTask.java

@@ -48,7 +48,7 @@ public class PlatePublishTask {
 	/**
 	 * 定时查询数据库需要下发的车辆进行下发
 	 */
-//	@Scheduled(fixedDelay = 8 * 1000)
+	@Scheduled(fixedDelay = 8 * 1000)
 	public void run() {
 		// 添加异常捕获，防止单个任务异常导致定时任务线程阻塞
 		try {

example/mqtt-car/src/main/resources/application-prod.yml

@@ -1,10 +1,26 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
+    #xa
+#    url: jdbc:mysql://127.0.0.1:3306/xa_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+#    username: root
+#    password: Xahg2024.
+    #jl
+#    url: jdbc:mysql://127.0.0.1:3306/jl_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+#    username: root
+#    password: JL202509jj
     #td
-    url: jdbc:mysql://192.168.251.16:3306/td_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+#    url: jdbc:mysql://127.0.0.1:3306/td_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+#    username: root
+#    password: td@JJ2024
+    #zr
+#    url: jdbc:mysql://192.168.155.42:3306/zr_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
+#    username: root
+#    password: zr202407.J
+    #xj
+    url: jdbc:mysql://127.0.0.1:3306/xj_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=5000&socketTimeout=30000
     username: root
-    password: td@JJ2024
+    password: XjJN2024!
     # Druid 连接池配置
     druid:
       max-active: 20
@@ -19,10 +35,13 @@ spring:
       min-evictable-idle-time-millis: 300000
   data:
     redis:
-      host: 192.168.251.16
+      #zr
+#      host: 192.168.155.42
+#      xa、jl、td、xj
+      host: 127.0.0.1
       port: 6379
       password:
-      database: 2
+      database: 1
       # Redis 超时配置，防止连接阻塞
       timeout: 5000ms
       lettuce:

example/mqtt-car/src/main/resources/application.yml

@@ -6,8 +6,8 @@ spring:
     name: mica-mqtt-server
   # 环境 dev|test|prod
   profiles:
-#    active: dev
-    active: prod
+    active: dev
+#    active: prod
   messages:
     encoding: UTF-8
     basename: i18n/messages