|
@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
+import org.springframework.web.bind.annotation.PathVariable;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PutMapping;
|
|
import org.springframework.web.bind.annotation.PutMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -26,15 +27,14 @@ import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 用水计量-小时Controller
|
|
* 用水计量-小时Controller
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
* @date 2024-12-03
|
|
* @date 2024-12-03
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/waterMeterH")
|
|
@RequestMapping("/waterMeterH")
|
|
@Api(value = "WaterMeterHController", description = "用水计量-小时")
|
|
@Api(value = "WaterMeterHController", description = "用水计量-小时")
|
|
-public class WaterMeterHController extends BaseController
|
|
|
|
-{
|
|
|
|
|
|
+public class WaterMeterHController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private IWaterMeterHService waterMeterHService;
|
|
private IWaterMeterHService waterMeterHService;
|
|
|
|
|
|
@@ -43,8 +43,7 @@ public class WaterMeterHController extends BaseController
|
|
*/
|
|
*/
|
|
@RequiresPermissions("ems:waterMeterH:list")
|
|
@RequiresPermissions("ems:waterMeterH:list")
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
- public TableDataInfo list(QueryMeter queryMeter)
|
|
|
|
- {
|
|
|
|
|
|
+ public TableDataInfo list(QueryMeter queryMeter) {
|
|
startPage();
|
|
startPage();
|
|
List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
|
|
List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
@@ -56,8 +55,7 @@ public class WaterMeterHController extends BaseController
|
|
@RequiresPermissions("ems:waterMeterH:export")
|
|
@RequiresPermissions("ems:waterMeterH:export")
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.EXPORT)
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.EXPORT)
|
|
@PostMapping("/export")
|
|
@PostMapping("/export")
|
|
- public void export(HttpServletResponse response, QueryMeter queryMeter)
|
|
|
|
- {
|
|
|
|
|
|
+ public void export(HttpServletResponse response, QueryMeter queryMeter) {
|
|
List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
|
|
List<WaterMeterH> list = waterMeterHService.selectWaterMeterHList(queryMeter);
|
|
ExcelUtil<WaterMeterH> util = new ExcelUtil<WaterMeterH>(WaterMeterH.class);
|
|
ExcelUtil<WaterMeterH> util = new ExcelUtil<WaterMeterH>(WaterMeterH.class);
|
|
util.exportExcel(response, list, "用水计量-小时数据");
|
|
util.exportExcel(response, list, "用水计量-小时数据");
|
|
@@ -69,8 +67,7 @@ public class WaterMeterHController extends BaseController
|
|
@RequiresPermissions("ems:waterMeterH:add")
|
|
@RequiresPermissions("ems:waterMeterH:add")
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.INSERT)
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.INSERT)
|
|
@PostMapping
|
|
@PostMapping
|
|
- public AjaxResult add(@RequestBody WaterMeterH waterMeterH)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult add(@RequestBody WaterMeterH waterMeterH) {
|
|
return toAjax(waterMeterHService.insertWaterMeterH(waterMeterH));
|
|
return toAjax(waterMeterHService.insertWaterMeterH(waterMeterH));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -80,8 +77,7 @@ public class WaterMeterHController extends BaseController
|
|
@RequiresPermissions("ems:waterMeterH:edit")
|
|
@RequiresPermissions("ems:waterMeterH:edit")
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.UPDATE)
|
|
@PutMapping
|
|
@PutMapping
|
|
- public AjaxResult edit(@RequestBody WaterMeterH waterMeterH)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult edit(@RequestBody WaterMeterH waterMeterH) {
|
|
return toAjax(waterMeterHService.updateWaterMeterH(waterMeterH));
|
|
return toAjax(waterMeterHService.updateWaterMeterH(waterMeterH));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -90,9 +86,24 @@ public class WaterMeterHController extends BaseController
|
|
*/
|
|
*/
|
|
@RequiresPermissions("ems:waterMeterH:remove")
|
|
@RequiresPermissions("ems:waterMeterH:remove")
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.DELETE)
|
|
@Log(title = "用水计量-小时", businessType = BusinessType.DELETE)
|
|
- @DeleteMapping("/delByDate")
|
|
|
|
- public AjaxResult remove(@RequestParam(name = "date") String date)
|
|
|
|
- {
|
|
|
|
|
|
+ @DeleteMapping("/delByDate")
|
|
|
|
+ public AjaxResult remove(@RequestParam(name = "date") String date) {
|
|
return toAjax(waterMeterHService.deleteWaterMeterHByDate(date));
|
|
return toAjax(waterMeterHService.deleteWaterMeterHByDate(date));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ @GetMapping("/sum/byDate/{date}")
|
|
|
|
+ public AjaxResult qryWaterMeterByDate(@PathVariable(name = "date") String date) {
|
|
|
|
+ return success(waterMeterHService.qryWaterMeterByDate(date));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @GetMapping("/sum/timeIndex/byDate/{date}")
|
|
|
|
+ public AjaxResult qryTimeIndexWaterMeterByDay(@PathVariable(name = "date") String date) {
|
|
|
|
+ return success(waterMeterHService.qryTimeIndexWaterMeterByDay(date));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @GetMapping("/sum/date/byDate/{date}")
|
|
|
|
+ public AjaxResult qryDateWaterMeterByDay(@PathVariable(name = "date") String date) {
|
|
|
|
+ return success(waterMeterHService.qryDateWaterMeterByDay(date));
|
|
|
|
+ }
|
|
}
|
|
}
|