From 0046bb66f7a0c724c692452fbe2693e53e4dfad3 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 18 Oct 2024 18:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=87=E4=BB=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/service/impl/SystemUserServiceImpl.java        | 3 +++
 .../modules/quality/controller/QualityFileController.java    | 5 ++---
 .../modules/quality/entity/QualityInspectionRecordDraft.java | 4 ++--
 .../modules/video/service/impl/VideoItemServiceImpl.java     | 2 +-
 src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java           | 5 ++++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index cadc71821..3ff4809f8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -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());
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityFileController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityFileController.java
index f2d4c6cbc..e5053b1bb 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityFileController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityFileController.java
@@ -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));
     }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java
index 3e277cc6e..1e67f9a5a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/QualityInspectionRecordDraft.java
@@ -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;
     /**
      * 创建时间
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
index 4e73790b1..38f3b04d2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
@@ -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);
diff --git a/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java b/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java
index 72888f85b..81487918e 100644
--- a/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java
+++ b/src/main/java/com/zhgd/xmgl/util/HikVideoUtil.java
@@ -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) {
             {