Commit 5aa5aa09 authored by 高飞's avatar 高飞

修复手动筛选功能bug

parent 0fb389f1
...@@ -22,7 +22,7 @@ import javax.jms.Message; ...@@ -22,7 +22,7 @@ import javax.jms.Message;
import javax.jms.Queue; import javax.jms.Queue;
import java.util.*; import java.util.*;
// //
@Component //@Component
@Slf4j @Slf4j
public class JMS_Oracle implements CommandLineRunner { public class JMS_Oracle implements CommandLineRunner {
@Autowired @Autowired
......
...@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; ...@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component //@Component
@Data @Data
public class JmsConfig { public class JmsConfig {
@Value("${spring.datasource.username}") @Value("${spring.datasource.username}")
......
...@@ -225,9 +225,11 @@ public class TraffController { ...@@ -225,9 +225,11 @@ public class TraffController {
String manualStatus=traffAlarmRecordMapper.seletManualStatus(); String manualStatus=traffAlarmRecordMapper.seletManualStatus();
if(manualStatus.equalsIgnoreCase("1")) { if(manualStatus.equalsIgnoreCase("1")) {
map.put("type", "recordalarm"); map.put("type", "recordalarm");
traffAlarmRecord.setManualstatus(0);
}else { }else {
map.put("type", "alarm"); map.put("type", "alarm");
traffAlarmRecord.setManualstatus(1);
} }
map.put("data", trffClientMessage); map.put("data", trffClientMessage);
...@@ -509,9 +511,14 @@ public class TraffController { ...@@ -509,9 +511,14 @@ public class TraffController {
@GetMapping("/test") @GetMapping("/test")
@ResponseBody @ResponseBody
public void test() { public void test() {
String manualStatus=traffAlarmRecordMapper.seletManualStatus();
Alarm alarm=new Alarm(); Alarm alarm=new Alarm();
alarm.setVideo_id("20200305112042989_0"); alarm.setVideo_id("20200305112042989_0");
alarm.setIncident_type("vehicle_ban"); alarm.setIncident_type("vehicle_ban");
String str="iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAYAAABIdFAMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAHhJREFUeNo8zjsOxCAMBFB/KEAUFFR0Cbng3nQPw68ArZdAlOZppPFIBhH5EAB8b+Tlt9MYQ6i1BuqFaq1CKSVcxZ2Acs6406KUgpt5/LCKuVgz5BDCSb13ZO99ZOdcZGvt4mJjzMVKqcha68iIePB86GAiOv8CDADlIUQBs7MD3wAAAABJRU5ErkJggg==";
List arrlist=new ArrayList();
arrlist.add(str);
alarm.setImg_base64(arrlist);
alarm.setTs("1345677777"); alarm.setTs("1345677777");
alarm.setType("TRAFFIC_INCIDENT_ALARM"); alarm.setType("TRAFFIC_INCIDENT_ALARM");
Map map=new HashMap(); Map map=new HashMap();
......
...@@ -47,6 +47,7 @@ public class Traffalarmrecord implements java.io.Serializable { ...@@ -47,6 +47,7 @@ public class Traffalarmrecord implements java.io.Serializable {
private String processstatus ;//����״̬; private String processstatus ;//����״̬;
private String objlable; private String objlable;
private String rectificationtype; private String rectificationtype;
private Integer manualstatus;
@Override @Override
public String toString() { public String toString() {
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<if test="processstatus != null">processstatus,</if> <if test="processstatus != null">processstatus,</if>
<if test="objlable != null">objlable,</if> <if test="objlable != null">objlable,</if>
<if test="rectificationtype != null">rectificationtype ,</if> <if test="rectificationtype != null">rectificationtype ,</if>
<if test="manualstatus != null">manualstatus ,</if>
</trim> </trim>
<trim prefix="select" suffix="from dual" suffixOverrides=","> <trim prefix="select" suffix="from dual" suffixOverrides=",">
...@@ -103,6 +104,7 @@ ...@@ -103,6 +104,7 @@
<if test="processstatus != null">#{processstatus},</if> <if test="processstatus != null">#{processstatus},</if>
<if test="objlable != null">#{objlable},</if> <if test="objlable != null">#{objlable},</if>
<if test="rectificationtype != null">#{rectificationtype},</if> <if test="rectificationtype != null">#{rectificationtype},</if>
<if test="manualstatus != null">#{manualstatus,jdbcType=INTEGER},</if>
</trim> </trim>
...@@ -174,7 +176,7 @@ ...@@ -174,7 +176,7 @@
and recordtype in ('illegal_parking','no_motor_ban') and recordtype in ('illegal_parking','no_motor_ban')
</update> </update>
<select id="seletManualStatus"> <select id="seletManualStatus" resultType="java.lang.String">
select name from t_code where type=4 select name from t_code where type=4
</select> </select>
</mapper> </mapper>
\ No newline at end of file
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