yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加生态流量监控接口

master
chenxiwang 2024-07-26 16:12:34 +08:00
parent 91dc3007c8
commit c29ce51617
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/gunshi/project/xyt/controller/StWaterRController.java
View File

@ -9,8 +9,10 @@ import com.gunshi.core.result.R;
import com.gunshi.db.dto.DateTimeRangeSo;
import com.gunshi.project.xyt.entity.vo.StWaterRVo;
import com.gunshi.project.xyt.model.ResMonthEcoFlow;
import com.gunshi.project.xyt.model.StStbprpB;
import com.gunshi.project.xyt.model.StWaterR;
import com.gunshi.project.xyt.service.ResMonthEcoFlowService;
import com.gunshi.project.xyt.service.StStbprpBService;
import com.gunshi.project.xyt.service.StWaterRService;
import com.gunshi.project.xyt.util.ConvertUtil;
import com.gunshi.project.xyt.util.DateUtil;
@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -48,6 +51,9 @@ public class StWaterRController {
@Autowired
private ResMonthEcoFlowService resMonthEcoFlowService;
@Autowired
private StStbprpBService stStbprpBService;
@Operation(summary = "新增")
@PostMapping("/insert")
@ -123,4 +129,41 @@ public class StWaterRController {
public R<Map<String, BigDecimal>> stat(@RequestBody @Validated DateTimeRangeSo dateTimeRangeSo) {
return R.ok(service.stat(dateTimeRangeSo));
}
@Operation(summary = "生态流量监控-列表")
@PostMapping("/ecologyFlowList")
public R<List<StWaterR>> ecologyFlowList(@RequestBody @Validated StWaterR stWaterR) {
// 查询生态（放水管流量站QQ）
StStbprpB stStbprpB = stStbprpBService.getOne(new QueryWrapper<StStbprpB>().eq("sttp", "QQ").last(" limit 1"));
if(ObjectUtils.isEmpty(stStbprpB) || StringUtils.isEmpty(stStbprpB.getStcd())){
return R.ok(new ArrayList<>());
}
QueryWrapper<StWaterR> wrapper = new QueryWrapper<StWaterR>()
.eq("stcd", stStbprpB.getStcd())
.ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime())
.le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime());
if(StringUtils.isNotBlank(stWaterR.getSortField())){
wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField());
}
return R.ok(service.list(wrapper));
}
@Operation(summary = "生态流量监控-分页")
@PostMapping("/ecologyFlowPage")
public R<Page<StWaterR>> ecologyFlowPage(@RequestBody @Validated StWaterR stWaterR) {
// 查询生态（放水管流量站QQ）
StStbprpB stStbprpB = stStbprpBService.getOne(new QueryWrapper<StStbprpB>().eq("sttp", "QQ").last(" limit 1"));
if(ObjectUtils.isEmpty(stStbprpB) || StringUtils.isEmpty(stStbprpB.getStcd())){
return R.ok(new Page<>());
}
QueryWrapper<StWaterR> wrapper = new QueryWrapper<StWaterR>()
.eq("stcd", stStbprpB.getStcd())
.ge(ObjectUtils.isNotNull(stWaterR.getStartTime()), "tm", stWaterR.getStartTime())
.le(ObjectUtils.isNotNull(stWaterR.getEndTime()), "tm", stWaterR.getEndTime());
if(StringUtils.isNotBlank(stWaterR.getSortField())){
wrapper.orderBy(true, ObjectUtils.isEmpty(stWaterR.getIsAsc()) ? false : stWaterR.getIsAsc(), stWaterR.getSortField());
}
return R.ok(service.page(stWaterR.getPageSo().toPage(), wrapper));
}
}

2
src/main/java/com/gunshi/project/xyt/model/StWaterR.java
View File

@ -38,7 +38,7 @@ public class StWaterR extends GenericPageParams implements Serializable {
@TableId(value="stcd", type= IdType.AUTO)
@Schema(description="测站编码")
@Size(max = 20,message = "测站编码最大长度要小于 20")
@NotBlank(message = "测站编码不能为空")
// @NotBlank(message = "测站编码不能为空")
private String stcd;
/**