feats

pom.xml

@@ -130,6 +130,13 @@
 			<version>3.0.0</version>
 		</dependency>
 		<!--swagger end-->
+
+		<!-- selenium-java -->
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-java</artifactId>
+			<version>3.4.0</version>
+		</dependency>
 	</dependencies>
 
 	<profiles>

src/main/java/com/shigongli/common/OSSUtils.java

@@ -11,6 +11,8 @@ import java.io.*;
 @Component
 public class OSSUtils {
 
+    public static final String defaultDir = "/shigongli/images/";
+
     @Autowired
     AliyunConfig aliyunConfig;
 
@@ -23,7 +25,7 @@ public class OSSUtils {
     public String putObject(MultipartFile mf, String ... toDirs) throws IOException {
         String fName = formatFileName(mf.getOriginalFilename());
         String preFix = String.valueOf(System.currentTimeMillis());
-        String toDir = "/";
+        String toDir = defaultDir;
         if (null != toDirs && toDirs.length > 0) {
             toDir = toDirs[0];
         }
@@ -36,7 +38,7 @@ public class OSSUtils {
     public String putObject(File f, String ... toDirs) throws FileNotFoundException {
         String fName = formatFileName(f.getName());
         String preFix = String.valueOf(System.currentTimeMillis());
-        String toDir = "/";
+        String toDir = defaultDir;
         if (null != toDirs && toDirs.length > 0) {
             toDir = toDirs[0];
         }

src/main/java/com/shigongli/common/ScreenShotUtil.java

@@ -0,0 +1,53 @@
+package com.shigongli.common;
+
+import com.shigongli.config.ScreenShotConfig;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+
+@Component
+public class ScreenShotUtil {
+    @Autowired
+    OSSUtils ossUtils;
+
+    @Autowired
+    ScreenShotConfig config;
+
+    public String shot(String url) throws Exception {
+        //驱动地址
+        System.setProperty("webdriver.chrome.driver", config.getDriver());
+
+        WebDriver webDriver = null;
+        ChromeOptions options=new ChromeOptions();
+        //设置 chrome 的无头模式
+        options.addArguments("--headless");
+        options.addArguments("--disable-gpu");
+        options.addArguments("--no-sandbox");
+        options.addArguments("--disable-dev-shm-usage");
+        options.addArguments("--start-maximized");
+        options.addArguments(String.format("--window-size=%s,%s", config.getWidth(), config.getHeight()));
+        //启动一个 chrome 实例
+        webDriver = new ChromeDriver(options);
+
+        //访问网址
+        webDriver.get(url);
+        Thread.sleep(config.getWait());
+
+        //截取全屏
+        File f  = ((TakesScreenshot)webDriver).getScreenshotAs(OutputType.FILE);
+
+        // 存入 oss
+        String imageUrl = ossUtils.putObject(f);
+
+        //退出
+        webDriver.quit();
+
+        return imageUrl;
+    }
+}

src/main/java/com/shigongli/config/ScreenShotConfig.java

@@ -0,0 +1,16 @@
+package com.shigongli.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "screen-shot")
+public class ScreenShotConfig {
+    private String driver;
+    private Integer wait;
+    private String width;
+    private String height;
+}

src/main/java/com/shigongli/controller/CommController.java

@@ -31,7 +31,7 @@ public class CommController extends BaseController {
     @PostMapping("/{plat}/image")
     public ResponseBean uploadImage(@RequestParam("file") MultipartFile multipartFile) {
         try {
-            String img = ossUtils.putObject(multipartFile, "/shigongli/images/");
+            String img = ossUtils.putObject(multipartFile);
             return ResponseBean.success(img);
         } catch (IOException e) {
             return ResponseBean.error("上传图片失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/shigongli/controller/TaHouseController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.shigongli.common.BaseController;
 import com.shigongli.common.ResponseBean;
+import com.shigongli.common.ScreenShotUtil;
 import com.shigongli.common.StringUtils;
 import com.shigongli.constants.StatusConstant;
 import com.shigongli.entity.TaPerson;
@@ -16,17 +17,15 @@ import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
 import com.shigongli.service.ITaHouseService;
 import com.shigongli.entity.TaHouse;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,12 +43,18 @@ public class TaHouseController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaHouseController.class);
 
+    @Value("weather-shot.url")
+    String weatherURL;
+
     @Autowired
     public ITaHouseService iTaHouseService;
 
     @Autowired
     ITaShopKeeperService iTaShopKeeperService;
 
+    @Autowired
+    ScreenShotUtil screenShotUtil;
+
 //
 //    /**
 //     * 分页查询列表
@@ -179,8 +184,56 @@ public class TaHouseController extends BaseController {
      */
     @RequestMapping(value="/ma/taHouse/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean houseDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+    public ResponseBean houseDetail(@ApiParam("房源ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHouseService.getById(id));
     }
 
+    @GetMapping("/ma/taHouse/{id}/share")
+    @ApiOperation(value="获取分享内容", notes = "获取分享内容", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getShareImage(@ApiParam("房源ID") @PathVariable String id) {
+        TaHouse taHouse = iTaHouseService.getById(id);
+        if (taHouse == null || StatusConstant.DELETE.equals(taHouse.getStatus())) {
+            return ResponseBean.error("房源不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String city = getCity(taHouse.getAddress());
+        if (StringUtils.isEmpty(city)) {
+            city = "南京";
+        }
+
+        String shot = null;
+        try {
+            shot = screenShotUtil.shot(String.format(weatherURL, city));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("image", shot);
+        return ResponseBean.success(res);
+    }
+
+    private String getCity (String address) {
+        if (StringUtils.isEmpty(address)) {
+            return null;
+        }
+
+        String[] parts = address.split("市");
+        String city = parts[0];
+        // 省
+        if (city.contains("省")) {
+            return city.split("省")[1];
+        }
+        // 自治区
+        if (city.contains("区")) {
+            return city.split("区")[1];
+        }
+        // 直辖市
+        if (city.contains("市")) {
+            return city.split("市")[1];
+        }
+
+        return city;
+    }
+
 }

src/main/java/com/shigongli/controller/TaHouseOrderController.java

@@ -111,9 +111,9 @@ public class TaHouseOrderController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taHouseOrder/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/ma/taHouseOrder/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHouseOrderGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    public ResponseBean taHouseOrderGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHouseOrderService.getById(id));
     }
 }

src/main/java/com/shigongli/controller/TaHouseSettingController.java

@@ -86,6 +86,11 @@ public class TaHouseSettingController extends BaseController {
             return ResponseBean.error("填写选择房源", ResponseBean.ERROR_MISSING_PARAMS);
         }
 
+        // 如果是更新内容
+        if (!StringUtils.isEmpty(taHouseSetting.getSettingId())) {
+            return taHouseSettingUpdate(taHouseSetting.getSettingId(), taHouseSetting);
+        }
+
         if (iTaHouseSettingService.save(taHouseSetting)){
 
             // 生成订单
@@ -124,8 +129,8 @@ public class TaHouseSettingController extends BaseController {
      */
     @RequestMapping(value="/taHouseSetting/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taHouseSettingUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaHouseSetting taHouseSetting) throws Exception{
+    public ResponseBean taHouseSettingUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                             @ApiParam("更新内容") @RequestBody TaHouseSetting taHouseSetting) throws Exception{
 
         if (iTaHouseSettingService.updateById(taHouseSetting)){
             return ResponseBean.success(iTaHouseSettingService.getById(id));
@@ -143,4 +148,16 @@ public class TaHouseSettingController extends BaseController {
     public ResponseBean taHouseSettingGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaHouseSettingService.getById(id));
     }
+
+
+    /**
+     * 根据房源查询最近的设置记录
+     * @param houseId  房源ID
+     */
+    @RequestMapping(value="/taHouseSetting/last",method= RequestMethod.GET)
+    @ApiOperation(value="根据房源查询最近的设置记录", notes = "根据房源查询最近的设置记录", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getTaHouseSettingLast(@ApiParam("房源ID") @RequestParam("houseId") String houseId) throws Exception{
+        TaHouseSetting taHouseSetting = iTaHouseSettingService.getLastByHouse(houseId);
+        return ResponseBean.success(taHouseSetting);
+    }
 }

src/main/java/com/shigongli/mapper/TaHouseSettingMapper.java

@@ -3,6 +3,7 @@ package com.shigongli.mapper;
 import com.shigongli.entity.TaHouseSetting;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaHouseSettingMapper extends BaseMapper<TaHouseSetting> {
 
+    TaHouseSetting getLastByHouse(@Param("houseId") String houseId);
 }

src/main/java/com/shigongli/service/ITaHouseSettingService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaHouseSettingService extends IService<TaHouseSetting> {
 
+    TaHouseSetting getLastByHouse(String houseId);
 }

src/main/java/com/shigongli/service/impl/TaHouseSettingServiceImpl.java

@@ -4,6 +4,7 @@ import com.shigongli.entity.TaHouseSetting;
 import com.shigongli.mapper.TaHouseSettingMapper;
 import com.shigongli.service.ITaHouseSettingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +18,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaHouseSettingServiceImpl extends ServiceImpl<TaHouseSettingMapper, TaHouseSetting> implements ITaHouseSettingService {
 
+    @Autowired
+    TaHouseSettingMapper taHouseSettingMapper;
+
+    @Override
+    public TaHouseSetting getLastByHouse(String houseId) {
+        return taHouseSettingMapper.getLastByHouse(houseId);
+    }
 }

src/main/resources/application-dev.yml

@@ -18,3 +18,13 @@ logging:
   level:
     root: info
     springfox: info
+
+
+###
+screen-shot:
+  # webdriver.chrome.driver
+  driver: E:/work/shigongli/lib/chromedriver.exe
+  # milliseconds
+  wait: 5000
+  width: '520'
+  height: '416'

src/main/resources/application.yml

@@ -52,6 +52,18 @@ weixin:
     token: yansenisahero
     aesKey: oz3KPVpLL1yWPWUKEv1JLIE23yB8wIPA9OkdhKKK0UB
 
+###
+screen-shot:
+  # webdriver.chrome.driver
+  driver: /yunpan/shigongli/service/lib/chromedriver
+  # milliseconds
+  wait: 3000
+  width: '520'
+  height: '416'
+
+# weather-shot
+weather-shot:
+  url: https://sgl.ycjcjy.com/weather.html?city=%s
 
 ###
 spring:
@@ -59,5 +71,3 @@ spring:
     name: demo
   profiles:
     active: @profileActive@
-
-

src/main/resources/mapper/TaHouseSettingMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shigongli.mapper.TaHouseSettingMapper">
 
+    <select id="getLastByHouse" resultType="com.shigongli.entity.TaHouseSetting">
+        SELECT
+            *
+        FROM
+            ta_house_setting t
+        WHERE
+            t.house_id = #{houseId}
+            AND t.`status` = 1
+            AND t.start_date &lt;= DATE_FORMAT( now( ), '%Y-%m-%d' ) AND t.end_date &gt;= DATE_FORMAT( now( ), '%Y-%m-%d' )
+        ORDER BY t.create_date DESC
+        LIMIT 1
+    </select>
 </mapper>