From d4212be4f036c5972e192a93e9a7f3a2e3bb2535 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 28 九月 2024 15:26:39 +0800
Subject: [PATCH] 加入logback配置

---
 collect/src/main/java/com/qianwen/mdc/collect/controller/MqttController.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/collect/src/main/java/com/qianwen/mdc/collect/controller/MqttController.java b/collect/src/main/java/com/qianwen/mdc/collect/controller/MqttController.java
index 31b7bf5..9427915 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/controller/MqttController.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/controller/MqttController.java
@@ -36,29 +36,27 @@
         return "Message sent to topic " + topic;
     }
     
-    @GetMapping("/create")
-    public String create(@RequestParam String topic, @RequestParam String message) {
-    	try {
-			iotdbCfg.getSessionPool().createTimeseries("root.f2.myt1", TSDataType.UNKNOWN, null, null);
-		} catch (IoTDBConnectionException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (StatementExecutionException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        return "Message sent to topic " + topic;
-    }
+    
     @GetMapping("/rec2")
     public void testRec2() {
     	//鏁版嵁鏍煎紡锛歿"174":[{"values":{"d1":12},"ts":"1721978780449"}]} 174鏄簲鐢╥d
     	//澶氭潯鏍煎紡锛歿"174":[{"values":{"DeviceStatus":2},"ts":"1722478128278"},{"values":{"spindleSpeed":22},"ts":"1722478128281"}]}
-    	String payload = "{\"174\":[{\"values\":{\"DeviceStatus\":2,\"Output\":34},\"ts\":\"1725247557768\"}]}";
+    	String payload = "{\"174\":[{\"values\":{\"DeviceStatus\":2,\"Output\":38},\"ts\":\"1725247557768\"}]}";
     	//payload = "{\"174\":[{\"values\":{\"Output\":11},\"ts\":\"1722478128278\"},{\"values\":{\"SpindleSpeed\":22},\"ts\":\"1722478128281\"}]}";
     	recService.handle(payload);
     }
     
     
+    @GetMapping("/recalarm")
+    public void testAlarm() {
+    	//鏁版嵁鏍煎紡锛歿"174":[{"values":{"d1":12},"ts":"1721978780449"}]} 174鏄簲鐢╥d
+    	//澶氭潯鏍煎紡锛歿"174":[{"values":{"DeviceStatus":2},"ts":"1722478128278"},{"values":{"spindleSpeed":22},"ts":"1722478128281"}]}
+    	
+    	String payload = "{\"174\":[{\"values\":{\"Alarm\":\"鍛婅淇℃伅1\"},\"ts\":\""+System.currentTimeMillis()+"\"}]}";
+    	//payload = "{\"174\":[{\"values\":{\"Output\":11},\"ts\":\"1722478128278\"},{\"values\":{\"SpindleSpeed\":22},\"ts\":\"1722478128281\"}]}";
+    	recService.handle(payload);
+    }
+    
     @GetMapping("/tpl")
     public Object tpl(String tplname) throws StatementExecutionException, IoTDBConnectionException {
     	boolean b = iotdbCfg.getSessionPool().checkTimeseriesExists("root.f2.output_22005.*");

--
Gitblit v1.9.3