Browse Source

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

develop
wangsixiang 9 months ago
parent
commit
bd3cdebc9d
  1. 2
      zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java
  2. 4
      zc-business/src/main/resources/mapper/business/DcEventMapper.xml

2
zc-business/src/main/java/com/zc/business/controller/NonAutomaticWarningController.java

@ -131,7 +131,7 @@ public class NonAutomaticWarningController extends BaseController {
String illegalTrafficEvent = data.getString("illegalTrafficEvent");
String directionName = data.getString("directionName");
String crossingName = data.getString("crossingName");
String targetPicUrl = "http://10.0.81.202/fjyj" + data.getString("targetPicUrl");
String targetPicUrl = "https://10.0.81.202/fjyj" + data.getString("targetPicUrl");
String laneNo = data.getString("laneNo");
ArrayList<String> pictures = new ArrayList<>();

4
zc-business/src/main/resources/mapper/business/DcEventMapper.xml

@ -451,8 +451,8 @@
CASE dc_event.event_state
WHEN '0' THEN '待确认'
WHEN '1' THEN '处理中'
WHEN '2' THEN '-已完成'
WHEN '3' THEN '-已撤销'
WHEN '2' THEN '已完成'
WHEN '3' THEN '已撤销'
END AS stringEventState,
CASE dc_event.event_source
WHEN '1' THEN '96659'

Loading…
Cancel
Save