1.1.0 接口加入city字段

air/src/main/java/com/air/applets/controller/AppletsMapController.java

@@ -1,12 +1,6 @@
 package com.air.applets.controller;
 
-import com.air.applets.entity.Dazutuan;
-import com.air.applets.entity.Facilities;
-import com.air.applets.entity.Huanxian;
-import com.air.applets.entity.Xingzhengqu;
 import com.air.applets.serivce.AppletsMapService;
-import com.air.land.entity.LandListedLonLat;
-import com.air.land.entity.LandToListLonLat;
 import com.cinderella.framework.common.core.util.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,8 +33,8 @@ public class AppletsMapController {
      */
     @ApiOperation(value = "根据定位经纬度范围行政区数据", notes = "根据定位经纬度范围行政区数据")
     @GetMapping("getRegionByLocation")
-    public R<List<Map<String, String>>> getRegionByLocation() {
-        return R.ok(mapService.getRegionByLocation(), "查询成功");
+    public R<List<Map<String, String>>> getRegionByLocation(String city) {
+        return R.ok(mapService.getRegionByLocation(city), "查询成功");
     }
 
     /**
@@ -69,8 +63,8 @@ public class AppletsMapController {
      */
     @ApiOperation(value = "根据定位经纬度返回5公里范围内的大组团小组团", notes = "根据定位经纬度返回5公里范围内的大组团小组团")
     @GetMapping("getTypeRegionByLocation")
-    public R<List<Map<String, String>>> getTypeRegionByLocation(@RequestParam String type) {
-        return R.ok(mapService.getTypeRegionByLocation(type), "查询成功");
+    public R<List<Map<String, String>>> getTypeRegionByLocation(@RequestParam String type,String city) {
+        return R.ok(mapService.getTypeRegionByLocation(type,city), "查询成功");
     }
 
     /**
@@ -80,8 +74,8 @@ public class AppletsMapController {
      */
     @ApiOperation(value = "根据定位经纬度范围行政区数据", notes = "根据定位经纬度范围行政区数据")
     @GetMapping("getLoopLine")
-    public R<List<Map<String, String>>> getLoopLine() {
-        return R.ok(mapService.getLoopLine(), "查询成功");
+    public R<List<Map<String, String>>> getLoopLine(String city) {
+        return R.ok(mapService.getLoopLine(city), "查询成功");
     }
 
     /**
@@ -91,8 +85,8 @@ public class AppletsMapController {
      */
     @ApiOperation(value = "获取拟挂牌地块数据", notes = "获取拟挂牌地块数据")
     @GetMapping("getLandToList")
-    public R<List<Map<String, String>>> getLandToList() {
-        return R.ok(mapService.getLandToList(), "查询成功");
+    public R<List<Map<String, String>>> getLandToList(String city) {
+        return R.ok(mapService.getLandToList(city), "查询成功");
     }
 
     /**
@@ -102,8 +96,8 @@ public class AppletsMapController {
      */
     @ApiOperation(value = "获取挂牌中数据", notes = "获取挂牌中数据")
     @GetMapping("getLandListing")
-    public R<List<Map<String, String>>> getLandListing() {
-        return R.ok(mapService.getLandListing(), "查询成功");
+    public R<List<Map<String, String>>> getLandListing(String city) {
+        return R.ok(mapService.getLandListing(city), "查询成功");
     }
 
     /**
@@ -113,18 +107,19 @@ public class AppletsMapController {
      */
     @ApiOperation(value = "获取出让地块数据", notes = "获取出让地块数据")
     @GetMapping("getLandList")
-    public R<List<Map<String, String>>> getLandList(@RequestParam String start, @RequestParam String end) {
-        return R.ok(mapService.getLandList(start, end), "查询成功");
+    public R<List<Map<String, String>>> getLandList(@RequestParam String start, @RequestParam String end,String city) {
+        return R.ok(mapService.getLandList(start, end,city), "查询成功");
     }
 
     /**
      * 设置行政区，环线，大组团，小组团经纬度
+     *
      * @author peihao
      * @date 2021/5/25
      **/
     @ApiOperation(value = "设置行政区，环线，大组团，小组团经纬度", notes = "设置行政区，环线，大组团，小组团经纬度")
     @GetMapping(value = "/setGeom/{type}")
-    public R setGeom(@PathVariable String type){
+    public R setGeom(@PathVariable String type) {
         return R.ok(mapService.setGeom(type));
     }
 

air/src/main/java/com/air/applets/entity/Dazutuan.java

@@ -48,6 +48,8 @@ public class Dazutuan extends Model<Dazutuan> {
     private String comment;
     @ApiModelProperty(value="")
     private String geom;
+    @ApiModelProperty(value = "城市")
+    private String city;
     @TableField(exist = false)
     @ApiModelProperty(value="")
     private String geoms;

air/src/main/java/com/air/applets/entity/Huanxian.java

@@ -48,6 +48,9 @@ public class Huanxian extends Model<Huanxian> {
     private String comment;
     @ApiModelProperty(value="")
     private String geom;
+
+    @ApiModelProperty(value = "城市")
+    private String city;
     @TableField(exist = false)
     @ApiModelProperty(value="")
     private String geoms;

air/src/main/java/com/air/applets/entity/Xiaozutuan.java

@@ -47,4 +47,7 @@ public class Xiaozutuan extends Model<Xiaozutuan> {
     private String comment;
     @ApiModelProperty(value="")
     private String geom;
+
+    @ApiModelProperty(value = "城市")
+    private String city;
 }

air/src/main/java/com/air/applets/entity/Xingzhengqu.java

@@ -50,6 +50,9 @@ public class Xingzhengqu extends Model<Xingzhengqu> {
     private String comment;
     @ApiModelProperty(value="")
     private String geom;
+
+    @ApiModelProperty(value = "城市")
+    private String city;
     @TableField(exist = false)
     @ApiModelProperty(value="")
     private String geoms;

air/src/main/java/com/air/applets/mapper/AppletsMapMapper.java

@@ -23,7 +23,7 @@ public interface AppletsMapMapper{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String,String>> getRegionByLocation();
+    List<Map<String,String>> getRegionByLocation(@Param("city") String city);
 
     /**
      * 根据定位经纬度范围行政区数据
@@ -43,7 +43,7 @@ public interface AppletsMapMapper{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getTypeRegionByLocation(String type);
+    List<Map<String, String>> getTypeRegionByLocation(@Param("type") String type,@Param("city") String city);
 
     /**
      * 获取环线数据
@@ -51,7 +51,7 @@ public interface AppletsMapMapper{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLoopLine();
+    List<Map<String, String>> getLoopLine(@Param("city") String city);
 
     /**
      * 获取拟挂牌地块数据
@@ -59,7 +59,7 @@ public interface AppletsMapMapper{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLandToList();
+    List<Map<String, String>> getLandToList(@Param("city") String city);
 
     /**
      * 获取挂牌中数据
@@ -69,7 +69,7 @@ public interface AppletsMapMapper{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLandListing(String nowDate);
+    List<Map<String, String>> getLandListing(@Param("nowDate")String nowDate,@Param("city")String city);
 
     /**
      * 获取出让地块数据
@@ -80,7 +80,7 @@ public interface AppletsMapMapper{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLandList(@Param("start") String start , @Param("end") String end,@Param("nowDate") String nowDate);
+    List<Map<String, String>> getLandList(@Param("start") String start , @Param("end") String end,@Param("nowDate") String nowDate,@Param("city")String city);
 
     List<Xingzhengqu> getXingzhengqu();
 

air/src/main/java/com/air/applets/serivce/AppletsMapService.java

@@ -23,7 +23,7 @@ public interface AppletsMapService{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getRegionByLocation();
+    List<Map<String, String>> getRegionByLocation(String city);
 
     /**
      * 根据定位经纬度范围行政区数据
@@ -43,7 +43,7 @@ public interface AppletsMapService{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getTypeRegionByLocation(String type);
+    List<Map<String, String>> getTypeRegionByLocation(String type,String city);
 
     /**
      * 获取环线数据
@@ -51,7 +51,7 @@ public interface AppletsMapService{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLoopLine();
+    List<Map<String, String>> getLoopLine(String city);
 
     /**
      * 获取拟挂牌地块数据
@@ -59,7 +59,7 @@ public interface AppletsMapService{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLandToList();
+    List<Map<String, String>> getLandToList(String city);
 
     /**
      * 获取挂牌中数据
@@ -67,7 +67,7 @@ public interface AppletsMapService{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLandListing();
+    List<Map<String, String>> getLandListing(String city);
 
     /**
      * 获取出让地块数据
@@ -77,7 +77,7 @@ public interface AppletsMapService{
      * @date 2021/6/7
      * @return
      **/
-    List<Map<String, String>> getLandList(String start , String end);
+    List<Map<String, String>> getLandList(String start , String end,String city);
 
     /**
      * 设置行政区，环线，大组团，小组团经纬度

air/src/main/java/com/air/applets/serivce/impl/AppletsMapServiceImpl.java

@@ -23,8 +23,8 @@ public class AppletsMapServiceImpl implements AppletsMapService {
     private AppletsMapMapper mapMapper;
 
     @Override
-    public List<Map<String, String>> getRegionByLocation() {
-        return mapMapper.getRegionByLocation();
+    public List<Map<String, String>> getRegionByLocation(String city) {
+        return mapMapper.getRegionByLocation(city);
     }
 
     @Override
@@ -33,28 +33,28 @@ public class AppletsMapServiceImpl implements AppletsMapService {
     }
 
     @Override
-    public List<Map<String, String>> getTypeRegionByLocation(String type) {
-        return mapMapper.getTypeRegionByLocation(type);
+    public List<Map<String, String>> getTypeRegionByLocation(String type,String city) {
+        return mapMapper.getTypeRegionByLocation(type,city);
     }
 
     @Override
-    public List<Map<String, String>> getLoopLine() {
-        return mapMapper.getLoopLine();
+    public List<Map<String, String>> getLoopLine(String city) {
+        return mapMapper.getLoopLine(city);
     }
 
     @Override
-    public List<Map<String, String>> getLandToList() {
-        return mapMapper.getLandToList();
+    public List<Map<String, String>> getLandToList(String city) {
+        return mapMapper.getLandToList(city);
     }
 
     @Override
-    public List<Map<String, String>> getLandListing() {
-        return mapMapper.getLandListing(DateUtil.formatDate(new Date()));
+    public List<Map<String, String>> getLandListing(String city) {
+        return mapMapper.getLandListing(DateUtil.formatDate(new Date()),city);
     }
 
     @Override
-    public List<Map<String, String>> getLandList(String start , String end) {
-        return mapMapper.getLandList(start,end,DateUtil.formatDate(new Date()));
+    public List<Map<String, String>> getLandList(String start , String end,String city) {
+        return mapMapper.getLandList(start,end,DateUtil.formatDate(new Date()),city);
     }
 
     @Override

air/src/main/java/com/air/land/controller/LandListedLonLatController.java

@@ -51,7 +51,7 @@ public class LandListedLonLatController {
     public R<List<LandListedLonLat>> getLandListedLonLatPage(@PathVariable String landListedId) {
         List<LandListedLonLat> list = landListedLonLatService.list(Wrappers.<LandListedLonLat>query().lambda()
                 .eq(LandListedLonLat::getLandListedId, landListedId)
-                .orderByAsc(LandListedLonLat::getCreateDate));
+                .orderByAsc(LandListedLonLat::getLatId));
         return R.ok(list, "查询成功");
     }
 

air/src/main/java/com/air/land/controller/LandToListLonLatController.java

@@ -46,7 +46,7 @@ public class LandToListLonLatController {
     public R<List<LandToListLonLat>> getLandListedLonLatPage(@PathVariable String proposedseriaId) {
         List<LandToListLonLat> list = landToListLonLatService.list(Wrappers.<LandToListLonLat>query().lambda()
                 .eq(LandToListLonLat::getProposedseriaId, proposedseriaId)
-                .orderByAsc(LandToListLonLat::getCreateDate));
+                .orderByAsc(LandToListLonLat::getLatId));
         return R.ok(list, "查询成功");
     }
 
@@ -86,12 +86,6 @@ public class LandToListLonLatController {
     @ApiOperation(value = "修改拟挂牌地块经纬度", notes = "修改拟挂牌地块经纬度")
     @PutMapping
     public R update(@RequestBody @Validated LandToListLonLatVo landToListLonLatVo) {
-        List<LandToListLonLat> list = landToListLonLatService.list(Wrappers.<LandToListLonLat>query().lambda()
-                .eq(LandToListLonLat::getProposedseriaId, landToListLonLatVo.getProposedseriaId())
-                .eq(LandToListLonLat::getLandCode, landToListLonLatVo.getLandCode()));
-        if (CollectionUtil.isNotEmpty(list)) {
-            return R.failed("地块编号已存在");
-        }
         LandToListLonLat landToListLonLat = new LandToListLonLat();
         BeanUtil.copyProperties(landToListLonLatVo, landToListLonLat);
         //转换经纬度标准格式

air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java

@@ -55,7 +55,6 @@ public class LandListedLonLatServiceImpl extends ServiceImpl<LandListedLonLatMap
             List<String> data = dataList.get(i);
             LandListedLonLat landListedLonLat = new LandListedLonLat();
             landListedLonLat.setLandListedId(landListedId);
-            landListedLonLat.setLandCode(Integer.valueOf(i+1).toString());
             landListedLonLat.setLandLonLat(data.get(0));
             landListedLonLat.setLineWidth(data.get(1));
             landListedLonLat.setLineColor(data.get(2));

air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java

@@ -52,7 +52,6 @@ public class LandToListLonLatServiceImpl extends ServiceImpl<LandToListLonLatMap
             List<String> data = dataList.get(i);
             LandToListLonLat landToListLonLat = new LandToListLonLat();
             landToListLonLat.setProposedseriaId(proposedseriaId);
-            landToListLonLat.setLandCode(Integer.valueOf(i+1).toString());
             landToListLonLat.setLandLonLat(data.get(0));
             landToListLonLat.setLineWidth(data.get(1));
             landToListLonLat.setLineColor(data.get(2));

air/src/main/java/com/air/land/vo/LandToListLonLatVo.java

@@ -18,13 +18,12 @@ import javax.validation.constraints.NotNull;
 public class LandToListLonLatVo {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "已挂牌主键", required = true)
+    @ApiModelProperty(value = "主键", required = true)
     private Long latId;
     @NotNull(message = "拟出让序号不能为空")
     @ApiModelProperty(value = "拟出让序号", required = true)
     private String proposedseriaId;
 
-    @NotBlank(message = "地块编号不能为空")
     @ApiModelProperty(value = "地块编号", required = true)
     private String landCode;
 

air/src/main/resources/mapper/AppletsMapMapper.xml

@@ -7,6 +7,11 @@
 
     <select id="getRegionByLocation" resultType="java.util.Map">
         select *,st_astext(geom) as geoms from xingzhengqu
+        <where>
+            <if test="city != null and city != ''">
+                city = #{city}
+            </if>
+        </where>
     </select>
 
     <select id="getFacilitiesByLocation" resultType="java.util.Map">
@@ -23,10 +28,20 @@
 
     <select id="getTypeRegionByLocation" resultType="java.util.Map">
         select *,st_astext(geom) as geoms from ${type}
+        <where>
+            <if test="city != null and city != ''">
+                city = #{city}
+            </if>
+        </where>
     </select>
 
     <select id="getLoopLine" resultType="java.util.Map">
         select *,st_astext(geom) as geoms from huanxian
+        <where>
+            <if test="city != null and city != ''">
+              city = #{city}
+            </if>
+        </where>
     </select>
 
     <select id="getLandToList" resultType="java.util.Map">
@@ -36,6 +51,9 @@
              land_to_list_lon_lat
         where
               geom is not null
+        <if test="city != null and city != ''">
+           and city = #{city}
+        </if>
     </select>
 
     <select id="getLandListing" resultType="java.util.Map">
@@ -50,7 +68,10 @@
             LEFT JOIN land_listed b ON a.land_listed_id = b.land_listed_id
         WHERE
             geom IS NOT NULL
-            and #{nowDate} > date_format(b.auction_date,'%Y-%m-%d')
+            and date_format(b.auction_date,'%Y-%m-%d') > #{nowDate}
+        <if test="city != null and city != ''">
+            and city = #{city}
+        </if>
     </select>
 
     <select id="getLandList" resultType="java.util.Map">
@@ -68,6 +89,9 @@
             and date_format(b.auction_date,'%Y-%m-%d') &lt; #{nowDate}
             and date_format(b.auction_date,'%Y-%m-%d') &lt; #{end}
             and date_format(b.auction_date,'%Y-%m-%d') > #{start}
+            <if test="city != null and city != ''">
+                and city = #{city}
+            </if>
     </select>
 
     <select id="getXingzhengqu" resultType="com.air.applets.entity.Xingzhengqu">