智慧保安后台管理项目备份
Administrator
2021-09-25 b55b8e77c5a8921d73268bd8fa79fc8caea0f748
ftp 连接配置修改,部门信息查询接口修改
4 files modified
21 ■■■■ changed files
src/main/java/org/springblade/modules/FTP/MysqlCenlint.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/monitor.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml 8 ●●●● patch | view | raw | blame | history
src/main/resources/application-test.yml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/MysqlCenlint.java
@@ -29,6 +29,7 @@
            if (!conn.isClosed ()) {
                System.out.println ( "数据库连接成功:" );
                String sqls = sql; //sql
                System.out.println("sqls = " + sqls);
                PreparedStatement ps = conn.prepareStatement ( sqls );
                boolean execute = ps.execute();
                ps.close ();
src/main/java/org/springblade/modules/FTP/monitor.java
@@ -27,7 +27,7 @@
        try {
            System.out.println("ftpHost = " + ftpHost);
//            System.out.println("ftpHost = " + ftpHost);
            // 连接ftp服务器
            ftp.connect(ftpHost, ftpPort);
@@ -36,8 +36,9 @@
            ftp.login(ftpUserName, ftpPassword);
            // 检验登陆操作的返回码是否正确
//            System.out.println("ftp.getReplyCode() = " + ftp.getReplyCode());
            // 检验登陆操作的返回码是否正确
            if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
                ftp.disconnect();
@@ -46,6 +47,7 @@
            }
            //被动模式,文件上传不成功会有提示
            ftp.enterLocalActiveMode();
            // 设置文件类型为二进制,与ASCII有区别
@@ -108,7 +110,7 @@
                            //删除本地文件
//                        MysqlCenlint.deletes(fileName);
                            MysqlCenlint.deletess(fileName);
//                            FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
                            is.close();
                            ftp.completePendingCommand();
                        }
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -28,6 +28,7 @@
        <result column="contactscell" property="contactscell"/>
        <result column="business_License" property="businessLicense"/>
        <result column="licence" property="licence"/>
        <result column="jurisdictionName" property="jurisdictionName"/>
        <result column="znum" property="znum"/>
        <result column="cnum" property="cnum"/>
        <result column="pnum" property="pnum"/>
@@ -41,9 +42,14 @@
        i.*,
        IFNULL(A.znum ,0) as znum,
        IFNULL(B.cnum ,0) as cnum,
        IFNULL(C.pnum ,0) as pnum
        IFNULL(C.pnum ,0) as pnum,
        sj.dept_name jurisdictionName
        FROM
        sys_information i
        left join
        sys_jurisdiction sj
        on
        sj.id = i.jurisdiction
        LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
        status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
        LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
src/main/resources/application-test.yml
@@ -23,9 +23,9 @@
#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 192.168.0.199
  ftpHost: 192.168.0.110
  ftpPort: 21
  ftpUserName: arsn
  ftpUserName: anonymous
  ftpPassword:
  ftpPath: anbao/
  localPath: D:\anbao\