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

数据校验修改

Browse Source
This commit is contained in:
GUO 2024-06-01 22:11:33 +08:00
parent adc97cd3fd
commit 5f35885ba5
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionCompareDataService.java
View File

@ -60,4 +60,6 @@ public interface IXzHikvisionCompareDataService extends IService<XzHikvisionComp
JSONObject checkCompareDataException(Map<String, Object> param); JSONObject checkCompareDataException(Map<String, Object> param);
void manualCompareData(Map<String, Object> param); void manualCompareData(Map<String, Object> param);
void deleteAllCompareData(Project project);
} }

26
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; 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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -447,8 +448,13 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
@Override @Override
public void addExceptionShowIfNull(String projectSn) { public void addExceptionShowIfNull(String projectSn) {
Map<String, Object> map = redisRepository.getHashValue(Cts.REDIS_HIKVISION_COMPARE_DATA + projectSn); Map<String, Object> map = redisRepository.getHashValue(Cts.REDIS_HIKVISION_COMPARE_DATA + projectSn);
System.out.println(); List<Integer> list = Arrays.asList(1, 2, 3, 4);
//redisRepository.putHashValue(Cts.REDIS_HIKVISION_COMPARE_DATA + project.getProjectSn(), "1", JSON.toJSONString(new MapBuilder<String, Object>().put(Cts.SUCCESS, false).put(Cts.MSG, rtJo).build())); 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<String, Object>().put(Cts.SUCCESS, false).put(Cts.MSG, "").build()));
}
}
} }
@Override @Override
@ -472,12 +478,21 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
Integer type = MapUtils.getInteger(param, "type"); Integer type = MapUtils.getInteger(param, "type");
String projectSn = MapUtils.getString(param, Cts.PROJECT_SN); String projectSn = MapUtils.getString(param, Cts.PROJECT_SN);
ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn); ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn);
addExceptionShowIfNull(projectSn);
try { try {
if (Objects.equals(type, 1)) { if (Objects.equals(type, 1)) {
//人员 //人员
xzHikvisionCompareDataMapper.delete(new LambdaQueryWrapper<XzHikvisionCompareData>()
.eq(XzHikvisionCompareData::getProjectSn, projectSn)
.ne(XzHikvisionCompareData::getType, 4)
);
hikvisionTask.compareHikvisionForEnterpriseEtc(projectInfoBySn); hikvisionTask.compareHikvisionForEnterpriseEtc(projectInfoBySn);
} else if (Objects.equals(type, 2)) { } else if (Objects.equals(type, 2)) {
//车辆 //车辆
xzHikvisionCompareDataMapper.delete(new LambdaQueryWrapper<XzHikvisionCompareData>()
.eq(XzHikvisionCompareData::getProjectSn, projectSn)
.eq(XzHikvisionCompareData::getType, 4)
);
hikvisionTask.compareHikvisionForCar(projectInfoBySn); hikvisionTask.compareHikvisionForCar(projectInfoBySn);
} }
} catch (Exception e) { } catch (Exception e) {
@ -485,4 +500,11 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
addExceptionShowIfNull(projectSn); addExceptionShowIfNull(projectSn);
} }
} }
@Override
public void deleteAllCompareData(Project project) {
xzHikvisionCompareDataMapper.delete(new LambdaQueryWrapper<XzHikvisionCompareData>()
.eq(XzHikvisionCompareData::getProjectSn, project.getProjectSn()));
}
} }

4
src/main/java/com/zhgd/xmgl/task/HikvisionTask.java
View File

@ -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.DepartmentInfoServiceImpl;
import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl; import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; 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.mapper.XzHikvisionCompareDataMapper;
import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService; import com.zhgd.xmgl.modules.xz.service.IXzHikvisionCompareDataService;
import com.zhgd.xmgl.util.HikvisionUtil; import com.zhgd.xmgl.util.HikvisionUtil;
@ -93,8 +92,7 @@ public class HikvisionTask {
List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>().eq(Project::getSyncHikvision, 1)); List<Project> projects = projectMapper.selectList(new LambdaQueryWrapper<Project>().eq(Project::getSyncHikvision, 1));
for (Project project : projects) { for (Project project : projects) {
try { try {
xzHikvisionCompareDataMapper.delete(new LambdaQueryWrapper<XzHikvisionCompareData>() xzHikvisionCompareDataService.deleteAllCompareData(project);
.eq(XzHikvisionCompareData::getProjectSn, project.getProjectSn()));
compareHikvisionForEnterpriseEtc(project); compareHikvisionForEnterpriseEtc(project);
compareHikvisionForCar(project); compareHikvisionForCar(project);
} catch (Exception e) { } catch (Exception e) {