修改验收审核不通过

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/service/impl/PointSystemServiceImpl.java

@@ -214,7 +214,7 @@ public class PointSystemServiceImpl extends ServiceImpl<PointSystemMapper, Point
 			if (warningDto != null) {
 				emqKeeper.getMqttClient().publish(STATIONWARNING, JSON.toJSONString(warningDto).getBytes(), 0, false);
 				System.out.println("发送预警成功: " + JSON.toJSONString(warningDto));
-				logger.info("发送预警成功: " + JSON.toJSONString(warningDto));
+				// logger.info("发送预警成功: " + JSON.toJSONString(warningDto));
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -233,10 +233,11 @@ public class PointSystemServiceImpl extends ServiceImpl<PointSystemMapper, Point
 		DynamicDetails dynamicDetails = new DynamicDetails(TABNAME, tabContent);
 		List<DynamicDetails> dynamicDetailsList = new ArrayList<>();
 		dynamicDetailsList.add(dynamicDetails);
-		StringBuilder indexKey = new StringBuilder(pointSystem.getStation()).append("#").append(pointSystem.getNumber())
-				.append("#").append(pointSystem.getFunctionNum());
+		StringBuilder indexKey = new StringBuilder("WL-").append(pointSystem.getStation()).append("#")
+				.append(pointSystem.getNumber()).append("#").append(pointSystem.getFunctionNum());
 		if (pointSystem.getNumber() == null) {
-			indexKey = new StringBuilder(pointSystem.getStationAbbr()).append("#").append(pointSystem.getFunctionNum());
+			indexKey = new StringBuilder("WL-").append(pointSystem.getStation()).append("#")
+					.append(pointSystem.getFunctionNum());
 		}
 
 		QueryWrapper<EquipmentSpecificIndex> indexWrapper = new QueryWrapper<>();
@@ -266,7 +267,7 @@ public class PointSystemServiceImpl extends ServiceImpl<PointSystemMapper, Point
 		if ("SYZ".equals(pointSystem.getNumber())) {
 			// 如果开启升压站预警
 			if (warnSYZ) {
-				indexKey = new StringBuilder(pointSystem.getStation()).append("#").append(pointSystem.getNumber())
+				indexKey =new StringBuilder("WL-").append(pointSystem.getStation()).append("#").append(pointSystem.getNumber())
 						.append("#").append(pointSystem.getFunctionNum());
 			} else {
 				System.out.println("升压站预警不发送: " + warningObjectCode + " , " + indexValue);
@@ -276,7 +277,7 @@ public class PointSystemServiceImpl extends ServiceImpl<PointSystemMapper, Point
 
 		String key = "104_warning:" + warningObjectCode + "_" + indexKey.toString() + "_" + indexValue;
 		// 添加缓存机制 在有限的时间内防止一直触发
-		if (redisUtil.get(key) != null&&redisUse) {
+		if (redisUtil.get(key) != null && redisUse) {
 			System.out.println("预警缓存存在,不触发: " + key);
 			return null;
 		} else {

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/AcceptanceStatusEnum.java

@@ -32,8 +32,10 @@ public enum AcceptanceStatusEnum {
     线下验收不通过("线下验收不通过", "9", "hygf_ys6","5"),
 
     验收完成("验收完成", "10", "hygf_ys5","5"),
-    线下验收完成("验收完成", "10", "hygf_ys6","0");
-
+    
+    线下验收完成("验收完成", "10", "hygf_ys6","0"),
+    
+    工程审核不通过("审核不通过", "12", "hygf_bw2","5");
     /**
      * 名称，描述
      */

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DealerReviewServiceImpl.java

@@ -108,7 +108,9 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
             }
                 return fl;
         } catch (Exception e) {
-            throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+        	 e.printStackTrace();
+        	 return false;
+            //throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
         }
     }