Administrator
2024-07-12 3dae16069f7f6572750f028a48ca291f449bbb44
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -23,10 +23,10 @@
import com.dy.pipIrrWechat.result.WechatResultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -47,14 +47,24 @@
@Tag(name = "小程序阀控器控制", description = "小程序阀控器控制")
@RestController
@RequestMapping(path = "valve")
@RequiredArgsConstructor
//@RequiredArgsConstructor
public class ValveCtrl extends ComSupport {
    private final CommandSv commandSv;
    private final SeVirtualCardMapper seVirtualCardMapper;
    private final IDLongGenerator idLongGenerator;
    @Value("${mw.rtuCallbackUrl_wx}")
    private String rtuCallbackUrl_wx;
    //@Value("${mw.rtuCallbackUrl_wx}")
    private String rtuCallbackUrl_wx = null;
    private Environment env = null;
    @Autowired
    public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {
        this.commandSv = commandSv;
        this.seVirtualCardMapper = seVirtualCardMapper;
        this.idLongGenerator = idLongGenerator;
        this.env = env;
    }
    /**
     * 小程序远程开阀
@@ -68,6 +78,10 @@
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        String pro_mw = "mw";
        String key_mw = "comSendUrl";
        rtuCallbackUrl_wx = env.getProperty(pro_mw + "." + key_mw);
        Long intakeId = valve.getIntakeId();
        String intakeName = valve.getIntakeName();
@@ -113,7 +127,7 @@
        // 虚拟卡状态为使用中,且不是强制开阀时提示
        if (vc.getInUse() == 1 && !forceOpen) {
            return BaseResponseUtils.buildErrorMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
            return BaseResponseUtils.buildCodeMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
        }
        // 获取水价