井站管理中井管理，站管理接口编写、调整

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

@@ -37,16 +37,17 @@ public class StationController {
 	 * 主页侧边选井树，加载直接子节点
 	 * @param superId 上级节点id
 	 * @param nodeType  节点类型（well、org）
+	 * @param typeEnd  某类节点是否结束
 	 * @param token  登录人信息，自动从请求获取
 	 * @return
 	 */
 	@RequestMapping("/loadSideTreeSubNodes")
-	public RespVO<List<SideTreeNode>> loadSideTreeSubNodes(String id,String nodeType,AccessToken token) {
+	public RespVO<List<SideTreeNode>> loadSideTreeSubNodes(String id,String nodeType,Boolean typeEnd,AccessToken token) {
 		if(StringUtils.isBlank(id)) {
 			id="0";
 		}
 		List<SideTreeNode> nodes=null;
-		if(SideTreeNode.WELL_NODE.equals(nodeType)) {
+		if(SideTreeNode.ORG_NODE.equals(nodeType)&&typeEnd) {
 			nodes=wellService.loadSideTreeSubNodes(id);
 		}
 		else {

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

@@ -1,5 +1,6 @@
 package com.hb.proj.base.controller;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +20,7 @@ import jakarta.validation.constraints.NotBlank;
 @Validated
 public class WellController {
 
+	@Autowired
 	private WellService service;
 	
 	/**

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

@@ -51,6 +51,7 @@ public class WellService {
     
     public boolean update(Well well) {
     	well.setModifyTime(new Date());
+    	well.setDelIf(false);
         return dao.update(well, "tzl_well", "well_id")>0;
     }
     
@@ -64,9 +65,10 @@ public class WellService {
     public WellVO get(String wellId){
         String sql="""
 				
-				select w.*,
+				select w.*,g.org_name belong_org_name,
 				(select group_concat(d.device_code) from tzl_gather_device d where d.well_id=w.well_id and d.del_if=false group by d.well_id) device_code 
 				from tzl_well w
+				left join tsys_org g on w.org_id=g.org_id and g.del_if=false
 				where w.well_id=?
 				
 				""";

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

@@ -2,7 +2,7 @@ package com.hb.proj.model;
 
 import lombok.Data;
 
-@Data
+
 public class SideTreeNode {
 	
 	public static final String WELL_NODE="well";
@@ -19,5 +19,61 @@ public class SideTreeNode {
 	
 	private Boolean typeEnd;  //该类型节点是否为末级
 	
-	private boolean isLeaf=false;  //是否叶子节点
+	private Boolean isLeaf=false;  //是否叶子节点
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getSuperId() {
+		return superId;
+	}
+
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getNodeType() {
+		return nodeType;
+	}
+
+	public void setNodeType(String nodeType) {
+		this.nodeType = nodeType;
+	}
+
+	public Boolean getTypeEnd() {
+		return typeEnd;
+	}
+
+	public void setTypeEnd(Boolean typeEnd) {
+		this.typeEnd = typeEnd;
+	}
+
+	public Boolean getIsLeaf() {
+		return isLeaf;
+	}
+
+	public void setIsLeaf(Boolean isLeaf) {
+		this.isLeaf = isLeaf;
+	}
+
+	public static String getWellNode() {
+		return WELL_NODE;
+	}
+
+	public static String getOrgNode() {
+		return ORG_NODE;
+	}
 }

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

@@ -60,4 +60,19 @@ public class Well {
      * 巡查标准显示模板
      */
     private String patrolStdTemp;
+    
+    /**
+     * 显示序号
+     */
+    private Integer displayNum;
+    
+    /**
+     * 坐标经度
+     */
+    private String lng;
+    
+    /**
+     * 坐标纬度
+     */
+    private String lat;
 }

src/main/java/com/hb/proj/sys/controller/UserController.java

@@ -4,9 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import cn.hutool.core.util.IdUtil;
-import com.hb.proj.model.UserRolePO;
-import com.hb.proj.sys.service.UserRoleService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +15,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.hb.proj.allconfig.AccessToken;
 import com.hb.proj.allconfig.SysLog;
 import com.hb.proj.model.User;
+import com.hb.proj.model.UserRolePO;
 import com.hb.proj.model.UserVO;
+import com.hb.proj.sys.service.UserRoleService;
 import com.hb.proj.sys.service.UserService;
 import com.hb.proj.utils.RequestParams;
 import com.hb.proj.utils.RespVO;
@@ -137,7 +136,7 @@ public class UserController {
 			 return RespVOBuilder.error("用户已不存在");
 		}
 		
-		if(dbUser.getLoginId().equals(user.getLoginId())) {  //修改了账号
+		if(!dbUser.getLoginId().equals(user.getLoginId())) {  //修改了账号
 			if(userService.isLoginIdUsing(user.getLoginId(), user.getUserId())) {
 				 return RespVOBuilder.error("该账号已被占用，请更换");
 			}

src/main/java/com/hb/proj/sys/service/OrgService.java

@@ -36,7 +36,7 @@ public class OrgService {
 	public List<SideTreeNode>  loadSideTreeSubNodes(String superId){
 		StringBuilder sql=new StringBuilder();
 		sql.append("select g.org_id id,g.org_name name,g.super_id,'"+SideTreeNode.ORG_NODE+"' node_type, ");
-		sql.append(" (select count(1) from tsys_org gs where gs.del_if=false and gs.super_id=g.org_id) type_end");
+		sql.append(" (select case when count(1)=0 then true else false end from tsys_org gs where gs.del_if=false and gs.super_id=g.org_id) type_end");
 		sql.append(" from tsys_org g");
 		
 		sql.append(" where g.del_if=false and g.super_id=?");