1、优远程升级相关代码； 2、修改升级监视功能模块代码。

liurunyu

2024-11-14 f628dd00d8f99b37a128243b941bb8cfefd02ac9

1、优远程升级相关代码；
2、修改升级监视功能模块代码。

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java

@@ -20,6 +20,10 @@
    public int failOneTotal ;//所有一包死失败

    public UpgradeState() {
        this.init();
    }

    public void init(){
        this.rtuTotal = 0;
        this.offLineTotal = 0;
        this.unStartTotal = 0;

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java

@@ -88,8 +88,10 @@
        this.queryStart = (this.pageCurr - 1) * this.pageSize ;
        this.queryCount = this.pageSize ;

        params.put("start", this.queryStart) ;
        params.put("count", this.queryCount) ;
        if(params != null){
            params.put("start", this.queryStart) ;
            params.put("count", this.queryCount) ;
        }
    }

}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java

@@ -1,7 +1,7 @@
package com.dy.pipIrrGlobal.daoRm;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
import com.dy.pipIrrGlobal.voUg.VoUgResult;
import org.apache.ibatis.annotations.Mapper;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuProgramMapper.java

@@ -1,7 +1,7 @@
package com.dy.pipIrrGlobal.daoRm;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;


 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuTaskMapper.java

@@ -1,9 +1,8 @@
package com.dy.pipIrrGlobal.daoRm;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voUg.VoUpgradeDetail;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuController.java

File was deleted

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuProgram.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuProgram.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.pojoRm;
package com.dy.pipIrrGlobal.pojoUg;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuTask.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuTask.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.pojoRm;
package com.dy.pipIrrGlobal.pojoUg;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuProgram.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuProgram.java
@@ -1,11 +1,9 @@
package com.dy.pipIrrGlobal.voRm;
package com.dy.pipIrrGlobal.voUg;

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.dy.common.po.BaseEntity;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuTask.java
@@ -1,16 +1,12 @@
package com.dy.pipIrrGlobal.voRm;
package com.dy.pipIrrGlobal.voUg;

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.dy.common.po.BaseEntity;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.web.multipart.MultipartFile;

