访客信息和邀访信息

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

@@ -30,7 +30,7 @@ import org.rcisoft.sys.service.VisitUserService;
 import java.util.List;
 
 /**
-* Created by cy on 2022年11月16日 下午3:06:06.
+* Created by cy on 2022年11月16日 下午4:30:18.
 */
 @RestController
 @RequestMapping("/visituser")
@@ -53,6 +53,19 @@ public class VisitUserController extends CyPaginationController<VisitUser> {
     }
     //@PreAuthorize("@cyPerm.hasPerm('sys:itUser:delete')")
     @CyOpeLogAnno(title = "system-邀访访客信息表管理-删除邀访访客信息表", businessType = CyLogTypeEnum.DELETE)
+    @ApiOperation(value="逻辑删除邀访访客信息表", notes="逻辑删除邀访访客信息表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
+    @DeleteMapping("/deleteLogical/{businessId:\\w+}")
+    public CyResult deleteLogical(@PathVariable int businessId,VisitUser visitUser) {
+        visitUser.setBusinessId(businessId);
+        CyPersistModel data = visitUserServiceImpl.removeLogical(visitUser);
+        return CyResultGenUtil.builder(data,
+            CyMessCons.MESSAGE_ALERT_SUCCESS,
+            CyMessCons.MESSAGE_ALERT_ERROR,
+        businessId);
+    }
+    //@PreAuthorize("@cyPerm.hasPerm('sys:itUser:delete')")
+    @CyOpeLogAnno(title = "system-邀访访客信息表管理-删除邀访访客信息表", businessType = CyLogTypeEnum.DELETE)
     @ApiOperation(value="删除邀访访客信息表", notes="删除邀访访客信息表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @DeleteMapping("/delete/{businessId:\\w+}")

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

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
-* Created with cy on 2022年11月16日 下午3:06:06.
+* Created with cy on 2022年11月16日 下午4:30:18.
 */
 
 public interface VisitUserRepository extends CyBaseMapper<VisitUser> {

src/main/java/org/rcisoft/sys/entity/VisitInfomation.java

@@ -2,9 +2,12 @@ package org.rcisoft.sys.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
 import org.rcisoft.core.entity.CyIdIncreEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.io.Serializable;
@@ -72,6 +75,8 @@ public class VisitInfomation  extends CyIdIncreEntity<VisitInfomation> {
      * @column visit_date
      * @default 
      */
+     @JsonFormat(pattern ="yyyy-MM-dd",timezone ="GMT+8")
+     @DateTimeFormat(pattern = "yyyy-MM-dd")
      @Excel(name = "访问日期", orderNum = "6", width = 20)
      private Date visitDate;
 
@@ -80,6 +85,8 @@ public class VisitInfomation  extends CyIdIncreEntity<VisitInfomation> {
      * @column visit_time
      * @default 
      */
+     @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      @Excel(name = "访问时间", orderNum = "7", width = 20)
      private Date visitTime;
 

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 import org.rcisoft.core.entity.CyIdIncreEntity;
-import org.rcisoft.core.entity.CyIdNotDataEntity;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.io.Serializable;
@@ -13,12 +12,13 @@ import java.util.Date;
 import java.util.List;
 
 /**
-* Created with cy on 2022年11月16日 下午3:06:06.
+* Created with cy on 2022年11月16日 下午4:30:18.
 */
 @Data
 @TableName("visit_user")
 public class VisitUser  extends CyIdIncreEntity<VisitUser> {
 
+
      /**
      * @desc 访问记录id
      * @column visit_id
@@ -26,6 +26,7 @@ public class VisitUser  extends CyIdIncreEntity<VisitUser> {
      */
      @Excel(name = "访问记录id", orderNum = "0", width = 20)
      private BigInteger visitId;
+
      /**
      * @desc 访客姓名
      * @column user_name
@@ -33,6 +34,7 @@ public class VisitUser  extends CyIdIncreEntity<VisitUser> {
      */
      @Excel(name = "访客姓名", orderNum = "1", width = 20)
      private String userName;
+
      /**
      * @desc 访客手机号
      * @column visit_phone

src/main/java/org/rcisoft/sys/service/VisitUserService.java

@@ -10,7 +10,7 @@ import org.rcisoft.core.model.CyPageInfo;
 import java.util.List;
 
 /**
- * Created by cy on 2022年11月16日 下午3:06:06.
+ * Created by cy on 2022年11月16日 下午4:30:18.
  */
 public interface VisitUserService {
 
@@ -28,6 +28,12 @@ public interface VisitUserService {
     */
     CyPersistModel remove(VisitUser visitUser);
     /**
+    * 逻辑删除 邀访访客信息表
+    * @param visitUser
+    * @return
+    */
+    CyPersistModel removeLogical(VisitUser visitUser);
+    /**
     * 修改 邀访访客信息表
     * @param visitUser
     * @return

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

@@ -25,7 +25,7 @@ import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * Created by cy on 2022年11月16日 下午3:06:06.
+ * Created by cy on 2022年11月16日 下午4:30:18.
  */
 @Service
 @Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
@@ -62,6 +62,20 @@ public class VisitUserServiceImpl extends ServiceImpl<VisitUserRepository,VisitU
         return new CyPersistModel(line);
     }
     /**
+    * 逻辑删除 邀访访客信息表
+    * @param visitUser
+    * @return
+    */
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Override
+    public CyPersistModel removeLogical(VisitUser visitUser){
+        visitUser.setDeleted();
+        int line = baseMapper.deleteById(visitUser);
+            log.debug(CyUserUtil.getAuthenUsername()+"逻辑删除了ID为"+
+                visitUser.getBusinessId()+"的邀访访客信息表信息");
+            return new CyPersistModel(line);
+        }
+    /**
     * 修改 邀访访客信息表
     * @param visitUser
     * @return

src/main/resources/mapper/VisitUserMapper.xml

@@ -7,16 +7,35 @@
         <result column="visit_id" jdbcType="BIGINT" property="visitId"/>
         <result column="user_name" jdbcType="VARCHAR" property="userName"/>
         <result column="visit_phone" jdbcType="VARCHAR" property="visitPhone"/>
+        <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+        <result column="flag" jdbcType="CHAR" property="flag"/>
     </resultMap>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <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>
     </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>
     </select>
 </mapper>
\ No newline at end of file