guns-admin/src/main/java/com/stylefeng/guns/modular/api/AppUserController.java
@@ -221,11 +221,24 @@ } public static void main(String[] args) { String url ="https://apis.map.qq.com/ws/place/v1/suggestion/?keyword="+"四川省成都市青羊区大墙西街72号"+"&key=AAIBZ-NO7AQ-RKQ5G-2YSBL-3MEJH-VTFH4"; String result = HttpUtils.sendGet(url); System.err.println(result); JSONArray data = JSONObject.parseObject(result).getJSONArray("data"); System.err.println("返回结果:"+data); String url1 ="https://apis.map.qq.com/ws/district/v1/getchildren?id=110000&key=ZQXBZ-N4KKN-JE4FI-SUUUY-OIT2J-VEB7C"; String result1 = HttpUtils.sendGet(url1); System.err.println(result1); JSONArray data1 = JSONObject.parseObject(result1).getJSONArray("data"); System.err.println("返回结果:"+data1); // String url ="https://apis.map.qq.com/ws/place/v1/suggestion/?keyword="+"四川省成都市青羊区大墙西街72号"+"&key=AAIBZ-NO7AQ-RKQ5G-2YSBL-3MEJH-VTFH4"; // String result = HttpUtils.sendGet(url); // System.err.println(result); // JSONArray data = JSONObject.parseObject(result).getJSONArray("data"); // System.err.println("返回结果:"+data); // String url1 ="https://apis.map.qq.com/ws/district/v1/search?&keyword="+"香港"+"&key=AAIBZ-NO7AQ-RKQ5G-2YSBL-3MEJH-VTFH4"; // String result1 = HttpUtils.sendGet(url1); // System.err.println(result1); // JSONArray data1 = JSONObject.parseObject(result1).getJSONArray("data"); // System.err.println("返回结果:"+data1); } // // todo 放行 // @ResponseBody guns-admin/src/main/java/com/stylefeng/guns/modular/api/HouseResourceController.java
@@ -143,14 +143,14 @@ @ResponseBody @PostMapping("/base/addHouse/add") @ApiOperation(value = "发布房源", tags = {"发布"}) // @ApiImplicitParams({ // @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header") // }) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header") }) public ResultUtil addHouse(@RequestBody AddHouseReq req){ // AppUser appUser = appUserService.getAppUser(); // if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){ // return ResultUtil.errorLogin("当前账号已被冻结或删除"); // } AppUser appUser = appUserService.getAppUser(); if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){ return ResultUtil.errorLogin("当前账号已被冻结或删除"); } return houseResourceService.addHouse(req); }
@@ -76,13 +76,13 @@ @ApiOperation(value = "获取求房源详情", tags = {"求房源"}) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "数据id", required = true), @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header") // @ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header") }) public ResultUtil<HousingDemandInfoRes> housingDemandInfo(Integer id){ AppUser appUser = appUserService.getAppUser(); if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){ return ResultUtil.errorLogin("当前账号已被冻结或删除"); } // AppUser appUser = appUserService.getAppUser(); // if(null != appUser && (appUser.getStatus() == 2|| appUser.getStatus() == 3)){ // return ResultUtil.errorLogin("当前账号已被冻结或删除"); // } HousingDemandInfoRes housingDemandInfoRes = housingDemandService.housingDemandInfo(id); return ResultUtil.success(housingDemandInfoRes); } guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/HouseResource.java
@@ -297,4 +297,19 @@ */ @TableField("is_manage") private Integer isManage; /** * 复式（0=否，1=是） */ @TableField("compound") private Integer compound; /** * 全幢（0=否，1=是） */ @TableField("building") private Integer building; /** * 泳池（0=否，1=是） */ @TableField("pool") private Integer pool; } guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/HousingDemand.java
@@ -208,4 +208,20 @@ */ @TableField("upTime") private Date upTime; /** * 复式（0=否，1=是） */ @TableField("compound") private Integer compound; /** * 全幢（0=否，1=是） */ @TableField("building") private Integer building; /** * 泳池（0=否，1=是） */ @TableField("pool") private Integer pool; } guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
@@ -23,6 +23,8 @@ import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.apache.http.entity.ContentType; import org.dom4j.Document; import org.dom4j.Element; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -32,7 +34,6 @@ import org.springframework.data.geo.Point; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.geo.GeoJsonPoint; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.CriteriaDefinition; import org.springframework.data.mongodb.core.query.Query; @@ -85,54 +86,12 @@ private RestTemplate restTemplate; @Autowired private IUserService userService; @Autowired private OSSService ossService; @Value("${wx.appletsAppid}") private String wxAppletsAppid; @Value("${wx.appletsAppSecret}") private String wxAppletsAppSecret; /** * 生成小程序码地址 */ public static final String CREATE_CODE_URL = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN"; // 生成小程序码 public String generateMiniProgramCode(String outputFilePath) throws IOException { // 获取access_token String accessToken = wxAppletTools.getAccessToken(); // 替换CREATE_CODE_URL String uri = CREATE_CODE_URL.replace("ACCESS_TOKEN", accessToken); // 跳转到的小程序页面路径 String pagePath = "pages/index/index"; URL url = new URL(uri); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); // 设置请求方法 connection.setRequestMethod("POST"); connection.setDoOutput(true); // 构建请求参数 String params = "path=" + URLEncoder.encode(pagePath, "UTF-8"); // 获取输出流 try (OutputStream outputStream = connection.getOutputStream()) { outputStream.write(params.getBytes()); } // 获取输入流 try (InputStream inputStream = connection.getInputStream(); FileOutputStream outputStream = new FileOutputStream(outputFilePath)) { // 将返回的图片数据写入文件 byte[] buffer = new byte[1024]; int bytesRead; while ((bytesRead = inputStream.read(buffer)) != -1) { outputStream.write(buffer, 0, bytesRead); } ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(buffer); MultipartFile file = new MockMultipartFile(ContentType.APPLICATION_OCTET_STREAM.toString(), byteArrayInputStream); return ossService.uploadFile(file); } } /** * 获取房源列表 * @param req @@ -469,9 +428,9 @@ } @Override public ResultUtil addHouse(AddHouseReq req) { // Integer appUserId = appUserService.getAppUser().getId(); Integer appUserId = appUserService.getAppUser().getId(); AppUser appUser = appUserService.selectOne(new EntityWrapper<AppUser>() .eq("id", 40) .eq("id", appUserId) .eq("status", 1)); if (appUser!=null){ if (req.getId()==null){ @@ -483,7 +442,7 @@ if (appUser.getAuth()!=2){ // 未认证 只能能发布三条房源信息 List<HouseResource> houseResources = this.selectList(new EntityWrapper<HouseResource>() .eq("app_user_id", 40) .eq("app_user_id", appUserId) .eq("is_delete", 0) .eq("type", 2) ); @@ -500,7 +459,7 @@ houseResource.setInsertTime(new Date()); houseResource.setGoodHouse(0); houseResource.setIsDelete(0); houseResource.setInsertUserId(40); houseResource.setInsertUserId(appUserId); houseResource.setViewsNumber(0); houseResource.setUpdateTime(new Date()); // todo 修改回审核和上下架状态 @@ -508,7 +467,7 @@ houseResource.setDataType(req.getDataType()); houseResource.setAuthStatus(1); houseResource.setLeaseTime(req.getTime()); houseResource.setAppUserId(40); houseResource.setAppUserId(appUserId); houseResource.setFirmHouse(req.getFirmHouse()); if (StringUtils.hasLength(req.getTime())){ if (req.getTime().contains("年")){ guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HousingDemandServiceImpl.java
@@ -423,7 +423,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); HousingDemand housingDemand = this.selectById(id); HousingDemandInfoRes housingDemandInfoRes = new HousingDemandInfoRes(); AppUser appUser = appUserService.getAppUser(); // AppUser appUser = appUserService.getAppUser(); housingDemandInfoRes.setId(id); housingDemandInfoRes.setDataType(housingDemand.getDataType()); housingDemandInfoRes.setQrCode(housingDemand.getQrCode()); @@ -531,15 +531,15 @@ int collectionTimes = collectionHousingDemandService.selectCount(new EntityWrapper<CollectionHousingDemand>().eq("housing_demand_id", id)); housingDemandInfoRes.setCollectionTimes(collectionTimes); housingDemandInfoRes.setCollection(0); if(null != appUser){ int collection = collectionHousingDemandService .selectCount(new EntityWrapper<CollectionHousingDemand>() .eq("housing_demand_id", id) .eq("app_user_id", appUser.getId())); housingDemandInfoRes.setCollection(0 == collection ? 0 : 1); } // if(null != appUser){ // int collection = collectionHousingDemandService // .selectCount(new EntityWrapper<CollectionHousingDemand>() // .eq("housing_demand_id", id) // .eq("app_user_id", appUser.getId())); // housingDemandInfoRes.setCollection(0 == collection ? 0 : 1); // } //添加访问次数记录 addViewsNumber(housingDemand); // addViewsNumber(housingDemand); return housingDemandInfoRes; }
@@ -21,13 +21,13 @@ private String houseModel; @ApiModelProperty(value = "出租时长(买卖房不填该字段) 例：1 = 不限 /1年1月", required = true) private String time; @ApiModelProperty(value = "出租(售卖)日期 例：随时/九月上旬", required = true) @ApiModelProperty(value = "出租(售卖)日期 例：随时/九月上旬") private String startTime; @ApiModelProperty(value = "售卖金额（月租金额）", required = true) private BigDecimal saleAmount; @ApiModelProperty(value = "房屋类型", required = true) private Integer houseTypeId; @ApiModelProperty(value = "所在楼层", required = true) @ApiModelProperty(value = "所在楼层") private String floor; @ApiModelProperty(value = "是否有电梯（0=否，1=是）", required = true) private Integer elevator; @@ -35,17 +35,17 @@ private Integer dryingArea; @ApiModelProperty(value = "无（0=否，1=是）", required = true) private Integer air; @ApiModelProperty(value = "是否有平台（0=否，1=是）", required = true) @ApiModelProperty(value = "是否有平台（0=否，1=是）") private Integer platform; @ApiModelProperty(value = "是否有阳台（0=否，1=是）", required = true) @ApiModelProperty(value = "是否有阳台（0=否，1=是）") private Integer balcony; @ApiModelProperty(value = "是否有花园（0=否，1=是）", required = true) @ApiModelProperty(value = "是否有花园（0=否，1=是）") private Integer garden; @ApiModelProperty(value = "是否有车位（0=否，1=是）", required = true) private Integer carport; @ApiModelProperty(value ="公司盘 0=否1=是",required = false) private Integer firmHouse; @ApiModelProperty(value = "是否可养宠物（0=否，1=是）", required = true) @ApiModelProperty(value = "是否可养宠物（0=否，1=是）") private Integer keepPet; @ApiModelProperty(value = "房屋面积", required = true) private String houseArea; @@ -57,11 +57,11 @@ private String houseAddress; @ApiModelProperty(value = "所属小区", required = true) private String cellName; @ApiModelProperty(value = "房源照片", required = true) @ApiModelProperty(value = "房源照片") private String housePhoto; @ApiModelProperty(value = "视频封面", required = true) private String videoPhoto; @ApiModelProperty(value = "房源视频", required = true) @ApiModelProperty(value = "房源视频") private String houseVideo; @ApiModelProperty(value = "标题", required = true) private String title; @@ -79,9 +79,15 @@ private String longitude; @ApiModelProperty(value ="纬度",required = true) private String latitude; @ApiModelProperty(value ="性别要求 1男2女3不限",required = true) @ApiModelProperty(value ="性别要求 1男2女3不限") private Integer sex; @ApiModelProperty(value ="1=保存并退出，2=发布",required = true) private Integer type; @ApiModelProperty(value ="是否有复式（0=否，1=是）") private Integer compound; @ApiModelProperty(value ="是否有全幢（0=否，1=是）") private Integer building; @ApiModelProperty(value ="是否有泳池（0=否，1=是）") private Integer pool; } guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/req/HousingDemandReq.java
@@ -46,7 +46,7 @@ private Integer balcony; @ApiModelProperty("是否可养宠物（0=否，1=是）") private Integer keepPet; @ApiModelProperty(value = "晾晒区是否有平台（0=否，1=是）", required = true) @ApiModelProperty(value = "晾晒区是否有平台（0=否，1=是）") private Integer platform; @ApiModelProperty("更多介绍") private String moreIntroduction; @@ -74,4 +74,11 @@ */ @ApiModelProperty("WatchApp") private String watchApp; @ApiModelProperty(value ="是否有复式（0=否，1=是）") private Integer compound; @ApiModelProperty(value ="是否有全幢（0=否，1=是）") private Integer building; @ApiModelProperty(value ="是否有泳池（0=否，1=是）") private Integer pool; }
