天气动态查询

src/main/java/com.huiju.welcome/controller/TaFirstpageController.java

@@ -210,20 +210,22 @@ public class TaFirstpageController extends BaseController {
     })
     @RequestMapping(value = "/firstpage/{firstpageId}", method = RequestMethod.GET)
     public ResponseBean get(@PathVariable int firstpageId, HttpServletRequest request) {
-        return detail(firstpageId, "", request);
+        return detail(firstpageId, "", request,null);
     }
 
     @ApiOperation(value = "前端获取指定首屏内容", notes = "前端获取指定首屏内容")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataType = "String", name = "deviceId", value = "设备ID"),
+            @ApiImplicitParam(paramType = "Query", dataType = "String", name = "weatherName", value = "天气名称")
     })
     @RequestMapping(value = "/screen/fristpage/device/{deviceId}", method = RequestMethod.GET)
-    public ResponseBean screenGet(@PathVariable String deviceId, HttpServletRequest request) {
-        return detail(0, deviceId, request);
+    public ResponseBean screenGet(@PathVariable String deviceId, HttpServletRequest request,
+                                  @RequestParam(value ="weatherName",required = false)String weatherName) {
+        return detail(0, deviceId, request,weatherName);
     }
 
     // getDetail 获取首屏详情
-    private ResponseBean detail(int firstpageId, String deviceId, HttpServletRequest request) {
+    private ResponseBean detail(int firstpageId, String deviceId, HttpServletRequest request,String weatherName) {
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<TaFirstpage> q = new QueryWrapper<>();
@@ -238,7 +240,8 @@ public class TaFirstpageController extends BaseController {
             responseBean.addError(HttpStatus.SC_NOT_FOUND, "内容不存在");
             return responseBean;
         }
-
+        //天气值weatherName
+        taFirstpage.setWeatherName(weatherName);
         // 获取内容
         Map<String, Object> ctt = taFirstpageService.detail(taFirstpage);
         responseBean.addSuccess(ctt);

src/main/java/com.huiju.welcome/model/TaFirstpage.java

@@ -38,6 +38,12 @@ public class TaFirstpage implements Serializable {
 
     private Integer status;
 
+    /**
+     * 前端获取指定首屏内容输入动态名称
+     */
+    @TableField(exist = false)
+    private  String weatherName;
+
     @TableField(exist = false)
     private List<TaFirstpageContent> content;
 

src/main/java/com.huiju.welcome/service/impl/TaFirstpageServiceImpl.java

@@ -43,7 +43,7 @@ public class TaFirstpageServiceImpl extends ServiceImpl<TaFirstpageMapper, TaFir
 
         // 获取天气
         if (taFirstpage.getWeatherShow()) {
-            res.put("weather",  saWeather.weather());
+            res.put("weather",  saWeather.weather(taFirstpage));
         }
 
         // 获取公告

src/main/java/com.huiju.welcome/utils/SAWeather.java

@@ -1,5 +1,6 @@
 package com.huiju.welcome.utils;
 
+import com.huiju.welcome.model.TaFirstpage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -42,9 +43,11 @@ public class SAWeather {
     @Value("${saweather.needMoreDay}")
     private String needMoreDay;
 
-    public String weather() {
+    public String weather(TaFirstpage taFirstpage) {
         List<String> params = new ArrayList<>();
-        params.add("area=" + city);
+        // WeatherName 为空时 显示默认
+        String temporaryCity = org.springframework.util.StringUtils.isEmpty(taFirstpage.getWeatherName()) ? city:taFirstpage.getWeatherName();
+        params.add("area=" + temporaryCity);
         params.add("needIndex=" + needIndex);
         params.add("need3HourForcast=" + need3HourForcast);
         params.add("needAlarm=" + needAlarm);