pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -458,99 +458,7 @@ </if> </where> </select> <!--根据指定条件获取开关阀报历史记录数量--> <select id="getOpenCloseValveReportsCount_history" resultType="java.lang.Long"> SELECT COUNT(*) AS recordCount FROM rm_open_close_valve_history oh INNER JOIN pr_intake inta ON inta.id = oh.intake_id <where> <if test="intakeId != null and intakeId > 0"> AND oh.intake_id = #{intakeId} </if> <if test="intakeNum != null and intakeNum != ''"> AND inta.name LIKE CONCAT('%', #{intakeNum}, '%') </if> <if test="rtuAddr != null and rtuAddr != ''"> AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%') </if> <if test="timeStart_open != null and timeStop_open != null"> AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open} </if> <if test="timeStart_close != null and timeStop_close != null"> AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close} </if> </where> </select> <!--根据指定条件获取开关阀报历史记录--> <select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve"> SELECT oh.intake_id AS intakeId, inta.name AS intakenum, oh.rtu_addr AS rtuAddr, oh.client_name AS clientName, oh.op_ic_card_no AS openIcNum, oh.op_ic_card_addr AS openIcAddr, oh.op_dt AS openTime, CASE WHEN oh.op_type = 1 THEN '刷卡开阀' WHEN oh.op_type = 3 THEN '中心站开阀' WHEN oh.op_type = 5 THEN '余额不足关阀' WHEN oh.op_type = 8 THEN '用户远程开阀' WHEN oh.op_type = 11 THEN '开关阀卡开阀' ELSE '未知' END AS openType, oh.op_order_no AS openOrderNo, oh.op_total_amount AS openTotalAmount, oh.op_remain_money AS openRemainMoney, oh.op_water_remain_user AS openWaterRemain, oh.op_ele_total_amount AS openEleTotalAmount, oh.cl_ic_card_no AS closeIcNum, oh.cl_ic_card_addr AS closeIcAddr, oh.cl_dt AS closeTime, CASE WHEN oh.cl_type = 2 THEN '刷卡关阀' WHEN oh.cl_type = 4 THEN '中心站关阀' WHEN oh.cl_type = 5 THEN '余额不足关阀' WHEN oh.cl_type = 6 THEN '流量计故障关阀' WHEN oh.cl_type = 7 THEN '紧急关阀' WHEN oh.cl_type = 9 THEN '用户远程关阀' WHEN oh.cl_type = 10 THEN '开关阀卡关阀' WHEN oh.cl_type = 12 THEN '黑名单命令关阀' WHEN oh.cl_type = 13 THEN '远程定时关阀' WHEN oh.cl_type = 14 THEN '远程定量关阀' ELSE '未知' END AS closeType, oh.cl_this_amount AS closeThisAmount, oh.cl_this_time AS thisTime, oh.cl_this_money AS thisMoney, oh.cl_remain_money AS closeRemainMoney, oh.cl_total_amount AS closeTotalAmount FROM rm_open_close_valve_history oh INNER JOIN pr_intake inta ON inta.id = oh.intake_id <where> <if test="intakeId != null and intakeId > 0"> AND oh.intake_id = #{intakeId} </if> <if test="intakeNum != null and intakeNum != ''"> AND inta.name LIKE CONCAT('%', #{intakeNum}, '%') </if> <if test="rtuAddr != null and rtuAddr != ''"> AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%') </if> <if test="timeStart_open != null and timeStop_open != null"> AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open} </if> <if test="timeStart_close != null and timeStop_close != null"> AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close} </if> </where> ORDER BY oh.op_dt DESC <trim prefix="limit "> <if test="start != null and count != null"> #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} </if> </trim> </select> <!--根据指定条件获取开关阀报历史记录--> <select id="getOpenCloseValveReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoOpenCloseValve"> SELECT oh.intake_id AS intakeId, pipIrr-platform/pipIrr-parent.iml
File was deleted pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
@@ -19,10 +19,13 @@ * @Description */ public class ComSupportP206V202404 { 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 final String mwIp = "romq9311819.vicp.fun" ; //http://romq9311819.vicp.fun:16583 protected static final String mwPort = "16583" ; protected static String rtuAddr = "37142501020100215" ; protected static String mwUrlTest = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/test" ; protected static String mwUrlSendCom = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/send" ; protected static String rtuAddr = "41162810400100001" ; protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ; protected static String controllerType = "57" ;//控制器类型 pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
@@ -18,23 +18,56 @@ public class CommandP206V202404Ctrl extends ComSupportP206V202404 { @GetMapping(path = "test") public BaseResponse<String> test() { //return this.connect() ;//连接通信中间件测试 //return this.cdXY(CodeV202404.cd_9C) ;//发送固定参数XY的命令 //return this.cd55(1) ; //return this.cd15() ; //return this.cd16() ; //return this.cd21() ; //return this.cd22() ; //return this.cd23() ; //return this.cd24() ; //return this.cd26() ; //return this.cd31() ; //return this.cd86() ; //return this.cd87() ; return this.cd92() ; //return this.cd93() ; //return this.cd9C() ; public BaseResponse<String> test(String com) { BaseResponse<String> rt = null ; if(com == null){ rt = this.connect() ;//连接通信中间件测试 }else{ try{ if(com.equals("10")){ rt = this.cd10() ; }else if(com.equals("15")){ rt = this.cd15() ; }else if(com.equals("16")){ rt = this.cd16() ; }else if(com.equals("21")){ rt = this.cd21() ; }else if(com.equals("22")){ rt = this.cd22() ; }else if(com.equals("23")){ rt = this.cd23() ; }else if(com.equals("24")){ rt = this.cd24() ; }else if(com.equals("26")){ rt = this.cd26() ; }else if(com.equals("31")){ rt = this.cd31() ; }else if(com.equals("55")){ rt = this.cd55(1) ; }else if(com.equals("65")){ rt = this.cd65(1) ; }else if(com.equals("86")){ rt = this.cd86() ; }else if(com.equals("87")){ rt = this.cd87() ; }else if(com.equals("92")){ rt = this.cd92() ; }else if(com.equals("93")){ rt = this.cd93() ; }else if(com.equals("9C")){ rt = this.cd9C() ; }else if(com.equals("A2")){ rt = this.cdA2() ; }else if(com.equals("A3")){ rt = this.cdA3() ; }else{ rt = this.cdXY(com) ;//发送固定参数XY的命令, 例命令CodeV202404.cd_9C } }catch (Exception e){ e.printStackTrace(); } } return rt ; } /** pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverter.java
File was deleted pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverterConfig.java
File was deleted pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/LoginVo.java
@@ -26,7 +26,7 @@ @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "密码不能为空") //不能为空也不能为null @Length(message = "密码必须{min}位", min = 5, max = 20) @Length(message = "密码不小于{min}位", min = 5, max = 30) public String password ; @Schema(description = "组织单位", requiredMode = Schema.RequiredMode.REQUIRED) pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
@@ -44,7 +44,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoIntake>>> getNotOnlineIntakes(@Valid CommonQO qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { @@ -64,7 +64,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoCumulativeFlow>>> getLargeFlowIntakes(@Valid CumulativeFlowQO qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(intakeSv.getLargeFlowIntakes(qo)); @@ -83,7 +83,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoCumulativeFlow>>> getSmallFlowIntakes(@Valid CumulativeFlowQO qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(intakeSv.getSmallFlowIntakes(qo)); @@ -102,7 +102,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoBatteryVolt>>> getUnderVoltIntakes(@Valid BatteryVoltQO qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(intakeSv.getUnderVoltIntakes(qo)); @@ -121,7 +121,7 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoSignalIntensity>>> getSpecifiedSignalIntakes(@Valid SignalIntensityQO qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(intakeSv.getSpecifiedSignalIntakes(qo)); @@ -140,7 +140,7 @@ @SsoAop() public BaseResponse<QueryResultVo<VoCountOfOpenType>> getCountByOpenType(@Valid OpenTypeQO qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(intakeSv.getCountByOpenType(qo)); @@ -159,7 +159,7 @@ @SsoAop() public BaseResponse<QueryResultVo<VoCountOfCloseType>> getCountByCloseType(@Valid CloseTypeQo qo, BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { return BaseResponseUtils.buildSuccess(intakeSv.getCountByCloseType(qo));
