元谋二期后端软件系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liurunyu
2024-07-15 5e2faddb34e79918b73dc75aca8f63048dd4526d 
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java


@@ -23,10 +23,11 @@


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.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.core.env.Environment;


import org.springframework.http.MediaType;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.validation.BindingResult;


@@ -47,7 +48,7 @@


@Tag(name = "小程序阀控器控制", description = "小程序阀控器控制")


@RestController


@RequestMapping(path = "valve")


@RequiredArgsConstructor


//@RequiredArgsConstructor


public class ValveCtrl extends ComSupport {


    private final CommandSv commandSv;


    private final SeVirtualCardMapper seVirtualCardMapper;


@@ -55,6 +56,23 @@




    @Value("${mw.rtuCallbackUrl_wx}")


    private String rtuCallbackUrl_wx;




    /**


     * pro_mw：属性


     * tag从控制器中获取


     * key_mw：url的key


     */


    private Environment env = null;


    private String pro_mw = "mw";


    private String key_mw = "comSendUrl";




    @Autowired


    public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {


        this.commandSv = commandSv;


        this.seVirtualCardMapper = seVirtualCardMapper;


        this.idLongGenerator = idLongGenerator;


        this.env = env;


    }




    /**


     * 小程序远程开阀


@@ -126,6 +144,8 @@


        }


        String rtuAddr = job_rtu.getString("rtuAddr");


        String protocol = job_rtu.getString("protocol");


        String orgTag = job_rtu.getString("orgTag");


        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);




        // 生成订单号


        String orderNo = generateOrderNo();


@@ -232,6 +252,8 @@


        }


        Long intakeId = job_rtu.getLong("intakeId");


        String protocol = job_rtu.getString("protocol");


        String orgTag = job_rtu.getString("orgTag");


        comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);




        String commandCode = null;


        if (protocol.equals("p206V202404")) {