合并

src/main/java/com/huiju/estateagents/controller/TdCityController.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaOrgCity;
 import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -38,12 +41,15 @@ public class TdCityController extends BaseController {
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    private TaOrgCityMapper taOrgCityMapper;
+
 
     /**
-     * 查询列表
+     * 中心端城市
      * @return
      */
-    @RequestMapping(value="/admin/tdCity",method= RequestMethod.GET)
+    @RequestMapping(value="/center/tdCity",method= RequestMethod.GET)
     public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -56,15 +62,28 @@ public class TdCityController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 业务端城市
+     */
+    @RequestMapping(value="/admin/tdCityList/tdCity",method= RequestMethod.GET)
+    public ResponseBean adminTdCityList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean<>();
+        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectAdminTdCityList(getOrgId(request));
+        responseBean.addSuccess(taOrgCityList);
+        return responseBean;
+    }
+
+
     /**
      * 查询列表
      * @return
      */
     @RequestMapping(value="/wx/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype){
+    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TdCity> result = iTdCityService.selectCity(leveltype, "1");
+            /**leveltype,暂时保留*/
+            List<TdCity> result = iTdCityService.selectWxCity(leveltype,getOrgId(request));
             responseBean.addSuccess(result);
         }catch (Exception e){
             logger.error("tdCityList -=- {}",e.toString());

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

@@ -56,4 +56,10 @@ public class TaOrgCity implements Serializable {
      * 上级ID
      */
     private Integer parentid;
+
+    /**
+     * 城市首字母
+     */
+    @TableField(exist = false)
+    private String initial;
 }

src/main/java/com/huiju/estateagents/mapper/TaOrgCityMapper.java

@@ -20,4 +20,11 @@ import java.util.List;
 public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
     // 查询所有的城市排除省份
     ArrayList<Integer> selectByIdCity(@Param("orgId") Integer orgId);
+
+    /**
+     * 根据orgid查询城市并排除省份
+     * @param orgId
+     * @return
+     */
+    List<TaOrgCity> selectAdminTdCityList(Integer orgId);
 }

src/main/java/com/huiju/estateagents/mapper/TdCityMapper.java

@@ -20,4 +20,10 @@ import java.util.List;
 public interface TdCityMapper extends BaseMapper<TdCity> {
     List<TdCity> selectCity(@Param("leveltype")String leveltype,@Param("status") String status);
 
+    /**
+     *查出当前ta_org_city下的城市
+     * @param orgId
+     * @return
+     */
+    List<TdCity> selectWxCity(@Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITdCityService.java

@@ -17,4 +17,6 @@ import java.util.List;
 public interface ITdCityService extends IService<TdCity> {
     List<TdCity> selectCity(String leveltype,String status);
 
+    // 微信端城市
+    List<TdCity> selectWxCity(String leveltype,Integer orgId);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,4 +27,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
         return tdCityMapper.selectCity(leveltype, status);
     }
 
+
+    @Override
+    public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
+        List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
+        return null;
+    }
+
 }

src/main/resources/mapper/TaOrgCity.xml

@@ -4,4 +4,23 @@
     <select id="selectByIdCity"  resultType="int">
         select city_id from ta_org_city where  parentid != 100000 and  org_id = #{orgId}
     </select>
+
+    <select id="selectAdminTdCityList" resultType="com.huiju.estateagents.entity.TaOrgCity">
+                SELECT
+                    oc.city_id AS id,
+                    oc.`name` AS name,
+                    oc.org_id,
+                    oc.`status`,
+                    oc.parentid,
+                LEFT (c.pinyin, 1) AS initial
+                FROM
+                ta_org_city oc
+                LEFT JOIN td_city c ON oc.city_id = c.id
+                WHERE
+                oc.org_id = #{orgId}
+                and  oc.parentid  !=100000
+                and  oc.status = 1
+                ORDER BY
+                c.pinyin
+    </select>
 </mapper>

src/main/resources/mapper/TdCityMapper.xml

@@ -19,6 +19,26 @@ FROM
 ORDER BY
 	pinyin
     </select>
-    
+
+
+    <select id="selectWxCity" resultType="com.huiju.estateagents.entity.TdCity">
+
+        SELECT
+                    oc.city_id AS id,
+                    oc.`name` AS name,
+                    oc.org_id,
+                    oc.`status`,
+                    oc.parentid,
+                LEFT (c.pinyin, 1) AS initial
+                FROM
+                ta_org_city oc
+                LEFT JOIN td_city c ON oc.city_id = c.id
+                WHERE
+                oc.org_id = #{orgId}
+                and  oc.parentid  !=100000
+                and  oc.status = 1
+                ORDER BY
+                c.pinyin
+    </select>
 
 </mapper>