/**
 * @Author: liurunyu

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUpgradeDetail.java

File was renamed from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUpgradeDetail.java
@@ -1,4 +1,4 @@
package com.dy.pipIrrGlobal.voRm;
package com.dy.pipIrrGlobal.voUg;

import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.softUpgrade.state.UpgradeState;
@@ -28,9 +28,4 @@
    //程序文件名
    public String hexFileName;

    //升级任务总体状态
    public UpgradeState ugOverallState;

    //升级任务RTU状态列表
    public List<UpgradeRtu> ugRtuStateList;
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java

New file
@@ -0,0 +1,44 @@
package com.dy.pipIrrGlobal.voUg;

import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.softUpgrade.state.UpgradeState;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

/**
 * @Author: liurunyu
 * @Date: 2024/11/14 9:14
 * @Description 监视RTU远程升级状态值对象
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
public class VoWatch {
    public VoUpgradeDetail upgrade ;
    public UpgradeState overall ;//全局统计
    public List<VoWatchRtu> rtus ;//一个控制器升级情况

    @Data
    @AllArgsConstructor
    @NoArgsConstructor
    public static class VoWatchRtu{
        public String rtuAddr ;     //控制器地址
        public Integer rate ;       //进度
        public String state;        //升级状态
        public Integer reTryTimes ; //重试次数
        public boolean over ;       //是否结束（true：是，false：否）
        public boolean success ;    //是否成功（true：是，false：否）

        public void fromCache(UpgradeRtu ugRtu){
            this.rtuAddr = ugRtu.rtuAddr ;
            this.rate = (ugRtu.currentPackage * 1000)/ugRtu.totalPackage ;//前端实现是1000份的进度条
            this.state = UpgradeRtu.getStateName(ugRtu.state) ;
            this.reTryTimes = ugRtu.reTryTimes ;
            this.over = ugRtu.isOver ;
            this.success = ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false ;
        }
    }
}

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml

@@ -5,9 +5,9 @@
            #name: sp
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml

@@ -5,9 +5,9 @@
      #name: test
      type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: com.mysql.cj.jdbc.Driver
#      url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
      url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#      url: jdbc:mysql://8.130.130.233:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
      url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#      url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
      username: root
      password: dysql,;.abc!@#
      druid:

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml

@@ -5,9 +5,9 @@
            #name: ym
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:

 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

@@ -77,7 +77,7 @@

pipIrr:
    global:
        dev: false  #是否开发阶段，true或false
        dev: true  #是否开发阶段，true或false
        dsName: ym  #开发阶段，设置临时的数据库名称
    nginx:
        webPort: 54321

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml

@@ -1,7 +1,7 @@
<?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.daoRm.UgRtuControllerMapper">
  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
    <!--@mbg.generated-->
    <!--@Table ug_rtu_controller-->
    <id column="id" jdbcType="BIGINT" property="id" />
@@ -168,7 +168,7 @@
    where task_id = #{taskId,jdbcType=BIGINT}
  </delete>

  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
    <!--@mbg.generated-->
    insert into ug_rtu_controller (id, task_id, controller_id, 
      rtu_addr)
@@ -177,7 +177,7 @@
    #{isOver,jdbcType=TINYINT}, #{ugState,jdbcType=INTEGER},
    #{overDt,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
    <!--@mbg.generated-->
    insert into ug_rtu_controller
    <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -227,7 +227,7 @@
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
    <!--@mbg.generated-->
    update ug_rtu_controller
    <set>
@@ -252,7 +252,7 @@
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
    <!--@mbg.generated-->
    update ug_rtu_controller
    set task_id = #{taskId,jdbcType=BIGINT},

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml

@@ -1,7 +1,7 @@
<?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.daoRm.UgRtuProgramMapper">
  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
    <!--@mbg.generated-->
    <!--@Table ug_rtu_program-->
    <id column="id" jdbcType="BIGINT" property="id" />
@@ -96,7 +96,7 @@
    update ug_rtu_program set deleted = 1
    where id = #{id,jdbcType=BIGINT}
  </delete>
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
    <!--@mbg.generated-->
    insert into ug_rtu_program (id, hex_file_name, store_ram_addr, 
      start_ram_addr, program_calculate_bytes, program_crc16, 
@@ -107,7 +107,7 @@
      #{programBytes,jdbcType=BLOB}, #{fileBytes,jdbcType=BLOB}, #{remark,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP},
      #{deleted,jdbcType=TINYINT})
  </insert>
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
    <!--@mbg.generated-->
    insert into ug_rtu_program
    <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -181,7 +181,7 @@
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
    <!--@mbg.generated-->
    update ug_rtu_program
    <set>
@@ -218,7 +218,7 @@
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
    <!--@mbg.generated-->
    update ug_rtu_program
    set hex_file_name = #{hexFileName,jdbcType=VARCHAR},

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml

@@ -1,7 +1,7 @@
<?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.daoRm.UgRtuTaskMapper">
  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
    <!--@mbg.generated-->
    <!--@Table ug_rtu_task-->
    <id column="id" jdbcType="BIGINT" property="id" />
@@ -95,7 +95,7 @@
    order by bd.id DESC
  </select>

  <select id="selectTaskDetail" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voRm.VoUpgradeDetail">
  <select id="selectTaskDetail" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voUg.VoUpgradeDetail">
    <!--@mbg.generated-->
    select
    ttb.id as taskId,
@@ -107,7 +107,7 @@
    where ttb.id = #{taskId,jdbcType=BIGINT}
  </select>

  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
    <!--@mbg.generated-->
    insert into ug_rtu_task (id, program_id, creator, 
      remark, dt, is_execute, is_over, deleted
@@ -117,7 +117,7 @@
      #{isOver,jdbcType=TINYINT}, #{deleted,jdbcType=TINYINT}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
    <!--@mbg.generated-->
    insert into ug_rtu_task
    <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -173,7 +173,7 @@
      </if>
    </trim>
  </insert>
  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
    <!--@mbg.generated-->
    update ug_rtu_task
    <set>
@@ -201,7 +201,7 @@
    </set>
    where id = #{id,jdbcType=BIGINT}
  </update>
  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
    <!--@mbg.generated-->
    update ug_rtu_task
    set program_id = #{programId,jdbcType=BIGINT},

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java

@@ -4,13 +4,12 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.softUpgrade.parse.HexFileParse;
import com.dy.common.softUpgrade.parse.HexFileVo;
import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.voRm.VoRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.voUg.VoRtuProgram;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramSv.java

@@ -2,7 +2,7 @@

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java

@@ -5,7 +5,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerSv.java

@@ -3,7 +3,6 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.voPr.VoController;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java

@@ -11,7 +11,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voPr.VoController;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java

@@ -2,7 +2,7 @@

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java

@@ -5,7 +5,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voUg.VoUgResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java

@@ -5,8 +5,8 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.voRm.VoRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voUg.VoRtuTask;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;

 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskSv.java

@@ -2,7 +2,7 @@

import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/CurUpgradeStateVo.java

File was deleted

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/QueryVo.java

New file
@@ -0,0 +1,21 @@
package com.dy.pipIrrRemote.rtuUpgrage;


import com.dy.common.webUtil.QueryConditionVo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

@Data
@EqualsAndHashCode(callSuper = false)
@ToString(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Schema(name = "监视升级情况查询条件")
public class QueryVo extends QueryConditionVo {

    @Schema(description = "控制器地址")
    public String rtuAddr ;

}


 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java

@@ -2,16 +2,17 @@

import com.dy.common.aop.SsoAop;
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.softUpgrade.state.UpgradeInfo;
import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.softUpgrade.state.UpgradeTaskVo;
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.rtuMw.ToRtuMwCom;
import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
import com.dy.pipIrrGlobal.voUg.VoWatch;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,6 +27,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;

import java.util.ArrayList;
import java.util.List;

/**
@@ -121,6 +124,7 @@
    }

    /**
     *  监视：
     * 当前rtu远程升级任务执行状态
     * @return 操作结果
     */
