添加危废信息展示以及app调用接口

李宇

2021-01-13 5ce314bb05eef373bd25b0b2e289a01bf6e5b6c4

 src/main/java/com/nanometer/smartlab/controller/UserMngController.java

@@ -7,6 +7,7 @@
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.entity.enumtype.Waster;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.BaseRoleService;
import com.nanometer.smartlab.service.SysUserService;
@@ -66,6 +67,7 @@
    private String editPasswor;
    private List<BaseMeta> codeList;
    private List<BaseRole> roleList;
    private List<Waster> wasterSelectList;

    public List<BaseRole> getRoleList() {
        return roleList;
@@ -194,11 +196,26 @@
                    errorMsg += "第"+i+"行,密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上";
                }

                sysUser.setPassword(MD5Utils.encode((int)Double.parseDouble(valuesList.get(5))+""));//密码
                sysUser.setPassword(MD5Utils.encode(valuesList.get(5))+"");//密码

                //valuesList.get(8) id卡号检查
                if (valuesList.get(8) != null && valuesList.get(8).length()>0){
                    //大写转换
                    String idCardUpper = valuesList.get(8).trim().toUpperCase();
                    //8位和20位下8位才做补齐20位，否则提示输入id卡号8位或者20位
                    if (idCardUpper.length() == 8 ||idCardUpper.length() == 20) {
                        if (idCardUpper.length() == 8){
                            //8位补齐20位，否则不做操作
                            String idCard = "E0E01E000A" + idCardUpper + "01";
                            sysUser.setIdCard(idCard);//id卡号
                        }
                    }else{
                        FacesUtils.warn("第"+i+"行,id卡号需要8位或者20位");
                        return;
                    }
                }
                sysUser.setPhone(valuesList.get(6));//电话
                sysUser.setEmail(valuesList.get(7));//邮箱
                sysUser.setIdCard(valuesList.get(8));//id卡号
                sysUser.setPoint((int)Double.parseDouble(valuesList.get(9)));//分数
                sysUser.setRoleId(valuesList.get(10));//角色
                if(valuesList.get(11).equals("是")){
@@ -336,12 +353,30 @@
                }

                // 检查idCard
                if (this.sysUser.getIdCard() != null && this.sysUser.getIdCard().length()>0){
                    String idCardUpper = sysUser.getIdCard().trim().toUpperCase();
                    //8位和20位下8位才做补齐20位，否则提示输入id卡号8位或者20位
                    if (idCardUpper.length() == 8 ||idCardUpper.length() == 20) {
                        if (idCardUpper.length() == 8){
                            //8位补齐20位，否则不做操作
                            this.sysUser.setIdCard("E0E01E000A" + idCardUpper + "01");
                        }else{
                            //20位
                            this.sysUser.setIdCard(idCardUpper);
                        }
                    }else{
                        FacesUtils.warn("id卡号8位或者20位");
                        return;
                    }
                }


                if (!StringUtils.isEmpty(this.sysUser.getIdCard()) && this.sysUserService.isSysUserExist(null, null, this.sysUser.getIdCard(), null)) {
                    FacesUtils.warn("ID卡号已存在。");
                    return;
                }
                if(!org.apache.commons.lang.StringUtils.isNotBlank(sysUser.getProjectId())){
                    sysUser.setProjectId(null);
                if(!org.apache.commons.lang.StringUtils.isNotBlank(sysUser.getProject())){
                    sysUser.setProject(null);
                }

                String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
@@ -375,6 +410,23 @@
                }

                // 检查idCard
                if (this.sysUser.getIdCard() != null && this.sysUser.getIdCard().length()>0){
                    String idCardUpper = sysUser.getIdCard().trim().toUpperCase();
                    //8位和20位下8位才做补齐20位，否则提示输入id卡号8位或者20位
                    if (idCardUpper.length() == 8 ||idCardUpper.length() == 20) {
                        if (idCardUpper.length() == 8){
                            //8位补齐20位，否则不做操作
                            this.sysUser.setIdCard("E0E01E000A" + idCardUpper + "01");
                        }else{
                            //20位
                            this.sysUser.setIdCard(idCardUpper);
                        }
                    }else{
                        FacesUtils.warn("id卡号8位或者20位");
                        return;
                    }
                }

                if(this.sysUser.getIdCard()==null || this.sysUser.getIdCard()==""){

                }else {
@@ -489,6 +541,14 @@
       return seeFlagSelectList;
    }

    public List<Waster> getWasterSelectList() {
        if (this.wasterSelectList == null) {
            this.wasterSelectList = Arrays.asList(Waster.values());
        }

        return wasterSelectList;
    }

    public String getArp() {
        return arp;
    }