接口逻辑调整

src/main/java/org/rcisoft/sys/sysuser/controller/SysUserController.java

@@ -73,6 +73,11 @@ public class SysUserController extends CyPaginationController<SysUser> {
     @Autowired
     private IJieLinkService jieLinkServiceImpl;
 
+    /**
+     * 捷顺开关
+     */
+    @Value("${jieLink.synchronization}")
+    private boolean synchronization;
 
     //@PreAuthorize("@cyPerm.hasPerm('sys:user:add')")
     @CyOpeLogAnno(title = "system-用户表管理-新增用户表", businessType = CyLogTypeEnum.INSERT)
@@ -272,8 +277,11 @@ public class SysUserController extends CyPaginationController<SysUser> {
     @ResponseBody
     public CyResult getTradeScan(@PathVariable String personId) {
         // 根据用户id获取personId
-        // String codeUrl = jieLinkServiceImpl.pullVisitUserQrCode(personId);
-        String codeUrl = "sysUserServiceImpl.findById(businessId).toString()";
+        String codeUrl = "";
+        if (synchronization)
+            codeUrl = jieLinkServiceImpl.pullVisitUserQrCode(personId);
+        else
+            codeUrl = "sysUserServiceImpl.findById(businessId).toString()";
         String png_base64 = null;
         //返回二维码 并且构造支付包web支付对象
         ByteArrayOutputStream baOp = new ByteArrayOutputStream();

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
-import org.rcisoft.core.component.CyDownErrorTxtComp;
 import org.rcisoft.core.exception.CyServiceException;
 import org.rcisoft.core.result.enums.CyResSvcExcEnum;
 import org.rcisoft.core.util.CyCompareToolUtils;
@@ -13,7 +12,6 @@ import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.integration.jieLink.service.impl.JieLinkServiceImpl;
 import org.rcisoft.sys.dictionary.dao.DictDataRepository;
 import org.rcisoft.sys.dictionary.entity.DictData;
-import org.rcisoft.sys.dictionary.service.DictionaryService;
 import org.rcisoft.sys.rbac.dept.dao.SysDeptRbacRepository;
 import org.rcisoft.sys.rbac.dept.dto.SysDeptRbacDTO;
 import org.rcisoft.sys.rbac.dept.entity.SysDeptRbac;
@@ -41,15 +39,12 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.rcisoft.core.model.CyPageInfo;
-
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -68,23 +63,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
     @Autowired
     private SysDictDataRepositorys sysDictDataRepositorys;
     @Autowired
-    private DictionaryService dictionaryService;
-    @Autowired
     private DictDataRepository dictDataRepository;
     @Autowired
     private SysDeptRbacRepository sysDeptRbacRepository;
     @Autowired
     private JieLinkServiceImpl jieLinkService;
     @Autowired
-    private CyDownErrorTxtComp errorTxt;
-    @Autowired
     private SysUserRoleRepository sysUserRoleRepository;
     @Autowired
     private PasswordEncoder passwordEncoder;
     @Value("${cy.init.password}")
     private String password;
     /**
-     * 接口密码
+     * 捷顺开关
      */
     @Value("${jieLink.synchronization}")
     private boolean synchronization;
@@ -101,7 +92,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         // 如果传入的sysUser有id，则说明传入的用户为访客，则删除其作为访客的数据
         if (sysUser.getBusinessId() != null) {
             visitPersonRepositorys.delSysUser(Long.valueOf(sysUser.getBusinessId()));
-            if(synchronization) {
+            if (synchronization) {
                 if (!jieLinkService.pushDelUserData(sysUser)) {
                     try {
                         throw new CyServiceException(500, "添加员工失败，请稍后重试");
@@ -195,6 +186,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
         int line = baseMapper.deleteById(sysUser);
         log.debug(CyUserUtil.getAuthenUsername() + "逻辑删除了ID为" +
                 sysUser.getBusinessId() + "的用户表信息");
+        if (synchronization)
+            jieLinkService.pushDelUserData(sysUser);
         return new CyPersistModel(line);
     }
 
@@ -602,6 +595,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
      * @return
      */
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     public boolean saveJieLinkId(String persionId, Integer userId) {
         /**
          * TODO 此处需要格局用户的主键ID将捷顺的主键ID存储进去

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

@@ -93,6 +93,12 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     @Autowired
     private SysUserServiceImpl sysUserService;
 
+    /**
+     * 捷顺开关
+     */
+    @Value("${jieLink.synchronization}")
+    private boolean synchronization;
+
     /**
      * 保存 邀访信息
      *
@@ -168,10 +174,10 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
             u.setNormal();
             visitUserRepository.insert(u);
         });
-       /* if(jieLinkService.pushVisitorData(visitInfomation)) {
+        if (synchronization && jieLinkService.pushVisitorData(visitInfomation)) {
             visitInfomation.setSynStatus("1");
             baseMapper.updateById(visitInfomation);
-        }*/
+        }
         return new CyPersistModel(line);
     }
 

src/main/resources/mapper/SysUserRepositorys.xml

@@ -221,7 +221,7 @@
         </trim>
     </insert>
 
-    <insert id="addSysUsers" parameterType="org.rcisoft.sys.sysuser.entity.SysUser" useGeneratedKeys="true">
+    <insert id="addSysUsers" parameterType="org.rcisoft.sys.sysuser.entity.SysUser" useGeneratedKeys="true" keyProperty="businessId">
         insert into sys_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="username != null">username ,</if>
@@ -306,6 +306,7 @@
                         address,
                         dept_id,
                         position,
+                        person_id,
                         nlt_bz,
                         flag
         from sys_user
@@ -365,7 +366,7 @@
     <update id="saveJieLinkPersionId" parameterType="org.rcisoft.sys.sysuser.entity.SysUser">
         update sys_user
         set person_id = #{entity.personId}
-        where business_id = #{businessId}
+        where business_id = #{entity.businessId}
     </update>
 
     <select id="getPersionIdByUserId" resultType="java.lang.String">

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -446,9 +446,7 @@
                vi.visit_region,
                vi.visit_date,
                vi.visit_time,
-               vi.visit_status,
-               vu.user_name,
-               vu.visit_phone
+               vi.visit_status
         from visit_infomation vi
         where vi.del_flag = '0'
           and vi.flag = '1'