楼盘修改

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

@@ -14,6 +14,7 @@ import com.air.cityarea.entity.Xingzhengqu;
 import com.air.land.entity.LandListedLonLat;
 import com.air.utils.WgsUtil;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -22,6 +23,7 @@ import java.util.Map;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class AppletsMapServiceImpl implements AppletsMapService {
 
     private AppletsMapMapper mapMapper;
@@ -88,39 +90,38 @@ public class AppletsMapServiceImpl implements AppletsMapService {
     @Override
     public List<LandLonLatDto> getLandList(String start , String end,String city) {
         List<LandListedLonLat> list = mapMapper.getLandList(start, end, DateUtil.formatDate(new Date()), city);
-        list.forEach(rest ->{
-            rest.setLineColor(hex2RGB(rest.getLineColor(), Integer.valueOf( rest.getLineOpaqueness()) ));
-            rest.setFillColor(hex2RGB(rest.getFillColor(),Integer.valueOf( rest.getFillOpaqueness()) ));
-        });
         return LandLonLatConvert.getLandLonLatDto(list,1);
     }
-    /**
-     * 16进制颜色字符串转换成rgb
-     * @param hexStr
-     * @return rgb
-     */
-    public String hex2RGB(String hexStr,Integer lineOpaqueness){
-        if(hexStr != null && !"".equals(hexStr) && hexStr.length() == 7){
-            int[] rgb = new int[3];
-            rgb[0] = Integer.valueOf(hexStr.substring( 1, 3 ), 16);
-            rgb[1] = Integer.valueOf(hexStr.substring( 3, 5 ), 16);
-            rgb[2] = Integer.valueOf(hexStr.substring( 5, 7 ), 16);
-            String s = Integer.toHexString(lineOpaqueness);
 
-            StringBuilder sb = new StringBuilder();
-            sb.append("rgba(");
-//遍历int数组，并将int数组中的元素转换成字符串储存到字符缓冲区中去
-            for(int i=0;i < rgb.length;i++)
-            {
-                if(i!=rgb.length-1)
-                    sb.append(rgb[i]+" ,");
-                else
-                    sb.append(rgb[i]+","+s+" )");
-            }
-            return sb.toString();
-        }
-        return null;
-    }// 自定义一个字符缓冲区，
+
+//    /**
+//     * 16进制颜色字符串转换成rgb
+//     * @param hexStr
+//     * @return rgb
+//     */
+//    public String hex2RGB(String hexStr,Integer lineOpaqueness){
+//        if(hexStr != null && !"".equals(hexStr) && hexStr.length() == 7){
+//            int[] rgb = new int[3];
+//            rgb[0] = Integer.valueOf(hexStr.substring( 1, 3 ), 16);
+//            rgb[1] = Integer.valueOf(hexStr.substring( 3, 5 ), 16);
+//            rgb[2] = Integer.valueOf(hexStr.substring( 5, 7 ), 16);
+//            String s = Integer.toHexString(lineOpaqueness/100);
+//
+//            StringBuilder sb = new StringBuilder();
+//            sb.append("rgba(");
+////遍历int数组，并将int数组中的元素转换成字符串储存到字符缓冲区中去
+//            for(int i=0;i < rgb.length;i++)
+//            {
+//                if(i!=rgb.length-1)
+//                    sb.append(rgb[i]+" ,");
+//                else
+//                    sb.append(rgb[i]+","+s+" )");
+//            }
+//            log.info("rgb==={}"+sb.toString());
+//            return sb.toString();
+//        }
+//        return null;
+//    }// 自定义一个字符缓冲区，
 
 
     @Override

air/src/main/java/com/air/housing/controller/HousingEstatesController.java

@@ -18,6 +18,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 楼盘（小区）
@@ -52,6 +54,13 @@ public class HousingEstatesController {
         return R.ok(housingEstatesService.getHousingEstatesNamePage(page.toPage(), name));
     }
 
+
+    @GetMapping("/page/housing_names/name")
+    @ApiOperation(value = "查询楼盘名称")
+    public R<List<HousingEstatesName>> getHousingEstatesNamePage( String name) {
+        return R.ok(housingEstatesService.getHousingEstatesName( name));
+    }
+
     @PostMapping("/create_from_origin")
     @ApiOperation(value = "提交楼盘定义信息")
     public R createFromOrigin(@RequestBody @Validated HousingDefine housingDefine) {

air/src/main/java/com/air/housing/mapper/HousingEstatesMapper.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 楼盘（小区）
  *
@@ -32,4 +34,12 @@ public interface HousingEstatesMapper extends BaseMapper<HousingEstates> {
      */
     @InterceptorIgnore
     IPage<HousingEstatesListDto> selectIPage(IPage<HousingEstatesListDto> page, @Param("query") HousingEstatesQuery query);
+
+    /**
+     * 查询楼盘名称
+     *
+     * @param name@return
+     */
+    @InterceptorIgnore
+    List<HousingEstatesName> selectIName(@Param("name") String name);
 }

air/src/main/java/com/air/housing/service/HousingEstatesService.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
 
+import java.util.List;
+
 /**
  * 楼盘（小区）
  *
@@ -25,6 +27,14 @@ public interface HousingEstatesService extends IService<HousingEstates> {
      */
     IPage<HousingEstatesName> getHousingEstatesNamePage(IPage<HousingEstatesName> page, String name);
 
+
+    /**
+     * 查询楼盘名称
+     * @param name
+     * @return
+     */
+    List<HousingEstatesName> getHousingEstatesName(String name);
+
     /**
      * 提交楼盘定义信息
      * 根据前端提交的“楼盘id”（housingEstateId）字段是否为空来进行逻辑分支：

air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

@@ -18,20 +18,24 @@ import com.air.origin.entity.BlocksOrigin;
 import com.air.origin.entity.HousesOrigin;
 import com.air.origin.service.BlocksOriginService;
 import com.air.origin.service.HousesOriginService;
+import com.air.utils.RedisUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cinderella.framework.common.core.exception.BusinessException;
-import com.cinderella.framework.common.core.util.R;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 楼盘（小区）
@@ -60,13 +64,85 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
     @Autowired
     private FormatService formatService;
 
+    private RedisUtil redisUtil;
+
+    @Autowired
+    ThreadPoolTaskExecutor executor;
+
+
     @Override
     public IPage<HousingEstatesName> getHousingEstatesNamePage(IPage<HousingEstatesName> page, String name) {
+        return housingEstatesMapper.getHousingEstatesNamePage(page, name);
+    }
+
+    @Override
+    @Transactional
+    public List<HousingEstatesName> getHousingEstatesName(String name) {
         //查询地块表
         List<LandListed> landListeds = landListedMapper.selectBuildingName();
-        log.info("查询地块表===={}==",landListeds);
+        List<HousingEstatesName> housingEstatesNames = housingEstatesMapper.selectIName(name);
+        List<HousingEstates> list = new ArrayList<>();
+        //添加未添加的楼盘
+        for (int i = 0; i < landListeds.size(); i++) {
+            for (HousingEstatesName housingEstatesName : housingEstatesNames) {
+                if(landListeds.get(i).getBuildingName().equals(housingEstatesName.getName())){
+                    log.info("========================{}",landListeds.get(i));
+                    landListeds.remove(i);
+                }
+            }
+        }
+//        landListeds.forEach( landName ->{
+//            housingEstatesNames.forEach( housingName ->{
+//                if(landName.getBuildingName().equals(housingName.getName())){
+//                   landListeds.remove(landName.getBuildingName());
+//                }
+//            } );
+//        });
+        if(landListeds.size() > 0){
 
-        return housingEstatesMapper.getHousingEstatesNamePage(page, name);
+            landListeds.forEach(landListed -> {
+                HousingEstates housingEstates = new HousingEstates();
+                housingEstates.setName(landListed.getBuildingName());
+                housingEstates.setStatusCd(Constant.COMMON_STATUS_1000);
+                list.add(housingEstates);
+            });
+            log.info("添加的数量{}",list.size());
+            this.saveBatch(list);
+        }else{
+            return housingEstatesNames;
+        }
+
+        //添加地块关联表
+        List<LandListed> landListed = landListedMapper.selectBuildingNames(); //查询楼盘。编号
+        List<HousingEstatesName> housingEstatesName = housingEstatesMapper.selectIName(name); //查询楼盘
+        List<AnnoBlocksRel> annoBlocksRelList = new ArrayList<>();
+        //添加地块关联表
+
+            housingEstatesName.forEach( housingEstatesName1 -> {
+                landListed.forEach( landListed1 -> {
+                    if(housingEstatesName1.getName().equals(landListed1.getBuildingName())){
+                        AnnoBlocksRel annoBlocksRel = new AnnoBlocksRel();
+                        annoBlocksRel.setHousingEstatesId(housingEstatesName1.getHousingEstateId());
+                        annoBlocksRel.setLandListedId(landListed1.getLandListedId());
+                        if(redisUtil.getCacheObject(landListed1.getLandListedId() + housingEstatesName1.getHousingEstateId() )  != null){
+                            annoBlocksRel.setMainLand(0);
+                        }else{
+                            redisUtil.setCacheObject(landListed1.getLandListedId() + housingEstatesName1.getHousingEstateId(),1,5, TimeUnit.MINUTES);
+                            annoBlocksRel.setMainLand(1);
+                        }
+                        annoBlocksRel.setStatusCd(Constant.COMMON_STATUS_1000);
+                        annoBlocksRelList.add(annoBlocksRel);
+                    }
+                });
+            });
+            if(annoBlocksRelList.size() > 0){
+                log.info("添加的数量{}",annoBlocksRelList.size());
+                boolean b = annoBlocksRelService.saveBatch(annoBlocksRelList);
+                if(!b){
+                    throw new BusinessException("添加失败！！");
+                }
+            }
+        return housingEstatesName;
     }
 
     /**

air/src/main/java/com/air/housing/vo/HousingEstatesName.java

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode
 public class HousingEstatesName {
     @ApiModelProperty(value = "楼盘id")
-    private String housingEstateId;
+    private Long housingEstateId;
     @ApiModelProperty(value = "楼盘名称")
     private String name;
 }

air/src/main/java/com/air/land/mapper/LandListedMapper.java

@@ -78,8 +78,12 @@ public interface LandListedMapper extends BaseMapper<LandListed> {
 
 
     /**
-     * 查询已挂牌地库楼盘
+     * 查询已挂牌地库楼盘名称
      */
     List<LandListed> selectBuildingName();
+    /**
+     * 查询已挂牌地库楼盘名称
+     */
+    List<LandListed> selectBuildingNames();
 
 }

air/src/main/java/com/air/utils/GeomUtils.java

@@ -46,16 +46,18 @@ public class GeomUtils {
         String strokeColor;
         String fillColor1;
         if ("wechat_applet".equals(s)){
-//
-//            strokeColor = computeColorWechat(lineColor, lineOpaqueness);
-//            fillColor1 = computeColorWechat(fillColor, fillOpaqueness);
-            strokeColor =lineColor;
-            fillColor1 = fillColor;
+            log.info("处理前透明度=={}",lineOpaqueness);
+            strokeColor = computeColorWechat(lineColor, lineOpaqueness);
+            fillColor1 = computeColorWechat(fillColor, fillOpaqueness);
+//            strokeColor =lineColor;
+//            fillColor1 = fillColor;
         }else {
 //            strokeColor = computeColor(lineColor, lineOpaqueness);
 //            fillColor1 = computeColor(fillColor, fillOpaqueness);
-            strokeColor = lineColor;
-            fillColor1 = fillColor;
+            strokeColor = computeColorWechats(lineColor, lineOpaqueness);
+            fillColor1 = computeColorWechats(fillColor, fillOpaqueness);
+//            strokeColor = lineColor;
+//            fillColor1 = fillColor;
         }
         polygonGeom.setStrokeColor(strokeColor);
         polygonGeom.setFillColor(fillColor1);
@@ -65,7 +67,7 @@ public class GeomUtils {
     }
 
     public static CoordinatePoint lonLatConvertPoint(String lonLat){
-        log.info("范围坐标=={}",lonLat);
+      //  log.info("范围坐标=={}",lonLat);
 
         List<String> lonLatList = Arrays.asList(lonLat.split(";"));//将坐标转换为数组
 
@@ -136,8 +138,8 @@ public class GeomUtils {
         double Lon = Math.atan2(Y, X);
         double Hyp = Math.sqrt(X * X + Y * Y);
         double Lat = Math.atan2(Z, Hyp);
-        log.info("{}",Lat * 180 / Math.PI);
-        log.info("{}", Lon * 180 / Math.PI);
+  //      log.info("{}",Lat * 180 / Math.PI);
+  //      log.info("{}", Lon * 180 / Math.PI);
 //        return new GeoCoordinate(Lat * 180 / Math.PI, Lon * 180 / Math.PI);
         Map<String,Double> map = new HashMap<String,Double>();
         map.put("lon", Lon * 180 / Math.PI);
@@ -237,19 +239,63 @@ public class GeomUtils {
         return colorBuffer.toString();
     }
 
-//    public static String computeColorWechat(String color,Integer opaqueness){
-//        if (StrUtil.isEmpty(color) || opaqueness == null){
-//            return null;
-//        }
-//        String hex = Integer.toHexString(opaqueness);
-//        return color+hex;
-//    }
+    /**
+     * 微信小程序处理
+     * @param color
+     * @param opaqueness
+     * @return
+     */
     public static String computeColorWechat(String color,Integer opaqueness){
         if (StrUtil.isEmpty(color) || opaqueness == null){
             return null;
         }
         String hex = Integer.toHexString(opaqueness);
+        log.info("透明度后======={}",hex);
         return color+hex;
     }
 
+    /**
+     * app处理
+     * @param color
+     * @param opaqueness
+     * @return
+     */
+    public static String computeColorWechats(String color,Integer opaqueness){
+        if (StrUtil.isEmpty(color) || opaqueness == null){
+            return null;
+        }
+        String hex = hex2RGB(color,opaqueness);
+        return hex;
+    }
+
+
+
+    /**
+     * 16进制颜色字符串转换成rgb
+     * @param hexStr
+     * @return rgb
+     */
+    public static String hex2RGB(String hexStr, Integer lineOpaqueness){
+        if(hexStr != null && !"".equals(hexStr) && hexStr.length() == 7){
+            String strR = hexStr.substring(1,3);
+
+            String strG = hexStr.substring(3,5);
+
+            String strB = hexStr.substring(5,7);
+
+            int red = Integer.parseInt(strR,16);
+
+            int green = Integer.parseInt(strG,16);
+
+            int blue = Integer.parseInt(strB,16);
+            double v = lineOpaqueness.doubleValue()/1000;
+            String re ="rgba("+ red +","+green+ ","+blue +","+v+")";
+            log.info("rgb==={}"+re);
+            return  re;
+
+        }
+        return null;
+    }// 自定义一个字符缓冲区，
+
+
 }

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

@@ -13,6 +13,15 @@
             </if>
         </where>
     </select>
+    <select id="selectIName" resultType="com.air.housing.vo.HousingEstatesName">
+        select housing_estate_id, name
+        from housing_estates
+        <where>
+            <if test="name != null and name != ''">
+                name like concat('%', #{name}, '%')
+            </if>
+        </where>
+    </select>
 
     <select id="selectIPage" resultType="com.air.housing.dto.HousingEstatesListDto">
         select h.housing_estate_id,

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

@@ -171,7 +171,13 @@
         GROUP BY DATE_FORMAT(ll.auction_date,'%Y-%m-%d')
     </select>
     <select id="selectBuildingName" resultType="com.air.land.entity.LandListed">
+        select  DISTINCT building_name from land_listed
+        where building_name is not null
+    </select>
 
+    <select id="selectBuildingNames" resultType="com.air.land.entity.LandListed">
+        select  land_listed_id,building_name from land_listed
+        where building_name is not null
     </select>
 
 

air/src/test/java/com/air/DemoApplicationTests.java

@@ -8,6 +8,21 @@ class DemoApplicationTests {
 
     @Test
     void contextLoads() {
+        String hexColor = "#ff9900";
+
+        String strR = hexColor.substring(1,3);
+
+        String strG = hexColor.substring(3,5);
+
+        String strB = hexColor.substring(5,7);
+
+        int red = Integer.parseInt(strR,16);
+
+        int green = Integer.parseInt(strG,16);
+
+        int blue = Integer.parseInt(strB,16);
+
+        System.out.println(red+"="+green+"="+blue);
     }
 
 }