用户新增，修改接口修改

Administrator

2021-08-26 9aa48f6d77fa530d1bfa40d542d3a773e238c790

用户新增，修改接口修改

 src/main/java/org/springblade/modules/qrcode/QrCodeController.java

@@ -35,13 +35,14 @@
    private final IUserService userService;

    /**
     * 二维码生成
     * 二维码生成-字节流
     * @param securityNumber 保安证编号
     * @return
     */
    @GetMapping("/getQrCode")
    public ResponseEntity<byte[]> getQrCode(String securityNumber){
        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
//        String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
        String url = "http://223.82.109.183:2080/securityInfo.html";
        if (null!=securityNumber) {
            String content = url + "?securityNumber=" + securityNumber;
//                "&realName=" + one.getRealName() +
@@ -71,7 +72,7 @@


    /**
     * 二维码生成
     * 二维码生成base64
     * @param securityNumber 保安证编号
     * @return
     */

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

@@ -557,20 +557,50 @@
        user.setTenantId("000000");
        //用户新增
        boolean status = userService.save(user);
        //获取从业记录
        List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
        if (experiences.size()>0){
            int count = 0;
            for (int i = 0; i < experiences.size(); i++) {
                Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
                e.setSecurityid(user.getId().toString());
                experienceService.save(e);
                count++;
            }
            if (count < 1) {
                return R.status(false);
            }

        String birthday;
        String rtime;
        if (user.getBirthday()==null){
            birthday =null;
        }
        else {
            birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
        }

        if ( user.getRtime()==null){
            rtime =null;
        }
        else {
            rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
        }



        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," +
            "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
            "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
            "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
            "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
            "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
            + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
            + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
            "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
        FtpUtil.sqlFileUpload(s);

        //获取从业记录
//        List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
//        if (experiences.size()>0){
//            int count = 0;
//            for (int i = 0; i < experiences.size(); i++) {
//                Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
//                e.setSecurityid(user.getId().toString());
//                experienceService.save(e);
//                count++;
//            }
//            if (count < 1) {
//                return R.status(false);
//            }
//        }
        //判断是否持证是否为空
        return R.status(status);
    }

 src/main/java/org/springblade/modules/system/excel/UserExcel.java

@@ -38,9 +38,9 @@
public class UserExcel implements Serializable {
    private static final long serialVersionUID = 1L;

    @ColumnWidth(15)
    @ExcelProperty("账号")
    private String account;
//    @ColumnWidth(15)
//    @ExcelProperty("账号")
//    private String account;

    @ExcelProperty("单位名称")
    private String deptId;
@@ -60,8 +60,8 @@
    @ExcelProperty("性别")
    private String sex;

    @ExcelProperty("出生日期")
    private Date birthday;
//    @ExcelProperty("出生日期")
//    private Date birthday;

    @ExcelProperty("身份证号")
    private String cardid;
@@ -95,8 +95,8 @@
    @ExcelProperty("保安员证编码")
    private String securitynumber;

    @ExcelProperty("人员状态")
    private String status;
//    @ExcelProperty("人员状态")
//    private String status;


}