红码不能通行
This commit is contained in:
parent
18b692117e
commit
e7b1634cab
@ -452,18 +452,18 @@ public class AsyncHikvision {
|
|||||||
* 删除
|
* 删除
|
||||||
*
|
*
|
||||||
* @param workerInfo
|
* @param workerInfo
|
||||||
* @param devSn
|
* @param devSns
|
||||||
*/
|
*/
|
||||||
public void deletePersonAuth(WorkerInfo workerInfo, String devSn) {
|
public void deletePersonAuth(WorkerInfo workerInfo, String devSns) {
|
||||||
if (StringUtils.isBlank(devSn)) {
|
if (StringUtils.isBlank(devSns)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Date now = ThreadLocalUtil.getNotNull().getDate("now");
|
Date now = ThreadLocalUtil.getNotNull().getDate("now");
|
||||||
String[] devSnArr = StringUtils.split(devSn, ",");
|
String[] devSnArr = StringUtils.split(devSns, ",");
|
||||||
for (String ds : devSnArr) {
|
for (String ds : devSnArr) {
|
||||||
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(3).setWhoId(workerInfo.getId()).setDeviceSn(ds).setCreateDate(now));
|
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(workerInfo.getProjectSn()).setType(3).setOperate(3).setWhoId(workerInfo.getId()).setDeviceSn(ds).setCreateDate(now));
|
||||||
}
|
}
|
||||||
asyncHikvision.deletePersonAuthAsync(workerInfo, devSn, now);
|
asyncHikvision.deletePersonAuthAsync(workerInfo, devSns, now);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Async("hikvisionExecutor")
|
@Async("hikvisionExecutor")
|
||||||
|
|||||||
@ -37,6 +37,7 @@ import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
|
|||||||
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
||||||
|
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
||||||
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
|
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
|
||||||
import com.zhgd.xmgl.util.DateUtils;
|
import com.zhgd.xmgl.util.DateUtils;
|
||||||
@ -71,6 +72,10 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
@Autowired
|
@Autowired
|
||||||
IHiddenDangerInspectionStatisticsService hiddenDangerInspectionStatisticsService;
|
IHiddenDangerInspectionStatisticsService hiddenDangerInspectionStatisticsService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
SanjiangDataCall sanjiangDataCall;
|
||||||
|
@Autowired
|
||||||
|
WorkerInfoServiceImpl workerInfoService;
|
||||||
|
@Autowired
|
||||||
private HiddenDangerInspectRecordMapper hiddenDangerInspectRecordMapper;
|
private HiddenDangerInspectRecordMapper hiddenDangerInspectRecordMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private HiddenDangerRectifyRecordMapper hiddenDangerRectifyRecordMapper;
|
private HiddenDangerRectifyRecordMapper hiddenDangerRectifyRecordMapper;
|
||||||
@ -82,15 +87,12 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
private WorkerInfoMapper workerInfoMapper;
|
private WorkerInfoMapper workerInfoMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private HiddenDangerInspectionStatisticsMapper hiddenDangerInspectionStatisticsMapper;
|
private HiddenDangerInspectionStatisticsMapper hiddenDangerInspectionStatisticsMapper;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectMapper projectMapper;
|
private ProjectMapper projectMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private EnterpriseInfoMapper enterpriseInfoMapper;
|
private EnterpriseInfoMapper enterpriseInfoMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private INoticeService noticeService;
|
private INoticeService noticeService;
|
||||||
@Autowired
|
|
||||||
SanjiangDataCall sanjiangDataCall;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteHiddenDangerInspectRecord(Long id) {
|
public void deleteHiddenDangerInspectRecord(Long id) {
|
||||||
@ -164,8 +166,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
}
|
}
|
||||||
String enterpriseSn = hiddenDangerInspectRecord.getEnterpriseSn();
|
String enterpriseSn = hiddenDangerInspectRecord.getEnterpriseSn();
|
||||||
if (StrUtil.isNotBlank(enterpriseSn)) {
|
if (StrUtil.isNotBlank(enterpriseSn)) {
|
||||||
EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>()
|
EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>().eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
|
||||||
.eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
|
|
||||||
hiddenDangerInspectRecord.setEnterpriseId(String.valueOf(enterpriseInfo.getId()));
|
hiddenDangerInspectRecord.setEnterpriseId(String.valueOf(enterpriseInfo.getId()));
|
||||||
}
|
}
|
||||||
hiddenDangerInspectRecordMapper.insert(hiddenDangerInspectRecord);
|
hiddenDangerInspectRecordMapper.insert(hiddenDangerInspectRecord);
|
||||||
@ -222,7 +223,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("id", workerInfo.getId());
|
map.put("id", workerInfo.getId());
|
||||||
map.put("deductScore", ds);
|
map.put("deductScore", ds);
|
||||||
workerInfoMapper.updateScore(map);
|
workerInfoService.updateScoreSendAuth(map);
|
||||||
|
|
||||||
//存记录
|
//存记录
|
||||||
XzDeductScoreRecord vo = new XzDeductScoreRecord();
|
XzDeductScoreRecord vo = new XzDeductScoreRecord();
|
||||||
@ -246,9 +247,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
statistics.setProjectSn(projectSn);
|
statistics.setProjectSn(projectSn);
|
||||||
statistics.setCreateTime(createTime);
|
statistics.setCreateTime(createTime);
|
||||||
//删除原来
|
//删除原来
|
||||||
hiddenDangerInspectionStatisticsService.remove(new LambdaQueryWrapper<HiddenDangerInspectionStatistics>()
|
hiddenDangerInspectionStatisticsService.remove(new LambdaQueryWrapper<HiddenDangerInspectionStatistics>().eq(HiddenDangerInspectionStatistics::getProjectSn, projectSn).eq(HiddenDangerInspectionStatistics::getCreateTime, DateUtil.formatDate(createTime)));
|
||||||
.eq(HiddenDangerInspectionStatistics::getProjectSn, projectSn)
|
|
||||||
.eq(HiddenDangerInspectionStatistics::getCreateTime, DateUtil.formatDate(createTime)));
|
|
||||||
hiddenDangerInspectionStatisticsService.save(statistics);
|
hiddenDangerInspectionStatisticsService.save(statistics);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -349,8 +348,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
}
|
}
|
||||||
|
|
||||||
String[] heads = {"检查结果", "检查人", "检查时间", "详细位置", "隐患类别", "隐患明细", "隐患级别", "事故隐患", "整改要求", "整改单位", "整改人", "整改时限", "复查人", "检查类型"};
|
String[] heads = {"检查结果", "检查人", "检查时间", "详细位置", "隐患类别", "隐患明细", "隐患级别", "事故隐患", "整改要求", "整改单位", "整改人", "整改时限", "复查人", "检查类型"};
|
||||||
String[] headsStr = {"statusname", "createUserName", "createTime", "dutyRegion", "checkItemSubName", "checkContent", "hiddenDangerLevel", "faultlevelname",
|
String[] headsStr = {"statusname", "createUserName", "createTime", "dutyRegion", "checkItemSubName", "checkContent", "hiddenDangerLevel", "faultlevelname", "rectifyRequire", "enterpriseName", "changeUserName", "changeLimitTime", "reviewUserName", "recordtypename"};
|
||||||
"rectifyRequire", "enterpriseName", "changeUserName", "changeLimitTime", "reviewUserName", "recordtypename"};
|
|
||||||
JxlExcelUtils.excelExport("安全检查台账列表", heads, headsStr, list, response);
|
JxlExcelUtils.excelExport("安全检查台账列表", heads, headsStr, list, response);
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -486,8 +484,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
setAllRatio(allTodayDataHdir);
|
setAllRatio(allTodayDataHdir);
|
||||||
setTodayRatio(allTodayDataHdir);
|
setTodayRatio(allTodayDataHdir);
|
||||||
// 最近20条隐患
|
// 最近20条隐患
|
||||||
List<HiddenDangerInspectRecord> hiddenDangerInspectRecordList = hiddenDangerInspectRecordMapper.selectList(Wrappers.lambdaQuery(HiddenDangerInspectRecord.class)
|
List<HiddenDangerInspectRecord> hiddenDangerInspectRecordList = hiddenDangerInspectRecordMapper.selectList(Wrappers.lambdaQuery(HiddenDangerInspectRecord.class).eq(HiddenDangerInspectRecord::getProjectSn, projectSn).last("limit 20"));
|
||||||
.eq(HiddenDangerInspectRecord::getProjectSn, projectSn).last("limit 20"));
|
|
||||||
allTodayDataHdir.setHiddenDangerInspectRecordList(hiddenDangerInspectRecordList);
|
allTodayDataHdir.setHiddenDangerInspectRecordList(hiddenDangerInspectRecordList);
|
||||||
return allTodayDataHdir;
|
return allTodayDataHdir;
|
||||||
}
|
}
|
||||||
@ -516,8 +513,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
setAllRatio(totalAndWeekHiddenDanger);
|
setAllRatio(totalAndWeekHiddenDanger);
|
||||||
setWeekRatio(totalAndWeekHiddenDanger);
|
setWeekRatio(totalAndWeekHiddenDanger);
|
||||||
// 最近20条隐患
|
// 最近20条隐患
|
||||||
List<HiddenDangerInspectRecord> hiddenDangerInspectRecordList = hiddenDangerInspectRecordMapper.selectList(Wrappers.lambdaQuery(HiddenDangerInspectRecord.class)
|
List<HiddenDangerInspectRecord> hiddenDangerInspectRecordList = hiddenDangerInspectRecordMapper.selectList(Wrappers.lambdaQuery(HiddenDangerInspectRecord.class).eq(HiddenDangerInspectRecord::getProjectSn, projectSn).last("limit 20"));
|
||||||
.eq(HiddenDangerInspectRecord::getProjectSn, projectSn).last("limit 20"));
|
|
||||||
totalAndWeekHiddenDanger.setHiddenDangerInspectRecordList(hiddenDangerInspectRecordList);
|
totalAndWeekHiddenDanger.setHiddenDangerInspectRecordList(hiddenDangerInspectRecordList);
|
||||||
return totalAndWeekHiddenDanger;
|
return totalAndWeekHiddenDanger;
|
||||||
|
|
||||||
@ -544,11 +540,7 @@ public class HiddenDangerInspectRecordServiceImpl extends ServiceImpl<HiddenDang
|
|||||||
} else {
|
} else {
|
||||||
offsetDay = -offsetDay;
|
offsetDay = -offsetDay;
|
||||||
}
|
}
|
||||||
return hiddenDangerInspectionStatisticsMapper.selectList(Wrappers.<HiddenDangerInspectionStatistics>
|
return hiddenDangerInspectionStatisticsMapper.selectList(Wrappers.<HiddenDangerInspectionStatistics>lambdaQuery().eq(HiddenDangerInspectionStatistics::getProjectSn, MapUtils.getString(map, "projectSn")).between(HiddenDangerInspectionStatistics::getCreateTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), offsetDay)), DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1))));
|
||||||
lambdaQuery().eq(HiddenDangerInspectionStatistics::getProjectSn, MapUtils.getString(map, "projectSn"))
|
|
||||||
.between(HiddenDangerInspectionStatistics::getCreateTime,
|
|
||||||
DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), offsetDay)),
|
|
||||||
DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -245,59 +245,69 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
|
|||||||
//判断是否配置并下发设备
|
//判断是否配置并下发设备
|
||||||
if (tempProjectUfaceConfig != null && tempProjectUfaceConfig.getIssueDev() == 1) {
|
if (tempProjectUfaceConfig != null && tempProjectUfaceConfig.getIssueDev() == 1) {
|
||||||
if (tempProjectUfaceConfig.getSupplierType() == 9) {
|
if (tempProjectUfaceConfig.getSupplierType() == 9) {
|
||||||
//海康门禁isc
|
if (NumberUtils.lt(workerInfo.getSafeScore(), 80D)) {
|
||||||
String devSns = "";
|
//红码不能通行
|
||||||
String notDevSns = "";
|
List<UfaceDev> allList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
||||||
if (Objects.equals(workerInfo.getDevType(), 1)) {
|
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn()));
|
||||||
devSns = workerInfo.getUfaceDevId();
|
if (CollUtil.isNotEmpty(allList)) {
|
||||||
if (StrUtil.isNotBlank(devSns)) {
|
String devSns = StrUtil.join(",", allList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
List<UfaceDev> existList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
asyncHikvision.deletePersonAuth(workerInfo, devSns);
|
||||||
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn())
|
|
||||||
.in(UfaceDev::getId, StrUtil.split(devSns, ","))
|
|
||||||
);
|
|
||||||
List<UfaceDev> notExistList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
|
||||||
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn())
|
|
||||||
.notIn(UfaceDev::getId, StrUtil.split(devSns, ","))
|
|
||||||
);
|
|
||||||
if (CollUtil.isNotEmpty(notExistList)) {
|
|
||||||
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
|
||||||
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
|
||||||
}
|
|
||||||
if (CollUtil.isNotEmpty(existList)) {
|
|
||||||
devSns = StrUtil.join(",", existList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
|
||||||
asyncHikvision.addPersonAuth(workerInfo, devSns);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
//只删除
|
|
||||||
List<UfaceDev> notExistList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
|
||||||
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn()));
|
|
||||||
if (CollUtil.isNotEmpty(notExistList)) {
|
|
||||||
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
|
||||||
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if (Objects.equals(workerInfo.getDevType(), 2)) {
|
} else {
|
||||||
//设备分组情况!
|
//海康门禁isc
|
||||||
String ufaceDevGroupId = workerInfo.getUfaceDevGroupId();
|
String devSns = "";
|
||||||
if (StrUtil.isNotBlank(ufaceDevGroupId)) {
|
String notDevSns = "";
|
||||||
List<UfaceDev> listForIsc = ufaceDevMapper.getUfaceDevListForIsc(StrUtil.split(ufaceDevGroupId, ","), workerInfo.getProjectSn());
|
if (Objects.equals(workerInfo.getDevType(), 1)) {
|
||||||
List<UfaceDev> notExistList = ufaceDevMapper.getUfaceDevListForIscNotExist(StrUtil.split(ufaceDevGroupId, ","), workerInfo.getProjectSn());
|
devSns = workerInfo.getUfaceDevId();
|
||||||
if (CollUtil.isNotEmpty(notExistList)) {
|
if (StrUtil.isNotBlank(devSns)) {
|
||||||
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
List<UfaceDev> existList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
||||||
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn())
|
||||||
|
.in(UfaceDev::getId, StrUtil.split(devSns, ","))
|
||||||
|
);
|
||||||
|
List<UfaceDev> notExistList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
||||||
|
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn())
|
||||||
|
.notIn(UfaceDev::getId, StrUtil.split(devSns, ","))
|
||||||
|
);
|
||||||
|
if (CollUtil.isNotEmpty(notExistList)) {
|
||||||
|
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
|
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
||||||
|
}
|
||||||
|
if (CollUtil.isNotEmpty(existList)) {
|
||||||
|
devSns = StrUtil.join(",", existList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
|
asyncHikvision.addPersonAuth(workerInfo, devSns);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
//只删除
|
||||||
|
List<UfaceDev> notExistList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
||||||
|
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn()));
|
||||||
|
if (CollUtil.isNotEmpty(notExistList)) {
|
||||||
|
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
|
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (CollUtil.isNotEmpty(listForIsc)) {
|
} else if (Objects.equals(workerInfo.getDevType(), 2)) {
|
||||||
devSns = StrUtil.join(",", listForIsc.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
//设备分组情况!
|
||||||
asyncHikvision.addPersonAuth(workerInfo, devSns);
|
String ufaceDevGroupId = workerInfo.getUfaceDevGroupId();
|
||||||
}
|
if (StrUtil.isNotBlank(ufaceDevGroupId)) {
|
||||||
} else {
|
List<UfaceDev> listForIsc = ufaceDevMapper.getUfaceDevListForIsc(StrUtil.split(ufaceDevGroupId, ","), workerInfo.getProjectSn());
|
||||||
//只删除
|
List<UfaceDev> notExistList = ufaceDevMapper.getUfaceDevListForIscNotExist(StrUtil.split(ufaceDevGroupId, ","), workerInfo.getProjectSn());
|
||||||
List<UfaceDev> notExistList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
if (CollUtil.isNotEmpty(notExistList)) {
|
||||||
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn())
|
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
);
|
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
||||||
if (CollUtil.isNotEmpty(notExistList)) {
|
}
|
||||||
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
if (CollUtil.isNotEmpty(listForIsc)) {
|
||||||
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
devSns = StrUtil.join(",", listForIsc.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
|
asyncHikvision.addPersonAuth(workerInfo, devSns);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
//只删除
|
||||||
|
List<UfaceDev> notExistList = ufaceDevMapper.selectList(new LambdaQueryWrapper<UfaceDev>()
|
||||||
|
.eq(UfaceDev::getProjectSn, workerInfo.getProjectSn())
|
||||||
|
);
|
||||||
|
if (CollUtil.isNotEmpty(notExistList)) {
|
||||||
|
notDevSns = StrUtil.join(",", notExistList.stream().map(UfaceDev::getDevSn).collect(Collectors.toList()));
|
||||||
|
asyncHikvision.deletePersonAuth(workerInfo, notDevSns);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -475,6 +485,10 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl<ProjectUfaceConfi
|
|||||||
HikvisionUfaceSDKUtil.addOrUpdatePerson(workerInfo, tempProjectUfaceConfig, devSns);
|
HikvisionUfaceSDKUtil.addOrUpdatePerson(workerInfo, tempProjectUfaceConfig, devSns);
|
||||||
} else if (tempProjectUfaceConfig.getSupplierType() == 9) {
|
} else if (tempProjectUfaceConfig.getSupplierType() == 9) {
|
||||||
//海康门禁isc
|
//海康门禁isc
|
||||||
|
if (NumberUtils.lt(workerInfo.getSafeScore(), 80D)) {
|
||||||
|
log.info("安全评分红码不下发权限,名称:{}", workerInfo.getWorkerName());
|
||||||
|
return;
|
||||||
|
}
|
||||||
asyncHikvision.addPersonAuth(workerInfo, devSns);
|
asyncHikvision.addPersonAuth(workerInfo, devSns);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,7 +20,6 @@ import com.zhgd.xmgl.base.entity.vo.SectorVo;
|
|||||||
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
|
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
|
||||||
import com.zhgd.xmgl.call.SanjiangDataCall;
|
import com.zhgd.xmgl.call.SanjiangDataCall;
|
||||||
import com.zhgd.xmgl.enums.ParamEnum;
|
import com.zhgd.xmgl.enums.ParamEnum;
|
||||||
import com.zhgd.xmgl.modules.basicdata.entity.Notice;
|
|
||||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
||||||
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
|
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
|
||||||
import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
|
import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
|
||||||
@ -28,7 +27,8 @@ import com.zhgd.xmgl.modules.quality.entity.DangerItemRecord;
|
|||||||
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
|
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
|
||||||
import com.zhgd.xmgl.modules.quality.entity.QualityRectifyRecord;
|
import com.zhgd.xmgl.modules.quality.entity.QualityRectifyRecord;
|
||||||
import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
|
import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
|
||||||
import com.zhgd.xmgl.modules.quality.entity.vo.*;
|
import com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordVo;
|
||||||
|
import com.zhgd.xmgl.modules.quality.entity.vo.RecordVo;
|
||||||
import com.zhgd.xmgl.modules.quality.mapper.DangerItemRecordMapper;
|
import com.zhgd.xmgl.modules.quality.mapper.DangerItemRecordMapper;
|
||||||
import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper;
|
import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper;
|
||||||
import com.zhgd.xmgl.modules.quality.mapper.QualityRectifyRecordMapper;
|
import com.zhgd.xmgl.modules.quality.mapper.QualityRectifyRecordMapper;
|
||||||
@ -38,6 +38,7 @@ import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
|
|||||||
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
||||||
|
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
||||||
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
|
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
|
||||||
import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto;
|
import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto;
|
||||||
@ -78,6 +79,8 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
|||||||
@Autowired
|
@Autowired
|
||||||
XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
|
XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
WorkerInfoServiceImpl workerInfoService;
|
||||||
|
@Autowired
|
||||||
private QualityRegionMapper qualityRegionMapper;
|
private QualityRegionMapper qualityRegionMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private EnterpriseInfoMapper enterpriseInfoMapper;
|
private EnterpriseInfoMapper enterpriseInfoMapper;
|
||||||
@ -338,7 +341,8 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
|||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("id", workerInfo.getId());
|
map.put("id", workerInfo.getId());
|
||||||
map.put("deductScore", ds);
|
map.put("deductScore", ds);
|
||||||
workerInfoMapper.updateScore(map);
|
workerInfoService.updateScoreSendAuth(map);
|
||||||
|
|
||||||
|
|
||||||
//存记录
|
//存记录
|
||||||
XzDeductScoreRecord vo = new XzDeductScoreRecord();
|
XzDeductScoreRecord vo = new XzDeductScoreRecord();
|
||||||
@ -518,7 +522,6 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void recoverScore(QualityInspectionRecord hiddenDangerInspectRecord) {
|
private void recoverScore(QualityInspectionRecord hiddenDangerInspectRecord) {
|
||||||
if (hiddenDangerInspectRecord.getRecordType() == null || hiddenDangerInspectRecord.getRecordType() == 2) {
|
if (hiddenDangerInspectRecord.getRecordType() == null || hiddenDangerInspectRecord.getRecordType() == 2) {
|
||||||
return;
|
return;
|
||||||
@ -549,7 +552,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
|
|||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("id", workerInfo.getId());
|
map.put("id", workerInfo.getId());
|
||||||
map.put("deductScore", ds * -1);
|
map.put("deductScore", ds * -1);
|
||||||
workerInfoMapper.updateScore(map);
|
workerInfoService.updateScoreSendAuth(map);
|
||||||
|
|
||||||
//不能超过100分
|
//不能超过100分
|
||||||
WorkerInfo w1 = workerInfoMapper.selectById(systemUser.getWorkerId());
|
WorkerInfo w1 = workerInfoMapper.selectById(systemUser.getWorkerId());
|
||||||
|
|||||||
@ -44,6 +44,7 @@ import com.zhgd.xmgl.modules.video.mapper.WorkerInfoToAiAnalyseHardWareAlarmReco
|
|||||||
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
|
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
|
||||||
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
||||||
|
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzAiDeductRule;
|
import com.zhgd.xmgl.modules.xz.entity.XzAiDeductRule;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
||||||
import com.zhgd.xmgl.modules.xz.mapper.XzAiDeductRuleMapper;
|
import com.zhgd.xmgl.modules.xz.mapper.XzAiDeductRuleMapper;
|
||||||
@ -82,6 +83,8 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
|
|||||||
@Autowired
|
@Autowired
|
||||||
NoticeServiceImpl noticeService;
|
NoticeServiceImpl noticeService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
WorkerInfoServiceImpl workerInfoService;
|
||||||
|
@Autowired
|
||||||
private XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
|
private XzDeductScoreRecordMapper xzDeductScoreRecordMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IDictionaryItemService dictionaryItemService;
|
private IDictionaryItemService dictionaryItemService;
|
||||||
@ -501,7 +504,8 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
|
|||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("id", id);
|
map.put("id", id);
|
||||||
map.put("deductScore", deductScore);
|
map.put("deductScore", deductScore);
|
||||||
workerInfoMapper.updateScore(map);
|
workerInfoService.updateScoreSendAuth(map);
|
||||||
|
|
||||||
WorkerInfo wi = workerInfoMapper.selectById(id);
|
WorkerInfo wi = workerInfoMapper.selectById(id);
|
||||||
List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, record.getProjectSn());
|
List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, record.getProjectSn());
|
||||||
try {
|
try {
|
||||||
|
|||||||
@ -141,4 +141,11 @@ public interface IWorkerInfoService extends IService<WorkerInfo> {
|
|||||||
List<StatsTrendVo> statsEnterpriseRisk(Map<String, Object> map);
|
List<StatsTrendVo> statsEnterpriseRisk(Map<String, Object> map);
|
||||||
|
|
||||||
WorkerInfo queryById(Map<String, Object> map);
|
WorkerInfo queryById(Map<String, Object> map);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新安全分数,并重新下发通行权限
|
||||||
|
*
|
||||||
|
* @param map
|
||||||
|
*/
|
||||||
|
void updateScoreSendAuth(HashMap<String, Object> map);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2164,6 +2164,14 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
|
|||||||
return page.getRecords().get(0);
|
return page.getRecords().get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateScoreSendAuth(HashMap<String, Object> map) {
|
||||||
|
workerInfoMapper.updateScore(map);
|
||||||
|
String id = MapUtils.getString(map, "id");
|
||||||
|
WorkerInfo workerInfo = baseMapper.selectById(id);
|
||||||
|
projectUfaceConfigService.updateWorkerInfo(workerInfo, workerInfo);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 真正递归的方法
|
* 真正递归的方法
|
||||||
*
|
*
|
||||||
|
|||||||
@ -36,6 +36,7 @@ import com.zhgd.xmgl.modules.worker.entity.WorkerInfoAuditRecord;
|
|||||||
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoAuditRecordMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoAuditRecordMapper;
|
||||||
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
|
||||||
|
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent;
|
import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent;
|
||||||
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
|
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
|
||||||
@ -97,6 +98,8 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
|
|||||||
@Autowired
|
@Autowired
|
||||||
XzSecurityDangerItemRecordMapper dangerItemRecordMapper;
|
XzSecurityDangerItemRecordMapper dangerItemRecordMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
WorkerInfoServiceImpl workerInfoService;
|
||||||
|
@Autowired
|
||||||
private QualityRegionMapper qualityRegionMapper;
|
private QualityRegionMapper qualityRegionMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private EnterpriseInfoMapper enterpriseInfoMapper;
|
private EnterpriseInfoMapper enterpriseInfoMapper;
|
||||||
@ -353,7 +356,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
|
|||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("id", workerInfo.getId());
|
map.put("id", workerInfo.getId());
|
||||||
map.put("deductScore", ds);
|
map.put("deductScore", ds);
|
||||||
workerInfoMapper.updateScore(map);
|
workerInfoService.updateScoreSendAuth(map);
|
||||||
|
|
||||||
//存记录
|
//存记录
|
||||||
XzDeductScoreRecord vo = new XzDeductScoreRecord();
|
XzDeductScoreRecord vo = new XzDeductScoreRecord();
|
||||||
@ -840,7 +843,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
|
|||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("id", workerInfo.getId());
|
map.put("id", workerInfo.getId());
|
||||||
map.put("deductScore", ds * -1);
|
map.put("deductScore", ds * -1);
|
||||||
workerInfoMapper.updateScore(map);
|
workerInfoService.updateScoreSendAuth(map);
|
||||||
|
|
||||||
//不能超过100分
|
//不能超过100分
|
||||||
WorkerInfo w1 = workerInfoMapper.selectById(systemUser.getWorkerId());
|
WorkerInfo w1 = workerInfoMapper.selectById(systemUser.getWorkerId());
|
||||||
|
|||||||
@ -74,6 +74,15 @@ public class NumberUtils {
|
|||||||
return b1 != null && b2 != null && b1 <= b2;
|
return b1 != null && b2 != null && b1 <= b2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 小于
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static boolean lt(Double b1, Double b2) {
|
||||||
|
return b1 != null && b2 != null && b1 < b2;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* description: 使用 String.format 格式化数字,实现左侧补 0
|
* description: 使用 String.format 格式化数字,实现左侧补 0
|
||||||
*
|
*
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user