傅行帆 6 年前
父节点
当前提交
62eadf70d6

+ 4
- 4
src/main/java/com.huiju.welcome/controller/AudioController.java 查看文件

44
     }
44
     }
45
     
45
     
46
     @RequestMapping(value = "/screen/weather", method = RequestMethod.GET)
46
     @RequestMapping(value = "/screen/weather", method = RequestMethod.GET)
47
-    public ResponseBean getWeather(@RequestParam String town) {
47
+    public ResponseBean getWeather(@RequestParam String city) {
48
         ResponseBean responseBean = new ResponseBean();
48
         ResponseBean responseBean = new ResponseBean();
49
-        if (StringUtils.isEmpty(town)) {
50
-            town = "南京";
49
+        if (StringUtils.isEmpty(city)) {
50
+            city = "南京";
51
         }
51
         }
52
-        responseBean.addSuccess(saWeather.weather(town));
52
+        responseBean.addSuccess(saWeather.weather(city));
53
         return responseBean;
53
         return responseBean;
54
     }
54
     }
55
 }
55
 }

+ 1
- 1
src/main/java/com.huiju.welcome/service/impl/TaGoodsServiceImpl.java 查看文件

45
         for(int j =0;j<goodsList.size();j++){
45
         for(int j =0;j<goodsList.size();j++){
46
             List<TaGoodsSpec> thisSpec = new ArrayList<>();
46
             List<TaGoodsSpec> thisSpec = new ArrayList<>();
47
             for (int h = 0;h<specList.size();h++){
47
             for (int h = 0;h<specList.size();h++){
48
-                if (goodsList.get(j).getGoodsId()==specList.get(h).getGoodsId()){
48
+                if (goodsList.get(j).getGoodsId().equals(specList.get(h).getGoodsId())){
49
                     thisSpec.add(specList.get(h));
49
                     thisSpec.add(specList.get(h));
50
                 }
50
                 }
51
             }
51
             }