admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
guo 2024-03-12 22:14:19 +08:00
commit ddd2d7ce41
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
View File

@ -230,8 +230,8 @@ public class CarPassRecordController {
}
@ApiOperation(value = "接收车辆摄像头传过来的车辆通行记录", notes = "接收车辆摄像头传过来的车辆通行记录", httpMethod = "POST")
@PostMapping(value = "/saveCarPassRecord1")
public Result<Object> saveCarPassRecord(@RequestBody CarPassRecord carPassRecord) {
@PostMapping(value = "/addCarPassRecord")
public Result<Object> addCarPassRecord(@RequestBody CarPassRecord carPassRecord) {
CarCamera camera = carCameraService.getOne(Wrappers.<CarCamera>lambdaQuery().eq(CarCamera::getCameraId, carPassRecord.getCameraId()));
Map<String, Object> resultMap = carPassRecordService.saveCameraCarPassRecord(carPassRecord.getCarNumber(), carPassRecord.getCarLogo(), carPassRecord.getColor(), camera.getProjectSn(), carPassRecord.getCameraId(), carPassRecord.getType() == 0 ? "in" : "out", carPassRecord.getImageUrl(), null);
return Result.success(resultMap);

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -325,6 +325,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/paveCompactionRecord/add").permitAll()
.antMatchers("/xmgl/bridgeErectMachineAlarm/add").permitAll()
.antMatchers("/xmgl/workerBlacklist/list").permitAll()
.antMatchers("/xmgl/carPassRecord/addCarPassRecord").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证.
.and()