保安员新增，修改，时间同步，定时任务打印时间

Administrator

2021-12-08 f47e7d71f9ce13f3964b7d3753d3b42b36d35582

保安员新增，修改，时间同步，定时任务打印时间

 src/main/java/org/springblade/modules/crontab/Crontab.java

@@ -25,7 +25,7 @@
     * 定时任务，每天凌晨1点执行一次，
     * 自动处理之前报了名，申请了考试又没有去考试的，做缺考标记，并将报名状态修改为已取消报名
     */
    @Scheduled(cron = "* * 23 * * ?")
    @Scheduled(cron = "0 0 23 * * ?")
//    @Scheduled(cron = "*/30 * * * * ?")
    @GetMapping("/examApplyStatus")
    public void examApplyStatus(){

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

@@ -281,7 +281,7 @@
    public R update(@Valid @RequestBody User user) throws Exception {
        CacheUtil.clear(USER_CACHE);
        User user1 = userService.getById(user.getId());
        String url = null;
        String url = "";
        if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
            if (user.getFingerprint().length()>100) {
                //指纹图片上传并返回url
@@ -388,6 +388,7 @@
        }

        user.setPassword(user1.getPassword());
        user.setUpdateTime(new Date());
        userService.updateById(user);
        String rtime;
        if (user.getRtime() == null) {
@@ -424,6 +425,7 @@
                + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
                + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
                + ",guncode = " + "'" + user.getGuncode() + "'"
                + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
                + " " + "where id = " + "'" + user.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.success("修改成功");
@@ -446,7 +448,8 @@
                url = split[1];
            }
        }

        user.setUpdateTime(new Date());
        //更新
        userService.updateById(user);

        //内网同步
@@ -462,6 +465,7 @@
                + ",address = " + "'" + user.getAddress() + "'"
                + ",registered = " + "'" + user.getRegistered() + "'"
                + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
                + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
                + ",hold = " + "'" + user.getHold() + "'"
                + ",cell = " + "'" + user.getCell() + "'"
                + " " + "where id = " + "'" + user.getId() + "'";
@@ -534,6 +538,7 @@
    @PostMapping("/updatePaperTime")
    public R updatePaperTime(@RequestBody User user) {
        user.setPaperTime(new Date());
        user.setUpdateTime(new Date());
        userService.updateById(user);
        String paperTime = null;
        //发证日期处理
@@ -545,6 +550,7 @@
        String s1 =
            "update blade_user set paper_time = " + "'" + paperTime + "'"
                + ",user_type = " + "'" + user.getUserType() + "'"
                + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
                + " " + "where id = " + "'" + user.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        return R.success("修改成功");
@@ -978,9 +984,11 @@
                        if(!user2.getDeptId().equals(user.getDeptId())) {
                            user2.setStatus(2);
                            //先将原有人员离职  cell 1:手动录入  2：自动录入
                            user2.setUpdateTime(new Date());
                            userService.updateById(user2);
                            //内网同步
                            String s1 = "update blade_user set status = " + user2.getStatus() +
                                ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
                                " where id = " + "'" + user2.getId() + "'";
                            FtpUtil.sqlFileUpload(s1);

@@ -998,7 +1006,7 @@
            }
        }

        String url = null;
        String url = "";
        if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
            if (user.getFingerprint().length()>100) {
                String s = uploadBase64String(user);
@@ -1023,6 +1031,7 @@
            //取身份证号码后6位作为密码
            user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
        }
        user.setCreateTime(new Date());
        user.setTenantId("000000");
        //用户新增
        boolean status = userService.save(user);
@@ -1063,7 +1072,7 @@
            "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,examination_type,status,is_deleted,dispatch,guncode,cell) " +
            "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
            "values(" + "'" + user.getId() + "'" +
            "," + "'" + user.getTenantId() + "'" +
            "," + "'" + user.getAccount() + "'" +
@@ -1095,6 +1104,7 @@
            "," + "'" + user.getIsDeleted() + "'" +
            "," + "'" + user.getDispatch() + "'" +
            "," + "'" + user.getGuncode() + "'" +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
            "," + "'" + user.getCell() + "'" + ");"+
        "insert into sys_experience(id,name,post,entryTime," +
            "cardId,companyname,securityId) " +

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

@@ -62,6 +62,7 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import sun.java2d.pipe.SpanShapeRenderer;

import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -901,6 +902,7 @@
                    if (userCount > 0 && Func.isEmpty(user.getId())) {
                        throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
                    }
                    user.setCreateTime(new Date());
                    //新增
                    this.save(user);

@@ -920,7 +922,7 @@
                        "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," +
                        "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
                        "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time) " +
                        "values(" + "'" + user.getId() + "'" +
                        "," + "'" + user.getTenantId() + "'" +
                        "," + "'" + user.getAccount() + "'" +
@@ -949,7 +951,8 @@
                        "," + "'" + user.getExaminationType() + "'" +
                        "," + "'" + user.getStatus() + "'" +
                        "," + "'" + user.getIsDeleted() + "'" +
                        "," + "'" + user.getDispatch() + "'" + ");"+
                        "," + "'" + user.getDispatch() + "'" +
                        "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" + ");"+
                    "insert into sys_experience(id,name,post,entryTime," +
                        "cardId,companyname,securityId) " +
                        "values(" + "'" + experience.getId() + "'" + "," +
@@ -990,11 +993,13 @@
                            user2.setRegistered("");
                        }
                        //更新用户数据
                        user2.setUpdateTime(new Date());
                        this.updateById(user2);
                        String s1 =
                            "update blade_user set hold = " + "'" + user2.getHold() + "'"
                                + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
                                + ",dept_id = " + "'" + user2.getDeptId() + "'"
                                + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
                                + ",registered = " + "'" + user2.getRegistered() + "'"
                                + " " + "where id = " + "'" + user2.getId() + "'";
                        FtpUtil.sqlFileUpload(s1);
