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

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-06-07 16:30:12 +08:00
parent 6b3aacbbdf
commit a32d4d5caf
6 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
View File

@ -162,7 +162,7 @@ public class SystemUserController {
@ApiImplicitParam(name = "enterpriseTypeId", required = false, value = "企业类型id", paramType = "body"),
@ApiImplicitParam(name = "xzProjectOrgId", required = false, value = "项目组织机构id", paramType = "body"),
@ApiImplicitParam(name = "qualityRegionId", required = false, value = "区域id", paramType = "body"),
@ApiImplicitParam(name = "qualityRegionBindType", required = false, value = "1区域绑定单位2区域绑定的人", paramType = "body"),
@ApiImplicitParam(name = "qualityRegionBindType", required = false, value = "1区域绑定的人2区域绑定单位", paramType = "body"),
@ApiImplicitParam(name = "userId", required = false, value = "用户id", paramType = "body"),
@ApiImplicitParam(name = "isSupervisingRoleName", required = false, value = "1监理角色名称的人", paramType = "body"),
})

6
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
View File

@ -57,13 +57,13 @@
LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=t.sn
left join xz_project_org xpo on xpo.id=t.xz_project_org_id
left join xz_registry xr on xr.account = t.account and xr.approval_process = 2
<if test="param.qualityRegionId != null and param.qualityRegionId != '' and param.qualityRegionBindType == '2'.toString()">
<if test="param.qualityRegionId != null and param.qualityRegionId != '' and param.qualityRegionBindType == '1'.toString()">
JOIN quality_region_to_user qrtu on ei.id = qrtu.enterprise_id and t.user_id=qrtu.user_id and
qrtu.quality_region_id = #{param.qualityRegionId}
</if>
<if test="param.qualityRegionId != null and param.qualityRegionId != '' and param.qualityRegionBindType == '1'.toString()">
<if test="param.qualityRegionId != null and param.qualityRegionId != '' and param.qualityRegionBindType == '2'.toString()">
JOIN quality_region_to_enterprise qrte on ei.id = qrte.enterprise_id and
qrtu.quality_region_id = #{param.qualityRegionId}
qrte.quality_region_id = #{param.qualityRegionId}
</if>
</sql>
<select id="getSystemUsersBySn" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" parameterType="map">

7
src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java
View File

@ -295,5 +295,12 @@ public class AiAnalyseHardWareAlarmRecordController {
return Result.ok();
}
@ApiOperation(value = "设置误报忽略不删除", notes = "设置误报忽略不删除", httpMethod = "POST")
@PostMapping(value = "/setFalsePositive")
public Result setFalsePositive(@RequestBody AiAnalyseHardWareAlarmRecord taskProgressMaterialRel) {
aiAnalyseHardWareAlarmRecordService.setFalsePositive(taskProgressMaterialRel);
return Result.ok();
}
}

3
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
View File

@ -19,6 +19,9 @@
witaahwar.ai_analyse_hard_ware_alarm_record_id
left join worker_info wi on wi.id = witaahwar.worker_info_id
WHERE a.project_sn = #{param.projectSn}
<if test="param.handleResult != null">
and a.handle_result = #{param.handleResult}
</if>
<if test="param.pushPersonId != null">
and find_in_set(#{param.pushPersonId}, a.push_person_ids)
</if>

2
src/main/java/com/zhgd/xmgl/modules/video/service/IAiAnalyseHardWareAlarmRecordService.java
View File

@ -62,4 +62,6 @@ public interface IAiAnalyseHardWareAlarmRecordService extends IService<AiAnalyse
void falsePositiveDeletion(Long id);
BigDecimal getScore(String projectSn, Date time);
void setFalsePositive(AiAnalyseHardWareAlarmRecord taskProgressMaterialRel);
}

9
src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
View File

@ -657,6 +657,15 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
return new BigDecimal(20);
}
@Override
public void setFalsePositive(AiAnalyseHardWareAlarmRecord taskProgressMaterialRel) {
AiAnalyseHardWareAlarmRecord record = baseMapper.selectById(taskProgressMaterialRel.getId());
if (record == null) {
throw new OpenAlertException("未找到该记录");
}
baseMapper.updateById(taskProgressMaterialRel);
}
private Integer getAlarmType(Integer algorithmId) {
/*
4 行人闯入