From fbb3e2c8042e221a2d6eca0e4087a6f3ea7effd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Fri, 28 Jul 2023 09:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/process/service/impl/SupvPushGwServiceImpl.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
index aa392d6b6..aa83f1aa1 100644
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
@@ -1,6 +1,7 @@
 package com.njcn.process.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -162,8 +163,8 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
             }
 
             //监督对象类型
-            if(mapSubvObjType.containsKey(supvPlan.getSupvType())) {
-                supvPlan.setSupvType(String.format("%02d", mapSubvObjType.get(supvPlan.getSupvType()).getAlgoDescribe()));
+            if(mapSubvObjType.containsKey(supvPlan.getSupvObjType())) {
+                supvPlan.setSupvType(String.format("%02d", mapSubvObjType.get(supvPlan.getSupvObjType()).getAlgoDescribe()));
             }
 
             //电站等级
@@ -188,6 +189,8 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
                 pvTerminalTreeVO = mapCode.get(supvPlan.getPlanOrgId());
                 supvPlan.setPlanOrgName(pvTerminalTreeVO.getName());
             }
+
+            supvPlan.setSupvObjId(IdUtil.simpleUUID());
         }
         if(supvPlanList.size()>100){
             throw new BusinessException("一次最多上送100条数据");