合并

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -473,4 +473,11 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
+
+    // 树形菜单
+    @RequestMapping(value="/center/taUser/city/tree",method= RequestMethod.GET)
+    public ResponseBean cityTree(){
+        ResponseBean taUser = iTaUserService.cityTree();
+        return taUser;
+    }
 }

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -3,10 +3,7 @@ package com.huiju.estateagents.center.taUser.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -166,6 +163,22 @@ public class TaUser implements Serializable {
     /**
      * ta_org/orgNum楼盘最大数
      */
-    @TableField(exist = false)
+  @TableField(exist = false)
     private int orgNum;
+
+    // 所有省份城市
+    @TableField(exist = false)
+    List<TdCity> tdCityList;
+
+    /**
+     * 前台传值城市
+     */
+    @TableField(exist = false)
+    private ArrayList<Integer> selectCityTree;
+
+    /**
+     * 城市ID
+     */
+    @TableField(exist = false)
+    private Integer cityId;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.center.taUser.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 
@@ -35,4 +36,10 @@ public interface ITaUserService extends IService<TaUser> {
     TaUser addAdminUser(TaUser taUser) throws Exception;
     
     TaUser updateAdminUser(TaUser taUser) throws Exception;
+
+    /**
+     * 查询所有城市
+     * @return
+     */
+    ResponseBean cityTree();
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
@@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -71,6 +73,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private ITaBuildingReportService iTaBuildingReportService;
+
+	@Autowired
+    private  TdCityMapper tdCityMapper;
+
+	@Autowired
+	private  TaOrgCityMapper taOrgCityMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -104,11 +112,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setName(taUser.getOrgName());
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
-		taOrg.setOrgNum(taUser.getOrgNum());
+		taOrg.setBuildingNum(taUser.getOrgNum());
+		taOrg.setDefaultCityId(taUser.getCityId());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
 
+		// 维护当前城市所在城市
+		addAndupdate(taUser.getSelectCityTree(),false,taOrg.getOrgId());
+
 		// 插入积分, 默认全部 1 积分
 		List<TdPointsRules> pointsRules = tdPointsRulesMapper.getTPLRules();
 		if (pointsRules != null) {
@@ -151,6 +163,32 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return taUser;
 	}
 
+	// 维护公司所在城市
+	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
+
+			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
+			tdCityQuery.eq("leveltype",1);
+			 List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
+
+		// isA=true删除所有城市重新添加
+		if (isA == true){
+			for(Integer city:selectCityTree) {
+				taOrgCityMapper.deleteById(city);
+			}
+		}
+			 // 对比现在的城市ID
+			 for(Integer city:selectCityTree){
+				for (TdCity tdCity : tdCityList){
+					if (city.equals(tdCity.getId())){
+						TaOrgCity  taOrgCity = new TaOrgCity();
+						taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+					}
+
+				}
+			 }
+
+	}
+
 	@Override
 	public TaUser getInfoWithOrg(Integer id) {
 		TaUser taUser = this.getById(id);
@@ -162,7 +200,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
-			taUser.setOrgNum(taOrg.getOrgNum());
+			taUser.setOrgNum(taOrg.getBuildingNum());
+			taOrg.setDefaultCityId(taUser.getCityId());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -186,11 +225,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
-			taOrg.setOrgNum(taUser.getOrgNum());
+			taOrg.setBuildingNum(taUser.getOrgNum());
 
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");
 			}
+
+			addAndupdate(taUser.getSelectCityTree(),true,taOrg.getOrgId());
 		}
 		
 		taUser.setLoginPassword(null);
@@ -367,4 +408,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		
 		return taUser;
 	}
+
+    @Override
+    public ResponseBean cityTree() {
+	   ResponseBean responseBean = new ResponseBean<>();
+	    // 省份
+        TaUser taUser = new TaUser();
+	    QueryWrapper<TdCity> tdCityQueryWrapper= new  QueryWrapper<>();
+        tdCityQueryWrapper.eq("leveltype",1);
+        List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQueryWrapper);
+        taUser.setTdCityList(tdCityList);
+        for (TdCity tdCity: tdCityList){
+            // 根据parentid查询城市
+            QueryWrapper<TdCity> tdCityQuery= new  QueryWrapper<>();
+            tdCityQuery.eq("parentid",tdCity.getId());
+            List<TdCity> city= tdCityMapper.selectList(tdCityQuery);
+            tdCity.setChildren(city);
+        }
+        responseBean.addSuccess(taUser);
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/entity/TaOrg.java

@@ -60,5 +60,10 @@ public class TaOrg implements Serializable {
     /**
      * 最大数
      */
-    private int orgNum;
+    private int buildingNum;
+
+    /**
+     * 默认城市
+     */
+    private Integer defaultCityId;
 }

src/main/java/com/huiju/estateagents/entity/TdCity.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -77,5 +78,8 @@ public class TdCity implements Serializable {
     @TableField(exist = false)
     private String initial;
 
+    // 父节点的子类
+    @TableField(exist = false)
+    private List<TdCity> children;
 
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -300,7 +300,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQuery.eq("org_id",orgId);
         taBuildingQuery.gt("status",-1);
         int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
-        if (orgNum >= taOrg.getOrgNum()){
+        if (orgNum >= taOrg.getBuildingNum()){
             return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
         }