Merge branch 'PSM-13' into qingpu

徐烜
2 parents b140cd04 11f520fd
Showing 2 changed files with 87 additions and 4 deletions
README.md
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
@@ -300,6 +300,91 @@
 | data.operCode | short | 二级协议 |
 | data.requestAck | short | 请求应答字 0x06同意 0x15不同意|
  
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0xa3,
+        "deviceId":12345,
+        "ipAddress":222.66.0.204,
+        "port":8899,
+        "reportMode":0,
+        "interval":0,
+        "distance":0,
+        "speedingThreshold":0,
+        "alarmThreshold":0,
+        "posIpAddress":0,
+        "posPort":0,
+        "delay":0,
+        "speedThreshold1":0,
+        "speedThreshold2":0,
+        "contrast":0,
+        "brightness":0,
+        "saturation":0
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+| data.deviceId | string | 设备编号|
+| data.ipAddress | string | 网关IP地址|
+| data.port | string | 网关端口|
+| data.reportMode | short | 定时定距上报模式|
+| data.interval | int | 定时上报时间间隔|
+| data.distance | string | 定距上报距离间隔|
+| data.speedingThreshold | short | 非线路状态超速阀门|
+| data.alarmThreshold | short | 预警阀门|
+| data.posIpAddress | string | pos机IP地址|
+| data.posPort | string | pos机端口|
+| data.delay | int | 延迟机关时间|
+| data.deviceId | short | 中门视频切换到码表界面速度阀门 默认45|
+| data.deviceId | short | 码表界面切换到中门视频速度阀门 默认35|
+| data.deviceId | short | 对比度|
+| data.deviceId | short | 亮度|
+| data.deviceId | short | 饱和度|
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0xa4
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+
+```json
+{
+    "deviceId":12345,
+    "timestamp":44324,
+    "operCode":0xC0,
+    "data":{
+        "operCode":0xa5
+        "programVersion":2
+    }
+}
+```
+| .. | .. | .. |
+| ---- | ---- | ---- |
+| deviceId | string | 设备编号 |
+| timestamp | long | 时间戳(ms) |
+| operCode | short | 一级协议 |
+| data.operCode | short | 二级协议 |
+| data.programVersion | short | 程序版本 |
+
 <span style="color: red">Response</span>:
 ```json
 {
@@ -307,7 +392,6 @@
 }
 ```
  
-
 ### 调度消息上传接口
 ----------
 上行POST地址：[http://192.168.168.120:9088/control/upstream](http://192.168.168.120:9088/control/upstream)
@@ -24,8 +24,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
 	List<SchedulePlanInfo> findByDate(Date date);
  
     Long deleteByXlAndScheduleDateGreaterThanEqualAndScheduleDateLessThanEqual(Integer xlid, Date startDate, Date endDate);
-
-
+    
     @Query(value = " select " +
             "xl as xlId, " +
             "xl_name as xlName, " +
@@ -45,7 +44,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "where bc_type = 'out' and " +
             "xl = ?1 and " +
             "schedule_date = ?2 " +
-            "group by xl_name, schedule_date, lp_name " +
+            "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
             "order by xl_name, schedule_date, lp ", nativeQuery = true)
     List<Object[]> findGroupInfo(Integer xlid, Date scheduleDate);