add:add: 提交捷顺道闸对接接口代码(未完成版本-5) 剩余接收上传门禁记录的接口开发

src/main/java/org/rcisoft/integration/jieLink/Controller/JieLinkInterController.java

@@ -33,7 +33,13 @@ public class JieLinkInterController {
              * 2、检查设备系统内是否存在，不存在返回错误信息
              * 3、保存门禁记录信息，按照年划分
              */
-
+            JieLinkResultDto jieLinkResultDto = jieLinkService.saveDoorRecordInfo(recodeDto);
+            if(jieLinkResultDto!=null){
+                result = jieLinkResultDto;
+            }else{
+                result.setCode("SYSTEM_ERROR");
+                result.setMsg("上传记录出现异常，请重新上传");
+            }
         }else{
             result.setCode("ILLEGAL_ARGUMENT");
             result.setMsg("参数缺失，请检查请求实体信息");
@@ -42,5 +48,4 @@ public class JieLinkInterController {
     }
 
 
-
 }

src/main/java/org/rcisoft/integration/jieLink/common/SignUtils.java

 package org.rcisoft.integration.jieLink.common;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.crypto.SecureUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -63,8 +64,10 @@ public class SignUtils {
     }
 
     public static void main(String[] args) {
-        SignDto signData = SignUtils.getSignData("1111", "222222222222");
-        System.out.println(signData.getSign());
+//        SignDto signData = SignUtils.getSignData("1111", "222222222222");
+//        System.out.println(signData.getSign());
+//        System.out.println(UUID.randomUUID().toString());
+        System.out.println(RandomUtil.randomString("ABCDEF0123456789", 8));
     }
 
 

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

 package org.rcisoft.integration.jieLink.service.impl;
 
 
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +21,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 捷顺道闸对接接口实现
@@ -330,20 +332,36 @@ public class JieLinkServiceImpl  implements IJieLinkService {
         JSONObject result = new JSONObject();
         VisitDataInviteDto manData = new VisitDataInviteDto();
         //TODO 此处需要沟通下才行
-        manData.setPersonId("");//转换ID
-        manData.setItemId("");//邀访记录
-        manData.setTimeDesc("");//邀访时间格式
+        manData.setPersonId(sysUserService.getPersionIdByUserId(infoMation.getUserId()));//转换ID
+        manData.setItemId(infoMation.getItemId());//邀访记录
+        //生成邀访时间格式的JSON字符串
+        manData.setTimeDesc("");//邀访时间格式  需要根据两个字段以及数据字典中对应的类型进行计算得到开始和结束时间
         manData.setVisitorType("3");//访客类型
-        manData.setContent("");//到访事由
+        //到访事由   两个字段做或判断
+        if(StringUtils.isNotBlank(infoMation.getVisitReason())){
+            manData.setContent(infoMation.getVisitReason());
+        }else{
+            manData.setContent(infoMation.getVisitReasonOther());
+        }
+
         List<VisitDataSubItemDto> userList = new ArrayList<>();
         if(infoMation.getUserList()!=null && !infoMation.getUserList().isEmpty()){
             List<VisitUser> userDataList = infoMation.getUserList();
             for(VisitUser user: userDataList){
                 VisitDataSubItemDto userItemDto = new VisitDataSubItemDto();
-                userItemDto.setVisitorId("");//访客ID
+                //此处的访客ID存在问题，一会沟通下
+                userItemDto.setVisitorId(user.getPersonId());//访客ID
                 userItemDto.setVisitorName(user.getUserName());//访客名称
                 userItemDto.setVisitorTel(user.getVisitPhone());//访客手机号
                 //下面需要构建凭证信息，此处没有用数据获取的源头
+                List<VisitDataCredentialDto> credentialDtos = new ArrayList<>();
+                VisitDataCredentialDto credentialDto = new VisitDataCredentialDto();
+                credentialDto.setCredentialId(UUID.randomUUID().toString());
+                credentialDto.setCredentialType("1");
+                String cardNo = RandomUtil.randomString("ABCDEF0123456789", 8);
+                credentialDto.setCredentialNo(cardNo);
+                credentialDtos.add(credentialDto);
+                userItemDto.setCredentialList(credentialDtos);
                 ///参数对应啦
                 userList.add(userItemDto);
             }
@@ -412,7 +430,13 @@ public class JieLinkServiceImpl  implements IJieLinkService {
          * 2、检查设备系统内是否存在，不存在返回错误信息
          * 3、保存门禁记录信息，按照年划分
          */
+        JieLinkResultDto result = new JieLinkResultDto();
+        JieLinkPersonDto person = recordDto.getPerson();
+        if(person!=null){//
 
+        }else{
+            //访客记录为空了
+        }
 
         return null;
     }

src/main/java/org/rcisoft/sys/sysuser/dao/SysUserRepositorys.java

@@ -47,6 +47,10 @@ public interface SysUserRepositorys extends CyBaseMapper<SysUser> {
      */
     IPage<SysUser> querySysUsersPaged(CyPageInfo cyPageInfo, @Param("entity") SysUser sysUser );
 
+    public int saveJieLinkPersionId(@Param("entity") SysUser userData);
+
+    public String getPersionIdByUserId(@Param("userId") Integer userId);
+
 
 }
 

src/main/java/org/rcisoft/sys/sysuser/entity/SysUser.java

@@ -72,6 +72,12 @@ public class SysUser extends CyIdIncreEntity<SysUser> {
 //    @Excel(name = "登录名", orderNum = "0", width = 20)
     private String username;
 
+    /**
+     * 捷顺用户ID
+     */
+    private String personId;
+
+
     /**
      * @desc 用户昵称
      * @column nick_name

src/main/java/org/rcisoft/sys/sysuser/service/SysUserService.java

@@ -96,4 +96,11 @@ public interface SysUserService {
      * @return
      */
     boolean saveJieLinkId(String persionId,Integer userId);
+
+    /**
+     * 根据用户ID换捷顺系统的用户ID
+     * @param userId
+     * @return
+     */
+    public String getPersionIdByUserId(Integer userId);
 }

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

@@ -539,8 +539,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
          */
         SysUser modifyData = new SysUser();
         modifyData.setBusinessId(userId);
+        modifyData.setPersonId(persionId);
+        int i = sysUserRepositorys.saveJieLinkPersionId(modifyData);
+        if(i>0){
+            return true;
+        }else{
+            return false;
+        }
+    }
 
-        return false;
+    @Override
+    public String getPersionIdByUserId(Integer userId) {
+         return sysUserRepositorys.getPersionIdByUserId(userId);
     }
 
     /**

src/main/java/org/rcisoft/sys/visit/entity/VisitInfoMation.java

@@ -106,6 +106,10 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     @TableField(exist = false)
     private String[] visitRegions;
 
+    /**
+     * 捷顺邀访记录ID
+     */
+    private String itemId;
     /**
      * @desc 访问日期
      * @column visit_date

src/main/java/org/rcisoft/sys/visit/entity/VisitUser.java

@@ -40,6 +40,11 @@ public class VisitUser  extends CyIdIncreEntity<VisitUser> {
      @Excel(name = "访客手机号", orderNum = "2", width = 20)
      private String visitPhone;
 
+     /**
+      * 访客对应的捷顺ID
+      */
+     private String personId;
+
      private VisitInfoMation visitInfo;
 
      public VisitUser() {

src/main/resources/mapper/SysUserRepositorys.xml

@@ -5,6 +5,7 @@
         <id column="business_id" jdbcType="BIGINT" property="businessId"/>
 
         <result column="username" jdbcType="VARCHAR" property="username"/>
+        <result column="person_id" jdbcType="VARCHAR" property="personId"/>
         <result column="nick_name" jdbcType="VARCHAR" property="nickName"/>
         <result column="user_type" jdbcType="VARCHAR" property="userType"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
@@ -240,4 +241,14 @@
         where del_flag = 0
           and dept_id = #{businessId}
     </select>
+
+    <update id="saveJieLinkPersionId"  parameterType="org.rcisoft.sys.sysuser.entity.SysUser">
+        update sys_user set person_id = #{entity.personId} where business_id = #{businessId}
+    </update>
+
+    <select id="getPersionIdByUserId" resultType="java.lang.String" >
+        SELECT person_id from sys_user where business_id = #{userId}
+    </select>
+
+
 </mapper>