From 63380d7d3739c1e1094570986d7ca5db7946f9fb Mon Sep 17 00:00:00 2001 From: tianyuan <2861334240@qq.com> Date: Sat, 18 Oct 2025 00:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BC=A0=E8=BE=93=E9=83=A8?= =?UTF-8?q?=E5=88=86=E8=8D=89=E7=A8=BF1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manage-web/MonitorController.java | 43 +++++++++++ src/manage-web/WebMqttConfig.java | 42 +++++++++++ src/manage-web/WebMqttSubscriber.java | 54 ++++++++++++++ src/mqtt-server/DataForwarder.java | 86 ++++++++++++++++++++++ src/mqtt-server/MqttConfig.java | 53 +++++++++++++ src/mqtt-server/MqttSubscriber.java | 73 ++++++++++++++++++ src/repair-app/ RepairMqttSubscriber.java | 62 ++++++++++++++++ src/repair-app/RepairMqttConfig.java | 43 +++++++++++ src/repair-app/WorkOrderController.java | 53 +++++++++++++ src/student-app/ StudentMqttConfig.java | 39 ++++++++++ src/student-app/DrinkController.java | 49 ++++++++++++ src/student-app/StudentMqttSubscriber.java | 45 +++++++++++ 12 files changed, 642 insertions(+) create mode 100644 src/manage-web/MonitorController.java create mode 100644 src/manage-web/WebMqttConfig.java create mode 100644 src/manage-web/WebMqttSubscriber.java create mode 100644 src/mqtt-server/DataForwarder.java create mode 100644 src/mqtt-server/MqttConfig.java create mode 100644 src/mqtt-server/MqttSubscriber.java create mode 100644 src/repair-app/ RepairMqttSubscriber.java create mode 100644 src/repair-app/RepairMqttConfig.java create mode 100644 src/repair-app/WorkOrderController.java create mode 100644 src/student-app/ StudentMqttConfig.java create mode 100644 src/student-app/DrinkController.java create mode 100644 src/student-app/StudentMqttSubscriber.java diff --git a/src/manage-web/MonitorController.java b/src/manage-web/MonitorController.java new file mode 100644 index 0000000..441d1f5 --- /dev/null +++ b/src/manage-web/MonitorController.java @@ -0,0 +1,43 @@ +package com.campus.water.web.controller; + +import com.campus.water.web.entity.SensorDataWebVO; +import com.campus.water.web.service.RealTimeService; +import com.campus.water.web.service.HistoryDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 监控数据接口（供Web前端Vue调用，适配管理员“监控设备数据”需求） + */ +@RestController +@RequestMapping("/api/admin/monitor") +public class MonitorController { + @Autowired + private RealTimeService realTimeService; + @Autowired + private HistoryDataService historyDataService; + + // 1. 获取单设备实时数据（适配前端设备详情页） + @GetMapping("/realTime/{deviceId}") + public SensorDataWebVO getRealTimeData(@PathVariable String deviceId) { + return realTimeService.getRealTimeData(deviceId); + } + + // 2. 获取全量设备实时状态（适配前端监控总览页） + @GetMapping("/realTime/all") + public List getAllRealTimeData() { + return realTimeService.getAllRealTimeData(); + } + + // 3. 获取设备历史数据（适配前端历史曲线，需求中“查看历史水质”） + @GetMapping("/history/{deviceId}") + public List getHistoryData( + @PathVariable String deviceId, + @RequestParam String startTime, // 开始时间（如2024-05-20 00:00:00） + @RequestParam String endTime // 结束时间 + ) { + return historyDataService.getHistoryData(deviceId, startTime, endTime); + } +} \ No newline at end of file diff --git a/src/manage-web/WebMqttConfig.java b/src/manage-web/WebMqttConfig.java new file mode 100644 index 0000000..404c953 --- /dev/null +++ b/src/manage-web/WebMqttConfig.java @@ -0,0 +1,42 @@ +package com.campus.water.web.config; + +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 管理Web端MQTT配置（订阅MQTT服务器转发的全量数据，适配管理员监控需求） + */ +@Configuration +public class WebMqttConfig { + // MQTT服务器转发的主题前缀（需求中全量设备数据/告警） + private String mqttBroker = "tcp://mqtt-server.campus.com:1883"; + private String clientId = "campus-water-admin-web"; // Web端客户端ID + + @Bean + public MqttClient mqttClient() throws Exception { + MqttClient client = new MqttClient(mqttBroker, clientId, new MemoryPersistence()); + MqttConnectOptions options = new MqttConnectOptions(); + options.setCleanSession(false); + options.setKeepAliveInterval(60); + client.connect(options); + System.out.println("管理Web已连接MQTT服务器：" + mqttBroker); + return client; + } + + // 订阅的主题（全量设备数据+全量告警，适配管理员权限） + @Bean + public String[] subscribeTopics() { + return new String[]{ + "forward/web/device/#", // 全量设备实时数据 + "forward/web/alert/#" // 全量告警报文 + }; + } + + @Bean + public int[] qosLevels() { + return new int[]{0, 1}; // 告警QoS=1，设备数据QoS=0 + } +} \ No newline at end of file diff --git a/src/manage-web/WebMqttSubscriber.java b/src/manage-web/WebMqttSubscriber.java new file mode 100644 index 0000000..3881249 --- /dev/null +++ b/src/manage-web/WebMqttSubscriber.java @@ -0,0 +1,54 @@ +package com.campus.water.web.mqtt; + +import com.alibaba.fastjson2.JSONObject; +import com.campus.water.web.entity.SensorDataWebVO; +import com.campus.water.web.entity.AlertWebVO; +import com.campus.water.web.service.RealTimeService; +import org.eclipse.paho.client.mqttv3.IMqttMessageListener; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * 管理Web端MQTT订阅器（接收实时设备数据/告警，适配管理员监控需求） + */ +@Component +public class WebMqttSubscriber { + @Autowired + private MqttClient mqttClient; + @Autowired + private String[] subscribeTopics; + @Autowired + private int[] qosLevels; + @Autowired + private RealTimeService realTimeService; + + @PostConstruct + public void startSubscribe() throws Exception { + for (int i = 0; i < subscribeTopics.length; i++) { + String topic = subscribeTopics[i]; + int qos = qosLevels[i]; + mqttClient.subscribe(topic, qos, messageListener()); + System.out.println("管理Web已订阅主题：" + topic); + } + } + + private IMqttMessageListener messageListener() { + return (topic, message) -> { + String payload = new String(message.getPayload()); + System.out.println("管理Web接收数据：主题=" + topic + "，内容=" + payload); + + // 解析数据并缓存到内存（供前端轮询获取实时数据） + if (topic.startsWith("forward/web/device/")) { + SensorDataWebVO sensorVO = JSONObject.parseObject(payload, SensorDataWebVO.class); + realTimeService.updateRealTimeData(sensorVO); // 缓存实时数据 + } else if (topic.startsWith("forward/web/alert/")) { + AlertWebVO alertVO = JSONObject.parseObject(payload, AlertWebVO.class); + realTimeService.addAlert(alertVO); // 缓存告警（前端告警列表实时更新） + } + }; + } +} \ No newline at end of file diff --git a/src/mqtt-server/DataForwarder.java b/src/mqtt-server/DataForwarder.java new file mode 100644 index 0000000..bbd4dcf --- /dev/null +++ b/src/mqtt-server/DataForwarder.java @@ -0,0 +1,86 @@ +package com.campus.water.mqtt.core; + +import com.alibaba.fastjson2.JSONObject; +import com.campus.water.mqtt.entity.SensorData; +import com.campus.water.mqtt.entity.AlertMessage; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 数据转发器（按需求转发到管理Web/学生APP/维修APP，实现多端数据同步） + */ +@Component +public class DataForwarder { + @Autowired + private MqttClient mqttClient; + + // 1. 转发传感器数据到管理Web（全量数据，适配管理员监控需求） + public void forwardToWeb(SensorData sensorData) throws Exception { + String topic = "forward/web/device/" + sensorData.getDeviceId(); + String payload = JSONObject.toJSONString(sensorData); + publish(topic, payload, 0); // Web端QoS=0（普通监控数据） + } + + // 2. 转发告警到管理Web（适配管理员查看告警需求） + public void forwardToWeb(AlertMessage alert) throws Exception { + String topic = "forward/web/alert/" + alert.getDeviceId(); + String payload = JSONObject.toJSONString(alert); + publish(topic, payload, 1); // 告警QoS=1（确保管理员看到） + } + + // 3. 转发制水机水质数据到学生APP（仅终端机关联的制水机，适配查水质需求） + public void forwardToStudentApp(SensorData sensorData) throws Exception { + // 仅制水机数据需转发（学生APP查水质） + if (sensorData.getDeviceType() != 1) return; + + // 按终端机ID转发（需求中学生扫码查对应终端机的水质） + String terminalId = getRelatedTerminalId(sensorData.getDeviceId()); + String topic = "forward/student/terminal/" + terminalId; + String payload = JSONObject.toJSONString(new JSONObject() {{ + put("terminalId", terminalId); + put("tdsValue", sensorData.getTdsValue()); + put("waterQuality", getWaterQuality(sensorData.getTdsValue())); // 水质等级 + put("timestamp", sensorData.getTimestamp()); + }}); + publish(topic, payload, 0); + } + + // 4. 转发供水机水位/告警到维修APP（仅本辖区设备，适配维修员权限需求） + public void forwardToRepairApp(SensorData sensorData) throws Exception { + String areaId = sensorData.getAreaId(); // 设备所属片区（如AREA01） + String topic = "forward/repair/area/" + areaId + "/device/" + sensorData.getDeviceId(); + String payload = JSONObject.toJSONString(sensorData); + publish(topic, payload, 0); + } + + public void forwardToRepairApp(AlertMessage alert) throws Exception { + String areaId = alert.getAreaId(); + String topic = "forward/repair/area/" + areaId + "/alert/" + alert.getDeviceId(); + String payload = JSONObject.toJSONString(alert); + publish(topic, payload, 1); // 告警QoS=1（确保维修员抢单） + } + + // 通用发布方法 + private void publish(String topic, String payload, int qos) throws Exception { + MqttMessage message = new MqttMessage(payload.getBytes()); + message.setQos(qos); + mqttClient.publish(topic, message); + System.out.println("MQTT服务器转发数据：主题=" + topic + "，内容=" + payload); + } + + // 工具方法：根据制水机ID获取关联的终端机ID（需求中终端机关联制水机） + private String getRelatedTerminalId(String deviceId) { + // 实际需从MySQL设备表查询，此处模拟（如制水机WM001关联终端机TERM001/TERM002） + return deviceId.equals("WM001") ? "TERM001" : "TERM002"; + } + + // 工具方法：根据TDS值判断水质等级（需求中“优质矿化水”标准） + private String getWaterQuality(double tds) { + if (tds < 50) return "纯净水（无矿物质）"; + else if (tds < 300) return "优质矿化水"; + else if (tds < 600) return "合格矿化水"; + else return "水质超标（不建议饮用）"; + } +} \ No newline at end of file diff --git a/src/mqtt-server/MqttConfig.java b/src/mqtt-server/MqttConfig.java new file mode 100644 index 0000000..0f060f6 --- /dev/null +++ b/src/mqtt-server/MqttConfig.java @@ -0,0 +1,53 @@ +package com.campus.water.mqtt.config; + +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Properties; + +/** + * MQTT服务器配置（适配需求中Air724模块数据上传，对接MQTT Broker） + */ +@Configuration +public class MqttConfig { + // 从配置文件读取Broker地址（需求中云端Broker，如EMQX） + private String brokerUrl = "tcp://mqtt-server.campus.com:1883"; + private String clientId = "campus-water-mqtt-server"; // 服务器端客户端ID + private int keepAlive = 60; // 心跳间隔（秒），适配Air724模块低功耗 + + @Bean + public MqttClient mqttClient() throws Exception { + // 1. 创建MQTT客户端（内存持久化，避免服务器存储压力） + MqttClient client = new MqttClient(brokerUrl, clientId, new MemoryPersistence()); + + // 2. 配置连接参数（确保数据可靠传输，适配需求中告警不丢失） + MqttConnectOptions options = new MqttConnectOptions(); + options.setCleanSession(false); // 保持会话，重连后恢复订阅 + options.setKeepAliveInterval(keepAlive); + options.setAutomaticReconnect(true); // 自动重连，适配网络波动 + + // 3. 连接Broker + client.connect(options); + System.out.println("MQTT服务器已连接Broker：" + brokerUrl); + return client; + } + + // 订阅的主题（严格按需求中设备类型划分，便于权限隔离） + @Bean + public String[] subscribeTopics() { + return new String[]{ + "sensor/watermaker/#", // 制水机传感器数据（TDS/水压/流量，需求图3） + "sensor/watersupply/#", // 供水机传感器数据（水位/漏水，需求图3） + "alert/#" // 设备告警报文（滤芯损坏/水位异常，需求告警流程） + }; + } + + // QoS配置（需求中告警用QoS=1确保送达，普通传感器数据QoS=0） + @Bean + public int[] qosLevels() { + return new int[]{0, 0, 1}; // 告警QoS=1，传感器数据QoS=0 + } +} \ No newline at end of file diff --git a/src/mqtt-server/MqttSubscriber.java b/src/mqtt-server/MqttSubscriber.java new file mode 100644 index 0000000..beeb56b --- /dev/null +++ b/src/mqtt-server/MqttSubscriber.java @@ -0,0 +1,73 @@ +package com.campus.water.mqtt.core; + +import com.campus.water.mqtt.service.AlertTriggerService; +import com.campus.water.mqtt.service.SensorDataStorage; +import org.eclipse.paho.client.mqttv3.IMqttMessageListener; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * MQTT数据订阅器（接收制水机/供水机数据，对应需求中“云端接收设备数据”） + */ +@Component +public class MqttSubscriber { + @Autowired + private MqttClient mqttClient; + @Autowired + private String[] subscribeTopics; + @Autowired + private int[] qosLevels; + @Autowired + private DataParser dataParser; + @Autowired + private DataForwarder dataForwarder; + @Autowired + private SensorDataStorage sensorDataStorage; + @Autowired + private AlertTriggerService alertTriggerService; + + // 初始化订阅（项目启动后自动执行） + @PostConstruct + public void startSubscribe() throws Exception { + // 为每个主题绑定消息监听器 + for (int i = 0; i < subscribeTopics.length; i++) { + String topic = subscribeTopics[i]; + int qos = qosLevels[i]; + mqttClient.subscribe(topic, qos, messageListener()); + System.out.println("MQTT服务器已订阅主题：" + topic + "（QoS=" + qos + "）"); + } + } + + // 消息监听器（接收数据后解析→存储→转发） + private IMqttMessageListener messageListener() { + return (topic, message) -> { + String payload = new String(message.getPayload()); + System.out.println("MQTT服务器接收数据：主题=" + topic + "，内容=" + payload); + + // 按主题类型处理（严格对齐需求中设备数据类型） + if (topic.startsWith("sensor/watermaker/")) { + // 1. 处理制水机传感器数据（TDS/水压/流量） + var sensorData = dataParser.parseWaterMakerData(topic, payload); + sensorDataStorage.saveToInfluxDB(sensorData); // 存入时序库 + dataForwarder.forwardToWeb(sensorData); // 转发到管理Web + dataForwarder.forwardToStudentApp(sensorData); // 转发到学生APP（水质数据） + } else if (topic.startsWith("sensor/watersupply/")) { + // 2. 处理供水机传感器数据（水位） + var sensorData = dataParser.parseWaterSupplyData(topic, payload); + sensorDataStorage.saveToInfluxDB(sensorData); // 存入时序库 + dataForwarder.forwardToWeb(sensorData); // 转发到管理Web + dataForwarder.forwardToRepairApp(sensorData); // 转发到维修APP（辖区水位） + } else if (topic.startsWith("alert/")) { + // 3. 处理告警报文（触发工单） + var alert = dataParser.parseAlertMessage(topic, payload); + alertTriggerService.createWorkOrder(alert); // 生成工单（存入MySQL） + dataForwarder.forwardToWeb(alert); // 转发到管理Web（告警列表） + dataForwarder.forwardToRepairApp(alert); // 转发到维修APP（抢单） + } + }; + } +} \ No newline at end of file diff --git a/src/repair-app/ RepairMqttSubscriber.java b/src/repair-app/ RepairMqttSubscriber.java new file mode 100644 index 0000000..fae45b3 --- /dev/null +++ b/src/repair-app/ RepairMqttSubscriber.java @@ -0,0 +1,62 @@ +package com.campus.water.repair.mqtt; + +import com.alibaba.fastjson2.JSONObject; +import com.campus.water.repair.config.RepairMqttConfig; +import com.campus.water.repair.entity.AreaDeviceVO; +import com.campus.water.repair.entity.RepairAlertVO; +import com.campus.water.repair.service.AreaDeviceService; +import com.campus.water.repair.service.WorkOrderService; +import org.eclipse.paho.client.mqttv3.IMqttMessageListener; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 维修APP端MQTT订阅器（仅接收本辖区设备数据/告警，适配“抢单/巡检”需求） + */ +@Component +public class RepairMqttSubscriber { + @Autowired + private RepairMqttConfig mqttConfig; + @Autowired + private AreaDeviceService areaDeviceService; + @Autowired + private WorkOrderService workOrderService; + + // 维修员登录后订阅本辖区数据（先查询维修员所属片区） + public void subscribeAreaData(String repairmanId, String areaId) throws Exception { + MqttClient client = mqttConfig.mqttClient(repairmanId); + + // 1. 订阅本辖区设备数据（供水机水位/制水机状态） + String deviceTopic = mqttConfig.getDeviceSubscribeTopic(areaId); + client.subscribe(deviceTopic, 0, deviceMessageListener(areaId)); + + // 2. 订阅本辖区告警报文（触发抢单） + String alertTopic = mqttConfig.getAlertSubscribeTopic(areaId); + client.subscribe(alertTopic, 1, alertMessageListener(areaId)); + + System.out.println("维修APP（ID：" + repairmanId + "）已订阅片区" + areaId + "数据"); + } + + // 设备数据监听器（缓存辖区设备状态，供巡检使用） + private IMqttMessageListener deviceMessageListener(String areaId) { + return (topic, message) -> { + String payload = new String(message.getPayload()); + AreaDeviceVO deviceVO = JSONObject.parseObject(payload, AreaDeviceVO.class); + areaDeviceService.updateAreaDeviceStatus(areaId, deviceVO); + System.out.println("维修APP接收片区" + areaId + "设备数据：" + payload); + }; + } + + // 告警监听器（新告警触发工单，推送抢单提醒） + private IMqttMessageListener alertMessageListener(String areaId) { + return (topic, message) -> { + String payload = new String(message.getPayload()); + RepairAlertVO alertVO = JSONObject.parseObject(payload, RepairAlertVO.class); + // 触发工单生成（存入MySQL）并推送抢单提醒 + workOrderService.createWorkOrderFromAlert(alertVO); + System.out.println("维修APP接收片区" + areaId + "告警：" + payload + "（已生成工单）"); + }; + } +} \ No newline at end of file diff --git a/src/repair-app/RepairMqttConfig.java b/src/repair-app/RepairMqttConfig.java new file mode 100644 index 0000000..fb67d32 --- /dev/null +++ b/src/repair-app/RepairMqttConfig.java @@ -0,0 +1,43 @@ +package com.campus.water.repair.config; + +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 维修APP端MQTT配置（仅订阅本辖区设备数据/告警，适配维修员权限需求） + */ +@Configuration +public class RepairMqttConfig { + private String mqttBroker = "tcp://mqtt-server.campus.com:1883"; + private String clientIdPrefix = "campus-water-repair-"; // 客户端ID前缀（拼接维修员ID） + + // 动态生成客户端ID（按维修员ID区分） + @Bean + public String clientId(String repairmanId) { + return clientIdPrefix + repairmanId; + } + + @Bean + public MqttClient mqttClient(String repairmanId) throws Exception { + String clientId = clientId(repairmanId); + MqttClient client = new MqttClient(mqttBroker, clientId, new MemoryPersistence()); + MqttConnectOptions options = new MqttConnectOptions(); + options.setCleanSession(false); // 重连后恢复订阅，避免错过工单 + options.setKeepAliveInterval(60); + client.connect(options); + System.out.println("维修APP（ID：" + repairmanId + "）已连接MQTT服务器"); + return client; + } + + // 订阅主题（仅本辖区设备数据+告警，适配“维修员仅查看本辖区”需求） + public String getDeviceSubscribeTopic(String areaId) { + return "forward/repair/area/" + areaId + "/device/#"; + } + + public String getAlertSubscribeTopic(String areaId) { + return "forward/repair/area/" + areaId + "/alert/#"; + } +} \ No newline at end of file diff --git a/src/repair-app/WorkOrderController.java b/src/repair-app/WorkOrderController.java new file mode 100644 index 0000000..69d31d6 --- /dev/null +++ b/src/repair-app/WorkOrderController.java @@ -0,0 +1,53 @@ +package com.campus.water.repair.controller; + +import com.campus.water.repair.entity.WorkOrderVO; +import com.campus.water.repair.service.WorkOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 工单接口（供维修APP前端调用，适配“抢单/处理工单、跟踪状态”需求） + */ +@RestController +@RequestMapping("/api/repair/workOrder") +public class WorkOrderController { + @Autowired + private WorkOrderService workOrderService; + + // 1. 获取本辖区待抢单工单（需求“抢单”功能） + @GetMapping("/pending/{repairmanId}") + public List getPendingWorkOrder(@PathVariable String repairmanId) { + String areaId = workOrderService.getRepairmanArea(repairmanId); // 获取维修员所属片区 + return workOrderService.getPendingWorkOrderByArea(areaId); + } + + // 2. 抢单（需求核心功能，需校验辖区权限） + @PostMapping("/grab") + public String grabWorkOrder( + @RequestParam String repairmanId, + @RequestParam String orderId + ) { + return workOrderService.grabWorkOrder(repairmanId, orderId) ? + "抢单成功，请及时处理" : "工单已被抢，或您无权限抢此工单"; + } + + // 3. 提交工单处理结果（需求“处理工单并提交”功能） + @PostMapping("/complete") + public String completeWorkOrder( + @RequestParam String orderId, + @RequestParam String repairmanId, + @RequestParam String dealNote, // 处理备注（如“已更换滤芯”） + @RequestParam String imgUrl // 现场照片URL（可选） + ) { + workOrderService.completeWorkOrder(orderId, repairmanId, dealNote, imgUrl); + return "工单处理完成，已提交审核"; + } + + // 4. 查看个人处理中的工单（需求“跟踪工单状态”功能） + @GetMapping("/processing/{repairmanId}") + public List getProcessingWorkOrder(@PathVariable String repairmanId) { + return workOrderService.getProcessingWorkOrderByRepairman(repairmanId); + } +} \ No newline at end of file diff --git a/src/student-app/ StudentMqttConfig.java b/src/student-app/ StudentMqttConfig.java new file mode 100644 index 0000000..72d5b88 --- /dev/null +++ b/src/student-app/ StudentMqttConfig.java @@ -0,0 +1,39 @@ +package com.campus.water.student.config; + +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 学生APP端MQTT配置（仅订阅终端机水质数据，适配学生权限需求） + */ +@Configuration +public class StudentMqttConfig { + private String mqttBroker = "tcp://mqtt-server.campus.com:1883"; + private String clientIdPrefix = "campus-water-student-"; // 客户端ID前缀（拼接学生ID） + + // 动态生成客户端ID（按学生ID区分，避免冲突） + @Bean + public String clientId(String studentId) { + return clientIdPrefix + studentId; + } + + @Bean + public MqttClient mqttClient(String studentId) throws Exception { + String clientId = clientId(studentId); + MqttClient client = new MqttClient(mqttBroker, clientId, new MemoryPersistence()); + MqttConnectOptions options = new MqttConnectOptions(); + options.setCleanSession(true); // 学生APP登录后重新订阅，无需保留会话 + options.setKeepAliveInterval(120); // 移动端心跳间隔 longer，适配电池续航 + client.connect(options); + System.out.println("学生APP（ID：" + studentId + "）已连接MQTT服务器"); + return client; + } + + // 订阅主题（仅终端机水质数据，适配学生“扫码查水质”需求） + public String getSubscribeTopic(String terminalId) { + return "forward/student/terminal/" + terminalId; + } +} \ No newline at end of file diff --git a/src/student-app/DrinkController.java b/src/student-app/DrinkController.java new file mode 100644 index 0000000..64708e8 --- /dev/null +++ b/src/student-app/DrinkController.java @@ -0,0 +1,49 @@ +package com.campus.water.student.controller; + +import com.campus.water.student.entity.DrinkRecordVO; +import com.campus.water.student.service.DrinkRecordService; +import com.campus.water.student.service.WaterQualityService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 饮水接口（供学生APP前端调用，适配“扫码用水、查看饮水量”需求） + */ +@RestController +@RequestMapping("/api/student/drink") +public class DrinkController { + @Autowired + private DrinkRecordService drinkRecordService; + @Autowired + private WaterQualityService waterQualityService; + + // 1. 扫码用水（生成饮水记录，需求核心功能） + @PostMapping("/scan") + public String scanDrink( + @RequestParam String studentId, + @RequestParam String terminalId, + @RequestParam double volume // 饮水量（终端机流量传感器获取或按时间估算） + ) { + // 获取当前终端机水质（用于记录） + String waterQuality = waterQualityService.getWaterQuality(terminalId); + // 生成饮水记录（存入MySQL） + drinkRecordService.createDrinkRecord(studentId, terminalId, volume, waterQuality); + return "扫码用水成功，饮水量：" + volume + "L，水质：" + waterQuality; + } + + // 2. 查询今日饮水量（需求“查看每日饮水量”功能） + @GetMapping("/today/{studentId}") + public DrinkRecordVO getTodayDrink(@PathVariable String studentId) { + return drinkRecordService.getTodayDrinkRecord(studentId); + } + + // 3. 查询历史饮水量（按日/周/月筛选） + @GetMapping("/history/{studentId}") + public List getHistoryDrink( + @PathVariable String studentId, + @RequestParam String type, // type: day/week/month + @RequestParam String date // 日期（如2024-05-20） + ) { + return drinkRecordService.getHistoryDrinkRecord(studentId, type, date); + } +} \ No newline at end of file diff --git a/src/student-app/StudentMqttSubscriber.java b/src/student-app/StudentMqttSubscriber.java new file mode 100644 index 0000000..943a6c3 --- /dev/null +++ b/src/student-app/StudentMqttSubscriber.java @@ -0,0 +1,45 @@ +package com.campus.water.student.mqtt; + +import com.alibaba.fastjson2.JSONObject; +import com.campus.water.student.config.StudentMqttConfig; +import com.campus.water.student.entity.WaterQualityVO; +import com.campus.water.student.service.WaterQualityService; +import org.eclipse.paho.client.mqttv3.IMqttMessageListener; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 学生APP端MQTT订阅器（仅接收终端机水质数据，适配“扫码查水质”需求） + */ +@Component +public class StudentMqttSubscriber { + @Autowired + private StudentMqttConfig mqttConfig; + @Autowired + private WaterQualityService waterQualityService; + + // 学生扫码后订阅对应终端机的水质数据 + public void subscribeTerminalWaterQuality(String studentId, String terminalId) throws Exception { + // 1. 创建MQTT客户端（按学生ID区分） + MqttClient client = mqttConfig.mqttClient(studentId); + + // 2. 订阅该终端机的水质主题 + String topic = mqttConfig.getSubscribeTopic(terminalId); + client.subscribe(topic, 0, messageListener(terminalId)); + System.out.println("学生APP（ID：" + studentId + "）已订阅终端机" + terminalId + "水质数据"); + } + + // 消息监听器（缓存水质数据，供APP前端展示） + private IMqttMessageListener messageListener(String terminalId) { + return (topic, message) -> { + String payload = new String(message.getPayload()); + System.out.println("学生APP接收终端机" + terminalId + "水质数据：" + payload); + + // 解析水质数据并缓存 + WaterQualityVO qualityVO = JSONObject.parseObject(payload, WaterQualityVO.class); + waterQualityService.updateWaterQuality(terminalId, qualityVO); + }; + } +} \ No newline at end of file -- 2.34.1