sdsdsd

src/main/java/com/template/api/SmartAccessControllerAPI.java

@@ -13,11 +13,11 @@ public interface SmartAccessControllerAPI {
 
     @GetMapping("/getPage")
     @ApiOperation(value = "门禁通行记录", notes = "门禁通行记录", httpMethod = "GET")
-    CommonResult getPage(@RequestParam Integer currentPage, @RequestParam Integer pageCount,String keyWord,Integer gradeId,Integer classId,Integer departmentId,Integer openType,Integer resultStatus,String startTime,String endTime);
+    CommonResult getPage(@RequestParam Integer currentPage, @RequestParam Integer pageCount,String keyWord,Integer gradeId,Integer classId,Integer departmentId,String openType,String resultStatus,String startTime,String endTime);
 
     @GetMapping("/getPageExport")
     @ApiOperation(value = "门禁通行记录导出", notes = "门禁通行记录导出", httpMethod = "GET")
-    void getPageExport(HttpServletResponse response, String keyWord, Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus, String startTime, String endTime);
+    void getPageExport(HttpServletResponse response, String keyWord, Integer gradeId, Integer classId, Integer departmentId, String openType,String resultStatus, String startTime, String endTime);
 
 
 }

src/main/java/com/template/api/SmartVisitorControllerAPI.java

@@ -156,7 +156,8 @@ public interface SmartVisitorControllerAPI {
     @ApiOperation(value = "大屏——学生家长预约核销", notes = "大屏——学生家长预约核销", httpMethod = "GET")
     CommonResult verification(@RequestParam int id);
 
-
-
+    @GetMapping(value = "/parentsScreenPage")
+    @ApiOperation(value = "大屏——家长访客记录", notes = "大屏——家长访客记录", httpMethod = "GET")
+    CommonResult parentsScreenPage(@RequestParam int currentPage, @RequestParam int pageCount, @RequestParam int userId, String status);
 
 }

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

