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

zhubaomin

2024-10-22 a5be09617c3b7fb3bc9d9a18700f0bdb84deaeca

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


 Conflicts:

	pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/PipIrrSellApplication.java

 pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FmCtrl.java

@@ -129,5 +129,21 @@
        return rvo ;
    }

    /**
     * 解析哈希值集合，计算出该这些哈希值对应的文件服务器属性
     * @param hashCodes
     * @return 文件服务器属性对象集合
     */
    @PostMapping(path = "parseHashcodes")
    public List<FileRestVo> parseHashcodes(List<Integer> hashCodes){
        List<FileRestVo> reList = new ArrayList<>() ;
        if(hashCodes != null && hashCodes.size() > 0){
            for(Integer hashCode : hashCodes){
                reList.add(parseHashcode(hashCode)) ;
            }
        }
        return reList ;
    }


}

 pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/PipIrrIrrigateApplication.java

@@ -18,7 +18,7 @@
                })
        }
)
@MapperScan({"com.dy.pipIrrGlobal.daoIr", "com.dy.pipIrrGlobal.daoIr"})
@MapperScan({"com.dy.pipIrrGlobal.daoIr", "com.dy.pipIrrGlobal.daoIr","com.dy.pipIrrGlobal.daoFi"})
public class PipIrrIrrigateApplication {

    public static void main(String[] args) {

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

@@ -18,7 +18,7 @@
                })
        }
)
@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa"})
@MapperScan(basePackages={"com.dy.pipIrrGlobal.daoRm", "com.dy.pipIrrGlobal.daoPr", "com.dy.pipIrrGlobal.daoSe", "com.dy.pipIrrGlobal.daoBa","com.dy.pipIrrGlobal.daoFi"})
public class PipIrrRemoteApplication {

    public static void main(String[] args) {

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuLogCtrl.java

@@ -92,7 +92,16 @@
    @SsoAop()
    public BaseResponse<List<String>> rtuLogText(String rtuAddr){
        String mwUrlRtuLogText = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw_text);
        return this.requestMw4Text(rtuAddr, mwUrlRtuLogText) ;
        BaseResponse<List<String>> text = this.requestMw4Text(rtuAddr, mwUrlRtuLogText);
        if (text != null){
            if (text.getContent().get(0).contains("控制器")){
                return BaseResponseUtils.buildErrorMsg(""+text.getContent().get(0)+"") ;
            }
            return text ;
        }else {
            return BaseResponseUtils.buildErrorMsg("获取日志文件为null") ;
        }
//        return this.requestMw4Text(rtuAddr, mwUrlRtuLogText) ;
    }



 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/PipIrrStatisticsApplication.java

@@ -22,7 +22,8 @@
        "com.dy.pipIrrGlobal.daoPr",
        "com.dy.pipIrrGlobal.daoSe",
        "com.dy.pipIrrGlobal.daoBa",
        "com.dy.pipIrrGlobal.daoSt"})
        "com.dy.pipIrrGlobal.daoSt",
        "com.dy.pipIrrGlobal.daoFi"})
public class PipIrrStatisticsApplication {

    public static void main(String[] args) {