Commit a854df3c authored by 高飞's avatar 高飞

更改测试数据

parent cc72ef86
......@@ -533,7 +533,7 @@ public class TraffController {
public void test() {
String manualStatus=traffAlarmRecordMapper.seletManualStatus();
Alarm alarm=new Alarm();
alarm.setVideo_id("20200305112042989_0");
alarm.setVideo_id("33_65_230_156_554_fbXdTkVe98u_ecvs_0");
alarm.setIncident_type("vehicle_ban");
String str="iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAYAAABIdFAMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHhJREFUeNo8zjsOxCAMBFB/KEAUFFR0Cbng3nQPw68ArZdAlOZppPFIBhH5EAB8b+Tlt9MYQ6i1BuqFaq1CKSVcxZ2Acs6406KUgpt5/LCKuVgz5BDCSb13ZO99ZOdcZGvt4mJjzMVKqcha68iIePB86GAiOv8CDADlIUQBs7MD3wAAAABJRU5ErkJggg==";
List arrlist=new ArrayList();
......@@ -542,7 +542,7 @@ public class TraffController {
alarm.setTs("1345677777");
alarm.setType("TRAFFIC_INCIDENT_ALARM");
Map map=new HashMap();
map.put("type", "recordalarm");
map.put("type", "alarm");
map.put("data", alarm);
map.put("recordid", "33448");
WebSocket.GroupSending(JsonUtil.beanToString(map));
......@@ -570,28 +570,28 @@ public class TraffController {
@ResponseBody
public void test2() {
Alarm alarm=new Alarm();
alarm.setVideo_id("20200305112042989_0");
alarm.setVideo_id("33_65_230_156_554_fbXdTkVe98u_ecvs_0");
alarm.setIncident_type("vehicle_ban");
alarm.setType("TRAFFIC_INCIDENT_ALARM");
Map map=new HashMap();
map.put("type", "recordalarm");
map.put("type", "alarm");
map.put("data", alarm);
map.put("recordid", "33446");
map.put("recordid", "3344656");
WebSocket.GroupSending(JsonUtil.beanToString(map));
Traffalarmrecord traffAlarmRecord=new Traffalarmrecord();
traffAlarmRecord.setRecordid(Long.parseLong("33446"));
traffAlarmRecord.setChannelid(new Integer(1));
traffAlarmRecord.setFdid("20200305112042989");
traffAlarmRecord.setChannelid(new Integer(0));
traffAlarmRecord.setFdid("33_65_230_156_554_fbXdTkVe98u_ecvs");
traffAlarmRecord.setRecordtype("vehicle_ban");
traffAlarmRecordMapper.inserTraffAlarmRecord(traffAlarmRecord);
map.put("recordid", "33447");
map.put("recordid", "3344766");
WebSocket.GroupSending(JsonUtil.beanToString(map));
Traffalarmrecord traffAlarmRecord2=new Traffalarmrecord();
traffAlarmRecord2.setRecordid(Long.parseLong("33447"));
traffAlarmRecord2.setChannelid(new Integer(1));
traffAlarmRecord2.setFdid("20200305112042989");
traffAlarmRecord2.setChannelid(new Integer(0));
traffAlarmRecord2.setFdid("33_65_230_157_554_pKf3kS8Vo0N_ecvs");
traffAlarmRecord2.setRecordtype("vehicle_ban");
traffAlarmRecordMapper.inserTraffAlarmRecord(traffAlarmRecord2);
......
......@@ -29,12 +29,12 @@ mybatis.configuration.default-statement-timeout=3000
#spring.datasource.dbcp2.connection-properties=characterEncoding=utf8
# Mysql���ݿ�-����Դ����
#spring.datasource.username=test
#spring.datasource.password=test
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin
spring.datasource.username=hzjt
spring.datasource.password=hzjt
spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin
spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin
#spring.datasource.username=hzjt
#spring.datasource.password=hzjt
#spring.datasource.url=jdbc:oracle:thin:@33.65.250.179:1521:helowin
spring.datasource.driverClassName=oracle.jdbc.OracleDriver
# druid
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
......@@ -62,7 +62,8 @@ spring.datasource.useGlobalDataSourceStat=true
#redis
# Redis��������ַ
spring.redis.host=33.65.250.179
#spring.redis.host=33.65.250.179
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
spring.redis.port=6379
# Redis�������������루Ĭ��Ϊ�գ�
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment