大屏访客预约数据展示

src/main/java/com/template/controller/SmartFaceDiscernTestController.java

@@ -114,8 +114,7 @@ public class SmartFaceDiscernTestController implements SmartFaceDiscernTestContr
                 smartFaceDiscernTest.setType(type);
                 smartFaceDiscernTest.setUserId(userId);
                 smartFaceDiscernTest.setDateTime(time);
-                smartFaceDiscernTest.setIdNum(idNum);
-                smartFaceDiscernTest.setSn(sn);
+
 
 
                 if (userId != 0) {

src/main/java/com/template/controller/SmartVisitorController.java

@@ -227,6 +227,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             //将第一个受访学生的部门ID带过去
             sv.setDepartmentId(student.getDepartmentId());
             sv.setVisitorType(eVisitorType.Parent.getValue());
+//            图片
+            sv.setImage(par.getImage());
 
             //        获取受访者id
             Integer respondent = sv.getRespondent();
@@ -939,6 +941,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult getScreenPage(int currentPage, int pageCount, String phone,String status) {
         PageUtils<SmartVisitorScreenVo> page = smartVisitorService.getScreenPage(currentPage, pageCount,phone,status);
 

src/main/java/com/template/mapper/SmartVisitorMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.SmartVisitor;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.SmartVisitorScreenVo;
 import com.template.model.vo.VisitorPageVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -29,5 +30,5 @@ public interface SmartVisitorMapper extends BaseMapper<SmartVisitor> {
     IPage<VisitorPageVo> getPage(Page<SmartVisitor> page,@Param("type")Integer type,@Param("keyWord") String keyWord,@Param("status") Integer status,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("visitorStartTime") String visitorStartTime,@Param("visitorEndTime") String visitorEndTime);
 
 
-
+    IPage<SmartVisitorScreenVo> getScreenPage(Page<SmartVisitorScreenVo> page,@Param("phone") String phone,@Param("status")  String status);
 }

src/main/java/com/template/model/pojo/SmartVisitor.java

@@ -113,6 +113,9 @@ public class SmartVisitor implements Serializable {
     @ApiModelProperty(value = "访客验证码")
     private String visitorCode;
 
+    @ApiModelProperty(value = "图片")
+    private String image;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/template/model/request/otherAppointmentRequest.java

@@ -73,4 +73,5 @@ public class otherAppointmentRequest {
      */
     @NotBlank(message = "受访者电话不能为空")
     private String respondentPhone;
+
 }

src/main/java/com/template/model/request/parentsAppointmentRequest.java

@@ -49,4 +49,9 @@ public class parentsAppointmentRequest {
      */
     private List<AffiliateUserVo> students;
 
+    /**
+     * 图片
+     */
+    private String image;
+
 }

src/main/java/com/template/model/vo/SmartVisitorScreenVo.java

@@ -1,12 +1,33 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class SmartVisitorScreenVo {
 
     private int id;
 
+    @ApiModelProperty(value = "访问事由")
+    private String visitReason;
+
+    @ApiModelProperty(value = "图片")
+    private String image;
+
+    @ApiModelProperty(value = "来访时间")
+    private Date visitorTime;
+
+    @ApiModelProperty(value = "学生姓名")
+    private String studentName;
+
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+    @ApiModelProperty(value = "学号")
+    private String cardNo;
 
+    private int statu;
 
 }

src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java

@@ -130,6 +130,10 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
 
     @Override
     public PageUtils<SmartVisitorScreenVo> getScreenPage(int currentPage, int pageCount, String phone, String status) {
-        return null;
+        Page<SmartVisitorScreenVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<SmartVisitorScreenVo> datas = smartVisitorMapper.getScreenPage(page,phone,status);
+        return new PageUtils(datas);
     }
 }

src/main/resources/mapper/template/SmartVisitorMapper.xml

@@ -134,5 +134,30 @@
         </if>
         order by sv.create_time desc
     </select>
+    <select id="getScreenPage" resultType="com.template.model.vo.SmartVisitorScreenVo">
+        SELECT
+            sv.id,
+            sv.visit_reason as visitReason,
+            sv.image as image,
+            sv.visitor_time as visitorTime,
+            su.`name` as studentName,
+            su.card_no as cardNo,
+            sc.`name` as className,
+            sv.statu as statu
+        FROM
+            `smart_visitor` sv
+                LEFT JOIN smart_user su ON sv.respondent = su.id
+                LEFT JOIN smart_class sc ON su.school_class = sc.id
+        WHERE
+            sv.deleted = 0
+          AND sv.visitor_type =1
+        <if test="status != null and status != ''">
+            and sv.statu = #{status}
+        </if>
+        <if test="phone != null and phone != ''">
+            and sv.user_phone = #{phone}
+        </if>
+        order by sv.visitor_time desc
+    </select>
 
 </mapper>