@@ -135,20 +139,47 @@
    })
    @GetMapping(path = "/curUpgradeState")
    @SsoAop()
    public BaseResponse<UpgradeInfo> curUpgradeState(){
    public BaseResponse<QueryResultVo<VoWatch> > curUpgradeState(QueryVo qvo){
        if(RtuUpgradeStateReceiverCtrl.cache == null){
            //return BaseResponseUtils.buildError("当前没有升级任务") ;
            //正式运行时，下面两行去掉，上面一行打开
            RtuUpgradeStateReceiverCtrl ctrl = SpringContextUtil.getBean(RtuUpgradeStateReceiverCtrl.class);
            ctrl.demo();
        }
        CurUpgradeStateVo vo = new CurUpgradeStateVo() ;
        List<VoUpgradeDetail> list = this.sv.selectTaskDetail(RtuUpgradeStateReceiverCtrl.cache.ugTaskId);
        if(list != null && list.size() > 0){
            vo.upgrade = list.get(0) ;

        QueryResultVo<VoWatch> rsVo = new QueryResultVo();
        VoWatch vo = new VoWatch() ;
        vo.upgrade = this.sv.selectTaskDetail(RtuUpgradeStateReceiverCtrl.cache.ugTaskId);
        vo.overall = RtuUpgradeStateReceiverCtrl.cache.ugOverallState ;
        vo.rtus = new ArrayList<>() ;
        if(RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList != null && RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() > 0){
            if(qvo.rtuAddr != null && !qvo.rtuAddr.trim().equals("")){
                qvo.pageCurr = 1 ;
                RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.stream().filter(rtu -> rtu.rtuAddr.equals(qvo.rtuAddr)).forEach(ugRtu -> {
                    VoWatch.VoWatchRtu rtu = new VoWatch.VoWatchRtu() ;
                    rtu.fromCache(ugRtu) ;
                    vo.rtus.add(rtu) ;
                }); ;
            }else{
                if(qvo.pageCurr < 1){
                    qvo.pageCurr = 1 ;
                }
                int start = (qvo.pageCurr - 1) * qvo.pageSize ;
                if(start >= RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size()){
                    start = RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() - 1 ;
                }
                for(int i = start; i < (start + qvo.pageSize) && i < RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size(); i++){
                    UpgradeRtu ugRtu = RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.get(i) ;
                    VoWatch.VoWatchRtu rtu = new VoWatch.VoWatchRtu() ;
                    rtu.fromCache(ugRtu) ;
                    vo.rtus.add(rtu) ;
                }
            }
        }
        vo.ugOverallState = RtuUpgradeStateReceiverCtrl.cache.ugOverallState ;
        vo.ugRtuStateList = RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList ;
        return BaseResponseUtils.buildSuccess(vo) ;
        rsVo.obj = vo ;
        rsVo.pageSize = qvo.pageSize ;
        rsVo.pageCurr = qvo.pageCurr ;
        rsVo.calculateAndSet(0L + vo.rtus.size(), null);
        return BaseResponseUtils.buildSuccess(rsVo) ;
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java

@@ -8,8 +8,8 @@
import com.dy.common.util.DateTime;
import com.dy.common.util.ThreadJob;
import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -117,7 +117,7 @@
            UgRtuTask tpo = this.sv.selectLastTask() ;
            if(tpo != null) {
                UgRtuProgram ppo = this.sv.selectProgramById(tpo.programId);
                if (ppo == null) {
                if (ppo != null) {
                    List<String> taskRtuAddrs = this.sv.selectAllRtuAddrByTask("" + tpo.id);
                    if (taskRtuAddrs != null && taskRtuAddrs.size() > 0) {
                        cache = new UpgradeInfo();
@@ -167,11 +167,8 @@
        while (true){
            for(UpgradeRtu rtu : cache.ugRtuStateList){
                this.rtuUpgrade(rtu) ;
                hasRunning = this.statisticsNowUpgradeState() ;
                if(!hasRunning){
                    break ;
                }
            }
            hasRunning = this.statisticsNowUpgradeState() ;
            if(!hasRunning){
                break ;
            }
@@ -244,6 +241,7 @@
    public boolean statisticsNowUpgradeState() {
        boolean hasRunning = false ;
        if(cache.ugRtuStateList != null && cache.ugRtuStateList.size() > 0){
            cache.ugOverallState.init();
            for(UpgradeRtu rtu : cache.ugRtuStateList){
                if(rtu.state == UpgradeRtu.STATE_OFFLINE){
                    cache.ugOverallState.offLineTotal ++ ;

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java

@@ -4,9 +4,9 @@
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voUg.VoUpgradeDetail;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,8 +61,12 @@
     * 查询一个升级任务有关信息
     * @return 升级任务有关信息
     */
    public List<VoUpgradeDetail> selectTaskDetail(String taskId){
        return this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
    public VoUpgradeDetail selectTaskDetail(String taskId){
        List<VoUpgradeDetail> list = this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }
        return null ;
    }