Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/IIotQxzCommService.java

@@ -238,16 +238,15 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         pushMapStr.put("$toString", roundMap);
 
         Map<String, Object> dateMap = new HashMap<>();
-        dateMap.put("$dateSubtract", new HashMap<String, Object>(){{
-            put("startDate", "$_id.time");
-            put("unit", "hour");
-            put("amount", 0);
+        dateMap.put("$dateToString", new HashMap<String, Object>(){{
+            put("date", "$_id.time");
+            put("format", "%Y-%m-%d %H:%M:%S");
+            put("timezone", "Asia/Shanghai");
         }});
 
         Map<String, Object> pushMap = new HashMap<>();
         pushMap.put("number", pushMapStr);
-        pushMap.put("time", "$_id.time");
-//        pushMap.put("time", dateMap);
+        pushMap.put("time", dateMap);
 
         GroupOperation groupOperation4 = Aggregation.group("_id.eName", "_id.eNum", "_id.eKey")
                 .push(pushMap).as("dataList");