|
@@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
import java.math.BigInteger;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
@@ -40,8 +41,8 @@ public class PayControlRecordController {
|
|
|
@ApiParam(value = "操作类型 0关阀 1开阀", required = false) @RequestParam(required = false) String type,
|
|
|
@ApiParam(value = "操作结果 0执行中 1成功 2失败", required = false) @RequestParam(required = false) String result,
|
|
|
@ApiParam(value = "阀门状态: 0关阀 1开阀 2无阀,3异常", required = false) @RequestParam(required = false) String state,
|
|
|
- @ApiParam(value = "开始时间yyyyMMdd", required = false) @RequestParam(required = false) String beginTime,
|
|
|
- @ApiParam(value = "结束时间yyyyMMdd", required = false) @RequestParam(required = false) String endTime
|
|
|
+ @ApiParam(value = "开始时间yyyyMMdd", required = true) @RequestParam(required = false) String beginTime,
|
|
|
+ @ApiParam(value = "结束时间yyyyMMdd", required = true) @RequestParam(required = false) String endTime
|
|
|
){
|
|
|
try {
|
|
|
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
|
@@ -88,8 +89,8 @@ public class PayControlRecordController {
|
|
|
@ApiParam(value = "操作类型 0关阀 1开阀", required = false) @RequestParam(required = false) String type,
|
|
|
@ApiParam(value = "操作结果 0执行中 1成功 2失败", required = false) @RequestParam(required = false) String result,
|
|
|
@ApiParam(value = "阀门状态: 0关阀 1开阀 2 无阀,3异常", required = false) @RequestParam(required = false) String state,
|
|
|
- @ApiParam(value = "开始时间yyyyMMdd", required = false) @RequestParam(required = false) String beginTime,
|
|
|
- @ApiParam(value = "结束时间yyyyMMdd", required = false) @RequestParam(required = false) String endTime,
|
|
|
+ @ApiParam(value = "开始时间yyyyMMdd", required = true) @RequestParam(required = false) String beginTime,
|
|
|
+ @ApiParam(value = "结束时间yyyyMMdd", required = true) @RequestParam(required = false) String endTime,
|
|
|
@ApiParam(value = "页数,非必传,默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
|
|
|
@ApiParam(value = "条数,非必传,默认15条", required = false, defaultValue = "15") @RequestParam(required = false, defaultValue = "15") int pageSize
|
|
|
){
|
|
@@ -129,6 +130,103 @@ public class PayControlRecordController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/exportExcel")
|
|
|
+ @ApiOperation(value="导出阀控记录",notes="导出阀控记录")
|
|
|
+ public void exportExcel(
|
|
|
+ @ApiParam(value = "水表电子号,水表档案号", required = false) @RequestParam(required = false) String meterCode,
|
|
|
+ @ApiParam(value = "阀控规则", required = false) @RequestParam(required = false) String controlRuleId,
|
|
|
+ @ApiParam(value = "操作类型 0关阀 1开阀", required = false) @RequestParam(required = false) String type,
|
|
|
+ @ApiParam(value = "操作结果 0执行中 1成功 2失败", required = false) @RequestParam(required = false) String result,
|
|
|
+ @ApiParam(value = "阀门状态: 0关阀 1开阀 2 无阀,3异常", required = false) @RequestParam(required = false) String state,
|
|
|
+ @ApiParam(value = "开始时间yyyyMMdd", required = true) @RequestParam(required = false) String beginTime,
|
|
|
+ @ApiParam(value = "结束时间yyyyMMdd", required = true) @RequestParam(required = false) String endTime,
|
|
|
+ HttpServletResponse httpServletResponse
|
|
|
+ ){
|
|
|
+ try {
|
|
|
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
|
|
+ PayControlRecordDto payControlRecordDto = new PayControlRecordDto();
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(meterCode)){
|
|
|
+ payControlRecordDto.setMeterCode(meterCode);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(controlRuleId)){
|
|
|
+ payControlRecordDto.setControlRuleId(new Integer(controlRuleId));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(type)){
|
|
|
+ payControlRecordDto.setType(new Integer(type));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(result)){
|
|
|
+ payControlRecordDto.setResult(new Integer(result));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(state)){
|
|
|
+ payControlRecordDto.setResult(new Integer(state));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(beginTime)){
|
|
|
+ beginTime = beginTime +"000000";
|
|
|
+ payControlRecordDto.setBeginTime( LocalDateTime.parse(beginTime,df));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(endTime)){
|
|
|
+ endTime = endTime + "235959";
|
|
|
+ payControlRecordDto.setEndTime(LocalDateTime.parse(endTime, df));
|
|
|
+ }
|
|
|
+ payControlRecordService.exportExcel(payControlRecordDto,httpServletResponse);
|
|
|
+ }
|
|
|
+ catch (Exception ex){
|
|
|
+ throw new ServiceException(-99,"导出异常");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ @GetMapping("/exportExcel2")
|
|
|
+ @ApiOperation(value="导出阀控记录(单表)",notes="导出阀控记录(单表)")
|
|
|
+ public void exportExcel2(
|
|
|
+ @ApiParam(value = "水表电子号,水表档案号", required = false) @RequestParam(required = false) String meterCode,
|
|
|
+ @ApiParam(value = "阀控规则", required = false) @RequestParam(required = false) String controlRuleId,
|
|
|
+ @ApiParam(value = "操作类型 0关阀 1开阀", required = false) @RequestParam(required = false) String type,
|
|
|
+ @ApiParam(value = "操作结果 0执行中 1成功 2失败", required = false) @RequestParam(required = false) String result,
|
|
|
+ @ApiParam(value = "阀门状态: 0关阀 1开阀 2 无阀,3异常", required = false) @RequestParam(required = false) String state,
|
|
|
+ @ApiParam(value = "开始时间yyyyMMdd", required = true) @RequestParam(required = false) String beginTime,
|
|
|
+ @ApiParam(value = "结束时间yyyyMMdd", required = true) @RequestParam(required = false) String endTime,
|
|
|
+ HttpServletResponse httpServletResponse
|
|
|
+ ){
|
|
|
+ try {
|
|
|
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
|
|
+ PayControlRecordDto payControlRecordDto = new PayControlRecordDto();
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(meterCode)){
|
|
|
+ payControlRecordDto.setMeterCode(meterCode);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(StringUtils.isNotBlank(controlRuleId)){
|
|
|
+ payControlRecordDto.setControlRuleId(new Integer(controlRuleId));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(type)){
|
|
|
+ payControlRecordDto.setType(new Integer(type));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(result)){
|
|
|
+ payControlRecordDto.setResult(new Integer(result));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(state)){
|
|
|
+ payControlRecordDto.setResult(new Integer(state));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(beginTime)){
|
|
|
+ beginTime = beginTime +"000000";
|
|
|
+ payControlRecordDto.setBeginTime( LocalDateTime.parse(beginTime,df));
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(endTime)){
|
|
|
+ endTime = endTime + "235959";
|
|
|
+ payControlRecordDto.setEndTime(LocalDateTime.parse(endTime, df));
|
|
|
+ }
|
|
|
+ payControlRecordService.exportExcel2(payControlRecordDto,httpServletResponse);
|
|
|
+ }
|
|
|
+ catch (Exception ex){
|
|
|
+ throw new ServiceException(-99,"导出异常");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/findByYear")
|
|
|
@ApiOperation(value="查询阀控记录(按年)",notes="查询阀控记录(按年)")
|
|
|
public AjaxMessage<List<PayControlRecordDto>> findByYear(
|