pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
@@ -62,7 +62,7 @@ (code.equals(cd_92) ? "遥控启动阀门" : (code.equals(cd_93) ? "遥控关闭阀门" : (code.equals(cd_97) ? "APP远程开阀" : (code.equals(cd_98) ? "PP远程关阀" : (code.equals(cd_98) ? "APP远程关阀" : (code.equals(cd_3C) ? "设置水价" : (code.equals(cd_6C) ? "查询水价" : (code.equals(cd_3D) ? "设置黑名单" : pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
File was renamed from pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/ComSupport.java @@ -1,19 +1,20 @@ package com.dy.pipIrrRemote.common; package com.dy.pipIrrGlobal.command; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.dy.common.mw.protocol.Command; import com.dy.common.mw.protocol.CommandType; import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V202404.CodeV202404; import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.command.result.CommandResultCode; import com.dy.pipIrrGlobal.daoBa.BaSettingsMapper; import com.dy.pipIrrGlobal.daoPr.PrControllerMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.pipIrrRemote.result.RemoteResultCode; import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.DependsOn; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -22,9 +23,12 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Random; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -32,29 +36,18 @@ /** * @author ZhuBaoMin * @date 2024-05-21 15:30 * @LastEditTime 2024-05-21 15:30 * @Description * @date 2024-05-30 15:45 * @LastEditTime 2024-05-30 15:45 * @Description 命令支撑类 */ @Component @DependsOn({"baSettingsMapper", "prControllerMapper"}) public class ComSupport { //@NotNull //private final CommandSv commandSv; protected static String mwUrlTest = "http://127.0.0.1:8070/rtuMw/com/test" ; protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ; //protected static String rtuAddr = "37142501020100215" ; protected static String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ; protected static String controllerType = "57" ;//控制器类型 protected static Integer projectNo = 100 ;//项目编码 //protected static String icCardAddr = "04BEA5BB" ;//IC卡地址 //protected static String icCardNo = "37142501020500001" ;//IC卡编号（用户卡序列号） //protected String protocolName = ProtocolConstantV206V202404.protocolName; protected static String controllerType = null; protected static Integer projectNo = null; protected String commandTypeOuter = CommandType.outerCommand; // 存储实例化的 CompletableFuture<Data> 对象 @@ -66,6 +59,8 @@ @Autowired private BaSettingsMapper baSettingsMapper; @Autowired private PrControllerMapper prControllerMapper; public static ComSupport comSupport; /** @@ -75,23 +70,51 @@ public void init() { comSupport = this; comSupport.baSettingsMapper = this.baSettingsMapper; comSupport.prControllerMapper = this.prControllerMapper; } /** * 获取系统配置参数 */ public void setUp() { //protocolName = comSupport.baSettingsMapper.getItemValue("protocolName"); controllerType = comSupport.baSettingsMapper.getItemValue("controllerType"); projectNo = Integer.parseInt(comSupport.baSettingsMapper.getItemValue("projectNo")); setuped = true; } protected ComCdXyVo comCdXyVo(){ ComCdXyVo comVo = new ComCdXyVo() ; comVo.controllerType = controllerType ; comVo.projectNo = projectNo ; return comVo ; /** * 生成订单号 * @return */ public String generateOrderNo() { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss"); LocalDateTime dateTime = LocalDateTime.now(); Random random = new Random(); String CHARACTERS = "0123456789"; StringBuilder sb = new StringBuilder(4); for (int i = 0; i < 4; i++) { int index = random.nextInt(CHARACTERS.length()); sb.append(CHARACTERS.charAt(index)); } return dtf.format(dateTime) + sb.toString(); } /** * 根据取水口ID或阀控器地址获取阀控器对象 * @param intakeId * @return */ public JSONObject getRtu(Long intakeId, String rtuAddr) { PrController prController = prControllerMapper.getRtu(intakeId, rtuAddr); if(prController == null) { return null; } JSONObject job_rtu = new JSONObject(); job_rtu.put("rtuAddr", prController.getRtuAddr()); job_rtu.put("protocol", prController.getProtocol()); job_rtu.put("intakeId", prController.getIntakeId()); return job_rtu; } /** @@ -104,11 +127,12 @@ * @param operator 操作员 * @return */ protected RmCommandHistory getComHistory(Long comId, String commandCode, Long intakeId, String rtuAddr, String protocol, Object param, Long operator ) { protected RmCommandHistory getComHistory(Long comId, String commandCode, String commandName, Long intakeId, String rtuAddr, String protocol, Object param, Long operator ) { RmCommandHistory rmCommandHistory = new RmCommandHistory(); rmCommandHistory.setId(comId); rmCommandHistory.setCommandCode(commandCode); rmCommandHistory.setCommandName(CodeV202404.getCodeName(commandCode)); //rmCommandHistory.setCommandName(CodeV202404.getCodeName(commandCode)); rmCommandHistory.setCommandName(commandName); rmCommandHistory.setIntakeId(intakeId); rmCommandHistory.setRtuAddr(rtuAddr); rmCommandHistory.setProtocol(protocol); @@ -126,7 +150,7 @@ * @param param 参数数据 * @return 构造好的命令对象 */ protected Command command(Long comId, String commandCode, String rtuAddr, String protocol, Object param){ protected Command command(Long comId, String commandCode, String rtuAddr, String protocol, String rtuResultSendWebUrl, Object param){ Command com = new Command() ; com.id = String.valueOf(comId); com.code = commandCode ; @@ -152,9 +176,9 @@ try { CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId); System.out.println("receive result ID:" + comId); Data resultData = feature.get(10, TimeUnit.SECONDS); Data resultData = feature.get(30, TimeUnit.SECONDS); features.remove(comId); String commandId = resultData.getCommandId(); Long commandId = Long.parseLong(resultData.getCommandId()); if(commandId.equals(comId)) { return BaseResponseUtils.buildSuccess(resultData); }else { @@ -162,33 +186,13 @@ } } catch (InterruptedException e) { e.printStackTrace(); return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_ERROR.getMessage()); return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_ERROR.getMessage()); } catch (ExecutionException e) { e.printStackTrace(); return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_ERROR.getMessage()); return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_ERROR.getMessage()); } catch (TimeoutException e) { return BaseResponseUtils.buildFail(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage()); return BaseResponseUtils.buildFail(CommandResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage()); } } /** * 连接通信中间件测试 * @return */ protected BaseResponse sendTest(){ String url = UriComponentsBuilder.fromUriString(mwUrlTest) .build() .toUriString(); HttpHeaders headers = new HttpHeaders(); HttpEntity<?> httpEntity = new HttpEntity<>(headers); ResponseEntity<BaseResponse> response = null; try { // 通过Get方式调用接口 response = restTemplate.exchange(url, HttpMethod.GET, httpEntity, BaseResponse.class); } catch (Exception e) { e.printStackTrace(); } return response.getBody(); } /** @@ -210,5 +214,4 @@ } return response.getBody(); } } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/result/CommandResultCode.java
New file @@ -0,0 +1,29 @@ package com.dy.pipIrrGlobal.command.result; import lombok.AllArgsConstructor; import lombok.Getter; /** * @author ZhuBaoMin * @date 2024-05-07 14:54 * @LastEditTime 2024-05-07 14:54 * @Description */ @Getter @AllArgsConstructor public enum CommandResultCode { /** * Valve */ GET_RESULT_IN_ONE_MINUTE(10001,"1分钟后去查看结果"), GET_RESULT_ERROR(10002, "获取结果异常"), /** * RTU */ RTU_NOT_EXIST(20001, "阀控器不存在"), RTU_ADDR_CANNOT_BE_NULL(20002, "阀控器地址不能为空"); private final Integer code; private final String message; } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
@@ -88,16 +88,10 @@ Integer deleteIntakeId(@Param("controllerId") Long controllerId); /** * 根据取水口ID获取阀控器对象 * 根据取水口ID或阀控器地址获取阀控器对象 * @param intakeId * @return */ PrController getControllerByIntakeId(Long intakeId); /** * 根据RTU地址获取阀控器对象 * @param rtuAddr * @return */ PrController getControllerByRtuAddr(String rtuAddr); PrController getRtu(@Param("intakeId") Long intakeId, @Param("rtuAddr") String rtuAddr); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrIntakeVcMapper.java
New file @@ -0,0 +1,35 @@ package com.dy.pipIrrGlobal.daoPr; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dy.pipIrrGlobal.pojoPr.PrIntakeVc; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** * @author ZhuBaoMin * @date 2024-05-31 19:26 * @LastEditTime 2024-05-31 19:26 * @Description */ @Mapper public interface PrIntakeVcMapper extends BaseMapper<PrIntakeVc> { int deleteByPrimaryKey(Long id); int insert(PrIntakeVc record); int insertSelective(PrIntakeVc record); PrIntakeVc selectByPrimaryKey(Long id); int updateByPrimaryKeySelective(PrIntakeVc record); int updateByPrimaryKey(PrIntakeVc record); /** * 根据取水口ID获取与之绑定虚拟卡ID * @param intakeId * @return */ Long getVcIdByIntakeId(@Param("intakeId") Long intakeId); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoPr/PrIntakeVc.java
New file @@ -0,0 +1,56 @@ package com.dy.pipIrrGlobal.pojoPr; /** * @author ZhuBaoMin * @date 2024-05-31 19:26 * @LastEditTime 2024-05-31 19:26 * @Description */ import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.writer.ObjectWriterImplToString; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.dy.common.po.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.*; /** * 取水口虚拟卡绑定表 */ @TableName(value="pr_intake_vc", autoResultMap = true) @Data @Builder @ToString @NoArgsConstructor @AllArgsConstructor @Schema(name = "取水口虚拟卡绑定实体") public class PrIntakeVc implements BaseEntity { public static final long serialVersionUID = 202405311931001L; /** * 主键 */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @TableId(type = IdType.INPUT) @Schema(description = "实体id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private Long id; /** * 取水口ID */ @Schema(description = "取水口ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "取水口ID不能为空") private Long intakeId; /** * 虚拟卡ID */ @Schema(description = "虚拟卡ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "虚拟卡ID不能为空") private Long vcId; } pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -252,13 +252,18 @@ SELECT COUNT(*) AS recordCount FROM pr_controller WHERE rtuAddr = (SELECT rtuAddr FROM pr_controller_tramp WHERE id = ${controllerId}) AND intakeId IS NOT NULL </select> <!--根据取水口ID获取阀控器对象--> <select id="getControllerByIntakeId" resultType="com.dy.pipIrrGlobal.pojoPr.PrController"> SELECT * FROM pr_controller WHERE deleted = 0 AND intakeId = #{intakeId} LIMIT 0,1 </select> <!--根据RTU地址获取阀控器对象--> <select id="getControllerByRtuAddr" resultType="com.dy.pipIrrGlobal.pojoPr.PrController"> SELECT * FROM pr_controller WHERE deleted = 0 AND rtuAddr = #{rtuAddr} LIMIT 0,1 <!--根据取水口ID或阀控器地址获取阀控器对象--> <select id="getRtu" resultType="com.dy.pipIrrGlobal.pojoPr.PrController"> SELECT * FROM pr_controller <where> AND deleted = 0 <if test = "intakeId != null"> AND intakeId = #{intakeId} </if> <if test = "rtuAddr != null"> AND rtuAddr = #{rtuAddr} </if> </where> LIMIT 0,1 </select> </mapper> pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeVcMapper.xml
New file @@ -0,0 +1,85 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper"> <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoPr.PrIntakeVc"> <!--@mbg.generated--> <!--@Table pr_intake_vc--> <id column="id" jdbcType="BIGINT" property="id" /> <result column="intake_id" jdbcType="BIGINT" property="intakeId" /> <result column="vc_id" jdbcType="BIGINT" property="vcId" /> </resultMap> <sql id="Base_Column_List"> <!--@mbg.generated--> id, intake_id, vc_id </sql> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <!--@mbg.generated--> select <include refid="Base_Column_List" /> from pr_intake_vc where id = #{id,jdbcType=BIGINT} </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <!--@mbg.generated--> delete from pr_intake_vc where id = #{id,jdbcType=BIGINT} </delete> <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrIntakeVc"> <!--@mbg.generated--> insert into pr_intake_vc (id, intake_id, vc_id ) values (#{id,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, #{vcId,jdbcType=BIGINT} ) </insert> <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrIntakeVc"> <!--@mbg.generated--> insert into pr_intake_vc <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null"> id, </if> <if test="intakeId != null"> intake_id, </if> <if test="vcId != null"> vc_id, </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null"> #{id,jdbcType=BIGINT}, </if> <if test="intakeId != null"> #{intakeId,jdbcType=BIGINT}, </if> <if test="vcId != null"> #{vcId,jdbcType=BIGINT}, </if> </trim> </insert> <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrIntakeVc"> <!--@mbg.generated--> update pr_intake_vc <set> <if test="intakeId != null"> intake_id = #{intakeId,jdbcType=BIGINT}, </if> <if test="vcId != null"> vc_id = #{vcId,jdbcType=BIGINT}, </if> </set> where id = #{id,jdbcType=BIGINT} </update> <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoPr.PrIntakeVc"> <!--@mbg.generated--> update pr_intake_vc set intake_id = #{intakeId,jdbcType=BIGINT}, vc_id = #{vcId,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT} </update> <!--根据取水口ID获取与之绑定虚拟卡ID--> <select id="getVcIdByIntakeId" resultType="java.lang.Long"> SELECT vc_id AS vcId FROM pr_intake_vc WHERE intake_id = #{intakeId} LIMIT 0,1 </select> </mapper> pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -203,8 +203,14 @@ isOnLine BOOLEAN PATH '$.isOnLine' ) ) rtus ON com.rtu_addr = rtus.rtuAddr WHERE (com.command_code = '92' OR com.command_code = 'A2') AND com.operator = #{operator} AND NOT EXISTS (SELECT * FROM rm_command_history WHERE (command_code = '93' OR command_code = 'A3') AND param ->>'$.orderNo' = com.param ->>'$.orderNo') WHERE (com.command_code = '92' OR com.command_code = 'A2' OR com.command_code = '97') AND com.operator = #{operator} AND NOT EXISTS ( SELECT * FROM rm_command_history WHERE (result IS NULL OR result = 1 ) AND (command_code = '93' OR command_code = 'A3' OR command_code = '98') AND param ->>'$.orderNo' = com.param ->>'$.orderNo' ) ORDER BY com.send_time DESC </select> </mapper> pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
@@ -1,6 +1,6 @@ package com.dy.rtuMw.server.local.localProtocol; import java.util.HashMap; import com.dy.rtuMw.server.forTcp.TcpSessionCache; public class RtuOnLineDeal { @@ -8,13 +8,13 @@ * 查询在线与不在线情况 */ public RtuOnLineVo deal(){ //return (new RtuOnLineVo()).setOnLine(TcpSessionCache.allOnLine()); return (new RtuOnLineVo()).setOnLine(TcpSessionCache.allOnLine()); // 返回值测试代码 HashMap<String , Boolean> onLineMap = new HashMap<>() ; onLineMap.put("37142501020100215", true); onLineMap.put("dy20240325", false); onLineMap.put("4000004", true); return (new RtuOnLineVo()).setOnLine(onLineMap); //HashMap<String , Boolean> onLineMap = new HashMap<>() ; //onLineMap.put("37142501020100215", true); //onLineMap.put("dy20240325", false); //onLineMap.put("4000004", true); //return (new RtuOnLineVo()).setOnLine(onLineMap); } } pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/test/CommandP206V100Ctrl.java
@@ -23,8 +23,8 @@ @GetMapping(path = "test") public BaseResponse<String> test() { //return this.connect() ;//连接通信中间件测试 //return this.cd97() ; return this.cd98() ; return this.cd97() ; //return this.cd98() ; } /** pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
@@ -3,6 +3,7 @@ import com.dy.common.mw.protocol.Data; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.command.ComSupport; import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; @@ -25,10 +26,11 @@ public class CommandResultCtrl extends ComSupport { @PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE) public BaseResponse<String> receive(@RequestBody Data data) { String comId = "0"; Long comId = 0L; if(data.getCommandId() != null) { comId = data.getCommandId(); comId = Long.parseLong(data.getCommandId()); } CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId); if(feature != null) { feature.complete(data); pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -5,14 +5,16 @@ import com.alibaba.fastjson2.JSONObject; import com.dy.common.mw.protocol.Command; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.daoPr.PrControllerMapper; import com.dy.pipIrrGlobal.command.ComSupport; import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper; import com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper; import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper; import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper; import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; import com.dy.pipIrrGlobal.voRm.VoUnclosedValve; import com.dy.pipIrrGlobal.voSe.VoVirtualCard; import com.dy.pipIrrRemote.common.qo.OnLineIntakesQO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -36,26 +38,26 @@ @RequiredArgsConstructor public class CommandSv extends ComSupport { private final RmCommandHistoryMapper rmCommandHistoryMapper; private final PrControllerMapper prControllerMapper; private final SeVirtualCardMapper seVirtualCardMapper; private final PrIntakeMapper prIntakeMapper; private final PrWaterPriceMapper prWaterPriceMapper; private final PrIntakeVcMapper prIntakeVcMapper; /** * 根据取水口ID获取阀控器对象 * @param intakeId * 虚拟卡ID换虚拟卡对象 * @param vcId * @return */ public PrController getControllerByIntakeId(Long intakeId) { return prControllerMapper.getControllerByIntakeId(intakeId); public VoVirtualCard getVcById(Long vcId) { return seVirtualCardMapper.getVcById(vcId); } /** * 根据RTU地址获取阀控器对象 * @param rtuAddr * 获取水价 * @return */ public PrController getControllerByRtuAddr(String rtuAddr) { return prControllerMapper.getControllerByRtuAddr(rtuAddr); public Double getPrice() { return prWaterPriceMapper.getPrice(); } /** @@ -171,6 +173,7 @@ jsonArray.add(jsonObject); } System.out.println(jsonArray); List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator); if(res != null) { return res; @@ -183,4 +186,21 @@ } } /** * 修改命令日志记录，回调报错时将命令记录的执行结果改为失败 * @param po * @return */ public Integer updateCommandResult(RmCommandHistory po) { return rmCommandHistoryMapper.updateByPrimaryKeySelective(po); } /** * 根据取水口ID获取与之绑定虚拟卡ID * @param intakeId * @return */ public Long getVcIdByIntakeId(Long intakeId) { return prIntakeVcMapper.getVcIdByIntakeId(intakeId); } } pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveClose.java
@@ -35,8 +35,8 @@ /** * 用户类型 1-平台，2-APP */ @NotNull(message = "操作类型不能为空") private Integer userType; //@NotNull(message = "操作类型不能为空") //private Integer userType; /** * 操作人 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
@@ -1,6 +1,5 @@ package com.dy.pipIrrRemote.common.dto; import jakarta.validation.constraints.NotNull; import lombok.Data; /** @@ -22,6 +21,6 @@ /** * 用户类型 1-平台，2-APP */ @NotNull(message = "操作类型不能为空") private Integer userType; //@NotNull(message = "操作类型不能为空") //private Integer userType; } pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/result/RemoteResultCode.java
@@ -15,14 +15,16 @@ /** * Valve */ GET_RESULT_IN_ONE_MINUTE(10001,"1分钟后去查看结果"), //GET_RESULT_IN_ONE_MINUTE(10001,"1分钟后去查看结果"), GET_RESULT_ERROR(10002, "获取结果异常"), PLEASE_SELECT_A_VC(10002, "请选择一张虚拟卡"), IN_USE_VC_CANNOT_OPEN_VALVE(10002, "使用中虚拟卡不能用来开阀"), /** * RTU */ RTU_NOT_EXIST(20001, "阀控器不存在"), RTU_ADDR_CANNOT_BE_NULL(20002, "阀控器地址不能为空"); RTU_NOT_EXIST(20001, "阀控器不存在"); //RTU_ADDR_CANNOT_BE_NULL(20002, "阀控器地址不能为空"); private final Integer code; private final String message; pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
@@ -12,15 +12,13 @@ import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.command.ComSupport; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; import com.dy.pipIrrRemote.common.ComSupport; import com.dy.pipIrrRemote.common.CommandSv; import com.dy.pipIrrRemote.common.dto.Addr; import com.dy.pipIrrRemote.common.dto.DtoBase; import com.dy.pipIrrRemote.common.qo.OnLineIntakesQO; import com.dy.pipIrrRemote.result.RemoteResultCode; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -126,12 +124,12 @@ Long comId = idLongGenerator.generate(); // 取水口ID换阀控器地址及通讯协议 PrController prController = commandSv.getControllerByIntakeId(intakeId); if(prController == null) { return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); } String rtuAddr = prController.getRtuAddr(); String protocol = prController.getProtocol(); //PrController prController = commandSv.getControllerByIntakeId(intakeId); //if(prController == null) { // return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); //} //String rtuAddr = prController.getRtuAddr(); //String protocol = prController.getProtocol(); // 创建视图 ComCd10Vo param = new ComCd10Vo() ; @@ -140,13 +138,13 @@ param.rtuNewAddr = newRtuAddr; // 创建命令日志对象并添加到数据库中 RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator); comId = commandSv.insert(rmCommandHistory); System.out.println(comId); //RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator); //comId = commandSv.insert(rmCommandHistory); //System.out.println(comId); // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, param); sendCom2Mw(com); //Command com = command(comId, commandCode, rtuAddr, protocol, param); //sendCom2Mw(com); CompletableFuture<Data> featureObject = new CompletableFuture<>(); features.put(comId, featureObject); @@ -193,12 +191,14 @@ Long comId = idLongGenerator.generate(); // 取水口ID换阀控器地址及通讯协议 PrController prController = commandSv.getControllerByIntakeId(intakeId); if(prController == null) { return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); } String rtuAddr = prController.getRtuAddr(); String protocol = prController.getProtocol(); //PrController prController = commandSv.getControllerByIntakeId(intakeId); //if(prController == null) { // return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); //} //String rtuAddr = prController.getRtuAddr(); //String protocol = prController.getProtocol(); String rtuAddr = ""; String protocol = ""; // 创建视图 ComCdXyVo param = new ComCdXyVo(); @@ -206,11 +206,11 @@ param.projectNo = projectNo; // 创建命令日志对象并添加到数据库中 RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, "",intakeId, rtuAddr, protocol, param, operator); comId = commandSv.insert(rmCommandHistory); // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, param); Command com = command(comId, commandCode,"", rtuAddr, protocol, param); return sendCom2Mw(com); } } pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -5,25 +5,25 @@ import com.dy.common.aop.SsoAop; import com.dy.common.mw.protocol.Command; import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1; import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo; import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo; import com.dy.common.mw.protocol.p206V202404.CodeV202404; import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo; import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo; import com.dy.common.util.IDLongGenerator; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper; import com.dy.pipIrrGlobal.command.ComSupport; import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard; import com.dy.pipIrrGlobal.voRm.VoUnclosedValve; import com.dy.pipIrrGlobal.voSe.VoVirtualCard; import com.dy.pipIrrRemote.common.ComSupport; import com.dy.pipIrrRemote.common.CommandSv; import com.dy.pipIrrRemote.common.dto.ValveClose; import com.dy.pipIrrRemote.common.dto.ValveOpen; import com.dy.pipIrrRemote.result.RemoteResultCode; import com.dy.pipIrrRemote.utils.RestTemplateUtils; import com.dy.pipIrrSell.virtualCard.enums.LastOperateENUM; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -34,12 +34,10 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.Objects; import java.util.Random; /** * @author ZhuBaoMin @@ -49,19 +47,18 @@ */ @Slf4j @Tag(name = "阀门管理", description = "阀门操作") @Tag(name = "平台阀控器控制", description = "平台阀控器控制") @RestController @RequestMapping(path="valve") @RequiredArgsConstructor public class ValveCtrl extends ComSupport { private final RestTemplateUtils restTemplateUtils; private final CommandSv commandSv; private final SeVirtualCardMapper seVirtualCardMapper; private final PrWaterPriceMapper prWaterPriceMapper; private final IDLongGenerator idLongGenerator; private String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ; /** * 远程开阀（平台、APP） * 小程序远程开阀 * @param valve * @param bindingResult * @return @@ -77,49 +74,55 @@ Long intakeId = valve.getIntakeId(); Long vcId = valve.getVcId(); Integer userType = valve.getUserType(); Long operator = valve.getOperator(); Long comId = idLongGenerator.generate(); /** * 如果农户选择了虚拟卡，则使用该虚拟卡 * 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡 * 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡 */ if(vcId == null) { vcId = commandSv.getVcIdByIntakeId(intakeId); if(vcId == null) { return BaseResponseUtils.buildFail(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage()); } } // 获取系统参数 if(!setuped) { setUp(); } // 取水口ID换取水口对象 // 如果取水口为打开状态，则不允许被开阀 // 虚拟卡ID换虚拟卡对象 VoVirtualCard vc = seVirtualCardMapper.getVcById(vcId); VoVirtualCard vc = commandSv.getVcById(vcId); if(vc == null) { return BaseResponseUtils.buildFail(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage()); } if(vc.getInUse() == 1) { return BaseResponseUtils.buildFail(RemoteResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage()); } // 获取水价 Double waterPrice = prWaterPriceMapper.getPrice(); Double waterPrice = commandSv.getPrice(); // 取水口ID换阀控器地址及通讯协议 PrController prController = commandSv.getControllerByIntakeId(intakeId); if(prController == null) { JSONObject job_rtu = getRtu(intakeId, null); if(job_rtu == null) { return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); } String rtuAddr = prController.getRtuAddr(); String protocol = prController.getProtocol(); String rtuAddr = job_rtu.getString("rtuAddr"); String protocol = job_rtu.getString("protocol"); // 生成订单号 LocalDateTime dateTime = LocalDateTime.now(); Random random = new Random(); String CHARACTERS = "0123456789"; StringBuilder sb = new StringBuilder(4); for (int i = 0; i < 4; i++) { int index = random.nextInt(CHARACTERS.length()); sb.append(CHARACTERS.charAt(index)); } String orderNo = dtf.format(dateTime) + sb.toString(); String orderNo = generateOrderNo(); String commandCode = null; if(protocol.equals("p206V202404")) { // 获取功能码 if(userType == 1) { // 平台开阀 commandCode = CodeV202404.cd_92; }else { // APP开阀 commandCode = CodeV202404.cd_A2; } commandCode = CodeV202404.cd_92; // 创建视图 ComCd92_A2Vo param = new ComCd92_A2Vo(); @@ -133,25 +136,115 @@ param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, param); Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { //if(1 > 0) { //if(1 > 0) { // 请求成功 // 创建命令日志对象并添加到数据库中 RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator); String commandName = CodeV202404.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); // 回调失败 if(!response_CallBack.getCode().equals("0001")) { return BaseResponseUtils.buildError(RemoteResultCode.GET_RESULT_ERROR.getMessage()); // 命令日志执行结果改为失败 rmCommandHistory = new RmCommandHistory(); rmCommandHistory.setId(comId); rmCommandHistory.setResult((byte)0); commandSv.updateCommandResult(rmCommandHistory); return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } // 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 1); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); // 回调返回的内容 Data myData = (Data)response_CallBack.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } else { // 请求失败 JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param"); return BaseResponseUtils.buildFail(job_param.getString("message")); } } else if(protocol.equals("p206V1_0_1")) { // 获取功能码 commandCode = CodeV1_0_1.cd_92; // 创建视图 Com97Vo param = new Com97Vo() ; param.icCardNo = vc.getVcNum(); param.moneyRemain = vc.getMoney(); param.waterPrice = waterPrice; param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { //if(1 > 0) { // 请求成功 // 创建命令日志对象并添加到数据库中 String commandName = CodeV1_0_1.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); //回调失败 if(!response_CallBack.getCode().equals("0001")) { // 命令日志执行结果改为失败 rmCommandHistory = new RmCommandHistory(); rmCommandHistory.setId(comId); rmCommandHistory.setResult((byte)0); commandSv.updateCommandResult(rmCommandHistory); return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 1); @@ -168,32 +261,12 @@ return BaseResponseUtils.buildFail(job_param.getString("message")); } } else { // 获取功能码 if(userType == 1) { // 平台开阀 commandCode = "92"; }else { // APP开阀 commandCode = "97"; } // 创建视图 ComCd92_A2Vo param = new ComCd92_A2Vo(); // 创建命令日志对象并添加到数据库中 //RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, protocol, param, operator); //comId = commandSv.insert(rmCommandHistory); // 构造并发送命令 Command com = command(comId, commandCode, rtuAddr, protocol, param); sendCom2Mw(com); return BaseResponseUtils.buildSuccess(); return BaseResponseUtils.buildFail("系统暂不支持该协议"); } } /** * 远程关阀（平台、APP） * 小程序远程关阀 * @param valve * @param bindingResult * @return @@ -210,7 +283,6 @@ String rtuAddr = valve.getRtuAddr(); String vcNum = valve.getVcNum(); String orderNo = valve.getOrderNo(); Integer userType = valve.getUserType(); Long operator = valve.getOperator(); Long comId = idLongGenerator.generate(); @@ -220,23 +292,17 @@ } // 阀控器地址换取水口ID和通讯协议 PrController prController = commandSv.getControllerByRtuAddr(rtuAddr); if(prController == null) { JSONObject job_rtu = getRtu(null, rtuAddr); if(job_rtu == null) { return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage()); } Long intakeId = prController.getIntakeId(); String protocol = prController.getProtocol(); Long intakeId = job_rtu.getLong("intakeId"); String protocol = job_rtu.getString("protocol"); String commandCode = null; if(protocol.equals("p206V202404")) { // 获取功能码 if (userType == 1) { // 平台关阀 commandCode = CodeV202404.cd_93; } else { // APP关阀 commandCode = CodeV202404.cd_A3; } commandCode = CodeV202404.cd_93; // 创建视图 ComCd93_A3Vo param = new ComCd93_A3Vo(); @@ -246,7 +312,7 @@ param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, param); Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); @@ -254,20 +320,109 @@ // 请求成功 // 创建命令日志对象并添加到数据库中 RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator); String commandName = CodeV202404.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); // 回调失败 if(!response_CallBack.getCode().equals("0001")) { return BaseResponseUtils.buildError(RemoteResultCode.GET_RESULT_ERROR.getMessage()); // 命令日志执行结果改为失败 rmCommandHistory = new RmCommandHistory(); rmCommandHistory.setId(comId); rmCommandHistory.setResult((byte)0); commandSv.updateCommandResult(rmCommandHistory); return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage()); } // 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum); SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 1); virtualCard.setInUse((byte) 0); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); // 回调返回的内容 Data myData = (Data)response_CallBack.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } else { // 请求失败 JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param"); return BaseResponseUtils.buildFail(job_param.getString("message")); } } else if(protocol.equals("p206V1_0_1")) { // 获取功能码 commandCode = CodeV1_0_1.cd_93; // 创建视图 Com98Vo param = new Com98Vo() ; param.icCardNo = vcNum; param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { //if(1 > 0) { // 请求成功 // 创建命令日志对象并添加到数据库中 String commandName = CodeV1_0_1.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); // 回调失败 if(!response_CallBack.getCode().equals("0001")) { // 命令日志执行结果改为失败 rmCommandHistory = new RmCommandHistory(); rmCommandHistory.setId(comId); rmCommandHistory.setResult((byte)0); commandSv.updateCommandResult(rmCommandHistory); return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage()); } // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum); SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 0); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); @@ -281,48 +436,8 @@ return BaseResponseUtils.buildFail(job_param.getString("message")); } } else { // 获取功能码 if (userType == 1) { // 平台关阀 commandCode = "93"; } else { // APP关阀 commandCode = "98"; } // 创建视图 ComCd93_A3Vo param = new ComCd93_A3Vo(); param.controllerType = controllerType; param.projectNo = projectNo; param.icCardNo = vcNum; param.orderNo = orderNo; // 创建命令日志对象并添加到数据库中 RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator); comId = commandSv.insert(rmCommandHistory); // 构造并发送命令 Command com = command(comId, commandCode, rtuAddr, protocol, param); sendCom2Mw(com); return BaseResponseUtils.buildFail("系统暂不支持该协议"); } // 处理回调 BaseResponse response = dealWithCallBack(comId); if(!response.getCode().equals("0001")) { return BaseResponseUtils.buildError(RemoteResultCode.GET_RESULT_ERROR.getMessage()); } // 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum); SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 0); virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); Data myData = (Data)response.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } /** pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/dto/DTOValve.java
File was deleted pipIrr-platform/pipIrr-web/pipIrr-web-wechat/pom.xml
@@ -2,6 +2,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <dependencies> <dependency> <groupId>com.dy</groupId> <artifactId>pipIrr-web-sell</artifactId> <version>1.0.0</version> <scope>compile</scope> </dependency> </dependencies> <parent> <artifactId>pipIrr-web</artifactId> pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandResultCtrl.java
New file @@ -0,0 +1,40 @@ package com.dy.pipIrrWechat.command; import com.dy.common.mw.protocol.Data; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.command.ComSupport; import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.concurrent.CompletableFuture; /** * @author ZhuBaoMin * @date 2024-05-30 16:07 * @LastEditTime 2024-05-30 16:07 * @Description */ @Slf4j @RestController @RequestMapping(path="comRes") public class CommandResultCtrl extends ComSupport { @PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE) public BaseResponse<String> receive(@RequestBody Data data) { Long comId = 0L; if(data.getCommandId() != null) { comId = Long.parseLong(data.getCommandId()); } CompletableFuture<Data> feature = (CompletableFuture<Data>) features.get(comId); if(feature != null) { feature.complete(data); } return BaseResponseUtils.buildSuccess("ok"); } } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
New file @@ -0,0 +1,197 @@ package com.dy.pipIrrWechat.command; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.dy.common.mw.protocol.Command; import com.dy.common.webUtil.QueryResultVo; import com.dy.pipIrrGlobal.command.ComSupport; import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper; import com.dy.pipIrrGlobal.daoPr.PrIntakeVcMapper; import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper; import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper; import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.pipIrrGlobal.voPr.VoOnLineIntake; import com.dy.pipIrrGlobal.voRm.VoUnclosedValve; import com.dy.pipIrrGlobal.voSe.VoVirtualCard; import com.dy.pipIrrWechat.command.qo.OnLineIntakesQO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.common.utils.PojoUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @author ZhuBaoMin * @date 2024-05-30 16:13 * @LastEditTime 2024-05-30 16:13 * @Description */ @Slf4j @Service @RequiredArgsConstructor public class CommandSv extends ComSupport { private final RmCommandHistoryMapper rmCommandHistoryMapper; private final SeVirtualCardMapper seVirtualCardMapper; private final PrIntakeMapper prIntakeMapper; private final PrWaterPriceMapper prWaterPriceMapper; private final PrIntakeVcMapper prIntakeVcMapper; /** * 虚拟卡ID换虚拟卡对象 * @param vcId * @return */ public VoVirtualCard getVcById(Long vcId) { return seVirtualCardMapper.getVcById(vcId); } /** * 获取水价 * @return */ public Double getPrice() { return prWaterPriceMapper.getPrice(); } /** * 添加命令日志 * @param po 命令日志对象 * @return 字符串类型的主键 */ public Long insert(RmCommandHistory po) { rmCommandHistoryMapper.insert(po); return po.getId(); } /** * 修改命令日志信息 * @param po 命令日志对象 * @return 影响记录数量 */ public Integer update(RmCommandHistory po) { return rmCommandHistoryMapper.updateByPrimaryKeySelective(po); } /** * 获取取水口列表 * @return */ public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) { Command com = new Command() ; com.id = Command.defaultId; com.code = "LCD0001"; com.type = "innerCommand"; JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response != null && response.getString("code").equals("0001")) { JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap"); HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class); JSONArray jsonArray = new JSONArray(); for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) { JSONObject jsonObject = new JSONObject(); jsonObject.put("rtuAddr", entry.getKey()); jsonObject.put("isOnLine", entry.getValue()); jsonArray.add(jsonObject); } qo.setOnLineMap(jsonArray.toJSONString()); Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ; Long itemTotal = prIntakeMapper.getOnLineIntakesCount(params); QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = qo.pageSize ; rsVo.pageCurr = qo.pageCurr ; rsVo.calculateAndSet(itemTotal, params); rsVo.obj = prIntakeMapper.getOnLineIntakes(params); return rsVo; } else { QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>(); return rsVo; } } /** * 根据操作员获取常用取水口 * @param operator * @return */ public List<VoOnLineIntake> getUsedIntakes(Long operator) { Command com = new Command() ; com.id = Command.defaultId; com.code = "LCD0001"; com.type = "innerCommand"; JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response != null && response.getString("code").equals("0001")) { JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap"); HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class); JSONArray jsonArray = new JSONArray(); for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) { JSONObject jsonObject = new JSONObject(); jsonObject.put("rtuAddr", entry.getKey()); jsonObject.put("isOnLine", entry.getValue()); jsonArray.add(jsonObject); } return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator); } else { return new ArrayList<>(); } } /** * 根据操作员ID获取未关阀记录（包含在线情况） * @param operator * @return */ public List<VoUnclosedValve> getUnclosedValves(Long operator) { Command com = new Command() ; com.id = Command.defaultId; com.code = "LCD0001"; com.type = "innerCommand"; JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response != null && response.getString("code").equals("0001")) { JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap"); HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class); JSONArray jsonArray = new JSONArray(); for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) { JSONObject jsonObject = new JSONObject(); jsonObject.put("rtuAddr", entry.getKey()); jsonObject.put("isOnLine", entry.getValue()); jsonArray.add(jsonObject); } System.out.println(jsonArray); List<VoUnclosedValve> res = rmCommandHistoryMapper.getUnclosedValves(jsonArray.toJSONString(), operator); if(res != null) { return res; } else { return new ArrayList<>(); } } else { QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>(); return new ArrayList<>(); } } /** * 根据取水口ID获取与之绑定虚拟卡ID * @param intakeId * @return */ public Long getVcIdByIntakeId(Long intakeId) { return prIntakeVcMapper.getVcIdByIntakeId(intakeId); } } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
New file @@ -0,0 +1,438 @@ package com.dy.pipIrrWechat.command; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.dy.common.aop.SsoAop; import com.dy.common.mw.protocol.Command; import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1; import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo; import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo; import com.dy.common.mw.protocol.p206V202404.CodeV202404; import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo; import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo; import com.dy.common.util.IDLongGenerator; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; import com.dy.pipIrrGlobal.command.ComSupport; import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard; import com.dy.pipIrrGlobal.voRm.VoUnclosedValve; import com.dy.pipIrrGlobal.voSe.VoVirtualCard; import com.dy.pipIrrSell.virtualCard.enums.LastOperateENUM; import com.dy.pipIrrWechat.command.dto.ValveClose; import com.dy.pipIrrWechat.command.dto.ValveOpen; 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.springframework.http.MediaType; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.Objects; /** * @author ZhuBaoMin * @date 2024-05-30 16:11 * @LastEditTime 2024-05-30 16:11 * @Description */ @Slf4j @Tag(name = "小程序阀控器控制", description = "小程序阀控器控制") @RestController @RequestMapping(path="valve") @RequiredArgsConstructor public class ValveCtrl extends ComSupport { private final CommandSv commandSv; private final SeVirtualCardMapper seVirtualCardMapper; private final IDLongGenerator idLongGenerator; private String rtuResultSendWebUrl = "http://127.0.0.1:8087/wx/comRes/receive" ; /** * 小程序远程开阀 * @param valve * @param bindingResult * @return */ @PostMapping(path = "open_wx", consumes = MediaType.APPLICATION_JSON_VALUE) @Transactional(rollbackFor = Exception.class) @SsoAop() public BaseResponse<Boolean> open(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss"); if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } Long intakeId = valve.getIntakeId(); Long vcId = valve.getVcId(); Long operator = valve.getOperator(); Long comId = idLongGenerator.generate(); /** * 如果农户选择了虚拟卡，则使用该虚拟卡 * 如果农户未选择虚拟卡，则根据取水口ID获取与之绑定的虚拟卡 * 如果取水口没有与之绑定的虚拟卡，则提示农户选择一张虚拟卡 */ if(vcId == null) { vcId = commandSv.getVcIdByIntakeId(intakeId); if(vcId == null) { return BaseResponseUtils.buildFail(WechatResultCode.PLEASE_SELECT_A_VC.getMessage()); } } // 获取系统参数 if(!setuped) { setUp(); } // 取水口ID换取水口对象 // 如果取水口为打开状态，则不允许被开阀 // 虚拟卡ID换虚拟卡对象 VoVirtualCard vc = commandSv.getVcById(vcId); if(vc == null) { return BaseResponseUtils.buildFail(WechatResultCode.PLEASE_SELECT_A_VC.getMessage()); } if(vc.getInUse() == 1) { return BaseResponseUtils.buildFail(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage()); } // 获取水价 Double waterPrice = commandSv.getPrice(); // 取水口ID换阀控器地址及通讯协议 JSONObject job_rtu = getRtu(intakeId, null); if(job_rtu == null) { return BaseResponseUtils.buildError(WechatResultCode.RTU_NOT_EXIST.getMessage()); } String rtuAddr = job_rtu.getString("rtuAddr"); String protocol = job_rtu.getString("protocol"); // 生成订单号 String orderNo = generateOrderNo(); String commandCode = null; if(protocol.equals("p206V202404")) { // 获取功能码 commandCode = CodeV202404.cd_A2; // 创建视图 ComCd92_A2Vo param = new ComCd92_A2Vo(); param.controllerType = controllerType; param.projectNo = projectNo; param.icCardNo = vc.getVcNum(); param.waterRemain = 0.0; param.moneyRemain = vc.getMoney(); param.waterPrice = waterPrice; param.elePrice = 0.0; param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { //if(1 > 0) { // 请求成功 // 创建命令日志对象并添加到数据库中 String commandName = CodeV202404.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); // 回调失败 if(!response_CallBack.getCode().equals("0001")) { return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 1); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); // 回调返回的内容 Data myData = (Data)response_CallBack.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } else { // 请求失败 JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param"); return BaseResponseUtils.buildFail(job_param.getString("message")); } } else if(protocol.equals("p206V1_0_1")) { // 获取功能码 commandCode = CodeV1_0_1.cd_97; // 创建视图 Com97Vo param = new Com97Vo() ; param.icCardNo = vc.getVcNum(); param.moneyRemain = vc.getMoney(); param.waterPrice = waterPrice; param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { //if(1 > 0) { // 请求成功 // 创建命令日志对象并添加到数据库中 String commandName = CodeV1_0_1.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); //回调失败 if(!response_CallBack.getCode().equals("0001")) { return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 1); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); // 回调返回的内容 Data myData = (Data)response_CallBack.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } else { // 请求失败 JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param"); return BaseResponseUtils.buildFail(job_param.getString("message")); } } else { return BaseResponseUtils.buildFail("系统暂不支持该协议"); } } /** * 小程序远程关阀 * @param valve * @param bindingResult * @return */ @PostMapping(path = "close_wx", consumes = MediaType.APPLICATION_JSON_VALUE) @Transactional(rollbackFor = Exception.class) @SsoAop() public BaseResponse<Boolean> close(@RequestBody @Valid ValveClose valve, BindingResult bindingResult) { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss"); if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } String rtuAddr = valve.getRtuAddr(); String vcNum = valve.getVcNum(); String orderNo = valve.getOrderNo(); Long operator = valve.getOperator(); Long comId = idLongGenerator.generate(); // 获取系统参数 if(!setuped) { setUp(); } // 阀控器地址换取水口ID和通讯协议 JSONObject job_rtu = getRtu(null, rtuAddr); if(job_rtu == null) { return BaseResponseUtils.buildError(WechatResultCode.RTU_NOT_EXIST.getMessage()); } Long intakeId = job_rtu.getLong("intakeId"); String protocol = job_rtu.getString("protocol"); String commandCode = null; if(protocol.equals("p206V202404")) { // 获取功能码 commandCode = CodeV202404.cd_A3; // 创建视图 ComCd93_A3Vo param = new ComCd93_A3Vo(); param.controllerType = controllerType; param.projectNo = projectNo; param.icCardNo = vcNum; param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { // 请求成功 // 创建命令日志对象并添加到数据库中 String commandName = CodeV202404.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); // 回调失败 if(!response_CallBack.getCode().equals("0001")) { return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage()); } // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum); SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 0); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); // 回调返回的内容 Data myData = (Data)response_CallBack.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } else { // 请求失败 JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param"); return BaseResponseUtils.buildFail(job_param.getString("message")); } } else if(protocol.equals("p206V1_0_1")) { // 获取功能码 commandCode = CodeV1_0_1.cd_98; // 创建视图 Com98Vo param = new Com98Vo() ; param.icCardNo = vcNum; param.orderNo = orderNo; // 构造命令 Command com = command(comId, commandCode, rtuAddr, protocol, rtuResultSendWebUrl, param); // 发送命令 JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com)); if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) { //if(1 > 0) { // 请求成功 // 创建命令日志对象并添加到数据库中 String commandName = CodeV1_0_1.getCodeName(commandCode); RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, commandName, intakeId, rtuAddr, protocol, param, operator); commandSv.insert(rmCommandHistory); // 处理回调 BaseResponse response_CallBack = dealWithCallBack(comId); // 回调失败 if(!response_CallBack.getCode().equals("0001")) { return BaseResponseUtils.buildFail(response_CallBack.getMsg()); //return BaseResponseUtils.buildError(WechatResultCode.GET_RESULT_ERROR.getMessage()); } // 回调成功，再判断执行是否成功 JSONObject job_content = (JSONObject)JSON.toJSON(response_CallBack.getContent()); System.out.println(job_content); JSONObject job_subData = (JSONObject) job_content.getJSONObject("subData").getJSONObject("subData"); System.out.println(job_subData); Boolean dealResult = job_subData.getBoolean("success"); if(!dealResult) { return BaseResponseUtils.buildFail(response_CallBack.getContent().toString()); } /** * 执行成功 * 更改虚拟卡状态：是否使用中、最后操作、最后操作时间 */ Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum); SeVirtualCard virtualCard = new SeVirtualCard(); virtualCard.setId(vcId); virtualCard.setInUse((byte) 0); virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode()); virtualCard.setLastOperateTime(new Date()); seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard); // 回调返回的内容 Data myData = (Data)response_CallBack.getContent(); return BaseResponseUtils.buildSuccess(myData) ; } else { // 请求失败 JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param"); return BaseResponseUtils.buildFail(job_param.getString("message")); } } else { return BaseResponseUtils.buildFail("系统暂不支持该协议"); } } /** * 根据操作员ID获取未关阀记录 * @param operator * @return */ @GetMapping(path = "/get") @SsoAop() public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator){ try { List<VoUnclosedValve> res = commandSv.getUnclosedValves(operator); return BaseResponseUtils.buildSuccess(res); } catch (Exception e) { log.error("获取未关阀记录异常", e); return BaseResponseUtils.buildException(e.getMessage()) ; } } } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/DtoBase.java
New file @@ -0,0 +1,28 @@ package com.dy.pipIrrWechat.command.dto; import jakarta.validation.constraints.NotNull; import lombok.Data; /** * @author ZhuBaoMin * @date 2024-05-22 16:54 * @LastEditTime 2024-05-22 16:54 * @Description 设置命令基类 */ @Data public class DtoBase { public static final long serialVersionUID = 202405221655001L; /** * 取水口ID */ @NotNull(message = "取水口不能为空") private Long intakeId; /** * 操作人 */ @NotNull(message = "操作人不能为空") private Long operator; } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/ValveClose.java
New file @@ -0,0 +1,46 @@ package com.dy.pipIrrWechat.command.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; /** * @author ZhuBaoMin * @date 2024-05-24 17:25 * @LastEditTime 2024-05-24 17:25 * @Description 设置命令子类-远程关阀传输对象 */ @Data public class ValveClose { public static final long serialVersionUID = 202405241727001L; /** * 阀控器地址 */ @NotBlank(message = "阀控器地址不能为空") private String rtuAddr; /** * 虚拟卡编号 */ @NotBlank(message = "虚拟卡编号不能为空") private String vcNum; /** * 开阀时生成的订单号 */ @NotBlank(message = "订单号不能为空") private String orderNo; /** * 用户类型 1-平台，2-APP */ //@NotNull(message = "操作类型不能为空") //private Integer userType; /** * 操作人 */ @NotNull(message = "操作人不能为空") private Long operator; } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/dto/ValveOpen.java
New file @@ -0,0 +1,26 @@ package com.dy.pipIrrWechat.command.dto; import lombok.Data; /** * @author ZhuBaoMin * @date 2024-05-23 15:30 * @LastEditTime 2024-05-23 15:30 * @Description 设置命令子类-远程开阀传输对象 */ @Data public class ValveOpen extends DtoBase{ public static final long serialVersionUID = 202405231531001L; /** * 虚拟卡ID */ private Long vcId; /** * 用户类型 1-平台，2-APP */ //@NotNull(message = "操作类型不能为空") //private Integer userType; } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/qo/OnLineIntakesQO.java
New file @@ -0,0 +1,33 @@ package com.dy.pipIrrWechat.command.qo; import com.dy.common.webUtil.QueryConditionVo; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import lombok.Data; /** * @author ZhuBaoMin * @date 2024-05-27 20:32 * @LastEditTime 2024-05-27 20:32 * @Description */ @Data public class OnLineIntakesQO extends QueryConditionVo { /** * 中间件返回的RTU在线情况对象数组 */ private String onLineMap; /** * 取水口编号 */ private String intakeNum; /** * 是否在线 */ @Max(value = 1,message = "是否在线仅允许为真或假") @Min(value = 0,message = "是否在线仅允许为真或假") private Boolean isOnLine; } pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/result/WechatResultCode.java
@@ -14,7 +14,19 @@ @AllArgsConstructor public enum WechatResultCode { XXX(10001,"XXX"); /** * Valve */ //GET_RESULT_IN_ONE_MINUTE(10001,"1分钟后去查看结果"), GET_RESULT_ERROR(10002, "获取结果异常"), PLEASE_SELECT_A_VC(10002, "请选择一张虚拟卡"), IN_USE_VC_CANNOT_OPEN_VALVE(10002, "使用中虚拟卡不能用来开阀"), /** * RTU */ RTU_NOT_EXIST(20001, "阀控器不存在"); //RTU_ADDR_CANNOT_BE_NULL(20002, "阀控器地址不能为空"); private final Integer code; private final String message;
