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

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

@@ -14,7 +14,7 @@ import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.core.result.enums.CyReSysExcEnum;
 import org.rcisoft.core.util.CyEpExcelUtil;
 import org.rcisoft.core.util.CyQrCodeUtil;
-import org.rcisoft.sys.sysuser.dao.SysUserRepositorys;
+import org.rcisoft.integration.jieLink.service.IJieLinkService;
 import org.rcisoft.sys.sysuser.dto.ExportUserDTO;
 import org.rcisoft.sys.sysuser.entity.SysUser;
 import org.springframework.validation.BindingResult;
@@ -36,9 +36,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,6 +49,9 @@ public class SysUserController extends CyPaginationController<SysUser> {
     @Autowired
     private SysUserService sysUserServiceImpl;
 
+    @Autowired
+    private IJieLinkService jieLinkServiceImpl;
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:user:add')")
     @CyOpeLogAnno(title = "system-用户表管理-新增用户表", businessType = CyLogTypeEnum.INSERT)
     @ApiOperation(value = "添加用户表", notes = "添加用户表")
@@ -230,14 +230,16 @@ public class SysUserController extends CyPaginationController<SysUser> {
      * 获取 二维码接口地址
      * 配置文件需要 配置 前缀
      *
-     * @param businessId
+     * @param personId
      * @return
      * @deprecated 前端生成 二维码
      * 后端返回  base64
      */
-    @GetMapping("/getTradeScan/{businessId:\\w+}")
+    @GetMapping("/getTradeScan/{personId:\\w+}")
     @ResponseBody
-    public CyResult getTradeScan(@PathVariable Integer businessId) {
+    public CyResult getTradeScan(@PathVariable String personId) {
+        // 根据用户id获取personId
+        // String codeUrl = jieLinkServiceImpl.pullVisitUserQrCode(personId);
         String codeUrl = "sysUserServiceImpl.findById(businessId).toString()";
         String png_base64 = null;
         //返回二维码 并且构造支付包web支付对象

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

@@ -183,7 +183,10 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
      */
     public CyPersistModel forbidden(VisitInfoMation visitInfomation){
         visitInfomation.setVisitStatus("2");
+        // 禁用邀访信息
         int line = baseMapper.updateById(visitInfomation);
+        // 撤销邀访
+        //jieLinkService.cancelVisitorData(null, visitInfomation.getItemId());
         return new CyPersistModel(line);
     }
 

src/main/java/org/rcisoft/tencent/dto/UserDto.java

@@ -11,7 +11,8 @@ public class UserDto extends SysUserRbac {
     private String positionLabel;
     @Transient
     private String position;
-
+    @Transient
+    private String personId;
     //黑名单状态（0不存在1存在）
     @Transient
     private String blacklistFlag;

src/main/resources/mapper/SysUserRepositorys.xml

@@ -8,7 +8,6 @@
         <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="person_id" jdbcType="VARCHAR" property="personId"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="email" jdbcType="VARCHAR" property="email"/>
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
@@ -45,6 +44,7 @@
         <result column="position" jdbcType="VARCHAR" property="position"/>
         <result column="position_label" jdbcType="VARCHAR" property="positionLabel"/>
         <result column="username" jdbcType="VARCHAR" property="username"/>
+        <result column="person_id" jdbcType="VARCHAR" property="personId"/>
         <result column="password" jdbcType="VARCHAR" property="password"/>
         <result column="nick_name" jdbcType="VARCHAR" property="nickName"/>
         <result column="user_type" jdbcType="VARCHAR" property="userType"/>
@@ -79,6 +79,7 @@
         <result column="position" jdbcType="VARCHAR" property="position"/>
         <result column="position_label" jdbcType="VARCHAR" property="positionLabel"/>
         <result column="username" jdbcType="VARCHAR" property="username"/>
+        <result column="person_id" jdbcType="VARCHAR" property="personId"/>
         <result column="password" jdbcType="VARCHAR" property="password"/>
         <result column="nick_name" jdbcType="VARCHAR" property="nickName"/>
         <result column="user_type" jdbcType="VARCHAR" property="userType"/>