sadada

pom.xml

@@ -263,6 +263,11 @@
             <artifactId>dingtalk</artifactId>
             <version>2.1.14</version>
         </dependency>
+        <dependency>
+            <groupId>com.template</groupId>
+            <artifactId>mybatis_plus</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -16,7 +16,7 @@ public interface SmartFaceDiscernControllerAPI {
 
     @GetMapping(value = "/track")
     @ApiOperation(value = "学生轨迹", notes = "学生轨迹", httpMethod = "GET")
-    CommonResult track(@RequestParam Integer id, @RequestParam int dateTime);
+    CommonResult track(@RequestParam Integer id, @RequestParam String startTime,@RequestParam String endTime);
 
     @GetMapping(value = "/access")
     @ApiOperation(value = "门禁管理",notes = "门禁管理",httpMethod = "GET")

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

@@ -6,16 +6,18 @@ import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RequestMapping("/api/smartVisitorParentsConfig")
 public interface SmartVisitorParentsConfigControllerAPI {
 
     @GetMapping(value = "/getClassId")
     @ApiOperation(value = "获取班级所对应的配置", notes = "获取班级所对应的配置", httpMethod = "GET")
-    CommonResult getClassId(@RequestParam Integer page,@RequestParam Integer size, @RequestParam Integer classId);
+    CommonResult getClassId(@RequestParam Integer page,@RequestParam Integer size, @RequestParam Integer classId,@RequestParam Integer gradeId);
 
     @PostMapping(value = "/update")
     @ApiOperation(value = "家长访客配置修改", notes = "家长访客配置修改", httpMethod = "POST")
-    CommonResult update(@RequestBody SmartVisitorParentsConfig smartVisitorParentsConfig);
+    CommonResult update(@RequestBody List<SmartVisitorParentsConfig> smartVisitorParentsConfigs);
 
     @GetMapping(value = "/getUserId")
     @ApiOperation(value = "根据用户id获取所管理的班级配置", notes = "根据用户id获取所管理的班级配置", httpMethod = "GET")

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

@@ -34,7 +34,7 @@ public interface SmartWarningControllerAPI {
 
     @GetMapping(value = "/queryPageSmartWarning")
     @ApiOperation(value = "预警信息分页数据", notes = "预警信息分页数据", httpMethod = "GET")
-    CommonResult queryPageSmartWarning(@RequestParam int currentPage, @RequestParam int pageCount, String name,String state);
+    CommonResult queryPageSmartWarning(@RequestParam int currentPage, @RequestParam int pageCount,@RequestParam String startTime,@RequestParam String endTime,String name,String state);
 
     @GetMapping(value = "/deleteSmartWarningById")
     @ApiOperation(value = "根据ID删除指定预警信息", notes = "根据ID删除指定预警信息", httpMethod = "GET")
@@ -46,7 +46,7 @@ public interface SmartWarningControllerAPI {
 
     @GetMapping(value = "/excelSmartWarning")
     @ApiOperation(value = "预警导出", notes = "预警导出", httpMethod = "GET")
-    void excelSmartWarning(HttpServletResponse response,String location,String state);
+    void excelSmartWarning(HttpServletResponse response,@RequestParam String startTime,@RequestParam String endTime,String location,String state);
 
     @GetMapping(value = "/warningType")
     @ApiOperation(value = "预警小程序下拉框", notes = "预警小程序下拉框", httpMethod = "GET")
@@ -54,7 +54,7 @@ public interface SmartWarningControllerAPI {
 
     @GetMapping(value = "/pageWarning")
     @ApiOperation(value = "预警小程序分页展示", notes = "预警小程序分页展示", httpMethod = "GET")
-    CommonResult pageWarning(@RequestParam int currentPage, @RequestParam int pageCount,@RequestParam String type,@RequestParam String dateTime);
+    CommonResult pageWarning(@RequestParam int currentPage, @RequestParam int pageCount,@RequestParam String type,@RequestParam String startTime,@RequestParam String endTime);
 
     @GetMapping(value = "/warningDepartmentTree")
     @ApiOperation(value = "查询部门树形结构数据", notes = "查询部门树形结构数据", httpMethod = "GET")

src/main/java/com/template/common/utils/TimeExchange.java

@@ -9,6 +9,7 @@ import com.template.model.pojo.UnitTimeHelpModel;
 import com.template.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.aspectj.weaver.ast.Var;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -800,12 +801,15 @@ public class TimeExchange {
     }
 
     public static void main(String[] args) {
-        String result = "{\"errcode\":0,\"errmsg\":\"ok\",\"phone_info\":{\"phoneNumber\":\"18320846714\",\"purePhoneNumber\":\"18320846714\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1716975315,\"appid\":\"wx2fc3f45732fae5d3\"}}}";
-        JSONObject jsonObject = JSONObject.parseObject(result);
-        String errcode = String.valueOf(jsonObject.get("phone_info"));
-        JSONObject jsonErroObject = JSONObject.parseObject(errcode);
-        String purePhoneNumber = String.valueOf(jsonErroObject.get("purePhoneNumber"));
-        System.out.println(purePhoneNumber);
+//        String result = "{\"errcode\":0,\"errmsg\":\"ok\",\"phone_info\":{\"phoneNumber\":\"18320846714\",\"purePhoneNumber\":\"18320846714\",\"countryCode\":\"86\",\"watermark\":{\"timestamp\":1716975315,\"appid\":\"wx2fc3f45732fae5d3\"}}}";
+//        JSONObject jsonObject = JSONObject.parseObject(result);
+//        String errcode = String.valueOf(jsonObject.get("phone_info"));
+//        JSONObject jsonErroObject = JSONObject.parseObject(errcode);
+//        String purePhoneNumber = String.valueOf(jsonErroObject.get("purePhoneNumber"));
+//        System.out.println(purePhoneNumber);
+
+        String date = getDate();
+        System.out.println("date = " + date);
     }
 
 

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

@@ -83,7 +83,11 @@ public class ScheduleController {
     //周一到周五早上七点执行：0 0 7 ? * MON-FRI
     //0 0 22 * * ?
     @Async
+<<<<<<< HEAD
     @Scheduled(cron = "0 0 */1 * * ?")//一个小时
+=======
+    @Scheduled(cron = "0 0 22 * * ? ")
+>>>>>>> 8d5e6bb48a5afee8d07dfb01b54d055046e7921c
     @Transactional(rollbackFor = {Exception.class})
     public void autoDispatch() throws Exception {
 

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

@@ -14,6 +14,7 @@ import com.template.common.utils.TreeRecordsUtil;
 import com.template.common.utils.UUIDUtil;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
+import com.template.model.vo.SchoolClassVo;
 import com.template.model.weixin.AuthorAndGroup;
 import com.template.model.weixin.AuthorAndGroup2;
 import com.template.model.weixin.AuthorListGroup;
@@ -51,6 +52,9 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
     @Autowired
     public SmartMenuService smartMenuService;
 
+    @Autowired
+    public SmartClassService smartClassService;
+
     /**
      * 新增权限组
      *
@@ -719,9 +723,11 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
         }
         SmartUser smartUser = smartUserService.getById(userId);
         Integer schoolClass = smartUser.getSchoolClass();
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("schoolClass",schoolClass);
-        return CommonResult.ok(jsonObject);
+
+//        获取年级
+        SchoolClassVo schoolClassVo = smartClassService.getClassId(schoolClass);
+
+        return CommonResult.ok(schoolClassVo);
     }
 
 }

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

@@ -237,6 +237,7 @@ public class SmartClassController implements SmartClassControllerAPI {
                 svpc.setAppPushConfig(5);
                 svpc.setAppCancelConfig(6);
                 svpc.setAccessConfig(0);
+                svpc.setCarConfig(1);
                 smartVisitorParentsConfigService.save(svpc);
 
             } catch (Exception e) {

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

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -98,13 +99,9 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult track(Integer id, int dateTime) {
-        JSONObject date = getDate(dateTime);
+    public CommonResult track(Integer id, String startTime, String endTime) {
 
-        String stateTime = date.getString("stateTime");
-        String endTime = date.getString("endTime");
-
-        List<SmartFaceDiscern> smartFaceDiscerns = smartFaceDiscernService.track(stateTime, endTime, id);
+        List<SmartFaceDiscern> smartFaceDiscerns = smartFaceDiscernService.track(startTime, endTime, id);
         ArrayList<LastSevenDaysTrackVo> vos = new ArrayList<>();
         for (SmartFaceDiscern faceDiscern : smartFaceDiscerns) {
             //            人脸通过type查询对应的坐标
@@ -121,7 +118,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
             vos.add(lastSevenDaysTrackVo);
         }
 
-        List<SmartAttendance> attendances = smartAttendanceService.track(stateTime, endTime, id);
+        List<SmartAttendance> attendances = smartAttendanceService.track(startTime, endTime, id);
 //        获取班级名称
         SmartUser smartUser = smartUserService.getSmartById(id);
         SmartClass smartClass = smartClassService.getSmartClassById(smartUser.getSchoolClass());
@@ -147,7 +144,6 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
                 lastSevenDaysTrackVo.setType("请假");
             }
 
-
 //            lastSevenDaysTrackVo.setLocation(className);
             Date attendTime = attendance.getAttendTime();
             lastSevenDaysTrackVo.setDateTime(sdf.format(attendTime));
@@ -155,7 +151,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         }
 
 //        门禁信息
-        List<SmartAccess> smartAccesses = smartAccessService.track(stateTime, endTime, id);
+        List<SmartAccess> smartAccesses = smartAccessService.track(startTime, endTime, id);
         for (SmartAccess faceDiscern : smartAccesses) {
             //            门禁的通过type找到对应的坐标
             SmartCoord smartCoord=smartCoordService.getBytype(faceDiscern.getType());
@@ -205,7 +201,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
             int qrcodeCount = smartQrcodeService.count(qrcodeWrapper);
 
             LambdaQueryWrapper<SmartCarAccess> smartCarAccessWrapper = new LambdaQueryWrapper<>();
-            smartCarAccessWrapper.between(SmartCarAccess::getEnterTime, stateTime, endTime);
+            smartCarAccessWrapper.between(SmartCarAccess::getDataTime, stateTime, endTime);
             int carCount = smartCarAccessService.count(smartCarAccessWrapper);
 
             JSONObject jsonObject = new JSONObject();

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

@@ -2503,7 +2503,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
             //查找家长身份是否存在用了该手机号的用户
             int existCount = smartUserService.queryParentByCount(isur.getPhone());
-            if(existCount > 0){
+            if (existCount > 0) {
                 return CommonResult.fail("当前手机号已被其他家长使用");
             }
 
@@ -2844,7 +2844,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             }
 
             SmartUser oldUser = smartUserService.queryParentByPhone(usur.getPhone());
-            if(oldUser != null && oldUser.getId().intValue() != usur.getId().intValue()){
+            if (oldUser != null && oldUser.getId().intValue() != usur.getId().intValue()) {
                 return CommonResult.fail("当前手机号已被其他家长使用");
             }
 
@@ -3910,7 +3910,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
                 if (indexs != null) {
                     long existCount = indexs.stream().filter(e -> e.getParentPhone().equals(phone)).count();
-                    if(existCount > 0){
+                    if (existCount > 0) {
                         return CommonResult.fail("当前家长手机号已绑定该学生，请勿重复绑定");
                     }
 
@@ -4890,13 +4890,9 @@ public class SmartUserController implements SmartUserControllerAPI {
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult getPage(int currentPage, int pageCount, String keyWord, String schoolClass) {
-        LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.like(ObjectUtils.isNotEmpty(keyWord), SmartUser::getName, keyWord);
-        wrapper.eq(ObjectUtils.isNotEmpty(schoolClass), SmartUser::getSchoolClass, schoolClass);
-        wrapper.eq(SmartUser::getIdentityId, 2);
-        IPage<SmartUser> page = smartUserService.page(new Page<>(currentPage, pageCount), wrapper);
+        PageUtils<SmartUserPageVo> pageUtils = smartUserService.getPage(currentPage, pageCount, keyWord, schoolClass);
 
-        return CommonResult.ok(page);
+        return CommonResult.ok(pageUtils);
     }
 
     @Override
@@ -4997,22 +4993,18 @@ public class SmartUserController implements SmartUserControllerAPI {
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime startTime = LocalDateTime.parse(dateTime, dateTimeFormatter1);
         LocalDateTime endTime = startTime.plusDays(1);
+        //        正常
+        Set<StatisticsCampusManageVo> vos = new HashSet<>();
 
-        List<StatisticsCampusManageVo> ackVos = null;
-        JSONObject jsonObject = new JSONObject();
-        if (3 == type) {
 //            请假
-            //        查找请假记录
-            ackVos = smartUserService.getAckStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
-            jsonObject.put("count", ackVos.size());
-            jsonObject.put("data", ackVos);
-
-            return CommonResult.ok(jsonObject);
+        //        查找请假记录
+        List<StatisticsCampusManageVo> ackVos = smartUserService.getAckStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
+        if (ObjectUtils.isNotEmpty(ackVos) && ackVos.size() > 0) {
+            for (StatisticsCampusManageVo ackVo : ackVos) {
+                vos.add(ackVo);
+            }
         }
 
-        //        正常
-        Set<StatisticsCampusManageVo> vos = new HashSet<>();
-
 //        查找门禁记录
         List<StatisticsCampusManageVo> accessVos = smartUserService.getAccessStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo accessVo : accessVos) {
@@ -5028,39 +5020,39 @@ public class SmartUserController implements SmartUserControllerAPI {
         for (StatisticsCampusManageVo faceDiscernVo : faceDiscernVos) {
             vos.add(faceDiscernVo);
         }
-        if (ObjectUtils.isNotEmpty(ackVos) && ackVos.size() > 0) {
-            for (StatisticsCampusManageVo ackVo : ackVos) {
-                vos.add(ackVo);
-            }
-        }
-
 
-        if (2 == type) {
-//            正常
-            jsonObject.put("count", vos.size());
-            jsonObject.put("data", vos);
 
-            return CommonResult.ok(jsonObject);
-        } else if (1 == type) {
 //            异常
-            //        查找该班级下的所有人
-            List<StatisticsCampusManageVo> campusVos = smartUserService.getClassStudentManage(gradeId, classId, keyWord);
+        //        查找该班级下的所有人
+        List<StatisticsCampusManageVo> campusVos = smartUserService.getClassStudentManage(gradeId, classId, keyWord);
 
 //        不在正常记录里面的就是异常记录
-            ArrayList<StatisticsCampusManageVo> abnormalVos = new ArrayList<>();
-            for (StatisticsCampusManageVo campusVo : campusVos) {
-                if (!vos.contains(campusVo)) {
-                    abnormalVos.add(campusVo);
-                }
+        ArrayList<StatisticsCampusManageVo> abnormalVos = new ArrayList<>();
+        for (StatisticsCampusManageVo campusVo : campusVos) {
+            if (!vos.contains(campusVo)) {
+                abnormalVos.add(campusVo);
             }
-            jsonObject.put("count", abnormalVos.size());
-            jsonObject.put("data", abnormalVos);
-            return CommonResult.ok(jsonObject);
+        }
 
-        } else {
-            return CommonResult.fail("查询状态有误");
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("abnormal",abnormalVos.size());
+        jsonObject.put("normal",vos.size());
+        jsonObject.put("ack",ackVos.size());
+
+        if (1==type) {
+            jsonObject.put("data",abnormalVos);
+            return CommonResult.ok(jsonObject);
+        }else if (2==type){
+            jsonObject.put("data",vos);
+            return CommonResult.ok(jsonObject);
+        }else if (3==type){
+            jsonObject.put("data",ackVos);
+            return CommonResult.ok(jsonObject);
+        }else {
+            return CommonResult.fail("状态异常");
         }
 
+
     }
 
     @Override
@@ -5086,33 +5078,33 @@ public class SmartUserController implements SmartUserControllerAPI {
         //        正常
         Set<StatisticsCampusManageVo> vos = new HashSet<>();
 
-            //        查找请假记录
-        List<StatisticsCampusManageVo>    ackVos= smartUserService.getAckStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
-        if (ObjectUtils.isNotEmpty(ackVos)&&ackVos.size()>0) {
+        //        查找请假记录
+        List<StatisticsCampusManageVo> ackVos = smartUserService.getAckStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
+        if (ObjectUtils.isNotEmpty(ackVos) && ackVos.size() > 0) {
             for (StatisticsCampusManageVo ackVo : ackVos) {
                 vos.add(ackVo);
             }
         }
 
 //        查找门禁记录
-        List<StatisticsCampusManageVo> accessVos=smartUserService.getAccessStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+        List<StatisticsCampusManageVo> accessVos = smartUserService.getAccessStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo accessVo : accessVos) {
             vos.add(accessVo);
         }
 //        查找打卡记录
-        List<StatisticsCampusManageVo> attendanceVos=smartUserService.getAttendanceStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+        List<StatisticsCampusManageVo> attendanceVos = smartUserService.getAttendanceStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo attendanceVo : attendanceVos) {
             vos.add(attendanceVo);
         }
 //        查找人脸记录
-        List<StatisticsCampusManageVo> faceDiscernVos=smartUserService.getFaceDiscernStatisticsCampusManage(gradeId,classId,startTime,endTime,keyWord);
+        List<StatisticsCampusManageVo> faceDiscernVos = smartUserService.getFaceDiscernStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo faceDiscernVo : faceDiscernVos) {
             vos.add(faceDiscernVo);
         }
 
 //            异常
-            //        查找该班级下的所有人
-        List<StatisticsCampusManageVo> campusVos= smartUserService.getClassStudentManage(gradeId,classId,keyWord);
+        //        查找该班级下的所有人
+        List<StatisticsCampusManageVo> campusVos = smartUserService.getClassStudentManage(gradeId, classId, keyWord);
 
 //        不在正常记录里面的就是异常记录
         ArrayList<StatisticsCampusManageVo> abnormalVos = new ArrayList<>();
@@ -5122,13 +5114,13 @@ public class SmartUserController implements SmartUserControllerAPI {
             }
         }
         String[] s = dateTime.split(" ");
-        String s1=s[0];
+        String s1 = s[0];
 
-        int count=0;
+        int count = 0;
 
         for (int i = 0; i < abnormalVos.size(); i++) {
             StatisticsCampusManageVo vo = abnormalVos.get(i);
-            count=count+1;
+            count = count + 1;
             Row dataRow = sheet.createRow(count);
             dataRow.createCell(0).setCellValue(count);
             dataRow.createCell(1).setCellValue(vo.getGradeName());
@@ -5141,7 +5133,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
         for (int i = 0; i < ackVos.size(); i++) {
             StatisticsCampusManageVo vo = ackVos.get(i);
-            count=count+1;
+            count = count + 1;
             Row dataRow = sheet.createRow(count);
             dataRow.createCell(0).setCellValue(count);
             dataRow.createCell(1).setCellValue(vo.getGradeName());
@@ -5154,7 +5146,7 @@ public class SmartUserController implements SmartUserControllerAPI {
 
 
         for (StatisticsCampusManageVo vo : vos) {
-            count=count+1;
+            count = count + 1;
             Row dataRow = sheet.createRow(count);
             dataRow.createCell(0).setCellValue(count);
             dataRow.createCell(1).setCellValue(vo.getGradeName());
@@ -5166,7 +5158,7 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
 
 // 将工作簿写入文件
-        ExcelUtils.excelDownload(workbook, s1+"：在校统计.xlsx", response);
+        ExcelUtils.excelDownload(workbook, s1 + "：在校统计.xlsx", response);
 
     }
 

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

@@ -203,7 +203,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         }
 
         String startTime = par.getVisitorTime();
-        String endTime = TimeExchange.AddTimeDesH(TimeExchange.StringToDate(startTime, "yyyy-MM-dd HH:mm:ss"),4);
+        String endTime = TimeExchange.AddTimeDesH(TimeExchange.StringToDate(startTime, "yyyy-MM-dd HH:mm:ss"), 4);
 
         //要进行家长数据重复判断
         //那是不是第二次预约的时间不能在那个可访问的时间段内
@@ -261,8 +261,26 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 }
 //                门禁配置
                 Integer accessConfig = svpc.getAccessConfig();
-                if (0 == accessConfig) {
-                    try {
+//                车闸配置
+                Integer carConfig = svpc.getCarConfig();
+
+                try {
+                    if (0 == accessConfig) {
+                        List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
+                        String visitorNo = getUUIDBits(16);
+                        //region 将访客数据下发到设备
+                        for (SmartDevice device : devices) {
+                            CommonResult<String> insertVisitor = bsInsertVisitor(su, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
+                            if (!insertVisitor.isSuccess()) {
+                                throw new Exception(insertVisitor.getMessage());
+                            }
+                            sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
+                            sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
+                        }
+                        String code = GetVertifyCode.getRandomNumCode(6);
+                        sv.setVisitorCode(code);
+                    }
+                    if (0 == carConfig) {
                         if (!ObjectUtils.isEmpty(sv.getCarNum())) {
                             String appId = parkConfig.getAppId();
                             String carNo = sv.getCarNum();
@@ -301,25 +319,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                             ObjectMapper objectMapper = new ObjectMapper();
                             BsReservationVo reservation = objectMapper.readValue(result, BsReservationVo.class);
                             sv.setBsOrderNo(reservation.getData().getReOrderNo());
-                        } else {
-                            List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
-                            String visitorNo = getUUIDBits(16);
-                            //region 将访客数据下发到设备
-                            for (SmartDevice device : devices) {
-                                CommonResult<String> insertVisitor = bsInsertVisitor(su, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
-                                if (!insertVisitor.isSuccess()) {
-                                    throw new Exception(insertVisitor.getMessage());
-                                }
-                                sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
-                                sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
-                            }
-                            String code = GetVertifyCode.getRandomNumCode(6);
-                            sv.setVisitorCode(code);
                         }
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
                     }
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
                 }
+
             }
 
             svs.add(sv);
@@ -347,7 +352,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         }
 
         String startTime = oar.getVisitorTime();
-        String endTime = TimeExchange.AddTimeDesH(TimeExchange.StringToDate(startTime, "yyyy-MM-dd HH:mm:ss"),4);
+        String endTime = TimeExchange.AddTimeDesH(TimeExchange.StringToDate(startTime, "yyyy-MM-dd HH:mm:ss"), 4);
 
         //要进行访客数据重复判断
         //那是不是第二次预约的时间不能在那个可访问的时间段内
@@ -381,8 +386,28 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         } else if (9 == auditConfig) {
             sv.setStatu(9);
             Integer accessConfig = smartVisitorRestsConfig.getAccessConfig();
-            if (0 == accessConfig) {//推送到门禁
-                try {
+            Integer carConfig = smartVisitorRestsConfig.getCarConfig();
+
+            try {
+                if (0 == accessConfig) {//推送到门禁
+                    List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
+                    String visitorNo = getUUIDBits(16);
+                    //region 将访客数据下发到设备
+                    for (SmartDevice device : devices) {
+                        CommonResult<String> insertVisitor = bsInsertVisitor(su, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
+                        if (!insertVisitor.isSuccess()) {
+                            throw new Exception(insertVisitor.getMessage());
+                        }
+                        sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
+                        sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
+                    }
+                    String code = GetVertifyCode.getRandomNumCode(6);
+                    sv.setVisitorCode(code);
+
+
+                }
+                if (0 == carConfig) {
+//                    车闸
                     if (!ObjectUtils.isEmpty(sv.getCarNum())) {
                         String appId = parkConfig.getAppId();
                         String carNo = sv.getCarNum();
@@ -421,35 +446,22 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         ObjectMapper objectMapper = new ObjectMapper();
                         BsReservationVo reservation = objectMapper.readValue(result, BsReservationVo.class);
                         sv.setBsOrderNo(reservation.getData().getReOrderNo());
-                    } else {
-                        List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
-                        String visitorNo = getUUIDBits(16);
-                        //region 将访客数据下发到设备
-                        for (SmartDevice device : devices) {
-                            CommonResult<String> insertVisitor = bsInsertVisitor(su, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
-                            if (!insertVisitor.isSuccess()) {
-                                throw new Exception(insertVisitor.getMessage());
-                            }
-                            sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
-                            sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
-                        }
-                        String code = GetVertifyCode.getRandomNumCode(6);
-                        sv.setVisitorCode(code);
                     }
+                }
 
-                    //发送短信给其他访客用户
-                    if (!ObjectUtils.isEmpty(sv.getVisitorCode())) {
-                        String message = SendSms.sendVisitorSms("+86" + sv.getUserPhone(), TimeExchange.getYear(sv.getVisitorTime()), TimeExchange.getMonth(sv.getVisitorTime()), TimeExchange.getDay(sv.getVisitorTime()), TimeExchange.getTime(sv.getVisitorTime()), TimeExchange.getTime(sv.getVisitorDeadline()), sv.getVisitorCode());
-                        if (!message.contains("success")) {
-                            throw new Exception("发送失败");
-                        }
+                //发送短信给其他访客用户
+                if (!ObjectUtils.isEmpty(sv.getVisitorCode())) {
+                    String message = SendSms.sendVisitorSms("+86" + sv.getUserPhone(), TimeExchange.getYear(sv.getVisitorTime()), TimeExchange.getMonth(sv.getVisitorTime()), TimeExchange.getDay(sv.getVisitorTime()), TimeExchange.getTime(sv.getVisitorTime()), TimeExchange.getTime(sv.getVisitorDeadline()), sv.getVisitorCode());
+                    if (!message.contains("success")) {
+                        throw new Exception("发送失败");
                     }
-
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
                 }
 
+            } catch (Exception e) {
+                throw new RuntimeException(e);
             }
+
+
         }
 
         int result = smartVisitorService.insertSmartVisitor(sv);
@@ -655,8 +667,30 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 }
 //                门禁配置
                 Integer accessConfig = svpc.getAccessConfig();
+//                车闸配置
+                Integer carConfig = svpc.getCarConfig();
                 if (0 == accessConfig) {
-
+                    //查找用户是否存在
+                    SmartUser user = smartUserService.getSmartById(sv.getUserId());
+                    if (user == null) {
+                        throw new Exception("访客用户ID在系统中不存在，无法将访客信息下发到门禁设备！");
+                    }
+                    List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
+                    String visitorNo = getUUIDBits(16);
+                    //region 将访客数据下发到设备
+                    for (SmartDevice device : devices) {
+                        CommonResult<String> insertVisitor = bsInsertVisitor(user, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
+                        if (!insertVisitor.isSuccess()) {
+                            throw new Exception(insertVisitor.getMessage());
+                        }
+                        sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
+                        sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
+                    }
+                    String code = GetVertifyCode.getRandomNumCode(6);
+                    sv.setVisitorCode(code);
+                }
+                if (0 == carConfig) {
+//                    车闸配置
                     if (!ObjectUtils.isEmpty(sv.getCarNum())) {
                         String appId = parkConfig.getAppId();
                         String carNo = sv.getCarNum();
@@ -695,29 +729,10 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         ObjectMapper objectMapper = new ObjectMapper();
                         BsReservationVo reservation = objectMapper.readValue(result, BsReservationVo.class);
                         sv.setBsOrderNo(reservation.getData().getReOrderNo());
-                    } else {
-                        //查找用户是否存在
-                        SmartUser user = smartUserService.getSmartById(sv.getUserId());
-                        if (user == null) {
-                            throw new Exception("访客用户ID在系统中不存在，无法将访客信息下发到门禁设备！");
-                        }
-                        List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
-                        String visitorNo = getUUIDBits(16);
-                        //region 将访客数据下发到设备
-                        for (SmartDevice device : devices) {
-                            CommonResult<String> insertVisitor = bsInsertVisitor(user, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
-                            if (!insertVisitor.isSuccess()) {
-                                throw new Exception(insertVisitor.getMessage());
-                            }
-                            sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
-                            sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
-                        }
-                        String code = GetVertifyCode.getRandomNumCode(6);
-                        sv.setVisitorCode(code);
                     }
-
                 }
 
+
             } else if (type == 2) {//拒绝
                 sv.setStatu(2);
             }
@@ -751,8 +766,43 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 List<SmartVisitorRestsConfig> list = smartVisitorRestsConfigService.list(new LambdaQueryWrapper<>());
                 SmartVisitorRestsConfig smartVisitorRestsConfig = list.get(0);
                 Integer accessConfig = smartVisitorRestsConfig.getAccessConfig();
+//                车闸
+                Integer carConfig = smartVisitorRestsConfig.getCarConfig();
                 if (0 == accessConfig) {
                     //推送到门禁
+                    List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
+                    String visitorNo = getUUIDBits(16);
+                    //region 将访客数据下发到设备
+                    for (SmartDevice device : devices) {
+                        //查找用户是否存在
+                        SmartUser user = smartUserService.getSmartById(sv.getUserId());
+                        if (user == null) {
+                            throw new Exception("访客用户ID在系统中不存在，无法将访客信息下发到门禁设备！");
+                        }
+                        CommonResult<String> insertVisitor = bsInsertVisitor(user, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
+                        if (!insertVisitor.isSuccess()) {
+                            throw new Exception(insertVisitor.getMessage());
+                        }
+                        sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
+                        sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
+                    }
+                    String code = GetVertifyCode.getRandomNumCode(6);
+                    sv.setVisitorCode(code);
+
+                    //发送短信给其他访客用户
+                    if (!ObjectUtils.isEmpty(sv.getVisitorCode())) {
+                        Date visitorTime = sv.getVisitorTime();
+                        Date visitorDeadline = sv.getVisitorDeadline();
+                        String start = TimeExchange.getTime(visitorTime);
+                        String end = TimeExchange.getTime(visitorDeadline);
+                        String message = SendSms.sendVisitorSms("+86" + sv.getUserPhone(), TimeExchange.getYear(sv.getVisitorTime()), TimeExchange.getMonth(sv.getVisitorTime()), TimeExchange.getDay(sv.getVisitorTime()), start, end, sv.getVisitorCode());
+                        if (!message.contains("success")) {
+                            throw new Exception("发送失败");
+                        }
+                    }
+                }
+                if (0 == carConfig) {
+//                  车闸推送
                     if (!ObjectUtils.isEmpty(sv.getCarNum())) {
                         String appId = parkConfig.getAppId();
                         String carNo = sv.getCarNum();
@@ -791,40 +841,11 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         ObjectMapper objectMapper = new ObjectMapper();
                         BsReservationVo reservation = objectMapper.readValue(result, BsReservationVo.class);
                         sv.setBsOrderNo(reservation.getData().getReOrderNo());
-                    } else {
-                        List<SmartDevice> devices = smartDeviceService.queryOnLineDevice();
-                        String visitorNo = getUUIDBits(16);
-                        //region 将访客数据下发到设备
-                        for (SmartDevice device : devices) {
-                            //查找用户是否存在
-                            SmartUser user = smartUserService.getSmartById(sv.getUserId());
-                            if (user == null) {
-                                throw new Exception("访客用户ID在系统中不存在，无法将访客信息下发到门禁设备！");
-                            }
-                            CommonResult<String> insertVisitor = bsInsertVisitor(user, TimeExchange.DateToString(sv.getVisitorTime()), TimeExchange.DateToString(sv.getVisitorDeadline()), device.getNum(), visitorNo);
-                            if (!insertVisitor.isSuccess()) {
-                                throw new Exception(insertVisitor.getMessage());
-                            }
-                            sv.setVisitorsync(sv.getVisitorsync() == null ? insertVisitor.getData() : (sv.getVisitorsync() + "," + insertVisitor.getData()));
-                            sv.setDeviceNum(sv.getDeviceNum() == null ? device.getNum() : (sv.getDeviceNum() + "," + device.getNum()));
-                        }
-                        String code = GetVertifyCode.getRandomNumCode(6);
-                        sv.setVisitorCode(code);
-                    }
-
-                    //发送短信给其他访客用户
-                    if (!ObjectUtils.isEmpty(sv.getVisitorCode())) {
-                        Date visitorTime = sv.getVisitorTime();
-                        Date visitorDeadline = sv.getVisitorDeadline();
-                        String start = TimeExchange.getTime(visitorTime);
-                        String end = TimeExchange.getTime(visitorDeadline);
-                        String message = SendSms.sendVisitorSms("+86" + sv.getUserPhone(), TimeExchange.getYear(sv.getVisitorTime()), TimeExchange.getMonth(sv.getVisitorTime()), TimeExchange.getDay(sv.getVisitorTime()), start, end, sv.getVisitorCode());
-                        if (!message.contains("success")) {
-                            throw new Exception("发送失败");
-                        }
                     }
 
                 }
+
+
             } else if (type == 2) {//拒绝
                 sv.setStatu(2);
             }
@@ -865,7 +886,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         LocalDateTime date = LocalDateTime.now();
         String startTime = date.format(dateTimeFormatter1);
 
-        String endTime = TimeExchange.AddTimeDesH(TimeExchange.StringToDate(startTime, "yyyy-MM-dd HH:mm:ss"),4);
+        String endTime = TimeExchange.AddTimeDesH(TimeExchange.StringToDate(startTime, "yyyy-MM-dd HH:mm:ss"), 4);
 
         //要进行家长数据重复判断
         //那是不是第二次预约的时间不能在那个可访问的时间段内
@@ -956,8 +977,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     @Override
     @DESRespondSecret(validated = true)
     @PassToken
-    public CommonResult getScreenPage(int currentPage, int pageCount, String phone,String status) {
-        PageUtils<SmartVisitorScreenListVo> page = smartVisitorService.getScreenPage(currentPage, pageCount,phone,status);
+    public CommonResult getScreenPage(int currentPage, int pageCount, String phone, String status) {
+        PageUtils<SmartVisitorScreenListVo> page = smartVisitorService.getScreenPage(currentPage, pageCount, phone, status);
 
         return CommonResult.ok(page);
     }
@@ -980,22 +1001,22 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             return CommonResult.fail("访客记录已失效，审核失败！");
         }
         Integer statu = sv.getStatu();
-        if (9==statu) {
+        if (9 == statu) {
             return CommonResult.fail("该记录已完成，请勿重复操作");
         }
-        if (2==statu) {
+        if (2 == statu) {
             return CommonResult.fail("该记录未同意");
         }
-        if (1==statu) {
+        if (1 == statu) {
             return CommonResult.fail("该记录还未通过审核");
         }
-        if (7==statu) {
+        if (7 == statu) {
             sv.setStatu(8);
             int result = smartVisitorService.updateSmartVisitor(sv);
             if (result > 0) {
                 return CommonResult.ok("进校核销成功");
             }
-        }else if(8==statu){
+        } else if (8 == statu) {
             sv.setStatu(9);
             int result = smartVisitorService.updateSmartVisitor(sv);
             if (result > 0) {

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

@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -46,15 +48,15 @@ public class SmartVisitorParentsConfigController implements SmartVisitorParentsC
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult getClassId(Integer page,Integer size, Integer classId) {
-        PageUtils<SmartVisitorParentsConfigVo> smartVisitorParentsConfig=smartVisitorParentsConfigService.getClassIdPage(page,size,classId);
+    public CommonResult getClassId(Integer page,Integer size, Integer classId,Integer gradeId) {
+        PageUtils<SmartVisitorParentsConfigVo> smartVisitorParentsConfig=smartVisitorParentsConfigService.getClassIdPage(page,size,classId,gradeId);
         return CommonResult.ok(smartVisitorParentsConfig);
     }
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult update(SmartVisitorParentsConfig smartVisitorParentsConfig) {
-        boolean update = smartVisitorParentsConfigService.updateById(smartVisitorParentsConfig);
+    public CommonResult update(List<SmartVisitorParentsConfig> smartVisitorParentsConfigs) {
+        boolean update = smartVisitorParentsConfigService.updateBatchById(smartVisitorParentsConfigs);
 
         if (update) {
             return CommonResult.ok();

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

@@ -114,8 +114,8 @@ public class SmartWarningController implements SmartWarningControllerAPI {
      */
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult queryPageSmartWarning(int currentPage, int pageCount, String name, String state) {
-        PageUtils<SmartWarning> result = smartWarningService.queryPageSmartWarnings(currentPage, pageCount, name, state);
+    public CommonResult queryPageSmartWarning(int currentPage, int pageCount,String startTime,String endTime, String name, String state) {
+        PageUtils<SmartWarning> result = smartWarningService.queryPageSmartWarningMange(currentPage, pageCount,startTime,endTime, name, state);
 
         return CommonResult.ok(result);
     }
@@ -157,7 +157,7 @@ public class SmartWarningController implements SmartWarningControllerAPI {
 
     @Override
     @DESRespondSecret(validated = false)
-    public void excelSmartWarning(HttpServletResponse response, String location, String state) {
+    public void excelSmartWarning(HttpServletResponse response,String startTime,String endTime,String location, String state) {
         // 表头数据
 //        List<Object> head = Arrays.asList("姓名","事件","地点","时间","备注","状态","图片");
 //
@@ -171,7 +171,8 @@ public class SmartWarningController implements SmartWarningControllerAPI {
 //        获取数据
         LambdaQueryWrapper<SmartWarning> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(ObjectUtils.isNotEmpty(location), SmartWarning::getLocation, location)
-                .eq(ObjectUtils.isNotEmpty(state), SmartWarning::getStatu, state);
+                .eq(ObjectUtils.isNotEmpty(state), SmartWarning::getStatu, state)
+                .between(SmartWarning::getDateTime,startTime,endTime);
         List<SmartWarning> list = smartWarningService.list(queryWrapper);
 
 
@@ -226,8 +227,8 @@ public class SmartWarningController implements SmartWarningControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult pageWarning(int currentPage, int pageCount, String type, String dateTime) {
-        PageUtils<SmartWarning> result = smartWarningService.pageWarning(currentPage, pageCount, type, dateTime);
+    public CommonResult pageWarning(int currentPage, int pageCount, String type, String startTime,String endTime) {
+        PageUtils<SmartWarning> result = smartWarningService.pageWarning(currentPage, pageCount, type, startTime,endTime);
 
         return CommonResult.ok(result);
     }

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

@@ -71,4 +71,6 @@ public interface SmartUserMapper extends BaseMapper<SmartUser> {
     List<StatisticsCampusManageVo> getAckStatisticsCampusManage(@Param("gradeId") Integer gradeId, @Param("classId") Integer classId, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime,@Param("keyWord")String keyWord);
 
     List<StatisticsCampusManageVo> getClassStudentManage(@Param("gradeId") Integer gradeId, @Param("classId")Integer classId,@Param("keyWord")String keyWord);
+
+    IPage<SmartUserPageVo> getPage(Page<SmartUserPageVo> page,@Param("keyWord") String keyWord,@Param("schoolClass") String schoolClass);
 }

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

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SmartVisitorParentsConfigMapper extends BaseMapper<SmartVisitorParentsConfig> {
 
-    IPage<SmartVisitorParentsConfigVo> getClassIdPage(Page<SmartVisitorParentsConfigVo> p,@Param("classId") Integer classId);
+    IPage<SmartVisitorParentsConfigVo> getClassIdPage(Page<SmartVisitorParentsConfigVo> p,@Param("classId") Integer classId,@Param("gradeId")Integer gradeId);
 
     SmartVisitorParentsConfigVo getClassId(@Param("schoolClass") Integer schoolClass);
 }

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

@@ -44,11 +44,14 @@ public class SmartCarAccess implements Serializable {
     @ApiModelProperty(value = "车牌号码")
     private String carNo;
 
-    @ApiModelProperty(value = "入场时间")
-    private String enterTime;
+    @ApiModelProperty(value = "产生时间")
+    private String dataTime;
 
-    @ApiModelProperty(value = "入口车道名称")
-    private String enterGateName;
+    @ApiModelProperty(value = "车道名称")
+    private String carGateName;
+
+    @ApiModelProperty(value = "图片")
+    private String image;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

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

@@ -58,6 +58,9 @@ public class SmartVisitorParentsConfig implements Serializable {
     @ApiModelProperty(value = "门禁配置 0：推送到门禁，1：不推送到门禁")
     private Integer accessConfig;
 
+    @ApiModelProperty(value = "车闸配置 0：推送到车闸，1：不推送到车闸")
+    private Integer carConfig;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

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

@@ -39,6 +39,9 @@ public class SmartVisitorRestsConfig implements Serializable {
     @ApiModelProperty(value = "门禁配置 0：推送到门禁，1：不推送到门禁")
     private Integer accessConfig;
 
+    @ApiModelProperty(value = "车闸配置 0：推送到车闸，1：不推送到车闸")
+    private Integer carConfig;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

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

@@ -0,0 +1,14 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class SmartUserPageVo {
+    private Integer id;
+
+    private String name;
+
+    private String cardNo;
+
+    private String className;
+}

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

@@ -175,4 +175,5 @@ public interface SmartUserService extends IService<SmartUser> {
 
     SmartUser queryParentByPhone(String phone);
 
+    PageUtils<SmartUserPageVo> getPage(int currentPage, int pageCount, String keyWord, String schoolClass);
 }

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

@@ -16,7 +16,7 @@ import com.template.model.vo.SmartVisitorParentsConfigVo;
  */
 public interface SmartVisitorParentsConfigService extends IService<SmartVisitorParentsConfig> {
 
-    PageUtils<SmartVisitorParentsConfigVo> getClassIdPage(Integer page, Integer size, Integer classId);
+    PageUtils<SmartVisitorParentsConfigVo> getClassIdPage(Integer page, Integer size, Integer classId,Integer gradeId);
 
     SmartVisitorParentsConfigVo getClassId(Integer schoolClass);
 }

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

@@ -30,9 +30,10 @@ public interface SmartWarningService extends IService<SmartWarning> {
 
     List<String> warningType();
 
-    PageUtils<SmartWarning> pageWarning(int currentPage, int pageCount, String type, String dateTime);
+    PageUtils<SmartWarning> pageWarning(int currentPage, int pageCount, String type, String startTime,String endTime);
 
 
     List<BehaviourListVo> behaviourList();
 
+    PageUtils<SmartWarning> queryPageSmartWarningMange(int currentPage, int pageCount, String startTime, String endTime, String name, String state);
 }

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

@@ -42,7 +42,7 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
     private Integer page = 0;
     private Integer size = 20;
 
-    @Scheduled(cron = "0 0/45 * * * ? ")
+    @Scheduled(cron = "0 40 * * * ? ")
     @Async
     public void car() {
         if(scheduleConfig.getIsOpen().equals("1")) {
@@ -81,16 +81,17 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
         LocalDateTime endTime = now.withHour(23).withMinute(59).withSecond(59);
         String startData = stateTime.format(dateTimeFormatter1);
         String endData = endTime.format(dateTimeFormatter1);
+
 //        开始时间
         jsonObject.put("startTime", startData);
-//        jsonObject.put("startTime", "2024-01-10 00:00:00");
+//        jsonObject.put("startTime", "2024-06-26 00:00:00");
 //        结束时间
         jsonObject.put("endTime", endData);
 //        jsonObject.put("endTime", "2024-01-10 23:59:59");
 
-        jsonObject.put("size", "20");
-        jsonObject.put("indexId", "0");
-        jsonObject.put("carNo", "");
+        jsonObject.put("size", pagesize+"");
+        jsonObject.put("indexId", pageindex+"");
+//        jsonObject.put("carNo", "");
 
 
         String md5Str = "appid=" + parkConfig.getAppId() + "&endTime=" + endData + "&indexId=" + pageindex + "&parkKey=" + parkConfig.getParkKey() + "&rand=" + rand + "&size=" + pagesize + "&startTime=" + startData + "&version=v1.1" + "&" + parkConfig.getAppSecret();
@@ -104,6 +105,7 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
 
         JSONArray dataArray = jsonObject1.getJSONArray("data");
 
+
         if (ObjectUtils.isNotEmpty(dataArray) && dataArray.size() > 0) {
 
             for (int i = 0; i < dataArray.size(); i++) {
@@ -117,21 +119,25 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
                     String indexId = data.getString("indexId");
 //          车牌号码
                     String carNo = data.getString("carNo");
+
 //            入场时间
                     String enterTime = data.getString("enterTime");
 //             入口车道名称
                     String enterGateName = data.getString("enterGateName");
+//              图片
+                    String enterImgPath = data.getString("enterImgPath");
 
                     smartCarAccess.setIndexId(indexId);
                     smartCarAccess.setType("1");
                     smartCarAccess.setCarNo(carNo);
-                    smartCarAccess.setEnterTime(enterTime);
-                    smartCarAccess.setEnterGateName(enterGateName);
+                    smartCarAccess.setDataTime(enterTime);
+                    smartCarAccess.setCarGateName(enterGateName);
+                    smartCarAccess.setImage(enterImgPath);
 
                     //                    判断是否已经添加
                     LambdaQueryWrapper<SmartCarAccess> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(SmartCarAccess::getType, 1)
-                            .eq(SmartCarAccess::getIndexId, indexId);
+                    wrapper.eq(SmartCarAccess::getCarNo,carNo)
+                            .eq(SmartCarAccess::getDataTime, enterTime);
                     List<SmartCarAccess> list = this.list(wrapper);
 
                     if (ObjectUtils.isEmpty(list) && list.size() <= 0) {
@@ -139,15 +145,14 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
                     }
                 }
             }
+        }
 
-            page=page+1;
-        } else {
-            if (page>0) {
-                page=page-1;
-            }else {
-                page=0;
-            }
+//        判断是否还有第二页
+        if (dataArray.size()>=pagesize) {
+            getEnterCar(pageindex+1, pagesize);
         }
+
+
     }
 
 
@@ -176,16 +181,17 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
         LocalDateTime endTime = now.withHour(23).withMinute(59).withSecond(59);
         String startData = stateTime.format(dateTimeFormatter1);
         String endData = endTime.format(dateTimeFormatter1);
+
 //        开始时间
         jsonObject.put("startTime", startData);
-//        data.put("startTime", "2024-01-22 00:00:00");
+//        jsonObject.put("startTime", "2024-06-26 00:00:00");
 //        结束时间
         jsonObject.put("endTime", endData);
 //        data.put("endTime", "2024-01-22 23:59:59");
 
-        jsonObject.put("size", "20");
-        jsonObject.put("indexId", "0");
-        jsonObject.put("carNo", "");
+        jsonObject.put("size", pagesize+"");
+        jsonObject.put("indexId",pageindex+"");
+//        jsonObject.put("carNo", "");
 
 
         String md5Str = "appid=" + parkConfig.getAppId() + "&endTime=" + endData + "&indexId=" + pageindex + "&parkKey=" + parkConfig.getParkKey() + "&rand=" + rand + "&size=" + pagesize + "&startTime=" + startData + "&version=v1.1" + "&" + parkConfig.getAppSecret();
@@ -206,42 +212,72 @@ public class SmartCarAccessServiceImpl extends ServiceImpl<SmartCarAccessMapper,
 
                 if (ObjectUtils.isNotEmpty(data)) {
                     SmartCarAccess smartCarAccess = new SmartCarAccess();
-
 //            索引ID
                     String indexId = data.getString("indexId");
 //          车牌号码
                     String carNo = data.getString("carNo");
 //            入场时间
                     String enterTime = data.getString("enterTime");
+//                    出场时间
+                    String outTime = data.getString("outTime");
+
 //             入口车道名称
                     String enterGateName = data.getString("enterGateName");
+//              	出口车道名称
+                    String outOperatorName = data.getString("outGateName");
+
+                    //图片
+                    String outImgPath = data.getString("outImgPath");
+
+
 
                     smartCarAccess.setIndexId(indexId);
                     smartCarAccess.setType("2");
                     smartCarAccess.setCarNo(carNo);
-                    smartCarAccess.setEnterTime(enterTime);
-                    smartCarAccess.setEnterGateName(enterGateName);
+                    smartCarAccess.setDataTime(outTime);
+                    smartCarAccess.setCarGateName(outOperatorName);
+                    smartCarAccess.setImage(outImgPath);
 
                     //                    判断是否已经添加
                     LambdaQueryWrapper<SmartCarAccess> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(SmartCarAccess::getType, 2)
-                            .eq(SmartCarAccess::getIndexId, indexId);
+                    wrapper.eq(SmartCarAccess::getCarNo,carNo)
+                            .eq(SmartCarAccess::getDataTime,outTime);
                     List<SmartCarAccess> list = this.list(wrapper);
 
                     if (ObjectUtils.isEmpty(list) && list.size() <= 0) {
                         this.save(smartCarAccess);
                     }
+
+                    SmartCarAccess enterCar = new SmartCarAccess();
+                    enterCar.setIndexId(indexId);
+                    enterCar.setType("1");
+                    enterCar.setCarNo(carNo);
+                    enterCar.setDataTime(enterTime);
+                    enterCar.setCarGateName(enterGateName);
+
+
+                    //                    判断是否已经添加
+                    LambdaQueryWrapper<SmartCarAccess> wrapper2 = new LambdaQueryWrapper<>();
+                    wrapper2.eq(SmartCarAccess::getCarNo,carNo)
+                            .eq(SmartCarAccess::getDataTime,enterTime);
+                    List<SmartCarAccess> list2 = this.list(wrapper2);
+
+                    if (ObjectUtils.isEmpty(list2) && list2.size() <= 0) {
+                        this.save(enterCar);
+                    }
+
                 }
             }
 
-            page=page+1;
-        } else {
-            if (page>0) {
-                page=page-1;
-            }else {
-                page=0;
-            }
         }
+
+        //        判断是否还有第二页
+        if (dataArray.size()>=pagesize) {
+            getOutCar(pageindex+1, pagesize);
+        }
+
     }
 
+
+
 }

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

@@ -401,7 +401,7 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
     public List<StatisticsCampusVo> getClassStudent(Integer classId) {
         return smartUserMapper.getClassStudent(classId);
     }
-
+    @Override
     public List<SmartUser> queryTeachers() {
         QueryWrapper<SmartUser> queryWrapper = new QueryWrapper();
         queryWrapper.eq("identity_id", eIdentityStatu.Teacher.getValue());
@@ -461,5 +461,14 @@ public class SmartUserServiceImpl extends ServiceImpl<SmartUserMapper, SmartUser
         return result;
     }
 
+    @Override
+    public PageUtils<SmartUserPageVo> getPage(int currentPage, int pageCount, String keyWord, String schoolClass) {
+        Page<SmartUserPageVo> page = new Page<>();
+        page.setCurrent(currentPage);
+        page.setSize(pageCount);
+        IPage<SmartUserPageVo> result = smartUserMapper.getPage(page,keyWord,schoolClass);
+        return new PageUtils(result);
+    }
+
 
 }

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

@@ -29,10 +29,10 @@ public class SmartVisitorParentsConfigServiceImpl extends ServiceImpl<SmartVisit
     SmartVisitorParentsConfigMapper smartVisitorParentsConfigMapper;
 
     @Override
-    public PageUtils<SmartVisitorParentsConfigVo> getClassIdPage(Integer page, Integer size, Integer classId) {
+    public PageUtils<SmartVisitorParentsConfigVo> getClassIdPage(Integer page, Integer size, Integer classId,Integer gradeId) {
         Page<SmartVisitorParentsConfigVo> p = new Page<>(page,size);
 
-        IPage<SmartVisitorParentsConfigVo> page1 = smartVisitorParentsConfigMapper.getClassIdPage(p,classId);
+        IPage<SmartVisitorParentsConfigVo> page1 = smartVisitorParentsConfigMapper.getClassIdPage(p,classId,gradeId);
 
         return new PageUtils<>(page1);
     }

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

@@ -49,7 +49,7 @@ public class SmartWarningServiceImpl extends ServiceImpl<SmartWarningMapper, Sma
     }
 
     @Override
-    public PageUtils<SmartWarning> queryPageSmartWarnings(int currentPage, int pageCount, String name,String state) {
+    public PageUtils<SmartWarning> queryPageSmartWarnings(int currentPage, int pageCount,String name,String state) {
         Page<SmartWarning> page = new Page<>(currentPage, pageCount);
         LambdaQueryWrapper<SmartWarning> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(ObjectUtils.isNotEmpty(name),SmartWarning::getLocation,name)
@@ -77,16 +77,16 @@ public class SmartWarningServiceImpl extends ServiceImpl<SmartWarningMapper, Sma
     }
 
     @Override
-    public PageUtils<SmartWarning> pageWarning(int currentPage, int pageCount, String type, String dateTime) {
-        DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate state = LocalDate.parse(dateTime, dateTimeFormatter2);
-        LocalDate end = state.plusDays(1);
+    public PageUtils<SmartWarning> pageWarning(int currentPage, int pageCount, String type, String startTime,String endTime) {
+//        DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//        LocalDate state = LocalDate.parse(dateTime, dateTimeFormatter2);
+//        LocalDate end = state.plusDays(1);
         Page<SmartWarning> page = new Page<>(currentPage, pageCount);
         LambdaQueryWrapper<SmartWarning> queryWrapper = new LambdaQueryWrapper<>();
         if (!"全部".equals(type)) {
             queryWrapper.eq(SmartWarning::getType,type);
         }
-        queryWrapper.between(SmartWarning::getDateTime,state,end)
+        queryWrapper.between(SmartWarning::getDateTime,startTime,endTime)
                 .eq(SmartWarning::getStatu,0)
                 .orderByDesc(SmartWarning::getDateTime);
 
@@ -101,5 +101,17 @@ public class SmartWarningServiceImpl extends ServiceImpl<SmartWarningMapper, Sma
         return smartWarningMapper.behaviourList();
     }
 
+    @Override
+    public PageUtils<SmartWarning> queryPageSmartWarningMange(int currentPage, int pageCount, String startTime, String endTime, String name, String state) {
+        Page<SmartWarning> page = new Page<>(currentPage, pageCount);
+        LambdaQueryWrapper<SmartWarning> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(ObjectUtils.isNotEmpty(name),SmartWarning::getLocation,name)
+                .eq(ObjectUtils.isNotEmpty(state),SmartWarning::getStatu,state)
+                .between(SmartWarning::getDateTime,startTime,endTime)
+                .orderByDesc(SmartWarning::getDateTime);
+        IPage<SmartWarning> result = smartWarningMapper.selectPage(page, queryWrapper);
+        return new PageUtils<>(result);
+    }
+
 
 }

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

@@ -457,5 +457,22 @@
             and (su.name like '%' #{keyWord} '%' or su.card_no like '%' #{keyWord} '%')
         </if>
     </select>
+    <select id="getPage" resultType="com.template.model.vo.SmartUserPageVo">
+        SELECT su.id as id,
+        su.`name`  as name,
+        su.card_no as cardNo,
+        sc.`name`  as className
+        FROM `smart_user` su
+        LEFT JOIN smart_class sc on sc.id = su.school_class
+        WHERE su.deleted = 0
+        AND su.is_cancel = 0
+        AND su.identity_id = 2
+        <if test="schoolClass != null and schoolClass != '' ">
+            AND su.school_class = #{schoolClass}
+        </if>
+        <if test="keyWord != null and keyWord != '' ">
+            and su.name like '%' #{keyWord} '%'
+        </if>
+    </select>
 
 </mapper>

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

@@ -24,6 +24,9 @@
         <if test="classId != null and classId != '' and classId != 0 ">
             and svpc.class_id = #{classId}
         </if>
+        <if test="gradeId != null and gradeId != '' and gradeId != 0 ">
+            and sc.gradeId=#{gradeId}
+        </if>
     </select>
 
     <select id="getClassId" resultType="com.template.model.vo.SmartVisitorParentsConfigVo">