1.主要管理人接口修改 2.出资人修改 3.用户查询修改，保安员审查查询修改

Administrator

2021-11-24 47d788e075c8a4a38cb171a3ed78820aada74e8f

1.主要管理人接口修改
2.出资人修改
3.用户查询修改，保安员审查查询修改

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

@@ -18,7 +18,7 @@
    /**
     * ftp服务器IP地址
     */
    String ftpHost_dev = "192.168.0.112";
    String ftpHost_dev = "192.168.0.199";

    /**
     * ftp服务器IP地址
@@ -34,13 +34,13 @@
     * ftp服务器用户名
     */
    //String ftpUserName = "yly";
    String ftpUserName = "anonymous";
    String ftpUserName = "arsn";

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


    /**

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -149,16 +149,26 @@
        IFNULL( B.num, 0 ) AS bzc
        FROM
        (
        SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
        LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id =
        SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction
        ) H
        LEFT JOIN
        ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 0 or
        u.examination_type is null) and role_id =
        '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
        ) A ON H.departmentid = A.dept_id
        LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or
        u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY
        ) A
        ON H.departmentid = A.dept_id
        LEFT JOIN
        ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 1  and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY
        u.dept_id
        ) B ON H.departmentid = B.dept_id where 1=1
        ) B
        ON H.departmentid = B.dept_id
        left join
        sys_jurisdiction sj
        on
        sj.id = H.jurisdiction
        where 1=1
        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
            and H.jurisdiction = #{jurisdiction}
            and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
        </if>
        <if test="deptid!=null and deptid!=''">
            and H.departmentid = #{deptid}

 src/main/java/org/springblade/modules/member/mapper/MemberMapper.xml

@@ -19,8 +19,10 @@
        select * from sys_member where is_deleted = 0
    </select>

    <select id="selectMemberInfo" resultMap="memberResultMap">
        select * from sys_member
    <select id="selectMemberInfo" resultType="org.springblade.modules.member.vo.MemberVO">
        select
        id,name,post,cardid,cell,creditCode creditcode,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age
        from sys_member
        where
        1=1
        <if test="member.creditcode!=null and member.creditcode!=''" >

 src/main/java/org/springblade/modules/member/vo/MemberVO.java

@@ -33,4 +33,5 @@
public class MemberVO extends Member {
    private static final long serialVersionUID = 1L;

    private Integer age;
}

 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java

@@ -113,7 +113,7 @@
                "'" + shareholder.getCell() + "'"+"," +
                "'" + shareholder.getCreditcode() + "'" + ")";
        FtpUtil.sqlFileUpload(s1);
        return R.status(shareholderService.save(shareholder));
        return R.status(save);
    }

    /**

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -567,9 +567,7 @@
        //获取user
        User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
        //判断是否为空
//        if (null!=user.getHold()){
            //持证
//            if (user.getHold().equals("1")){

                //分配保安角色
        Role role = new Role();
        role.setRoleAlias("保安");
@@ -581,16 +579,7 @@
        if (userCount > 0 && Func.isEmpty(user.getId())) {
            throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
        }
//            }
            //未持证
//            if (user.getHold().equals("2")){
//                //分配未持证保安角色
//                Role role = new Role();
//                role.setRoleAlias("未持证保安");
//                Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//                user.setRoleId(oneRole.getId().toString());
//            }
//        }

        //密码加密
        if (Func.isNotEmpty(user.getPassword())) {
            user.setPassword(DigestUtil.encrypt(user.getPassword()));
@@ -615,6 +604,7 @@
            rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
        }
        String urla = "";
        if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
        String[] split = user.getAvatar().split(",");
        for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
@@ -622,8 +612,10 @@
        }
        String substring = urla.substring(0, urla.length() - 1);
        user.setAvatar(substring);
        }

        String urlf = "";
        if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
        String[] splits = user.getFingerprint().split(",");
        for (int i = 0; i < splits.length; i++) {
            String s = splits[i].substring(26, splits[i].length());
@@ -631,6 +623,7 @@
        }
        String substrings = urla.substring(0, urlf.length() - 1);
        user.setFingerprint(substrings);
        }

        String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
            "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,dispatch) " +

 src/main/resources/application-dev.yml

@@ -37,8 +37,8 @@

#图片批量上传zip
upload:
#  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
  localtion: ${UPLOAD_DIR:D:/test}
  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
#  localtion: ${UPLOAD_DIR:D:/test}
  maxFileSize: 10240KB
  maxRequestSize: 102400KB


 src/main/resources/application-test.yml

@@ -2,8 +2,6 @@
spring:
  redis:
    ##redis 单机环境配置
    ##将docker脚本部署的redis服务映射为宿主机ip
    ##生产环境推荐使用阿里云高可用redis服务并设置密码
    host: 127.0.0.1
    port: 6379
    password:
@@ -14,9 +12,30 @@
    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
    #  commandTimeout: 5000
  datasource:
    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://223.82.109.183:2083/zhbawy?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: root
    password: zhba0728

    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
    #username: postgres
    #password: 123456
    # Oracle
    #url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
    #username: BLADEX_BOOT
    #password: BLADEX_BOOT
    # SqlServer
    #url: jdbc:sqlserver://223.82.109.183:1433;DatabaseName=zhbaw
    #username: sa
    #password: zhbaw@2021


#图片批量上传zip
upload:
#  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
  localtion: ${UPLOAD_DIR:D:/test}
  maxFileSize: 10240KB
  maxRequestSize: 102400KB

#第三方登陆
social:
@@ -29,10 +48,8 @@
  lock:
    ##是否启用分布式锁
    enabled: false
    ##将docker脚本部署的redis服务映射为宿主机ip
    ##生产环境推荐使用阿里云高可用redis服务并设置密码
    ##redis服务地址
    address: redis://127.0.0.1:6379
    password: 123456
  #本地文件上传
  file:
    remote-mode: true

 src/main/resources/log/logback-dev.xml

@@ -102,7 +102,7 @@
    <logger name="com.netflix.discovery" level="INFO"/>
    <logger name="com.netflix.eureka" level="INFO"/>
    <!-- 业务日志 -->
    <Logger name="org.springblade" level="WARN"/>
    <Logger name="org.springblade" level="INFO"/>
    <Logger name="org.springblade.core.tenant" level="INFO"/>
    <Logger name="org.springblade.core.version" level="INFO"/>