智慧保安后台管理-外网-验收版本
tangzy
2021-09-17 a0b549672f2f012144271dad35557702a9e70cba
1.用户
3 files modified
44 ■■■■■ changed files
src/main/java/org/springblade/modules/system/controller/UserController.java 41 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/entity/User.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -29,6 +29,7 @@
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.DictCache;
import org.springblade.common.constant.FtpConstant;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
@@ -248,13 +249,11 @@
        String s1 =
            "update blade_user set account = " + "'" + user.getAccount()+ "'"
                + ",password = " + "'" + user.getPassword()+"'"
                + ",name = " + "'" + user.getName()+"'"
                + ",real_name = " + "'" + user.getRealName()+"'"
                + ",avatar = " + "'" + user.getAvatar()+"'"
                + ",email = " + "'" + user.getEmail()+"'"
                + ",phone = " + "'" + user.getPhone()+"'"
                + ",birthday = " + "'" + birthday+"'"
                + ",sex = " + "'" + user.getSex()+"'"
                + ",role_id = " + "'" + user.getRoleId()+"'"
                + ",dept_id = " + "'" + user.getDeptId()+"'"
@@ -615,28 +614,44 @@
        else {
            rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
        }
        String urla = "";
        String[] split = user.getAvatar().split(",");
        for (int i = 0; i < split.length; i++) {
            String s = split[i].substring(26, split[i].length());
            urla += FtpConstant.ip + s + ",";
        }
        String substring = urla.substring(0, urla.length() - 1);
        user.setAvatar(substring);
        String urlf = "";
        String[] splits = user.getFingerprint().split(",");
        for (int i = 0; i < splits.length; i++) {
            String s = splits[i].substring(26, splits[i].length());
            urlf += FtpConstant.ip + s + ",";
        }
        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,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
        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) " +
            "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
            "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
            "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
            "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
            "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
            "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
            "," + "'" + user.getDeptId() + "'" +
            "," + "'" + user.getCardid() + "'" +
            "," + "'" + user.getNativeplace() + "'" +
            "," + "'" + user.getNation() + "'" +
            "," + "'" + user.getFingerprint() + "'" +
            "," + "'" + user.getEducation() + "'" +
            "," + "'" + user.getPoliticaloutlook() + "'" +
            "," + "'" + user.getHealstats() + "'"
            + "," +"'" + user.getHeight() + "'" +
            + "," + "'" + user.getHeight() + "'" +
            "," + "'" + user.getAddress() + "'" +
            "," + "'" + user.getRegistered() + "'"+ "," +
            "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+
            "," + "'" + user.getHold() + "'"+
            "," + "'" + user.getJurisdiction() + "'"+
            "," + "'" + user.getDispatch() + "'"+")";
            "," + "'" + user.getRegistered() + "'" + "," +
            "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" +
            "," + "'" + user.getHold() + "'" +
            "," + "'" + user.getJurisdiction() + "'" +
            "," + "'" + user.getDispatch() + "'" + ")";
        FtpUtil.sqlFileUpload(s);
        //获取从业记录
src/main/java/org/springblade/modules/system/entity/User.java
@@ -128,7 +128,7 @@
     * 身高
     */
    @ApiModelProperty(value = "身高")
    private Integer height;
    private String height;
    /**
     * 联系电话
     */
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -47,6 +47,7 @@
        <result column="birthtime" property="birthtime"/>
        <result column="healstats" property="healstats"/>
        <result column="soil" property="soil"/>
        <result column="reason_for_leav" property="reasonForLeav"/>
    </resultMap>
    <!--带坐标-->