1.接口调整

tangzy

2021-09-17 edfba0ab647b6fc0b9e4b4057a7a090f9bd82423

1.接口调整

 src/main/java/org/springblade/common/constant/FtpConstant.java

@@ -8,29 +8,29 @@
    /**
     * sql connect
     */
    //String sql_connect_dev = "jdbc:mysql://223.82.109.183:2083/zhba";
    String sql_connect_dev = "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";

    /**
     * sql connect
     */
    String sql_connect_dev = "jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";
    //String sql_connect_dev = "jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true";

    //ftp服务器IP地址
    //String ftpHost_dev = "192.168.0.105";
    String ftpHost_dev = "192.168.0.112";

    //ftp服务器IP地址
    String ftpHost_dev = "47.49.21.194";
    //String ftpHost_dev = "47.49.21.194";

    //ftp服务器端口
    int ftpPort = 21;

    //ftp服务器用户名
    String ftpUserName = "ylcs";
    //String ftpUserName = "yly";
    //String ftpUserName = "ylcs";
    String ftpUserName = "anonymous";


    //ftp服务器密码
    String ftpPassword = "Yly@123";
    String ftpPassword = "";


    //ftp服务器路径
@@ -39,13 +39,14 @@
    /**
     * 本地路径
     */
    String localPath = "/home/song/anbao/";
    //String localPath = "D:\\anbao\\";
    //String localPath = "/home/song/anbao/";
    String localPath = "D:\\anbao\\";

    //minio本地保存地址
    String MinioPath = "/usr/local/minio/data/zhba/upload/picture";
    //String MinioPath = "/usr/local/minio/data/zhba/upload/picture";
    String MinioPath ="D:\\ftptp\\";


    String jsonUrl = "/usr/local/minio/data/zhba/upload/picture";
    //String jsonUrl = "D:\\anbao\\";
    //String jsonUrl = "/usr/local/minio/data/zhba/upload/picture";
    String jsonUrl = "D:\\anbao\\";
}

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -1145,21 +1145,24 @@
            }
            String deptid = strArrays.substring(0, strArrays.length() - 1);
            Map<String, Object> map = new HashMap<String, Object>();
            Map<Object, Object> objectStringMap = iDeptService.selectHold(deptid);
            if (objectStringMap == null) {
            List<Map<String, Object>> objectStringMap = iDeptService.selectHold(deptid);
            if (objectStringMap.size()==0) {
                map.put("name", list.get(i).get("deptname"));
                map.put("cz", cznumber);
                map.put("wcz", wcznumber);
                lists.add(map);
            } else {
                String cz = objectStringMap.get("cz").toString();
                cznumber = Integer.valueOf(cz);
                String wcz = objectStringMap.get("wcz").toString();
                wcznumber = Integer.valueOf(wcz);
                for (int c=0;c<objectStringMap.size();c++){
                    String cz = objectStringMap.get(c).get("cz").toString();
                    cznumber += Integer.valueOf(cz);
                    String wcz = objectStringMap.get(c).get("wcz").toString();
                    wcznumber += Integer.valueOf(wcz);
                }
                map.put("name",  list.get(i).get("deptname"));
                map.put("cz", cznumber);
                map.put("wcz", wcznumber);
                lists.add(map);

            }
        }
        return R.data(lists);

 src/main/java/org/springblade/modules/system/mapper/DeptMapper.java

@@ -83,7 +83,7 @@
    List<String> selectIn();
    List<Map<Object,String>> selectCount();
    List<Map<Object,String>> selectId(String id);
    Map<Object,Object> selectHold(String deptid);
    List<Map<String, Object>> selectHold(String deptid);
    /**
     * 懒加载获取部门树形结构,不包含顶级管理员公安局
     */

 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml

