src/main/java/com/comtika/safe/service/mobile/impl/MobileServiceImpl.java

@@ -127,7 +127,7 @@ public class MobileServiceImpl implements IMobileService {
             Map<String,Object> arg1 = new HashMap<>();
             arg1.put("totalEle",i);
             arg1.put("serialNo",ch.getName());
-            arg1.put("socketId",ch.getId());
+            // arg1.put("socketId",ch.getId());
             siteTotal.add(arg1);
         }
         condition.put("allTotalEle",totalEle);

src/main/resources/sql/mobile.md

@@ -69,7 +69,7 @@ where 1=1
 @if(!isEmpty(terminalId)){
     and t.terminal_id = #terminalId#
 @}
-GROUP BY t.id
+GROUP BY t.serial_no
 
 findTerminalDataTotal
 ===