Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2 天以前 4b99aedffe4e64425c059611dbb89d7d28b9ed06

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.voPr.VoController;
import com.dy.pipIrrGlobal.voPr.VoControllerSimple;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -94,4 +95,10 @@
     * @return
     */
    PrController getRtu(@Param("intakeId") Long intakeId, @Param("rtuAddr") String rtuAddr);

    /**
     * 不分页获取全部未删除的阀控器列表
     * @return
     */
    List<VoControllerSimple> getSimpleControllers();
}

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoControllerSimple.java

New file
@@ -0,0 +1,30 @@
package com.dy.pipIrrGlobal.voPr;

import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;

/**
 * @author ZhuBaoMin
 * @date 2025-05-07 14:32
 * @LastEditTime 2025-05-07 14:32
 * @Description 阀控器简单视图对象
 */

@Data
@JsonPropertyOrder({"controllerId", "rtuAddr"})
public class VoControllerSimple {
    private static final long serialVersionUID = 202505071433001L;

    /**
     * 阀控器ID
     */
    @JSONField(serializeUsing = ObjectWriterImplToString.class)
    private Long controllerId;

    /**
     * 阀控器地址
     */
    private String rtuAddr;
}

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

@@ -298,4 +298,9 @@
    </where>
    LIMIT 0,1
  </select>

  <!--不分页获取全部未删除的阀控器列表-->
  <select id="getSimpleControllers" resultType="com.dy.pipIrrGlobal.voPr.VoControllerSimple">
    SELECT id AS controllerId, rtuAddr FROM pr_controller WHERE deleted = 0
  </select>
</mapper>

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java

@@ -12,6 +12,7 @@
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.voPr.VoController;
import com.dy.pipIrrGlobal.voPr.VoControllerSimple;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrProject.result.ProjectResultCode;
import io.swagger.v3.oas.annotations.Operation;
@@ -244,5 +245,19 @@
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
    }


    /**
     * 不分页获取全部未删除的阀控器列表
     * @return
     */
    @GetMapping(path = "/getSimpleControllers")
    @SsoAop()
    public BaseResponse<List<VoControllerSimple>> getSimpleControllers() {
        try {
            List<VoControllerSimple> res = controllerSv.getSimpleControllers();
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取未完的计划异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerSv.java

@@ -14,6 +14,7 @@
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrIntakeController;
import com.dy.pipIrrGlobal.voPr.VoController;
import com.dy.pipIrrGlobal.voPr.VoControllerSimple;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -269,4 +270,12 @@

        return response.getBody();
    }

    /**
     * 不分页获取全部未删除的阀控器列表
     * @return
     */
    public List<VoControllerSimple> getSimpleControllers() {
        return prControllerMapper.getSimpleControllers();
    }
}