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

质量文件调整

Browse Source
This commit is contained in:
pengjie 2024-10-18 18:02:48 +08:00
parent d07b105f0f
commit 0046bb66f7
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -493,8 +493,11 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
result.put("realName", systemUser.getRealName());
if (systemUser != null && systemUser.getWorkerId() != null) {
result.put("workerId", systemUser.getWorkerId().toString());
WorkerInfo workerInfo = workerInfoMapper.selectById(systemUser.getWorkerId());
result.put("workerNature", workerInfo == null ? null : workerInfo.getWorkerNature());
} else {
result.put("workerId", "");
result.put("workerNature", null);
}
result.put("sn", systemUser.getSn());
result.put("styleType", companyConfig.getStyleType());

5
src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityFileController.java
View File

@ -204,15 +204,14 @@ public class QualityFileController {
/**
* 文件类型统计
*
* @param qualityFile
* @return
*/
@OperLog(operModul = "质量交底文件管理", operType = "新增", operDesc = "文件类型统计")
@ApiOperation(value = " 文件类型统计", notes = "文件类型统计", httpMethod = "POST")
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String")
@PostMapping(value = "/typeGroup")
public Result<Object> typeGroup(@RequestBody QualityFile qualityFile) {
QueryWrapper<QualityFile> queryWrapper = QueryGenerator.initQueryWrapper(qualityFile);
public Result<Object> typeGroup(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<QualityFile> queryWrapper = QueryGenerator.initPageQueryWrapper(QualityFile.class, map);
return Result.success(qualityFileService.typeGroup(new Page<>(-1, -1), queryWrapper));
}
}

4
src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java
View File

@ -28,7 +28,7 @@ public class QualityInspectionRecordDraft implements Serializable {
/**
* id
*/
@TableId(type = IdType.AUTO)
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private Long id;
/**
@ -108,7 +108,7 @@ public class QualityInspectionRecordDraft implements Serializable {
*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private Integer creatorId;
private Long creatorId;
/**
* 创建时间
*/

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

@ -803,7 +803,7 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
public String getTalkURLs(Map<String, Object> param) {
ProjectVideoConfig projectVideoConfig = getEnableProjectVideoConfigByProjectSn(param);
if (Objects.equals(projectVideoConfig.getVideoType(), ProjectVideoConfigVideoTypeEnum.ISC.getValue())) {
JSONObject result = HikVideoUtil.getTalkURLs(MapUtils.getString(param, "serialNumber")
JSONObject result = HikVideoUtil.getTalkURLs(MapUtils.getString(param, "serialNumber"), MapUtils.getString(param, "protocol")
, projectVideoConfig.getAccount(), projectVideoConfig.getPassword(), projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret());
System.out.println("===============" + result);
return JSON.toJSONString(result);

5
src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java
View File

@ -522,10 +522,13 @@ public class HikVideoUtil {
return JSONObject.parseObject(result);
}
public static JSONObject getTalkURLs(String cameraIndexCode, String Ip, String port, String appke, String appSecret) {
public static JSONObject getTalkURLs(String cameraIndexCode, String protocol, String Ip, String port, String appke, String appSecret) {
final String playbackURLs = ARTEMIS_PATH + "/api/video/v1/cameras/talkURLs";
Map<String, Object> paramMap = new HashMap<String, Object>();// post请求Form表单参数
paramMap.put("cameraIndexCode", cameraIndexCode);
if (StringUtils.isNotBlank(protocol)) {
paramMap.put("protocol", protocol);
}
String body = JSON.toJSON(paramMap).toString();
Map<String, String> path = new HashMap<String, String>(2) {
{