From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 377 insertions(+), 42 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
index f6d6087..63d9094 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
@@ -2,9 +2,12 @@
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
+import utils.StringUtils;
-import java.util.Date;
+import java.util.*;
/**
* 涓�鏈轰竴妗�
@@ -27,6 +30,54 @@
private String SBMC;
/**
+ * 鎽勫儚鏈洪噰闆嗗尯鍩燂紙鍙傝�冩枃妗ｈВ鏋愶級
+ */
+ private String SXJCJQY;
+
+ /**
+ * 鐩戞帶鐐逛綅绫诲瀷锛�1-涓�绫昏棰戠洃鎺х偣锛�2-浜岀被瑙嗛鐩戞帶鐐癸紱3-涓夌被瑙嗛鐩戞帶鐐癸紱4-鍏畨鍐呴儴瑙嗛鐩戞帶鐐癸紱9-鍏朵粬鐐逛綅銆�
+ * 鍙傜収鍏畨閮ㄣ�婂叧浜庤繘涓�姝ュ姞寮哄叕瀹夋満鍏宠棰戝浘鍍忎俊鎭簲鐢ㄥ伐浣滅殑鎰忚銆嬶紙鍏�氬瓧锕�2015锕�4鍙凤級瀹氫箟銆�
+ */
+ private String JKDWLX;
+
+ /**
+ * IPV4鍦板潃锛屾憚鍍忔満IP鍦板潃銆�
+ */
+ private String IP;
+
+ /**
+ * IPV6鍦板潃锛屾憚鍍忔満鎵╁睍IP鍦板潃銆�
+ */
+// private String IPV6;
+
+ /**
+ * 缁忓害銆�
+ */
+ private Double JD;
+
+ /**
+ * 绾害銆�
+ */
+ private Double WD;
+
+ /**
+ * 鎽勫儚鏈哄姛鑳界被鍨嬶紝鍙栧�艰寖鍥�(澶氶��) : [1.瑙嗛鐩戞帶;2.杞﹁締璇嗗埆;3.浜哄憳璇嗗埆;] 鏁版嵁鏍煎紡[濉叆澶氫釜鍊煎苟浠�/闅斿紑銆備緥濡� 1/2]
+ */
+ private String SXJGNLX;
+
+ /**
+ * MAC鍦板潃锛屾憚鍍忔満MAC鍦板潃銆�
+ */
+ private String MACDZ;
+
+ /**
+ * 璁惧鐘舵�侊紝1-鍦ㄧ敤锛�2-缁翠慨锛�3-鎷嗛櫎銆�
+ */
+ private String SBZT;
+
+ //---------------------------------------------------------------------
+
+ /**
* 璁惧鍘傚晢锛岀紪鐮�1-娴峰悍濞佽锛�2-澶у崕锛�3-澶╁湴浼熶笟锛�4-绉戣揪锛�5-瀹夎澹紱6-鍗氫笘锛�7-浜氬畨锛�8-鑻遍鎷擄紱9-瀹囪锛�10-娴蜂俊锛�11-涓槦鐢靛瓙锛�12-鏄庢櫙锛�13-鑱旀兂锛�14-涓叴锛�99-鍏朵粬銆�
*/
private String SBCS;
@@ -35,12 +86,6 @@
* 琛屾斂鍖哄煙锛岃鏀垮尯鍒掋�佺睄璐渷甯傚幙浠ｇ爜銆傚弬鐓с�奊B/T 2260 涓崕浜烘皯鍏卞拰鍥借鏀垮尯鍒掍唬鐮併�嬨��
*/
private String XZQY;
-
- /**
- * 鐩戞帶鐐逛綅绫诲瀷锛�1-涓�绫昏棰戠洃鎺х偣锛�2-浜岀被瑙嗛鐩戞帶鐐癸紱3-涓夌被瑙嗛鐩戞帶鐐癸紱4-鍏畨鍐呴儴瑙嗛鐩戞帶鐐癸紱9-鍏朵粬鐐逛綅銆�
- * 鍙傜収鍏畨閮ㄣ�婂叧浜庤繘涓�姝ュ姞寮哄叕瀹夋満鍏宠棰戝浘鍍忎俊鎭簲鐢ㄥ伐浣滅殑鎰忚銆嬶紙鍏�氬瓧锕�2015锕�4鍙凤級瀹氫箟銆�
- */
- private String JKDWLX;
/**
* 璁惧鍨嬪彿锛屾弿杩拌澶囩殑鍏蜂綋鍨嬪彿銆�
@@ -53,29 +98,9 @@
private String DWSC;
/**
- * IPV4鍦板潃锛屾憚鍍忔満IP鍦板潃銆�
- */
- private String IPV4;
-
- /**
- * IPV6鍦板潃锛屾憚鍍忔満鎵╁睍IP鍦板潃銆�
- */
- private String IPV6;
-
- /**
- * MAC鍦板潃锛屾憚鍍忔満MAC鍦板潃銆�
- */
- private String MACDZ;
-
- /**
* 鎽勫儚鏈虹被鍨嬶紝1-鐞冩満锛�2-鍗婄悆锛�3-鍥哄畾鏋満锛�4-閬ユ帶鏋満锛�5-鍗″彛鏋満锛�99-鏈煡銆�
*/
private String SXJLX;
-
- /**
- * 鎽勫儚鏈哄姛鑳界被鍨嬶紝1-杞﹁締鍗″彛锛�2-浜哄憳鍗″彛锛�3-寰崱鍙ｏ紱4-鐗瑰緛鎽勫儚鏈猴紱5-鏅�氱洃鎺э紱99-鍏朵粬锛屽閫夊悇鍙傛暟浠モ��/鈥濆垎闅斻��
- */
- private String SXJGNLX;
/**
* 琛ュ厜灞炴�э紝1-鏃犺ˉ鍏夈��2-绾㈠琛ュ厜銆�3-鐧藉厜琛ュ厜銆�9-鍏朵粬琛ュ厜銆�
@@ -92,16 +117,6 @@
* 鍙傝�冭寖寮忥細琛楅亾+闂ㄧ墝鍙风爜+鍗曚綅鍚嶇О銆傞珮閫熷叕璺�佸浗閬撶瓑鐐逛綅鍙弬鐓р�滃叕璺悕绉�+鍏噷鏁扳�濊寖寮忋��
*/
private String AZDZ;
-
- /**
- * 缁忓害銆�
- */
- private Double JD;
-
- /**
- * 绾害銆�
- */
- private Double WD;
/**
* 鎽勫儚鏈轰綅缃被鍨嬶紝1-鐪侀檯妫�鏌ョ珯銆�2-鍏氭斂鏈哄叧銆�3-杞︾珯鐮佸ご銆�4-涓績骞垮満銆�5-浣撹偛鍦洪銆�6-鍟嗕笟涓績銆�7-瀹楁暀鍦烘墍銆�8-鏍″洯鍛ㄨ竟銆�9-娌诲畨澶嶆潅鍖哄煙銆�10-浜ら�氬共绾裤��11-鍖婚櫌鍛ㄨ竟銆�12-閲戣瀺鏈烘瀯鍛ㄨ竟銆�13-鍗遍櫓鐗╁搧鍦烘墍鍛ㄨ竟銆�14-鍗氱墿棣嗗睍瑙堥銆�15-閲嶇偣姘村煙銆佽埅閬撱��96-甯傞檯鍏畨妫�鏌ョ珯锛�97-娑夊鍦烘墍锛�98-杈瑰娌跨嚎锛�99-鏃呮父鏅尯锛屽閫夊悇鍙傛暟浠モ��/鈥濆垎闅斻��
@@ -149,13 +164,333 @@
private Integer LXBCTS;
/**
- * 璁惧鐘舵�侊紝1-鍦ㄧ敤锛�2-缁翠慨锛�3-鎷嗛櫎銆�
- */
- private String SBZT;
-
- /**
* 鎵�灞為儴闂�/琛屼笟锛�1-鍏畨鏈哄叧锛�2-鐜繚閮ㄩ棬锛�3-鏂囧崥閮ㄩ棬锛�4-鍖荤枟閮ㄩ棬锛�5-鏃呮父绠＄悊锛�6-鏂伴椈骞跨數锛�7-椋熷搧鍖昏嵂鐩戠潱绠＄悊閮ㄩ棬锛�8-鏁欒偛绠＄悊閮ㄩ棬锛�9-妫�瀵熼櫌锛�10-娉曢櫌锛�11-閲戣瀺閮ㄩ棬锛�12-浜ら�氶儴闂紱13-浣忔埧鍜屽煄涔″缓璁鹃儴闂紱14-姘村埄閮ㄩ棬锛�15-鏋椾笟閮ㄩ棬锛�16-瀹夊叏鐢熶骇鐩戠潱閮ㄩ棬锛�17-甯傛斂甯傚濮旓紱18-鍥藉湡灞�锛屽彲鎵╁睍锛屽閫夊悇鍙傛暟浠モ��/鈥濆垎闅斻��
*/
private String SSBMHY;
+
+ public String getJKDWLX() {
+ if (Objects.equals(JKDWLX, "1")) {
+ this.JKDWLX = "涓�绫昏棰戠洃鎺х偣";
+ }
+ if (Objects.equals(JKDWLX, "2")) {
+ this.JKDWLX = "浜岀被瑙嗛鐩戞帶鐐�";
+ }
+ if (Objects.equals(JKDWLX, "3")) {
+ this.JKDWLX = "涓夌被瑙嗛鐩戞帶鐐�";
+ }
+ if (Objects.equals(JKDWLX, "4")) {
+ this.JKDWLX = "鍏畨鍐呴儴瑙嗛鐩戞帶鐐�";
+ }
+ if (Objects.equals(JKDWLX, "9")) {
+ this.JKDWLX = "鍏朵粬鐐逛綅";
+ }
+ return JKDWLX;
+ }
+
+ public String getSXJGNLX() {
+ List<String> sxjgnlx = new ArrayList<>();
+ if (StringUtils.contains(SXJGNLX, "1")) {
+ sxjgnlx.add("瑙嗛鐩戞帶");
+ }
+ if (StringUtils.contains(SXJGNLX, "2")) {
+ sxjgnlx.add("杞﹁締璇嗗埆");
+ }
+ if (StringUtils.contains(SXJGNLX, "3")) {
+ sxjgnlx.add("浜哄憳璇嗗埆");
+ }
+ if (!sxjgnlx.isEmpty()) {
+ this.SXJGNLX = String.join("/", sxjgnlx);
+ }
+ return SXJGNLX;
+ }
+
+ public String getSBZT() {
+ if (Objects.equals(SBZT, "1")) {
+ this.SBZT = "鍦ㄧ敤";
+ }
+ if (Objects.equals(SBZT, "2")) {
+ this.SBZT = "缁翠慨";
+ }
+ if (Objects.equals(SBZT, "3")) {
+ this.SBZT = "鎷嗛櫎";
+ }
+ return SBZT;
+ }
+
+ public String getSBCS() {
+ if (Objects.equals(SBCS, "1")) {
+ this.SBCS = "娴峰悍濞佽";
+ }
+ if (Objects.equals(SBCS, "2")) {
+ this.SBCS = "澶у崕";
+ }
+ if (Objects.equals(SBCS, "3")) {
+ this.SBCS = "澶╁湴浼熶笟";
+ }
+ if (Objects.equals(SBCS, "4")) {
+ this.SBCS = "绉戣揪";
+ }
+ if (Objects.equals(SBCS, "5")) {
+ this.SBCS = "瀹夎澹�";
+ }
+ if (Objects.equals(SBCS, "6")) {
+ this.SBCS = "鍗氫笘";
+ }
+ if (Objects.equals(SBCS, "7")) {
+ this.SBCS = "浜氬畨";
+ }
+ if (Objects.equals(SBCS, "8")) {
+ this.SBCS = "鑻遍鎷�";
+ }
+ if (Objects.equals(SBCS, "9")) {
+ this.SBCS = "瀹囪";
+ }
+ if (Objects.equals(SBCS, "10")) {
+ this.SBCS = "娴蜂俊";
+ }
+ if (Objects.equals(SBCS, "11")) {
+ this.SBCS = "涓槦鐢靛瓙";
+ }
+ if (Objects.equals(SBCS, "12")) {
+ this.SBCS = "鏄庢櫙";
+ }
+ if (Objects.equals(SBCS, "13")) {
+ this.SBCS = "鑱旀兂";
+ }
+ if (Objects.equals(SBCS, "14")) {
+ this.SBCS = "涓叴";
+ }
+ if (Objects.equals(SBCS, "99")) {
+ this.SBCS = "鍏朵粬";
+ }
+ return SBCS;
+ }
+
+ public String getSXJLX() {
+ if (Objects.equals(SXJLX, "1")) {
+ this.SXJLX = "鐞冩満";
+ }
+ if (Objects.equals(SXJLX, "2")) {
+ this.SXJLX = "鍗婄悆";
+ }
+ if (Objects.equals(SXJLX, "3")) {
+ this.SXJLX = "鍥哄畾鏋満";
+ }
+ if (Objects.equals(SXJLX, "4")) {
+ this.SXJLX = "閬ユ帶鏋満";
+ }
+ if (Objects.equals(SXJLX, "5")) {
+ this.SXJLX = "鍗″彛鏋満";
+ }
+ if (Objects.equals(SXJLX, "99")) {
+ this.SXJLX = "鏈煡";
+ }
+ return SXJLX;
+ }
+
+
+ public String getBGSX() {
+ if (Objects.equals(BGSX, "1")) {
+ this.BGSX = "鏃犺ˉ鍏�";
+ }
+ if (Objects.equals(BGSX, "2")) {
+ this.BGSX = "绾㈠琛ュ厜";
+ }
+ if (Objects.equals(BGSX, "3")) {
+ this.BGSX = "鐧藉厜琛ュ厜";
+ }
+ if (Objects.equals(BGSX, "9")) {
+ this.BGSX = "鍏朵粬琛ュ厜";
+ }
+ return BGSX;
+ }
+
+ public String getSXJBMGS() {
+ if (Objects.equals(SXJBMGS, "1")) {
+ this.SXJBMGS = "MPEG-4";
+ }
+ if (Objects.equals(SXJBMGS, "2")) {
+ this.SXJBMGS = "H.264";
+ }
+ if (Objects.equals(SXJBMGS, "3")) {
+ this.SXJBMGS = "SVAC";
+ }
+ if (Objects.equals(SXJBMGS, "4")) {
+ this.SXJBMGS = "H.265";
+ }
+ return SXJBMGS;
+ }
+
+ public String getSXJWZLX() {
+ List<String> wzlx = new ArrayList<>();
+ if (StringUtils.isBlank(SXJWZLX)) {
+ return SXJWZLX;
+ }
+ String[] split = SXJWZLX.split("/");
+ if (ArrayUtils.contains(split, "1")) {
+ wzlx.add("鐪侀檯妫�鏌ョ珯");
+ }
+ if (ArrayUtils.contains(split, "2")) {
+ wzlx.add("鍏氭斂鏈哄叧");
+ }
+ if (ArrayUtils.contains(split, "3")) {
+ wzlx.add("杞︾珯鐮佸ご");
+ }
+ if (ArrayUtils.contains(split, "4")) {
+ wzlx.add("涓績骞垮満");
+ }
+ if (ArrayUtils.contains(split, "5")) {
+ wzlx.add("浣撹偛鍦洪");
+ }
+ if (ArrayUtils.contains(split, "6")) {
+ wzlx.add("鍟嗕笟涓績");
+ }
+ if (ArrayUtils.contains(split, "7")) {
+ wzlx.add("瀹楁暀鍦烘墍");
+ }
+ if (ArrayUtils.contains(split, "8")) {
+ wzlx.add("鏍″洯鍛ㄨ竟");
+ }
+ if (ArrayUtils.contains(split, "9")) {
+ wzlx.add("娌诲畨澶嶆潅鍖哄煙");
+ }
+ if (ArrayUtils.contains(split, "10")) {
+ wzlx.add("浜ら�氬共绾�");
+ }
+ if (ArrayUtils.contains(split, "11")) {
+ wzlx.add("鍖婚櫌鍛ㄨ竟");
+ }
+ if (ArrayUtils.contains(split, "12")) {
+ wzlx.add("閲戣瀺鏈烘瀯鍛ㄨ竟");
+ }
+ if (ArrayUtils.contains(split, "13")) {
+ wzlx.add("鍗遍櫓鐗╁搧鍦烘墍鍛ㄨ竟");
+ }
+ if (ArrayUtils.contains(split, "14")) {
+ wzlx.add("鍗氱墿棣嗗睍瑙堥");
+ }
+ if (ArrayUtils.contains(split, "15")) {
+ wzlx.add("閲嶇偣姘村煙銆佽埅閬�");
+ }
+ if (ArrayUtils.contains(split, "96")) {
+ wzlx.add("甯傞檯鍏畨妫�鏌ョ珯");
+ }
+ if (ArrayUtils.contains(split, "97")) {
+ wzlx.add("娑夊鍦烘墍");
+ }
+ if (ArrayUtils.contains(split, "98")) {
+ wzlx.add("杈瑰娌跨嚎");
+ }
+ if (ArrayUtils.contains(split, "99")) {
+ wzlx.add("鏃呮父鏅尯");
+ }
+ this.SXJWZLX = String.join("/", wzlx);
+ return SXJWZLX;
+ }
+
+ public String getJSFW() {
+ if (Objects.equals(JSFW, "1")) {
+ this.JSFW = "涓�";
+ }
+ if (Objects.equals(JSFW, "2")) {
+ this.JSFW = "瑗�";
+ }
+ if (Objects.equals(JSFW, "3")) {
+ this.JSFW = "鍗�";
+ }
+ if (Objects.equals(JSFW, "4")) {
+ this.JSFW = "鍖�";
+ }
+ if (Objects.equals(JSFW, "5")) {
+ this.JSFW = "涓滃崡";
+ }
+ if (Objects.equals(JSFW, "6")) {
+ this.JSFW = "涓滃寳";
+ }
+ if (Objects.equals(JSFW, "7")) {
+ this.JSFW = "瑗垮崡";
+ }
+ if (Objects.equals(JSFW, "8")) {
+ this.JSFW = "瑗垮寳";
+ }
+ if (Objects.equals(JSFW, "9")) {
+ this.JSFW = "鍏ㄥ悜";
+ }
+ return JSFW;
+ }
+
+ public String getLWSX() {
+ if (Objects.equals(LWSX, "0")) {
+ this.LWSX = "宸茶仈缃�";
+ }
+ if (Objects.equals(LWSX, "1")) {
+ this.LWSX = "鏈仈缃�";
+ }
+ return LWSX;
+ }
+
+ public String getSSBMHY() {
+ List<String> ssbmhy = new ArrayList<>();
+ if (StringUtils.isBlank(SSBMHY)) {
+ return SSBMHY;
+ }
+ String[] split = SSBMHY.split("/");
+ if (ArrayUtils.contains(split, "1")) {
+ ssbmhy.add("鍏畨鏈哄叧");
+ }
+ if (ArrayUtils.contains(split, "2")) {
+ ssbmhy.add("鐜繚閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "3")) {
+ ssbmhy.add("鏂囧崥閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "4")) {
+ ssbmhy.add("鍖荤枟閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "5")) {
+ ssbmhy.add("鏃呮父绠＄悊");
+ }
+ if (ArrayUtils.contains(split, "6")) {
+ ssbmhy.add("鏂伴椈骞跨數");
+ }
+ if (ArrayUtils.contains(split, "7")) {
+ ssbmhy.add("椋熷搧鍖昏嵂鐩戠潱绠＄悊閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "8")) {
+ ssbmhy.add("鏁欒偛绠＄悊閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "9")) {
+ ssbmhy.add("妫�瀵熼櫌");
+ }
+ if (ArrayUtils.contains(split, "10")) {
+ ssbmhy.add("娉曢櫌");
+ }
+ if (ArrayUtils.contains(split, "11")) {
+ ssbmhy.add("閲戣瀺閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "12")) {
+ ssbmhy.add("浜ら�氶儴闂�");
+ }
+ if (ArrayUtils.contains(split, "13")) {
+ ssbmhy.add("浣忔埧鍜屽煄涔″缓璁鹃儴闂�");
+ }
+ if (ArrayUtils.contains(split, "14")) {
+ ssbmhy.add("姘村埄閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "15")) {
+ ssbmhy.add("鏋椾笟閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "16")) {
+ ssbmhy.add("瀹夊叏鐢熶骇鐩戠潱閮ㄩ棬");
+ }
+ if (ArrayUtils.contains(split, "17")) {
+ ssbmhy.add("甯傛斂甯傚濮�");
+ }
+ if (ArrayUtils.contains(split, "18")) {
+ ssbmhy.add("鍥藉湡灞�");
+ }
+ this.SSBMHY = String.join("/", ssbmhy);
+ return SSBMHY;
+ }
}
--
Gitblit v1.8.0