修改 人员导出

src/main/java/org/rcisoft/integration/jieLink/service/impl/JieLinkServiceImpl.java

@@ -255,9 +255,9 @@ public class JieLinkServiceImpl implements IJieLinkService {
     }
 
 
-    public static void main(String[] args) {
-        System.out.println(random());
-    }
+//    public static void main(String[] args) {
+//        System.out.println(random());
+//    }
 
     private static String random(){
         return String.valueOf((int)((Math.random()*9+1)*10000000));
@@ -781,22 +781,22 @@ public class JieLinkServiceImpl implements IJieLinkService {
             return false;
         }
     }
-//    public static void main(String[] args) {
-//        SignDto signDto = new SignDto();
-//        signDto.setAppId("app01");
-//        signDto.setKey("01b470fd-67de-11ed-8c40-02004c4f4f50");
-////        SignUtils.signData = appKeyInfo;
-//        SignDto signData = SignUtils.getSignData(signDto);
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
-//        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
-//        headers.set("appId", signData.getAppId());
-//        headers.set("v", signData.getV());
-//        headers.set("random", signData.getRandom());
-//        headers.set("timestamp", signData.getTimestamp());
-//        headers.set("sign", signData.getSign());
-//        System.out.println(JSONObject.toJSON(headers).toString().replaceAll("\\[","").replaceAll("\\]",""));
-//    }
+    public static void main(String[] args) {
+        SignDto signDto = new SignDto();
+        signDto.setAppId("app01");
+        signDto.setKey("01b470fd-67de-11ed-8c40-02004c4f4f50");
+//        SignUtils.signData = appKeyInfo;
+        SignDto signData = SignUtils.getSignData(signDto);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
+        headers.set("appId", signData.getAppId());
+        headers.set("v", signData.getV());
+        headers.set("random", signData.getRandom());
+        headers.set("timestamp", signData.getTimestamp());
+        headers.set("sign", signData.getSign());
+        System.out.println(JSONObject.toJSON(headers).toString().replaceAll("\\[","").replaceAll("\\]",""));
+    }
 
     /**
      * 撤销邀访记录

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -667,6 +667,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
             for (ExportUserDTO sysUser : addINfoList) {
                 errorDTO = new UserErrorDTO();
                 sysUser.setIdentity("0");
+                SysUser user = new SysUser();
                 // 判断是否存在用户
                 List<SysUser> userList = sysUserRepositorys.querySysUsersByPhone(sysUser.getPhone());
                 // 用户已存在
@@ -735,6 +736,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                         errorDTOArrayList.add(errorDTO);
                         continue;
                     }
+                    if (sysUser.getCarPlate().split(",").length > 6){
+                        BeanUtil.copyProperties(sysUser, errorDTO);
+                        errorDTO.setError("车牌号最多录入6个");
+                        errorDTOArrayList.add(errorDTO);
+                        continue;
+                    }
 //                    if (!sysUser.getCarPlate().contains("_")) {
 //                        BeanUtil.copyProperties(sysUser, errorDTO);
 //                        errorDTO.setError("车牌号格式错误，例：沪_XXXXXX");
@@ -746,6 +753,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                     if (StringUtils.isNotEmpty(error.getError())) {
                         errorDTOArrayList.add(error);
                         continue;
+                    } else {
+                        user.setCarList(cars);
                     }
                 }
                 //性别
@@ -808,7 +817,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                 sysUser.setAttendanceShow("0");
                 sysUser.setUsername(sysUser.getPhone());
                 sysUser.setCreateDate(new Date());
-                SysUser user = new SysUser();
                 BeanUtil.copyProperties(sysUser, user);
                 persist(user);
                 //sysUserRepositorys.addSysUser(sysUser);