优化代码 指定时间段用水量超过指定值的农户 指定时间段用水时长超过指定值的农户 指定时间段消费金额超过指定值的农户

wuzeyu

2024-09-02 a27ef29ee2116befc9043fb34db5d3a7fecb4094

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java

@@ -13,6 +13,7 @@
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import com.dy.pipIrrProject.result.ProjectResultCode;
import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -52,6 +53,11 @@
public class IntakeCtrl {
    private final IntakeSv intakeSv;

    @GetMapping("/test")
    public String sendMessage(String message) throws ApiException {
        return intakeSv.sendMessage(message);
    }

    /**
     * 客户端请求得到所有取水口名字
     *
@@ -72,7 +78,7 @@
        try {
            QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
            if (res == null) {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
            } else {
                return BaseResponseUtils.buildSuccess(res);
            }
@@ -100,7 +106,7 @@
    @SsoAop()
    public BaseResponse<PrIntake> one(@PathVariable("id") Long id) {
        if (this.intakeSv.selectById(id) == null) {
            return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
        }
@@ -121,7 +127,7 @@
        try {
            QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
            if (res == null) {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
            }
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
@@ -142,18 +148,20 @@
    @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody  @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
    public BaseResponse<Boolean> add(@RequestBody @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        po.setDeleted((byte)0);
        List<Long> ids = intakeSv.getIntakeIdsByName(po.getName());
        if (ids.size() > 0) {
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
        }
        po.setOperateDt(new Date());
        po.setDeleted((byte) 0);
        Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0);
        if (rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true);
    }
@@ -177,19 +185,22 @@
    @SsoAop()
    public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName());
        if (ids.size() > 0) {
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
        }
        int count;
        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        po.setOperateDt(new Date());
        try {
            count = this.intakeSv.update(po);
        } catch (Exception e) {
            log.error("保存分水口异常", e);
            log.error("保存取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
        if (count <= 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(true);
        }
@@ -214,14 +225,14 @@
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
        }
        Long id = Long.parseLong(map.get("id").toString());
        try {
            //取水口ID
            Integer recordCount = Optional.ofNullable(intakeSv.delete(id)).orElse(0);
            if (recordCount == 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
            } else {
                return BaseResponseUtils.buildSuccess(true);
            }
@@ -281,6 +292,7 @@

    /**
     * 获取取水口列表（在线和不在线）
     *
     * @param qo
     * @return
     */
@@ -298,6 +310,7 @@

    /**
     * 根据操作员获取常用取水口（在线和不在线）
     *
     * @param operator
     * @return
     */