@@ -42,13 +42,13 @@ public class SmartAccessController implements SmartAccessControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult getPage(Integer currentPage, Integer pageCount, String keyWord,Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus,String startTime,String endTime) {
+    public CommonResult getPage(Integer currentPage, Integer pageCount, String keyWord,Integer gradeId, Integer classId, Integer departmentId,String openType,String resultStatus,String startTime,String endTime) {
         PageUtils<SmartAccessVo> pageUtils=smartAccessService.getPage(currentPage,pageCount,keyWord,gradeId,classId,departmentId,openType,resultStatus,startTime,endTime);
         return CommonResult.ok(pageUtils);
     }
 
     @Override
-    public void getPageExport(HttpServletResponse response, String keyWord, Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus, String startTime, String endTime) {
+    public void getPageExport(HttpServletResponse response, String keyWord, Integer gradeId, Integer classId, Integer departmentId, String openType,String resultStatus, String startTime, String endTime) {
 
         //导出
         Workbook workbook = new XSSFWorkbook();

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

@@ -31,7 +31,7 @@ public class SmartPushConfigController implements SmartPushConfigControllerAPI {
     SmartPushConfigService smartPushConfigService;
 
     @Override
-    @DESRespondSecret(validated = false)
+    @DESRespondSecret(validated = true)
     public CommonResult list() {
         List<SmartPushConfig> list = smartPushConfigService.list(new LambdaQueryWrapper<>());
         SmartPushConfig s = list.get(0);
@@ -39,7 +39,7 @@ public class SmartPushConfigController implements SmartPushConfigControllerAPI {
     }
 
     @Override
-    @DESRespondSecret(validated = false)
+    @DESRespondSecret(validated = true)
     public CommonResult update(SmartPushConfig smartPushConfig) {
         boolean update = smartPushConfigService.updateById(smartPushConfig);
         if (update) {

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

@@ -875,8 +875,13 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         ArrayList<AverageScoreVo> averageScoreVos = new ArrayList<>();
         for (SmartSubject smartSubject : list) {
             AverageScoreVo averageScoreVo = new AverageScoreVo();
+<<<<<<< HEAD
             Integer smartSemesterId = smartSemester.getId();
             Double score = smartScoreService.getAverageScore(userId, semesterId, smartSemesterId);
+=======
+            Integer smartSemesterId = smartSubject.getId();
+            Double score =smartScoreService.getAverageScore(userId,semesterId,smartSemesterId);
+>>>>>>> bd8f058060bfbc1ceb005ce7b419e5ca1990b6d0
             averageScoreVo.setSubjectName(smartSubject.getName());
             if (ObjectUtils.isNotEmpty(score)) {
                 averageScoreVo.setScore(score);

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

@@ -5780,6 +5780,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult getPhoneUser
             (String phone) {
 
@@ -5794,8 +5795,8 @@ public class SmartUserController implements SmartUserControllerAPI {
 
 
     @Override
-    public CommonResult getPhoneAffiliate
-            (String phone) {
+    @DESRespondSecret(validated = true)
+    public CommonResult getPhoneAffiliate(String phone) {
         if (ObjectUtils.isEmpty(phone)) {
             return CommonResult.fail("参数异常");
         }
@@ -5809,7 +5810,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
 
 //        通过关联人找到对应用户
-        List<SmartUser> smartUsers = smartUserService.getAffiliateUser(affiliate);
+        List<SmartUserAffiliateVo> smartUsers = smartUserService.getAffiliateUser(affiliate);
 
 
         return CommonResult.ok(smartUsers);

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

@@ -997,6 +997,14 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         return CommonResult.fail();
     }
 
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult parentsScreenPage(int currentPage, int pageCount, int userId, String status) {
+        PageUtils<SmartVisitorScreenListVo> result = smartVisitorService.parentsScreenPage(currentPage, pageCount, userId, status);
+        return CommonResult.ok(result);
+
+    }
+
     /**
      * 1、学生请假：
      * 我们这边调用请假接口之后，把请假数据写到了百胜系统的"学生请假登记"页面中，那到时候学生是通过任意设备都能进出吗？

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

@@ -22,8 +22,8 @@ import java.util.List;
 @Repository
 public interface SmartAccessMapper extends BaseMapper<SmartAccess> {
 
-    IPage<SmartAccessVo> getPage(Page<SmartAccessVo> page, @Param("keyWord") String keyWord, @Param("gradeId") Integer gradeId, @Param("classId") Integer classId, @Param("departmentId") Integer departmentId, @Param("openType") Integer openType, @Param("resultStatus") Integer resultStatus, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<SmartAccessVo> getPage(Page<SmartAccessVo> page, @Param("keyWord") String keyWord, @Param("gradeId") Integer gradeId, @Param("classId") Integer classId, @Param("departmentId") Integer departmentId, @Param("openType") String openType, @Param("resultStatus") String resultStatus, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    List<SmartAccessVo> getPageExport(@Param("keyWord") String keyWord, @Param("gradeId") Integer gradeId, @Param("classId") Integer classId, @Param("departmentId") Integer departmentId, @Param("openType") Integer openType, @Param("resultStatus") Integer resultStatus, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<SmartAccessVo> getPageExport(@Param("keyWord") String keyWord, @Param("gradeId") Integer gradeId, @Param("classId") Integer classId, @Param("departmentId") Integer departmentId, @Param("openType") String openType, @Param("resultStatus") String resultStatus, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
 }

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

@@ -45,5 +45,5 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
 
     SmartStudentVo querySmartStudentById(@Param("userId") Integer userId);
 
-    List<SmartUser> getAffiliateUser(@Param("affiliate") String affiliate);
+    List<SmartUserAffiliateVo> getAffiliateUser(@Param("affiliate") String affiliate);
 }

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

@@ -32,4 +32,6 @@ public interface SmartVisitorMapper extends BaseMapper<SmartVisitor> {
 
 
     IPage<SmartVisitorScreenVo> getScreenPage(Page<SmartVisitorScreenVo> page,@Param("phone") String phone,@Param("status")  String status);
+
+    IPage<SmartVisitorScreenVo> parentsScreenPage(Page<SmartVisitorScreenVo> page,@Param("userId") int userId,@Param("status") String status);
 }

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

@@ -0,0 +1,143 @@
+package com.template.model.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SmartUserAffiliateVo {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "编号（学号）")
+    private String cardNo;
+
+    @ApiModelProperty(value = "时间组")
+    private Integer timeGroupId;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "身份ID")
+    private Integer identityId;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+
+    @ApiModelProperty(value = "性别  女：2   男：1")
+    private Integer sexId;
+
+    @ApiModelProperty(value = "部门ID")
+    private Integer departmentId;
+
+    @ApiModelProperty(value = "人脸照片")
+    private String headImage;
+
+    @ApiModelProperty(value = "年级")
+    private String grade;
+
+    @ApiModelProperty(value = "学院")
+    private String college;
+
+    @ApiModelProperty(value = "专业")
+    private String speciality;
+
+    @ApiModelProperty(value = "班级")
+    private Integer schoolClass;
+
+    @ApiModelProperty(value = "校区")
+    private String campus;
+
+    @ApiModelProperty(value = "宿舍号")
+    private String dormitoryNumber;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "关联人 被关联用户的ID 多个用户用逗号隔开")
+    private String affiliate;
+
+    @ApiModelProperty(value = "职称")
+    private String title;
+
+    @ApiModelProperty(value = "家庭住址")
+    private String address;
+
+    @ApiModelProperty(value = "民族")
+    private String nation;
+
+    @ApiModelProperty(value = "生源地")
+    private String ofStudent;
+
+    @ApiModelProperty(value = "毕业学校")
+    private String graduate;
+
+    @ApiModelProperty(value = "职务")
+    private Integer duties;
+
+    @ApiModelProperty(value = "是否推送公众号信息  不推送：0 推送：1")
+    private Integer isPush;
+
+    @ApiModelProperty(value = "是否注销  未注销：0  注销：1")
+    private Integer isCancel;
+
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+
+    @ApiModelProperty(value = "小程序openId")
+    private String xOpenId;
+
+    @ApiModelProperty(value = "公众号openId")
+    private String gzhOpenId;
+
+    @ApiModelProperty(value = "希沃学生UID")
+    private String xwStudentUid;
+
+    @ApiModelProperty(value = "百胜学生编号")
+    private String bsStudentNo;
+
+    @ApiModelProperty(value = "希沃教师工号")
+    private String xwTeacherCode;
+
+    @ApiModelProperty(value = "百胜教师编号")
+    private String bsStaffCode;
+
+    @ApiModelProperty(value = "家属关系")
+    private String ship;
+
+    @ApiModelProperty(value = "删除失败原因")
+    private String deleteReason;
+
+    /**
+     * 请求头
+     */
+    @TableField(exist = false)
+    private String userhead;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "钉钉Id")
+    private String dingId;
+
+    private String className;
+
+}

src/main/java/com/template/services/SmartAccessService.java

@@ -20,8 +20,8 @@ public interface SmartAccessService extends IService<SmartAccess> {
 
     List<SmartAccess> track(String stateTime, String endTime, Integer id);
 
-    PageUtils<SmartAccessVo> getPage(Integer currentPage, Integer pageCount,String keyWord,Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus,String startTime,String endTime);
+    PageUtils<SmartAccessVo> getPage(Integer currentPage, Integer pageCount,String keyWord,Integer gradeId, Integer classId, Integer departmentId,String openType,String resultStatus,String startTime,String endTime);
 
-    List<SmartAccessVo> getPageExport(String keyWord, Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus, String startTime, String endTime);
+    List<SmartAccessVo> getPageExport(String keyWord, Integer gradeId, Integer classId, Integer departmentId,String openType,String resultStatus, String startTime, String endTime);
 
 }

src/main/java/com/template/services/SmartUserService.java

@@ -119,7 +119,7 @@ public interface SmartUserService extends IService<SmartUser> {
      * @param affiliate
      * @return
      */
-    List<SmartUser> getAffiliateUser(String affiliate);
+    List<SmartUserAffiliateVo> getAffiliateUser(String affiliate);
 
     /**
      * 通过身份证号和学号查询对应的人

src/main/java/com/template/services/SmartVisitorService.java

@@ -43,4 +43,6 @@ public interface SmartVisitorService extends IService<SmartVisitor> {
     PageUtils<SmartVisitorVo> getPage(int currentPage, int pageCount, Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime);
 
     PageUtils<SmartVisitorScreenListVo> getScreenPage(int currentPage, int pageCount, String phone, String status);
+
+    PageUtils<SmartVisitorScreenListVo> parentsScreenPage(int currentPage, int pageCount, int userId, String status);
 }

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

@@ -41,7 +41,7 @@ public class SmartAccessServiceImpl extends ServiceImpl<SmartAccessMapper, Smart
     }
 
     @Override
-    public PageUtils<SmartAccessVo> getPage(Integer currentPage, Integer pageCount,String keyWord,Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus,String startTime,String endTime) {
+    public PageUtils<SmartAccessVo> getPage(Integer currentPage, Integer pageCount,String keyWord,Integer gradeId, Integer classId, Integer departmentId, String openType,String resultStatus,String startTime,String endTime) {
         Page<SmartAccessVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
@@ -50,7 +50,7 @@ public class SmartAccessServiceImpl extends ServiceImpl<SmartAccessMapper, Smart
     }
 
     @Override
-    public List<SmartAccessVo> getPageExport(String keyWord, Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus, String startTime, String endTime) {
+    public List<SmartAccessVo> getPageExport(String keyWord, Integer gradeId, Integer classId, Integer departmentId, String openType,String resultStatus, String startTime, String endTime) {
         List<SmartAccessVo> vos = smartAccessMapper.getPageExport(keyWord,gradeId,classId,departmentId,openType,resultStatus,startTime,endTime);
         return vos;
     }

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

@@ -320,7 +320,7 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
     }
 
     @Override
-    public List<SmartUser> getAffiliateUser(String affiliate) {
+    public List<SmartUserAffiliateVo> getAffiliateUser(String affiliate) {
         return smartUserMapper.getAffiliateUser(affiliate);
     }
 

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

@@ -209,4 +209,37 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
 
         return new PageUtils(voIPage);
     }
+
+    @Override
+    public PageUtils<SmartVisitorScreenListVo> parentsScreenPage(int currentPage, int pageCount, int userId, String status) {
+        Page<SmartVisitorScreenVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<SmartVisitorScreenVo> datas = smartVisitorMapper.parentsScreenPage(page,userId,status);
+
+        List<SmartVisitorScreenVo> list = datas.getRecords();
+        ArrayList<SmartVisitorScreenListVo> smartVisitorVos = new ArrayList<>();
+        for (SmartVisitorScreenVo smartVisitor : list) {
+            SmartVisitorScreenListVo smartVisitorVo = new SmartVisitorScreenListVo();
+            BeanUtils.copyProperties(smartVisitor,smartVisitorVo);
+            String image = smartVisitor.getImage();
+            if (ObjectUtils.isNotEmpty(image)) {
+                String[] split = image.split(",");
+                ArrayList<String> strings = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    String s = split[i];
+                    strings.add(s);
+                }
+                smartVisitorVo.setImage(strings);
+            }
+            smartVisitorVos.add(smartVisitorVo);
+        }
+
+        IPage<SmartVisitorScreenListVo> voIPage=new Page<>();
+        BeanUtils.copyProperties(datas ,voIPage);
+        voIPage.setRecords(smartVisitorVos);
+
+
+        return new PageUtils(voIPage);
+    }
 }

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

@@ -236,11 +236,12 @@
         </if>
     </select>
 
-    <select id="getAffiliateUser" resultType="com.template.model.pojo.SmartUser">
-        SELECT * FROM `smart_user`
-        where deleted = 0 and is_cancel=0
+    <select id="getAffiliateUser" resultType="com.template.model.vo.SmartUserAffiliateVo">
+        SELECT su.*,sc.name as className FROM `smart_user` su
+        left join smart_class sc on su.school_class=sc.id
+        where su.deleted = 0 and su.is_cancel=0
         <if test="affiliate != null and affiliate != ''">
-            and FIND_IN_SET(id,#{affiliate})
+            and FIND_IN_SET(su.id,#{affiliate})
         </if>
     </select>
 

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

@@ -163,4 +163,28 @@
         order by sv.visitor_time desc
     </select>
 
+    <select id="parentsScreenPage" 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 and sv.user_id= #{userId}
+        <if test="status != null and status != ''">
+            and sv.statu = #{status}
+        </if>
+        order by sv.visitor_time desc
+    </select>
+
+
 </mapper>