1.3d左侧耳朵查询返回增加闪烁频率、是否显示顶牌、顶牌内容

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/common/response/Node3DVoResponse.java

@@ -77,6 +77,11 @@ public class Node3DVoResponse{
 	private Boolean showInfo = false;
 
 	/**
+	 * 闪烁频率
+	 */
+	private Integer frequency = 0;
+	
+	/**
 	 * 显示图标闪烁
 	 */
 	private Boolean twinkle = false;
@@ -112,19 +117,6 @@ public class Node3DVoResponse{
 	
 	private String orgCode;
 
-	/**
-	 * 闪烁频率每秒
-	 */
-	private int rate = 0;
-
-	public int getRate() {
-		return rate;
-	}
-
-	public void setRate(int rate) {
-		this.rate = rate;
-	}
-
 	public String getId() {
 		return id;
 	}
@@ -159,7 +151,13 @@ public class Node3DVoResponse{
 		this.type = type;
 	}
 
+	public Integer getFrequency() {
+		return frequency;
+	}
 
+	public void setFrequency(Integer frequency) {
+		this.frequency = frequency;
+	}
 
 	public String getLevel() {
 		return level;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

@@ -190,7 +190,7 @@ public class View3dController extends BaseController {
 		return CommonResponseUtil.success(view3dService.getEquipStatusList(orgCode));
 	}
 	
-	@ApiOperation(value = "资源显示",notes = "资源显示")
+	@ApiOperation(value = "3d视图点显示",notes = "3d视图点显示")
 	@GetMapping(value = "initViewNode")
 	public CommonResponse initViewNode(String type,Long riskSourceId){
 		ReginParams reginParams =getSelectedOrgInfo();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/View3dNodeVo.java

@@ -19,6 +19,42 @@ public class View3dNodeVo {
 	private String[] relationKeys; 
 	private String level;
 	private String levelStr;
+	/**
+	 * 顶牌内容
+	 */
+	private String title;
+	/**
+	 * 闪烁频率
+	 */
+	private Integer frequency = 0;
+	/**
+	 * 是否显示顶牌
+	 */
+	private Boolean showInfo;
+
+	public Boolean getShowInfo() {
+		return showInfo;
+	}
+
+	public void setShowInfo(Boolean showInfo) {
+		this.showInfo = showInfo;
+	}
+
+	public Integer getFrequency() {
+		return frequency;
+	}
+
+	public void setFrequency(Integer frequency) {
+		this.frequency = frequency;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
 
 	public Long getId() {
 		return id;

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -548,10 +548,15 @@
 					'riskSource' as type,
 					rl.level,
 					CONCAT('level_',rl.level) as level_str,
-					R.id as risk_source_id
-				from f_risk_source R
-				left join f_risk_level rl on rl.id = r.risk_level_id
-				where is_region <![CDATA[<>]]> 'TRUE' AND status = 'ANOMALY'
+					R.id as risk_source_id,
+		            r.flicker_frequency as frequency,
+		            true as 'showInfo',
+					r.rpn as title
+				from f_risk_source R ,f_risk_level rl
+				where
+				r.is_region <![CDATA[<>]]> 'TRUE'
+				AND R.status = 'ANOMALY'
+				AND rl.id = r.risk_level_id
 				AND R.org_code like CONCAT(#{orgCode},'%')
 			UNION ALL
 			select
@@ -559,9 +564,24 @@
 					'patrol' as type,
 					p.status as level,
 					CONCAT('level_',p.status) as level_str,
-					p.risk_source_id
+					p.risk_source_id,
+		            0 as frequency,
+		            case p.status
+						when '0'
+						then false
+						else
+						true
+		            end as `showInfo`,
+		            case p.status
+						when '0'
+						then '未计划'
+						when '2'
+						then '不合格'
+						when '3'
+						then '漏检'
+		            end as title
 				from p_point p
-				where status in (0,2,3)
+				where status in ('0','2','3')
 				AND p.org_code like CONCAT(#{orgCode},'%')
 			UNION ALL
 			select 
@@ -569,7 +589,10 @@
 					'impEquipment' as type,
 					0 as level,
 					'level_0' as kevek_str,
-					e.risk_source_id
+					e.risk_source_id,
+					0 as frequency,
+					false as 'showInfo',
+					'' as title
 				from 
 				f_equipment e
 				left join f_equipment_fire_equipment efe ON e.id = efe.equipment_id
@@ -620,11 +643,12 @@
 				END positionDTO,
 				'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,
 				'{ "x": 1, "y": 1, "z": 1 }' scaleDTO,
-				false showInfo,
-				rs. CODE title,
+				true as showInfo,
+				rs.rpn as title,
 				'riskSource' type,
 				rs.org_code as orgCode,
-				rs.id as riskSourceId
+				rs.id as riskSourceId,
+		        rs.flicker_frequency as frequency
 		FROM
 				f_risk_source rs
 			LEFT JOIN f_risk_level rl ON rl.id = rs.risk_level_id
@@ -632,6 +656,7 @@
 				rs.position3d IS NOT NULL
 			AND rs.position3d != ''
 			AND rs.risk_level_id is not null
+			AND rs.is_region <![CDATA[<>]]> 'TRUE'
 			AND rs.status = 'ANOMALY'
 			UNION ALL
 				SELECT
@@ -664,11 +689,12 @@
 				END positionDTO,
 				'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,
 				'{ "x": 1, "y": 1, "z": 1 }' scaleDTO,
-				FALSE showInfo,
-				CODE title,
+				FALSE as showInfo,
+				name as title,
 				'impEquipment' type,
 				eq.org_code as orgCode,
-				eq.risk_source_id as riskSourceId
+				eq.risk_source_id as riskSourceId,
+		        0 as frequency
 		FROM
 				f_equipment eq
 			WHERE
@@ -710,16 +736,22 @@
 				END positionDTO,
 				'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,
 				'{ "x": 1, "y": 1, "z": 1 }' scaleDTO,
-				FALSE showInfo,
-				p.point_no title,
+				case p.status
+					when '0'
+					then false
+					else
+					true
+				end as `showInfo`,
+				p.name as title,
 				'patrol' as type,
 				p.org_code as orgCode,
-				p.risk_source_id as riskSourceId
+				p.risk_source_id as riskSourceId,
+				0 as frequency
 			from 
 			p_point p 
 			left join f_risk_source rs on p.risk_source_id = rs.id AND rs.is_region='TRUE'
 			where rs.id is not null
-				AND p.status in ('2','3')
+				AND p.status in ('0','2','3')
 				AND p.coordinates != '' AND p.coordinates is not null
 			) temp
 				WHERE 1=1