单井巡查获取实时数据排除图形数据，另取；自选井获取数据增加节点类型

src/main/java/com/hb/proj/base/controller/CustomWellController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.hb.proj.allconfig.AccessToken;
 import com.hb.proj.base.service.CustomWellService;
 import com.hb.proj.model.CustomWellPO;
+import com.hb.proj.model.CustomWellVO;
 import com.hb.proj.utils.RespVO;
 import com.hb.proj.utils.RespVOBuilder;
 import com.hb.xframework.dao.util.UUIDHexGenerator;
@@ -32,7 +33,7 @@ public class CustomWellController {
 	 * @return
 	 */
 	@RequestMapping("/loadMyCustomWells")
-	public RespVO<List<CustomWellPO>> loadMyCustomWells(AccessToken token){
+	public RespVO<List<CustomWellVO>> loadMyCustomWells(AccessToken token){
 		return RespVOBuilder.ok(service.loadMyCustomWells(token.getTokenId()));
 	}
 	

src/main/java/com/hb/proj/base/service/CustomWellService.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.hb.proj.model.CustomWellPO;
+import com.hb.proj.model.CustomWellVO;
 import com.hb.proj.model.SideTreeNode;
 import com.hb.xframework.dao.core.PreparedSQLArgs;
 import com.hb.xframework.dao.core.SpringJdbcDAO;
@@ -70,15 +71,15 @@ public class CustomWellService {
 	 * @param userId
 	 * @return
 	 */
-	public List<CustomWellPO> loadMyCustomWells(String userId){
+	public List<CustomWellVO> loadMyCustomWells(String userId){
 		String sql="""
-				select node_id,super_id,ifnull(w.well_name,cw.node_name) node_name
+				select node_id,super_id,cw.well_id,ifnull(w.well_name,cw.node_name) node_name
 				from tzl_custom_well cw
 				left join tzl_well w on cw.well_id=w.well_id and w.del_if=false
 				where user_id=?
 				order by cw.display_num
 				""";
-		return dao.queryForList(sql, CustomWellPO.class, userId);
+		return dao.queryForList(sql, CustomWellVO.class, userId);
 	}
 	
 	/**

src/main/java/com/hb/proj/constant/SortCodeConstant.java

@@ -8,5 +8,11 @@ public class SortCodeConstant {
 
 	public static final String PARAM_FREQ="freq";
 	
-	public static final Map<String,Object> paramType=MapUtils.build("diagram_load","GT","diagram_current","DL","diagram_power","DGL");
+	public static final String PARAM_DIAGRAM_LOAD="diagram_load";
+	
+	public static final String PARAM_DIAGRAM_CURRENT="diagram_current";
+	
+	public static final String PARAM_DIAGRAM_POWER="diagram_power";
+	
+	public static final Map<String,Object> paramType=MapUtils.build(PARAM_DIAGRAM_LOAD,"GT",PARAM_DIAGRAM_CURRENT,"DL",PARAM_DIAGRAM_POWER,"DGL");
 }

src/main/java/com/hb/proj/data/controller/SinglePatrolController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.hb.proj.base.service.PatrolTempService;
 import com.hb.proj.base.service.WellParamService;
 import com.hb.proj.base.service.WellService;
+import com.hb.proj.constant.SortCodeConstant;
 import com.hb.proj.model.TempPO;
 import com.hb.proj.model.WellVO;
 import com.hb.proj.utils.JacksonUtils;
@@ -85,6 +86,12 @@ public class SinglePatrolController {
 		Map<String,String>  rtData=ops.entries(wellId);
 		WellVO well=wellService.get(wellId);
 		rtData.put("status", well!=null?well.getStatus():null);
+		
+		//去除图形数据
+		rtData.remove(SortCodeConstant.PARAM_DIAGRAM_LOAD);
+		rtData.remove(SortCodeConstant.PARAM_DIAGRAM_CURRENT);
+		rtData.remove(SortCodeConstant.PARAM_DIAGRAM_POWER);
+		
 		return RespVOBuilder.ok(rtData);
 	}
 }

src/main/java/com/hb/proj/model/CustomWellVO.java

@@ -0,0 +1,20 @@
+package com.hb.proj.model;
+
+import org.apache.commons.lang3.StringUtils;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class CustomWellVO extends CustomWellPO {
+
+	private String nodeType;
+	
+	public void setWellId(String wellId) {
+		super.setWellId(wellId);
+		if(StringUtils.isNotBlank(wellId)) {
+			this.nodeType="well";
+		}
+	}
+}