Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/visit/controller/VisitInfomationController.java

@@ -53,12 +53,6 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
     @ApiOperation(value = "添加邀访信息", notes = "添加邀访信息")
     @PostMapping(value = "/add")
     public CyResult add(@RequestBody VisitInfoMation visitInfomation,HttpServletRequest request) {
-
-//        //todo 添加信息时候同时添加用户id
-//        String tempUserId = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_ID);
-//        int userId = Integer.parseInt(tempUserId);
-//        //添加条件添加用户id
-//        visitInfomation.setUserId(userId);
         CyPersistModel data = visitInfomationServiceImpl.persist(visitInfomation);
         return CyResultGenUtil.builder(data,
                 CyMessCons.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/sys/visit/service/impl/VisitInfomationServiceImpl.java

@@ -10,6 +10,7 @@ import org.rcisoft.core.jwt.util.CyJwtUtil;
 import org.rcisoft.core.util.CyCompareToolUtils;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.model.CyPersistModel;
+import org.rcisoft.integration.jieLink.service.impl.JieLinkServiceImpl;
 import org.rcisoft.sys.sysuser.dao.SysDeptRepositorys;
 import org.rcisoft.sys.sysuser.dao.SysDictDataRepositorys;
 import org.rcisoft.sys.sysuser.entity.SysDept;
@@ -83,10 +84,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     private CyJwtUtil cyJwtUtil;
 
     @Autowired
-    private CyGlobal global;
-
-    @Autowired
-    private PasswordEncoder passwordEncoder;
+    JieLinkServiceImpl jieLinkService;
 
     @Autowired
     private CyDownErrorTxtComp errorTxt;
@@ -134,21 +132,19 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
         log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +
                 visitInfomation.getBusinessId() + "的邀访信息信息");
         // 添加访客信息
-        List<VisitUser> visitUserList = visitInfomation.getUserList();
-        visitUserList.forEach(u -> {
+        visitInfomation.getUserList().forEach(u -> {
             // 判断当前访客(用户)是否已经存在
             SysUser sysUser = new SysUser();
             sysUser.setName(u.getUserName());
             sysUser.setPhone(u.getVisitPhone());
             sysUser.setUsername(u.getVisitPhone());
-            sysUser.setPassword(passwordEncoder.encode(global.getResetPassword()));
             sysUser.setNormal();
             List<SysUser> sysUserList = sysUserRepositorys.querySysUsers(sysUser);
             // 不存在新增
             if (CollectionUtils.isEmpty(sysUserList)) {
                 sysUser.setPersonId(UUID.randomUUID().toString());
                 sysUserRepositorys.insert(sysUser);
-                u.setPersonId(UUID.randomUUID().toString());
+                u.setPersonId(sysUser.getPersonId());
             } else {
                 // 存在覆盖
                 sysUser.setBusinessId(sysUserList.get(0).getBusinessId());
@@ -159,6 +155,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             u.setNormal();
             visitUserRepository.insert(u);
         });
+        //jieLinkService.pushVisitorData(visitInfomation);
         return new CyPersistModel(line);
     }
 
@@ -215,19 +212,19 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     public CyPersistModel merge(VisitInfoMation visitInfomation) {
         String regionCode = "";
         String region = "";
-        for (String s : visitInfomation.getVisitRegionCodes()){
-            regionCode = regionCode +s+',';
+        for (String s : visitInfomation.getVisitRegionCodes()) {
+            regionCode = regionCode + s + ',';
         }
-        if (regionCode.length()>0){
-            regionCode=regionCode.substring(0,regionCode.length()-1);
+        if (regionCode.length() > 0) {
+            regionCode = regionCode.substring(0, regionCode.length() - 1);
             visitInfomation.setVisitRegionCode(regionCode);
         }
 
-        for (String s : visitInfomation.getVisitRegions()){
-            region = region +s+',';
+        for (String s : visitInfomation.getVisitRegions()) {
+            region = region + s + ',';
         }
-        if (regionCode.length()>0){
-            region=region.substring(0,region.length()-1);
+        if (regionCode.length() > 0) {
+            region = region.substring(0, region.length() - 1);
             visitInfomation.setVisitRegion(region);
         }
 
@@ -310,11 +307,11 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             String phoneList = "";
             for (VisitUser vu : v.getUserList()) {
                 vuList = vuList + vu.getUserName() + ',';
-                phoneList = phoneList + vu.getVisitPhone()+ ',';
+                phoneList = phoneList + vu.getVisitPhone() + ',';
             }
             if (vuList.length() > 0) {
                 vuList = vuList.substring(0, vuList.length() - 1);
-                phoneList = phoneList.substring(0,phoneList.length()-1);
+                phoneList = phoneList.substring(0, phoneList.length() - 1);
             }
             v.setPhoneArry(phoneList);
             v.setUserArry(vuList);
@@ -332,7 +329,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
      * @return
      */
     @Override
-    public IPage<VisitInfoMation> findAllWithUserIdByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation ,HttpServletRequest request) {
+    public IPage<VisitInfoMation> findAllWithUserIdByPagination(CyPageInfo<VisitInfoMation> paginationUtility, VisitInfoMation visitInfomation, HttpServletRequest request) {
         //todo 获取用户id
         String tempUserId = CyUserUtil.getUserInfoStrProp(cyJwtUtil.getToken(request), CyUserUtil.USER_ID);
         //判断是否获取到当前用户id
@@ -359,7 +356,7 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             visitInfomation.setVisitRegionCodes(regionCodes);
         }
         //调用mapper层方法进行查询
-        IPage<VisitInfoMation> list = baseMapper.queryVisitInfomationsByUserIdPaged(paginationUtility, visitInfomation,userId);
+        IPage<VisitInfoMation> list = baseMapper.queryVisitInfomationsByUserIdPaged(paginationUtility, visitInfomation, userId);
         List<VisitInfoMation> mationList = list.getRecords();
         for (VisitInfoMation v : mationList) {
             if (v.getVisitRegionCode() != null) {
@@ -418,19 +415,19 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             String phoneList = "";
             for (VisitUser vu : v.getUserList()) {
                 vuList = vuList + vu.getUserName() + ',';
-                phoneList = phoneList + vu.getVisitPhone()+',';
+                phoneList = phoneList + vu.getVisitPhone() + ',';
             }
             if (vuList.length() > 0) {
                 vuList = vuList.substring(0, vuList.length() - 1);
-                phoneList = phoneList.substring(0,phoneList.length()-1);
+                phoneList = phoneList.substring(0, phoneList.length() - 1);
             }
             v.setUserArry(vuList);
             v.setPhoneArry(phoneList);
             if (v.getVisitStatus() != null) {
-                if (v.getVisitStatus().equals("0")){
+                if (v.getVisitStatus().equals("0")) {
                     v.setVisitStatus("未到访");
                 }
-                if (v.getVisitStatus().equals("1")){
+                if (v.getVisitStatus().equals("1")) {
                     v.setVisitStatus("已访问");
                 }
             }
@@ -606,19 +603,19 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 sysUserDTO.setName(visitInfoDto.getUserName());
                 // 校验手机号
                 Pattern pattern = Pattern.compile("^((13[0-9])|(14[0-9])|(15[0-9])|(16[0-9])|(17[0-9])|(18[0-9]))\\d{8}$+");
-                if (visitInfoDto.getPhone().length() != 11){
+                if (visitInfoDto.getPhone().length() != 11) {
                     throw new CyServiceException(CyResSvcExcEnum.PHONE_DATA_ERROR);
                 }
                 Matcher m = pattern.matcher(visitInfoDto.getPhone());
                 boolean isMatch = m.matches();
-                if (!isMatch){
+                if (!isMatch) {
                     throw new CyServiceException(CyResSvcExcEnum.PHONE_DATA_ERROR);
                 }
                 sysUserDTO.setPhone(visitInfoDto.getPhone());
                 sysUserDTO.setUserType("0");
                 // 根据姓名查询员工数据
                 List<SysUser> sysUsers = sysUserRepositorys.querySysUsers(sysUserDTO);
-                if (sysUsers.size() == 0){
+                if (sysUsers.size() == 0) {
                     throw new CyServiceException(CyResSvcExcEnum.USER_DATA_ERROR);
                 }
                 SysUser mainUser = sysUsers.get(0);
@@ -626,10 +623,10 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 visitInfoMation.setUserName(visitInfoDto.getUserName());
                 // 设置邀访信息部门名称
                 String deptId = mainUser.getDeptId();
-                if (deptId !=null){
-                    if (sysDeptRepositorys.queryDeptById(deptId).size()>0){
+                if (deptId != null) {
+                    if (sysDeptRepositorys.queryDeptById(deptId).size() > 0) {
                         SysDept dept = sysDeptRepositorys.queryDeptById(deptId).get(0);
-                        if (dept !=null){
+                        if (dept != null) {
                             String deptName = dept.getDeptName();
                             visitInfoMation.setDeptName(deptName);
                         }
@@ -637,13 +634,13 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 }
                 // 设置邀访信息职位名称
                 String position = mainUser.getPosition();
-                if (position !=null){
+                if (position != null) {
                     SysDictData sysDictData = new SysDictData();
                     sysDictData.setDictType("position");
                     List<SysDictData> dictDataList = sysDictDataRepositorys.querySysDictDatas(sysDictData);
                     String postName = "";
-                    for (SysDictData data:dictDataList){
-                        if (data.getDictValue().equals(position)){
+                    for (SysDictData data : dictDataList) {
+                        if (data.getDictValue().equals(position)) {
                             postName = data.getDictLabel();
                         }
                     }
@@ -651,39 +648,39 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
                 }
                 // 设置邀访信息访问事由
                 String reason = visitInfoDto.getVisitReason();
-                if (reason != null){
+                if (reason != null) {
                     SysDictData sysDictData = new SysDictData();
                     sysDictData.setDictType("visitReason");
                     List<SysDictData> dictDataList = sysDictDataRepositorys.querySysDictDatas(sysDictData);
                     String reasonCode = "";
-                    for (SysDictData data:dictDataList){
-                        if (data.getDictLabel().equals(reason)){
+                    for (SysDictData data : dictDataList) {
+                        if (data.getDictLabel().equals(reason)) {
                             reasonCode = data.getDictValue();
                         }
                     }
-                    if (reasonCode.equals("")){
+                    if (reasonCode.equals("")) {
                         visitInfoMation.setVisitReasonCode("other");
                         visitInfoMation.setVisitReason("其他");
                         visitInfoMation.setVisitReasonOther(reason);
-                    }else {
+                    } else {
                         visitInfoMation.setVisitReason(reason);
                         visitInfoMation.setVisitReasonCode(reasonCode);
                     }
                 }
                 // 设置邀访信息访问区域
-                if (visitInfoDto.getVisitRegion().length()>0){
+                if (visitInfoDto.getVisitRegion().length() > 0) {
                     String[] regions = visitInfoDto.getVisitRegion().split(",");
                     visitInfoMation.setVisitRegion(visitInfoDto.getVisitRegion());
                     String regionCode = "";
-                        for (String region:regions){
-                            if (region.equals("行政办公楼")){
-                                regionCode = regionCode + "0"+",";
-                            }else {
-                                regionCode = regionCode + "1"+",";
+                    for (String region : regions) {
+                        if (region.equals("行政办公楼")) {
+                            regionCode = regionCode + "0" + ",";
+                        } else {
+                            regionCode = regionCode + "1" + ",";
                         }
                     }
-                    if (regionCode.length()>0){
-                        regionCode = regionCode.substring(0,regionCode.length()-1);
+                    if (regionCode.length() > 0) {
+                        regionCode = regionCode.substring(0, regionCode.length() - 1);
                         visitInfoMation.setVisitRegionCode(regionCode);
                     }
                 }