@@ -104,43 +104,38 @@

    <!--懒加载获取部门树形结构(包含用户数据)-->
    <select id="lazyTreeUser" resultMap="treeNodeResultMap">
        select DISTINCT  * from (
            (SELECT
              dept.id,
              dept.parent_id,
              dept.dept_name AS title,
              dept.id AS "value",
              dept.id AS "key",
                        (
                            SELECT
                                CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
                            FROM
                                blade_dept
                            WHERE
                                parent_id = dept.id and is_deleted = 0
                        ) AS "has_children"
                    FROM
                        blade_dept dept
                    WHERE
                        dept.is_deleted = 0
            )
        select DISTINCT *
        from (
                 (SELECT dept.id,
                         dept.parent_id,
                         dept.dept_name AS title,
                         dept.id        AS "value",
                         dept.id        AS "key",
                         (
                             SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
                             FROM blade_dept
                             WHERE parent_id = dept.id
                               and is_deleted = 0
                         )              AS "has_children"
                  FROM blade_dept dept
                  WHERE dept.is_deleted = 0
                 )

            union
                 union

            (select
                id,
                dept_id  parent_id,
                real_name AS title,
                id AS "value",
                id AS "key",
                0 as "has_children"
                from blade_user
            )
        )c
                 (select id,
                         dept_id      parent_id,
                         real_name AS title,
                         id        AS "value",
                         id        AS "key",
                         0         as "has_children"
                  from blade_user
                 )
             ) c
    </select>

    <!--懒加载获取部门树形结构(包含用户数据)-->
    <select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
    <select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes">
        select DISTINCT
        *
        from (
@@ -178,7 +173,7 @@

        (select
        bu.id,
        bu.dept_id  parentId,
        bu.dept_id parentId,
        bu.real_name AS title,
        bu.id AS "value",
        bu.id AS "key",
@@ -207,7 +202,7 @@
    </select>

    <!--懒加载获取部门树形结构(包含用户数据)-->
    <select id="lazyTreeUsersPublicSecurity" resultType="org.springblade.modules.system.node.TreeNodes" >
    <select id="lazyTreeUsersPublicSecurity" resultType="org.springblade.modules.system.node.TreeNodes">
        select DISTINCT
        *
        from (
@@ -245,7 +240,7 @@

        (select
        bu.id,
        bu.dept_id  parentId,
        bu.dept_id parentId,
        bu.real_name AS title,
        bu.id AS "value",
        bu.id AS "key",
@@ -268,7 +263,7 @@
    </select>

    <!--懒加载获取部门树形结构(包含用户数据)-->
    <select id="lazyTreeUsersPublicSecuritys" resultType="org.springblade.modules.system.node.TreeNodes" >
    <select id="lazyTreeUsersPublicSecuritys" resultType="org.springblade.modules.system.node.TreeNodes">
        select DISTINCT
        *
        from (
@@ -303,7 +298,7 @@

        (select
        bu.id,
        bu.dept_id  parentId,
        bu.dept_id parentId,
        bu.real_name AS title,
        bu.id AS "value",
        bu.id AS "key",
@@ -324,30 +319,25 @@


    <select id="lazyTrees" resultMap="treeNodeResultMap">
    SELECT
        dept.id,
        dept.parent_id,
        dept.dept_name AS title,
        dept.id AS "value",
        dept.id AS "key",
        (
            SELECT
                CASE WHEN count(1) > 0 THEN 0 ELSE 1 END
            FROM
                blade_dept
            WHERE
                parent_id = dept.id and is_deleted = 0
        ) AS "has_children"
    FROM
        blade_dept dept WHERE (
                                  SELECT
                                      CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
                                  FROM
                                      blade_dept
                                  WHERE
                                      parent_id = dept.id and is_deleted = 0
                              ) =1
</select>
        SELECT dept.id,
               dept.parent_id,
               dept.dept_name AS title,
               dept.id        AS "value",
               dept.id        AS "key",
               (
                   SELECT CASE WHEN count(1) > 0 THEN 0 ELSE 1 END
                   FROM blade_dept
                   WHERE parent_id = dept.id
                     and is_deleted = 0
               )              AS "has_children"
        FROM blade_dept dept
        WHERE (
                  SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
                  FROM blade_dept
                  WHERE parent_id = dept.id
                    and is_deleted = 0
              ) = 1
    </select>

    <select id="getDeptNames" resultType="java.lang.String">
        SELECT
@@ -363,37 +353,48 @@
    </select>

    <select id="selectIn" resultType="java.util.HashMap">
        SELECT
            id as deptid,
            dept_name as deptname
        FROM
            blade_dept where is_deleted = 0
        SELECT id        as deptid,
               dept_name as deptname
        FROM blade_dept
        where is_deleted = 0
    </select>

    <!--统计单位类型数量-->
    <select id="selectCount" resultType="java.util.HashMap">
        SELECT
            id as jurisdiction,
            dept_name AS title
        FROM
            sys_jurisdiction
        WHERE
            is_deleted = 0 AND  parent_id!=0
        SELECT id        as jurisdiction,
               dept_name AS title
        FROM sys_jurisdiction
        WHERE is_deleted = 0
          AND parent_id!=0
    </select>

    <select id="selectHold" resultType="java.util.HashMap">
        SELECT
            IFNULL(B.cz,0) as cz,
            IFNULL(C.wcz,0) as wcz
        FROM (SELECT jurisdiction FROM blade_user ) A
            LEFT JOIN (SELECT COUNT(hold) as cz,jurisdiction FROM blade_user WHERE hold=0 and status=1 GROUP BY jurisdiction ) B ON A.jurisdiction=B.jurisdiction
            LEFT JOIN (SELECT COUNT(hold) as wcz,jurisdiction FROM blade_user WHERE hold=1 and status=1 GROUP BY jurisdiction ) C ON A.jurisdiction=C.jurisdiction
        WHERE A.jurisdiction in(${deptid}) GROUP BY cz,wcz
        SELECT IFNULL(B.cz, 0)  as cz,
               IFNULL(C.wcz, 0) as wcz,
               A.jurisdiction
        FROM (SELECT jurisdiction FROM blade_user) A
                 LEFT JOIN (SELECT COUNT(hold) as cz, jurisdiction
                            FROM blade_user
                            WHERE hold = 1
                              AND role_id = '1412226235153731586'
                              and status = 1
                            GROUP BY jurisdiction) B ON A.jurisdiction = B.jurisdiction
                 LEFT JOIN (SELECT COUNT(hold) as wcz, jurisdiction
                            FROM blade_user
                            WHERE hold = 2
                              AND role_id = '1412226235153731586'
                              and status = 1
                            GROUP BY jurisdiction) C ON A.jurisdiction = C.jurisdiction
        WHERE A.jurisdiction in (${deptid})
        GROUP BY cz, wcz, jurisdiction
    </select>

    <!--查询部门下面的所有单位-->
    <select id="selectId" resultType="java.util.HashMap">
        SELECT id FROM blade_dept WHERE parent_id =#{id} and is_deleted = 0
        SELECT id
        FROM blade_dept
        WHERE parent_id = #{id}
          and is_deleted = 0
    </select>
    <select id="securityLazyTree" resultMap="treeNodeResultMap">
        SELECT

 src/main/java/org/springblade/modules/system/service/IDeptService.java

@@ -125,7 +125,7 @@
    List<DeptVO> search(String deptName, Long parentId);
    List<Map<Object,String>> selectCount();
    List<Map<Object,String>> selectId(String id);
    Map<Object,Object> selectHold(String deptid);
    List<Map<String, Object>> selectHold(String deptid);
    List<String> selectIn();
    List<DeptVO> securityLazyTree(String jurisdiction, Long parentId);


 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -201,7 +201,7 @@
    }

    @Override
    public Map<Object, Object> selectHold(String deptid) {
    public List<Map<String, Object>> selectHold(String deptid) {
        return baseMapper.selectHold(deptid);
    }