mqtt相关日志
This commit is contained in:
parent
2ffc8e79a8
commit
55f76c22bf
@ -5,42 +5,12 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="ec76006e-5a88-4766-9722-bc8eda172857" name="Changes" comment="">
|
<list default="true" id="ec76006e-5a88-4766-9722-bc8eda172857" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/business/AccessStrategyDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/business/AccessStrategyDTO.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/system/MessageMqttDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/system/MessageMqttDTO.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/business/BatteryCompartmentDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/business/BatteryCompartmentDTO.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/MessageMqtt.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/MessageMqtt.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/system/ParamsDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/dtos/system/ParamsDTO.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageTopic.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/AccessStrategy.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/AccessStrategy.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/MessageMqttService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/MessageMqttService.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/Params.java" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/core/src/main/java/com/evotech/hd/core/entity/system/Params.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/MessageMqttServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/MessageMqttServiceImpl.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/commoms/mongodb/src/main/resources/application-mongoDev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/commoms/mongodb/src/main/resources/application-mongoDev.yml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/web-server/src/main/resources/mapper/MessageMqttMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/mapper/MessageMqttMapper.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/cnstant/ParamSysConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/cnstant/ParamSysConstants.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/config/handler/GlobalExceptionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/config/handler/GlobalExceptionHandler.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/config/mqtt/MqttMessageCallback.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/config/mqtt/MqttMessageCallback.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/config/mqtt/MqttPublishMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/config/mqtt/MqttPublishMessage.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/controller/OrderSwapController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/controller/OrderSwapController.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/controller/TestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/controller/TestController.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/job/JobConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/job/JobConstant.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/job/job/CheckAlarmJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/job/job/CheckAlarmJob.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/job/service/ExecutionBatterySwapService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/job/service/ExecutionBatterySwapService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mapper/BatteryCompartmentMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mapper/BatteryCompartmentMapper.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageUtilService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MessageUtilService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MqttMessageHandleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MqttMessageHandleService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MqttPublishUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/mqtt/MqttPublishUtils.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/BatteryCompartmentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/BatteryCompartmentService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/OrderSwapService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/OrderSwapService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/ParamsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/ParamsService.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/BatteryCompartmentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/BatteryCompartmentServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/OrderReservationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/OrderReservationServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/OrderSwapServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/OrderSwapServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/ParamsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/service/impl/ParamsServiceImpl.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/AccessStrategyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/AccessStrategyUtil.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/ParamUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/ParamUtils.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/instruction/InstructionReadUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/instruction/InstructionReadUtils.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/CloudSendInfoUtils.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/RsaEcbPkcsFullUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/java/com/evotech/hd/webserver/utils/sendCloud/RsaEcbPkcsFullUtil.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/application-dev.yml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/application.yml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/resources/mapper/AccessStrategyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/mapper/AccessStrategyMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/resources/mapper/BatteryCompartmentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/mapper/BatteryCompartmentMapper.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/web-server/src/main/resources/mapper/ParamsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/web-server/src/main/resources/mapper/ParamsMapper.xml" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -148,8 +118,8 @@
|
|||||||
<recent name="D:\andy\ideaWorker\my\station-control\web-server\src\main\resources" />
|
<recent name="D:\andy\ideaWorker\my\station-control\web-server\src\main\resources" />
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyClassDialog.RECENTS_KEY">
|
<key name="CopyClassDialog.RECENTS_KEY">
|
||||||
<recent name="com.evotech.hd.webserver.mqtt.enums" />
|
|
||||||
<recent name="com.evotech.hd.core.dtos.system" />
|
<recent name="com.evotech.hd.core.dtos.system" />
|
||||||
|
<recent name="com.evotech.hd.webserver.mqtt.enums" />
|
||||||
<recent name="com.evotech.hd.webserver.mapper" />
|
<recent name="com.evotech.hd.webserver.mapper" />
|
||||||
<recent name="com.evotech.hd.webserver.service.impl" />
|
<recent name="com.evotech.hd.webserver.service.impl" />
|
||||||
<recent name="com.evotech.hd.webserver.service" />
|
<recent name="com.evotech.hd.webserver.service" />
|
||||||
@ -411,7 +381,7 @@
|
|||||||
<workItem from="1768809252266" duration="601000" />
|
<workItem from="1768809252266" duration="601000" />
|
||||||
<workItem from="1768955894610" duration="4133000" />
|
<workItem from="1768955894610" duration="4133000" />
|
||||||
<workItem from="1768987212149" duration="43024000" />
|
<workItem from="1768987212149" duration="43024000" />
|
||||||
<workItem from="1769503255745" duration="74993000" />
|
<workItem from="1769503255745" duration="89100000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@ -32,9 +32,13 @@ public class MessageMqttDTO extends BaseDTO<MessageMqttDTO> {
|
|||||||
@ApiModelProperty("传送方向")
|
@ApiModelProperty("传送方向")
|
||||||
private String direction;
|
private String direction;
|
||||||
|
|
||||||
|
@ApiModelProperty("通讯方式")
|
||||||
|
private String requestMethod;
|
||||||
|
|
||||||
@ApiModelProperty("消息ID")
|
@ApiModelProperty("消息ID")
|
||||||
private String messageId;
|
private String messageId;
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("qos")
|
@ApiModelProperty("qos")
|
||||||
private Integer qos;
|
private Integer qos;
|
||||||
|
|
||||||
|
|||||||
@ -18,6 +18,8 @@ public class MessageMqtt extends BaseEntity {
|
|||||||
|
|
||||||
private String direction;
|
private String direction;
|
||||||
|
|
||||||
|
private String requestMethod;
|
||||||
|
|
||||||
private String messageId;
|
private String messageId;
|
||||||
|
|
||||||
private Integer qos;
|
private Integer qos;
|
||||||
@ -34,10 +36,11 @@ public class MessageMqtt extends BaseEntity {
|
|||||||
public MessageMqtt() {
|
public MessageMqtt() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public MessageMqtt(String stationCode, String direction, String type, String messageFunction) {
|
public MessageMqtt(String stationCode, String direction, String type, String messageFunction, String requestMethod) {
|
||||||
this.stationCode = stationCode;
|
this.stationCode = stationCode;
|
||||||
this.direction = direction;
|
this.direction = direction;
|
||||||
this.type = type;
|
this.type = type;
|
||||||
this.messageFunction = messageFunction;
|
this.messageFunction = messageFunction;
|
||||||
|
this.requestMethod = requestMethod;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,43 @@
|
|||||||
|
package com.evotech.hd.webserver.controller;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.evotech.hd.core.dtos.RequestParams;
|
||||||
|
import com.evotech.hd.core.dtos.Result;
|
||||||
|
import com.evotech.hd.core.dtos.system.MessageMqttDTO;
|
||||||
|
import com.evotech.hd.webserver.logging.annotation.ApiLog;
|
||||||
|
import com.evotech.hd.webserver.service.MessageMqttService;
|
||||||
|
import com.evotech.hd.webserver.utils.query.QueryWrapperGenerator;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MqttLogController
|
||||||
|
*
|
||||||
|
* @author andy.shi
|
||||||
|
* @ClassName:MqttLogController
|
||||||
|
* @date: 2026年02月05日 16:44
|
||||||
|
* @remark: 开发人员联系方式 1042025947@qq.com/微信同步
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/mqtt/log")
|
||||||
|
@Api(tags = "MQTT日志管理")
|
||||||
|
public class MqttLogController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
MessageMqttService messageMqttService;
|
||||||
|
|
||||||
|
@ApiOperation("订单列表")
|
||||||
|
@PostMapping("/page/list")
|
||||||
|
@ApiLog(value = "订单列表")
|
||||||
|
public Result<IPage<MessageMqttDTO>> pageList(@RequestBody RequestParams<MessageMqttDTO> params) throws Exception {
|
||||||
|
QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition(params.getParams(), MessageMqttDTO.class);
|
||||||
|
return Result.getInstance().buildIPage(MessageMqttDTO.class).success(messageMqttService.findPageList(new Page<MessageMqttDTO>(params.getPage().getPage(), params.getPage().getPageSize()), queryWrapper));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -20,6 +20,8 @@ public class MessageTopic implements Serializable {
|
|||||||
|
|
||||||
private String messageType;
|
private String messageType;
|
||||||
|
|
||||||
|
private String requestMethod;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return businessType + "/" + stationCode + "/" + dataDirection + "/" + messageType;
|
return businessType + "/" + stationCode + "/" + dataDirection + "/" + messageType;
|
||||||
|
|||||||
@ -1,13 +1,19 @@
|
|||||||
package com.evotech.hd.webserver.service;
|
package com.evotech.hd.webserver.service;
|
||||||
|
|
||||||
import cn.hutool.json.JSONObject;
|
import cn.hutool.json.JSONObject;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.evotech.hd.core.dtos.Result;
|
import com.evotech.hd.core.dtos.Result;
|
||||||
|
import com.evotech.hd.core.dtos.system.MessageMqttDTO;
|
||||||
import com.evotech.hd.core.entity.system.MessageMqtt;
|
import com.evotech.hd.core.entity.system.MessageMqtt;
|
||||||
import com.evotech.hd.webserver.mqtt.MessageTopic;
|
import com.evotech.hd.webserver.mqtt.MessageTopic;
|
||||||
|
|
||||||
public interface MessageMqttService extends IService<MessageMqtt> {
|
public interface MessageMqttService extends IService<MessageMqtt> {
|
||||||
|
|
||||||
|
IPage<MessageMqttDTO> findPageList(Page<MessageMqttDTO> page, QueryWrapper queryWrapper);
|
||||||
|
|
||||||
public Result<Integer> addResultId(String stationCode);
|
public Result<Integer> addResultId(String stationCode);
|
||||||
|
|
||||||
public Result<MessageMqtt> update(Integer id, MessageTopic topic, String messageId, int qos, JSONObject jo);
|
public Result<MessageMqtt> update(Integer id, MessageTopic topic, String messageId, int qos, JSONObject jo);
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.evotech.hd.core.dtos.Result;
|
import com.evotech.hd.core.dtos.Result;
|
||||||
import com.evotech.hd.core.dtos.system.LogDTO;
|
import com.evotech.hd.core.dtos.system.LogDTO;
|
||||||
|
import com.evotech.hd.core.dtos.system.MessageMqttDTO;
|
||||||
import com.evotech.hd.core.entity.system.Log;
|
import com.evotech.hd.core.entity.system.Log;
|
||||||
import com.evotech.hd.core.entity.system.MessageMqtt;
|
import com.evotech.hd.core.entity.system.MessageMqtt;
|
||||||
import com.evotech.hd.webserver.mapper.LogMapper;
|
import com.evotech.hd.webserver.mapper.LogMapper;
|
||||||
@ -16,6 +17,7 @@ import com.evotech.hd.webserver.mqtt.MessageTopic;
|
|||||||
import com.evotech.hd.webserver.mqtt.MqttMessageHeader;
|
import com.evotech.hd.webserver.mqtt.MqttMessageHeader;
|
||||||
import com.evotech.hd.webserver.service.LogService;
|
import com.evotech.hd.webserver.service.LogService;
|
||||||
import com.evotech.hd.webserver.service.MessageMqttService;
|
import com.evotech.hd.webserver.service.MessageMqttService;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -29,6 +31,12 @@ import org.springframework.stereotype.Service;
|
|||||||
@Service
|
@Service
|
||||||
public class MessageMqttServiceImpl extends ServiceImpl<MessageMqttMapper, MessageMqtt> implements MessageMqttService {
|
public class MessageMqttServiceImpl extends ServiceImpl<MessageMqttMapper, MessageMqtt> implements MessageMqttService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IPage<MessageMqttDTO> findPageList(Page<MessageMqttDTO> page, QueryWrapper queryWrapper) {
|
||||||
|
queryWrapper.orderByDesc("a.create_time");// 根据预约日期和预约时间段倒序排序
|
||||||
|
return getBaseMapper().findPage(page, queryWrapper);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Result<Integer> addResultId(String stationCode) {
|
public Result<Integer> addResultId(String stationCode) {
|
||||||
MessageMqtt messageMqtt = new MessageMqtt();
|
MessageMqtt messageMqtt = new MessageMqtt();
|
||||||
@ -54,8 +62,8 @@ public class MessageMqttServiceImpl extends ServiceImpl<MessageMqttMapper, Messa
|
|||||||
mm.setMessageId(messageId);
|
mm.setMessageId(messageId);
|
||||||
mm.setQos(qos);
|
mm.setQos(qos);
|
||||||
mm.setStationCode(topic.getStationCode());
|
mm.setStationCode(topic.getStationCode());
|
||||||
mm.setTopic(topic.toString());
|
mm.setRequestMethod(StringUtils.isEmpty(topic.getRequestMethod()) ? "MQTT" : topic.getRequestMethod());
|
||||||
mm.setType(topic.getMessageType());
|
|
||||||
if(saveOrUpdate(mm)){
|
if(saveOrUpdate(mm)){
|
||||||
return Result.getInstance().build(MessageMqtt.class).success(mm);
|
return Result.getInstance().build(MessageMqtt.class).success(mm);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.evotech.hd.webserver.mapper.MessageMqttMapper">
|
<mapper namespace="com.evotech.hd.webserver.mapper.MessageMqttMapper">
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
a.station_code,a.direction, a.message_id,a.qos,a.type,a.message_function,a.topic,a.content,
|
a.station_code,a.direction, a.message_id,a.qos,a.type,a.message_function,a.topic,a.content,request_method,
|
||||||
<include refid="com.evotech.hd.webserver.mapper.BasicMapper.Base_Column"/>
|
<include refid="com.evotech.hd.webserver.mapper.BasicMapper.Base_Column"/>
|
||||||
</sql>
|
</sql>
|
||||||
<!-- 通用查询结果列 -->
|
<!-- 通用查询结果列 -->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user