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

bug修改

Browse Source
This commit is contained in:
GUO 2024-05-27 21:58:06 +08:00
parent 6e04e47781
commit e9f4c16a6a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/zhgd/xmgl/modules/ammeter/controller/ConfigReloadController.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.ammeter.controller; package com.zhgd.xmgl.modules.ammeter.controller;
import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.task.CarInfoTask;
import com.zhgd.xmgl.task.VideoItemTask; import com.zhgd.xmgl.task.VideoItemTask;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -18,23 +19,31 @@ import java.util.Map;
@Api(tags = "配置重载控制器") @Api(tags = "配置重载控制器")
public class ConfigReloadController { public class ConfigReloadController {
@Autowired @Autowired
VideoItemTask videoItemTask; VideoItemTask videoItmTask;
@Autowired
CarInfoTask carInfoTask;
@RequestMapping(value = "/addVqdForHikvision") @RequestMapping(value = "/addVqdForHikvision")
public Result addVqdForHikvision(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception { public Result addVqdForHikvision(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
videoItemTask.addVqdForHikvision(); videoItmTask.addVqdForHikvision();
return Result.ok(); return Result.ok();
} }
@RequestMapping(value = "/saveXzHikvisionVideoFull") @RequestMapping(value = "/saveXzHikvisionVideoFull")
public Result saveXzHikvisionVideoFull(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception { public Result saveXzHikvisionVideoFull(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
videoItemTask.doSaveXzHikvisionVideoFull(param); videoItmTask.doSaveXzHikvisionVideoFull(param);
return Result.ok(); return Result.ok();
} }
@RequestMapping(value = "/saveDeviceState") @RequestMapping(value = "/saveDeviceState")
public Result saveDeviceState(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception { public Result saveDeviceState(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
videoItemTask.saveDeviceState(); videoItmTask.saveDeviceState();
return Result.ok();
}
@RequestMapping(value = "/deleteOrUpdateExpiredCar")
public Result deleteOrUpdateExpiredCar(@ApiIgnore @RequestBody Map<String, Object> param) throws Exception {
carInfoTask.deleteOrUpdateExpiredCar();
return Result.ok(); return Result.ok();
} }

2
src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.redis.lock.redisson.DistributedLock;
import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.async.AsyncHikvision;
import com.zhgd.xmgl.async.AsyncWorker; import com.zhgd.xmgl.async.AsyncWorker;
import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
@ -81,6 +82,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
} }
@Override @Override
@DistributedLock(keyPrefix = "car_info:", key = "#c.carNumber", tryLok = true, lockTime = 0)
public void addCarInfo(CarInfo c) { public void addCarInfo(CarInfo c) {
checkTime(c); checkTime(c);
QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();