提交 d5733dfa authored 作者: Phyday's avatar Phyday

综合监测功能改进

上级 d4c81932
...@@ -21,7 +21,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter ...@@ -21,7 +21,7 @@ public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter
http.formLogin() http.formLogin()
.and() .and()
.authorizeRequests() .authorizeRequests()
.antMatchers("/roadconditionevent/**", "/zhyh/lkpd/save", "/zhyh/dzxgcglgcxx/**", "/zhyh/dzxgcglgcjd/**", "/zhyh/dzxgcgljlzf/**", "/zhyh/dzxgcglysgl/**", .antMatchers( "/zhyh/lkpd/save", "/zhyh/dzxgcglgcxx/**", "/zhyh/dzxgcglgcjd/**", "/zhyh/dzxgcgljlzf/**", "/zhyh/dzxgcglysgl/**",
"/zhjc/ghjhghjdzb/**", "/zhjc/ghjhtzzh/**", "/zhjc/ghjh/**", "/zhjc/ghjhfghjdzb/**", "/zhjc/ghjhghjdzb/**", "/zhjc/ghjhtzzh/**", "/zhjc/ghjh/**", "/zhjc/ghjhfghjdzb/**",
"/zhyh/qldtjglrbsjhql/**", "/zhyh/qldtjgsjzdjgql/**", "/szgl/spdwvideo/**","/szgl/spdwvideojn/**") "/zhyh/qldtjglrbsjhql/**", "/zhyh/qldtjgsjzdjgql/**", "/szgl/spdwvideo/**","/szgl/spdwvideojn/**")
.permitAll() .permitAll()
......
...@@ -14,7 +14,7 @@ spring: ...@@ -14,7 +14,7 @@ spring:
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
username: root username: root
password: root password: 123456
cache: cache:
type: redis type: redis
redis: redis:
......
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
</if> </if>
</select> </select>
<update id="updateBatchByEventId" parameterType="java.util.List"> <update id="updateBatchByEventId" parameterType="java.util.List">
UPDATE road_condition_event UPDATE road_condition_event
WHERE event_id IN WHERE event_id IN
<foreach collection="eventIdList" item="id" open="(" separator="," close=")"> <foreach collection="eventIdList" item="id" open="(" separator="," close=")">
...@@ -714,10 +714,10 @@ ...@@ -714,10 +714,10 @@
select * from road_condition_event select * from road_condition_event
<where> <where>
<if test="lxbh !=null and lxbh !=''"> <if test="lxbh !=null and lxbh !=''">
road_code =#{lxbh} road_code =#{lxbh}
</if> </if>
<if test="zxzh !=null"> <if test="zxzh !=null">
and CONVERT(startM,DECIMAL) <![CDATA[ <= ]]>#{zxzh} and CONVERT(endM,DECIMAL) <![CDATA[ >= ]]>#{zxzh} and CONVERT(startM,DECIMAL) <![CDATA[ <= ]]>#{zxzh} and CONVERT(endM,DECIMAL) <![CDATA[ >= ]]>#{zxzh}
</if> </if>
</where> </where>
order by start_time order by start_time
......
...@@ -39,5 +39,6 @@ ...@@ -39,5 +39,6 @@
road_code like CONCAT('%',#{trafficRoute.roadName},'%') road_code like CONCAT('%',#{trafficRoute.roadName},'%')
</if> </if>
</where> </where>
ORDER BY crowd desc
</select> </select>
</mapper> </mapper>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论