Merge branch 'import' of http://gitlab.91isoft.com:90/wangcong/entrance_api- into import

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

@@ -77,10 +77,8 @@ public class VisitUserController extends CyPaginationController<VisitUser> {
     //@PreAuthorize("@cyPerm.hasPerm('sys:itUser:update')")
     @CyOpeLogAnno(title = "system-邀访访客信息表管理-修改邀访访客信息表", businessType = CyLogTypeEnum.UPDATE)
     @ApiOperation(value="修改邀访访客信息表", notes="修改邀访访客信息表")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
-    @PutMapping("/update/{businessId:\\w+}")
-    public CyResult update(@PathVariable int businessId, @Valid VisitUser visitUser, BindingResult bindingResult) {
-        visitUser.setBusinessId(businessId);
+    @PutMapping("/update")
+    public CyResult update(@Valid VisitUser visitUser) {
         CyPersistModel data = visitUserServiceImpl.merge(visitUser);
         return CyResultGenUtil.builder(data,
             CyMessCons.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/sys/visit/dao/VisitUserRepository.java

@@ -10,21 +10,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
-* Created with cy on 2022年11月16日 下午4:30:18.
-*/
+ * Created with cy on 2022年11月16日 下午4:30:18.
+ */
 @Mapper
 public interface VisitUserRepository extends CyBaseMapper<VisitUser> {
 
+    VisitUser queryByVisitUser(@Param("entity") VisitUser visitUser);
 
     List<VisitUser> queryVisitUsers(@Param("entity") VisitUser visitUser);
 
-    List<VisitUser> queryVisitUsersByVisitId(@Param("visitId") int visitId);
-
     /**
-    * 分页查询 visitUser
-    *
-    */
-    IPage<VisitUser> queryVisitUsersPaged(CyPageInfo cyPageInfo,@Param("entity") VisitUser visitUser);
+     * 分页查询 visitUser
+     */
+    IPage<VisitUser> queryVisitUsersPaged(CyPageInfo cyPageInfo, @Param("entity") VisitUser visitUser);
 
     int deleteByVisitId(@Param("visitId") int visitId);
 }

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

@@ -5,7 +5,6 @@ import com.alibaba.excel.util.FileUtils;
 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.jwt.util.CyJwtUtil;
 import org.rcisoft.core.util.CyCompareToolUtils;
@@ -85,9 +84,6 @@ public class VisitInfomationServiceImpl extends ServiceImpl<VisitInfomationRepos
     @Autowired
     JieLinkServiceImpl jieLinkService;
 
-    @Autowired
-    private CyDownErrorTxtComp errorTxt;
-
     @Value("${global.path.base_upload_location}")
     private String baseUploadLocation;
 

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

@@ -34,13 +34,16 @@ 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.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
+
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -154,7 +157,13 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository, Visit
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel merge(VisitUser visitUser) {
-        int line = baseMapper.updateById(visitUser);
+        int line = 1;
+        // 根据手机号和邀访id查询访客记录
+        VisitUser visitUsers = baseMapper.queryByVisitUser(visitUser);
+        if (visitUsers == null)
+            throw new CyServiceException(500, "您未被邀请");
+        if (!visitUsers.getUserName().equals(visitUser.getUserName()))
+            line = baseMapper.updateById(visitUser);
         log.debug(CyUserUtil.getAuthenUsername() + "修改了ID为" + visitUser.getBusinessId() + "的邀访访客信息表信息");
         return new CyPersistModel(line);
     }

src/main/resources/mapper/VisitUserMapper.xml

@@ -20,27 +20,37 @@
     <select id="queryVisitUsers" resultMap="BaseResultMap">
         select * from visit_user
         where 1=1
-            <if test="entity.delFlag !=null and entity.delFlag != '' ">
-                and del_flag = #{entity.delFlag}
-            </if>
-            <if test="entity.flag !=null and entity.flag != '' ">
-                and flag = #{entity.flag}
-            </if>
+        <if test="entity.delFlag !=null and entity.delFlag != '' ">
+            and del_flag = #{entity.delFlag}
+        </if>
+        <if test="entity.flag !=null and entity.flag != '' ">
+            and flag = #{entity.flag}
+        </if>
     </select>
 
     <select id="queryVisitUsersPaged" resultMap="BaseResultMap">
         select * from visit_user
         where 1=1
-            <if test="entity.delFlag !=null and entity.delFlag != '' ">
-                and del_flag = #{entity.delFlag}
-            </if>
-            <if test="entity.flag !=null and entity.flag != '' ">
-                and flag = #{entity.flag}
-            </if>
+        <if test="entity.delFlag !=null and entity.delFlag != '' ">
+            and del_flag = #{entity.delFlag}
+        </if>
+        <if test="entity.flag !=null and entity.flag != '' ">
+            and flag = #{entity.flag}
+        </if>
+    </select>
+
+    <select id="queryByVisitUser" resultType="org.rcisoft.sys.visit.entity.VisitUser">
+        select *
+        from visit_user
+        where del_flag = '0'
+          and flag = '1'
+          and visit_id = #{entity.visit_id}
+          and visit_phone = #{entity.visitPhone}
     </select>
-    <select id="queryVisitUsersByVisitId" resultType="org.rcisoft.sys.visit.entity.VisitUser"></select>
     <delete id="deleteByVisitId">
-        delete from visit_user where visit_id = #{visitId}
+        delete
+        from visit_user
+        where visit_id = #{visitId}
     </delete>
 
 </mapper>