diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java index da1eed3a8..13545a306 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java @@ -60,4 +60,6 @@ public interface IXzHikvisionCompareDataService extends IService param); void manualCompareData(Map param); + + void deleteAllCompareData(Project project); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java index 32b7f10b0..67e396ffd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -447,8 +448,13 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl map = redisRepository.getHashValue(Cts.REDIS_HIKVISION_COMPARE_DATA + projectSn); - System.out.println(); - //redisRepository.putHashValue(Cts.REDIS_HIKVISION_COMPARE_DATA + project.getProjectSn(), "1", JSON.toJSONString(new MapBuilder().put(Cts.SUCCESS, false).put(Cts.MSG, rtJo).build())); + List list = Arrays.asList(1, 2, 3, 4); + for (Integer type : list) { + Object o = map.get(type + ""); + if (o == null) { + redisRepository.putHashValue(Cts.REDIS_HIKVISION_COMPARE_DATA + projectSn, type + "", JSON.toJSONString(new MapBuilder().put(Cts.SUCCESS, false).put(Cts.MSG, "").build())); + } + } } @Override @@ -472,12 +478,21 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl() + .eq(XzHikvisionCompareData::getProjectSn, projectSn) + .ne(XzHikvisionCompareData::getType, 4) + ); hikvisionTask.compareHikvisionForEnterpriseEtc(projectInfoBySn); } else if (Objects.equals(type, 2)) { //车辆 + xzHikvisionCompareDataMapper.delete(new LambdaQueryWrapper() + .eq(XzHikvisionCompareData::getProjectSn, projectSn) + .eq(XzHikvisionCompareData::getType, 4) + ); hikvisionTask.compareHikvisionForCar(projectInfoBySn); } } catch (Exception e) { @@ -485,4 +500,11 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl() + .eq(XzHikvisionCompareData::getProjectSn, project.getProjectSn())); + } + } diff --git a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java index fa51d245b..f7c4a6249 100644 --- a/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java +++ b/src/main/java/com/zhgd/xmgl/task/HikvisionTask.java @@ -23,7 +23,6 @@ import com.zhgd.xmgl.modules.worker.service.ITeamInfoService; import com.zhgd.xmgl.modules.worker.service.impl.DepartmentInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; -import com.zhgd.xmgl.modules.xz.entity.XzHikvisionCompareData; import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionCompareDataMapper; import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService; import com.zhgd.xmgl.util.HikvisionUtil; @@ -93,8 +92,7 @@ public class HikvisionTask { List projects = projectMapper.selectList(new LambdaQueryWrapper().eq(Project::getSyncHikvision, 1)); for (Project project : projects) { try { - xzHikvisionCompareDataMapper.delete(new LambdaQueryWrapper() - .eq(XzHikvisionCompareData::getProjectSn, project.getProjectSn())); + xzHikvisionCompareDataService.deleteAllCompareData(project); compareHikvisionForEnterpriseEtc(project); compareHikvisionForCar(project); } catch (Exception e) {