From c999aef306c976a674bc9a3c4f344d73bc05a7d9 Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 3 Apr 2024 17:18:01 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/async/AsyncHikvision.java | 52 ++++++++++++------- .../zhgd/xmgl/config/SafetyHatWSClient.java | 3 +- .../modules/basicdata/entity/SystemUser.java | 4 +- .../service/impl/SystemUserServiceImpl.java | 10 ++++ .../project/entity/ProjectUfaceConfig.java | 2 +- .../XzSupplierRecordController.java | 17 +++--- .../entity/XzSupplierQualificationApply.java | 5 -- .../entity/XzSupplierQualificationRecord.java | 8 +-- .../xz/mapper/XzSupplierRecordMapper.java | 2 +- .../xz/mapper/xml/XzSupplierRecordMapper.xml | 9 ++-- .../xz/service/IXzSupplierRecordService.java | 3 +- ...SupplierQualificationApplyServiceImpl.java | 2 +- .../impl/XzSupplierRecordServiceImpl.java | 4 +- .../application-gsx-t-dev.properties | 4 +- 14 files changed, 72 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java index f9a7740cf..b5e41b843 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java @@ -202,31 +202,43 @@ public class AsyncHikvision { indexCodes.add(videoItem.getSerialNumber()); if ((i + 1) % 20 == 0) { //20一次发生http请求 - JSONObject requestParam = new JSONObject(); - requestParam.put("pageNo", 1); - requestParam.put("pageSize", 20); - requestParam.put("indexCodes", indexCodes); - JSONObject jo = hikvisionCall.getVqdForHikvision(projectVideoConfig, requestParam); - if (jo != null) { - //插入结果 - JSONArray listJa = jo.getJSONArray("list"); - if (CollUtil.isEmpty(listJa)) { - continue; - } - for (int j = 0; j < listJa.size(); j++) { - JSONObject lJo = listJa.getJSONObject(j); - ProjectVideoHkVqd vqd = new ProjectVideoHkVqd(); - BeanUtil.copyProperties(lJo, vqd); - vqd.setProjectSn(projectVideoConfig.getProjectSn()); - projectVideoHkVqdMapper.insert(vqd); - } - } + addVqdForHikvisionBatch(projectVideoConfig, indexCodes); + indexCodes = new ArrayList<>(); } else if (i == videoItems.size() - 1) { - + //最后一次 + addVqdForHikvisionBatch(projectVideoConfig, indexCodes); + indexCodes = new ArrayList<>(); } } } catch (Exception e) { e.printStackTrace(); } } + + /** + * 批量插入视频质量诊断结果 + * + * @param projectVideoConfig + * @param indexCodes + */ + private void addVqdForHikvisionBatch(ProjectVideoConfig projectVideoConfig, ArrayList indexCodes) { + JSONObject requestParam = new JSONObject(); + requestParam.put("pageNo", 1); + requestParam.put("pageSize", 20); + requestParam.put("indexCodes", indexCodes); + JSONObject jo = hikvisionCall.getVqdForHikvision(projectVideoConfig, requestParam); + if (jo != null) { + //插入结果 + JSONArray listJa = jo.getJSONArray("list"); + if (CollUtil.isNotEmpty(listJa)) { + for (int j = 0; j < listJa.size(); j++) { + JSONObject lJo = listJa.getJSONObject(j); + ProjectVideoHkVqd vqd = new ProjectVideoHkVqd(); + BeanUtil.copyProperties(lJo, vqd); + vqd.setProjectSn(projectVideoConfig.getProjectSn()); + projectVideoHkVqdMapper.insert(vqd); + } + } + } + } } diff --git a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java index 469db61cc..cafcb5bf4 100644 --- a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java +++ b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java @@ -156,12 +156,13 @@ public class SafetyHatWSClient { //纬度(坐标系：高德地图 GCJ-02) Double xPoint = jo.getDouble("x_point"); Double yPoint = jo.getDouble("y_point"); + Long time = jo.getLong("time"); Long ctime = joData.getLong("c_time"); Integer sosType = jo.getInteger("sos_type"); SafetyHatAlarm alarm = new SafetyHatAlarm(); alarm.setWorkerInfoId(dev.getWorkerInfoId()); alarm.setDevSn(dev.getDevSn()); - alarm.setAlarmTime(new Date(ctime * 1000L)); + alarm.setAlarmTime(new Date(time * 1000L)); alarm.setProjectSn(dev.getProjectSn()); alarm.setAlarmType(sosType); alarm.setLatitude(yPoint); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java index a6d7b7272..9e00e9e77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java @@ -174,5 +174,7 @@ public class SystemUser implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date registryTime; - + @TableField(exist = false) + @ApiModelProperty(value = "旧密码") + private java.lang.String oldPassword; } 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 c23705b6d..dfd2ff976 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 @@ -1130,6 +1130,13 @@ public class SystemUserServiceImpl extends ServiceImpl getXzSupplierByUserId(@RequestBody Map map) { - return Result.success(xzSupplierRecordService.getXzSupplierByUserId(map)); - } + @ApiOperation(value = "通过星纵-供应商-资质申请id查询星纵-供应商记录信息", notes = "通过星纵-供应商-资质申请id查询星纵-供应商记录信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "xzSupplierQualificationApplyId", value = "星纵-供应商-资质申请id", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/getXzSupplierByXzSupplierQualificationApplyId") + public Result getXzSupplierByXzSupplierQualificationApplyId(@RequestBody Map map) { + return Result.success(xzSupplierRecordService.getXzSupplierByXzSupplierQualificationApplyId(map)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationApply.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationApply.java index a3017019e..31bcb3839 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationApply.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationApply.java @@ -99,9 +99,4 @@ public class XzSupplierQualificationApply implements Serializable { @ApiModelProperty(value = "用户id") private java.lang.Long userId; - @TableField(exist = false) - @ApiModelProperty(value = "1审批通过2审批拒绝") - private java.lang.Integer type; - - } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java index f80afbc68..57ff6246c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzSupplierQualificationRecord.java @@ -32,11 +32,11 @@ public class XzSupplierQualificationRecord implements Serializable { @ApiModelProperty(value = "id") private java.lang.Long id; /** - * 星纵-供应商记录id + * 星纵-供应商-资质申请id */ - @Excel(name = "星纵-供应商记录id", width = 15) - @ApiModelProperty(value = "星纵-供应商记录id") - private java.lang.Long xzSupplierRecordId; + @Excel(name = "星纵-供应商-资质申请id", width = 15) + @ApiModelProperty(value = "星纵-供应商-资质申请id") + private java.lang.Long xzSupplierQualificationApplyId; /** * 资质文件名称 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierRecordMapper.java index 25bea7d76..b57bea3b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzSupplierRecordMapper.java @@ -25,5 +25,5 @@ public interface XzSupplierRecordMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); - XzSupplierRecord getXzSupplierByUserId(Map map); + XzSupplierRecord getXzSupplierByXzSupplierQualificationApplyId(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierRecordMapper.xml index 88f4a2482..d52d727b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzSupplierRecordMapper.xml @@ -7,11 +7,14 @@ ${ew.customSqlSegment} - SELECT a.*,b.user_id,c.company_type_name,b.xz_supplier_type_id,b.project_director_name,b.project_director_phone - from xz_supplier_record a INNER JOIN xz_user_to_supplier b ON a.id=b.xz_supplier_id + from xz_supplier_record a + join xz_supplier_qualification_apply xsqa on a.id = xsqa.xz_supplier_record_id + INNER JOIN xz_user_to_supplier b ON xsqa.apply_user_id=b.user_id LEFT JOIN xz_supplier_type c ON b.xz_supplier_type_id=c.id - WHERE b.user_id=#{userId} + WHERE xsqa.id=#{xzSupplierQualificationApplyId} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java index d84c75cd7..f01deed9d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzSupplierRecordService.java @@ -1,6 +1,5 @@ package com.zhgd.xmgl.modules.xz.service; -import com.zhgd.xmgl.modules.xz.entity.XzSupplier; import com.zhgd.xmgl.modules.xz.entity.XzSupplierRecord; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,5 +26,5 @@ public interface IXzSupplierRecordService extends IService { void delete(String id); - XzSupplierRecord getXzSupplierByUserId(Map map); + XzSupplierRecord getXzSupplierByXzSupplierQualificationApplyId(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java index 75cefbb6b..dc0eaff8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzSupplierQualificationApplyServiceImpl.java @@ -145,7 +145,7 @@ public class XzSupplierQualificationApplyServiceImpl extends ServiceImpl map) { - return baseMapper.getXzSupplierByUserId(map); + public XzSupplierRecord getXzSupplierByXzSupplierQualificationApplyId(Map map) { + return baseMapper.getXzSupplierByXzSupplierQualificationApplyId(map); } diff --git a/src/main/resources/application-gsx-t-dev.properties b/src/main/resources/application-gsx-t-dev.properties index fb96c365e..22db91a73 100644 --- a/src/main/resources/application-gsx-t-dev.properties +++ b/src/main/resources/application-gsx-t-dev.properties @@ -22,9 +22,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://192.168.34.221:30002 -#serverUrl=http://182.90.224.237:7000 -#serverUrl=http://127.0.0.1:6023 +serverUrl=http://182.90.224.237:51234 #\u89C6\u9891\u5206\u6790url video-analysis-url= server.ssl.enabled=false