@@ -1023,12 +1028,14 @@
                    }else {
                        user2.setRegistered("");
                    }
                    user2.setUpdateTime(new Date());
                    //更新用户数据
                    this.updateById(user2);
                    String s1 =
                        "update blade_user set hold = " + "'" + user2.getHold() + "'"
                            + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
                            + ",registered = " + "'" + user2.getRegistered() + "'"
                            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
                            + " " + "where id = " + "'" + user2.getId() + "'";
                    FtpUtil.sqlFileUpload(s1);
                }
@@ -1154,6 +1161,7 @@
                if (userCount > 0 && Func.isEmpty(user.getId())) {
                    throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
                }
                user.setCreateTime(new Date());
                //新增
                this.save(user);

@@ -1172,7 +1180,7 @@
                    "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," +
                    "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode) " +
                    "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time,guncode) " +
                    "values(" + "'" + user.getId() + "'" +
                    "," + "'" + user.getTenantId() + "'" +
                    "," + "'" + user.getAccount() + "'" +
@@ -1201,8 +1209,9 @@
                    "," + "'" + user.getExaminationType() + "'" +
                    "," + "'" + user.getStatus() + "'" +
                    "," + "'" + user.getIsDeleted() + "'" +
                    "," + "'" + user.getIsDeleted() + "'" +
                    "," + "'" + user.getGuncode() + "'" + ");"+
                    "," + "'" + user.getDispatch() + "'" +
                    "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
                "," + "'" + user.getGuncode() + "'" + ");"+
                "insert into sys_experience(id,name,post,entryTime," +
                    "cardId,companyname,securityId) " +
                    "values(" + "'" + experience.getId() + "'" + "," +
@@ -1246,12 +1255,14 @@
                        }else {
                            user2.setRegistered("");
                        }
                        user2.setUpdateTime(new Date());
                        //更新用户数据
                        this.updateById(user2);
                        String s1 =
                            "update blade_user set hold = " + "'" + user2.getHold() + "'"
                                + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
                                + ",dept_id = " + "'" + user2.getDeptId() + "'"
                                + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
                                + ",registered = " + "'" + user2.getRegistered() + "'"
                                + " " + "where id = " + "'" + user2.getId() + "'";
                        FtpUtil.sqlFileUpload(s1);
@@ -1280,12 +1291,14 @@
                    }else {
                        user2.setRegistered("");
                    }
                    user2.setUpdateTime(new Date());
                    //更新用户数据
                    this.updateById(user2);
                    String s1 =
                        "update blade_user set hold = " + "'" + user2.getHold() + "'"
                            + ",securitynumber = " + "'" + user2.getSecuritynumber() + "'"
                            + ",registered = " + "'" + user2.getRegistered() + "'"
                            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'"
                            + " " + "where id = " + "'" + user2.getId() + "'";
                    FtpUtil.sqlFileUpload(s1);
                }