Merge remote-tracking branch 'origin/master'

psdc-web/src/main/java/com/psdc/controller/index/Index.java

@@ -26,13 +26,13 @@ public class Index {
         return psdcThermometerHtdataService.sel8WnDu(modelId);
     }
 
-    @RequestMapping(value = "/zdb", method = RequestMethod.GET)
+    @RequestMapping(value = "/zdb/{modelId}", method = RequestMethod.GET)
-    public AjaxResult selzdb()  {
+    public AjaxResult selzdb(@PathVariable(value = "modelId", required = false) Integer modelId)  {
         // 查询总电表日常用电信息
-        if (null == psdcThermometerHtdataService.selTotalElectricityInfo(13)){
+        if (null == psdcThermometerHtdataService.selTotalElectricityInfo(modelId)){
             return AjaxResult.success("今日暂无数据！");
         }
-        return AjaxResult.success(psdcThermometerHtdataService.selTotalElectricityInfo(13));
+        return AjaxResult.success(psdcThermometerHtdataService.selTotalElectricityInfo(modelId));
     }
 
 }