最新代码

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

@@ -1,7 +1,13 @@
 package com.template.api;
 
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @RequestMapping("/api/smartAccess")
 public interface SmartAccessControllerAPI {
+//    @GetMapping("/getPage")
+//    @ApiOperation(value = "门禁通行记录", notes = "门禁通行记录", httpMethod = "GET")
+//    CommonResult getPage();
 }

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

@@ -1,6 +1,7 @@
 package com.template.controller;
 
 
+import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartAccessControllerAPI;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -15,7 +16,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2024-05-31
  */
 @RestController
+@DESRespondSecret
 public class SmartAccessController implements SmartAccessControllerAPI {
 
+
+
 }
 

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

@@ -21,6 +21,7 @@ import com.template.model.seewo.*;
 import com.template.model.vo.*;
 import com.template.services.SmartClassService;
 import com.template.services.SmartGradeService;
+import com.template.services.SmartVisitorParentsConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +66,9 @@ public class SmartClassController implements SmartClassControllerAPI {
     @Autowired
     private SmartGradeService smartGradeService;
 
+    @Autowired
+    private SmartVisitorParentsConfigService smartVisitorParentsConfigService;
+
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult insertSmartClass(SmartClass smartApply, BindingResult bindingResult) {
@@ -223,6 +227,18 @@ public class SmartClassController implements SmartClassControllerAPI {
                     throw new Exception("新增失败");
                 }
 
+//                添加班级配置
+                SmartVisitorParentsConfig svpc = new SmartVisitorParentsConfig();
+                svpc.setClassId(smartClass.getId());
+                svpc.setAppAuditConfig(1);
+                svpc.setAppPushConfig(5);
+                svpc.setAppCancelConfig(6);
+                svpc.setAppAuditConfig(1);
+                svpc.setAppPushConfig(5);
+                svpc.setAppCancelConfig(6);
+                svpc.setAccessConfig(0);
+                smartVisitorParentsConfigService.save(svpc);
+
             } catch (Exception e) {
                 throw new Exception("新增失败");
             }

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

@@ -260,7 +260,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
             if (localDateTime.isBefore(localDateTime2)) {
 //            比对结果
                 Integer resultStatus = jsonObject.getInteger("resultStatus");
-                if (1 == resultStatus) {
+//                if (1 == resultStatus) {
 
                     //          设备sn
                     String sn = jsonObject.getString("sn");
@@ -291,6 +291,10 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
                         userId = 0;
                     }
 
+//                    出入标识: 1-进, 0-出
+                    Integer inout = jsonObject.getInteger("inout");
+//                    开门方式：0-白名单比对，1-人证比对，2-IC卡比对
+                    Integer openType = jsonObject.getInteger("openType");
 
                     SmartAccess smartFaceDiscern = new SmartAccess();
 
@@ -301,6 +305,9 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
                     smartFaceDiscern.setDateTime(time);
                     smartFaceDiscern.setIdNum(idNum);
                     smartFaceDiscern.setSn(sn);
+                    smartFaceDiscern.setInout(inout);
+                    smartFaceDiscern.setOpenType(openType);
+                    smartFaceDiscern.setResultStatus(resultStatus);
                     if (userId != 0) {
                         //                    判断是否已经添加
                         LambdaQueryWrapper<SmartAccess> wrapperFD = new LambdaQueryWrapper<>();
@@ -391,7 +398,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
 
                     }
                 }
-            }
+//            }
 
         } catch (
                 Exception e) {

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

@@ -83,6 +83,8 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     @Resource
     private ParkConfig parkConfig;
 
+    @Autowired
+    SmartVisitorParentsConfigService smartVisitorParentsConfigService;
 
     /**
      * 新增访客预约
@@ -209,7 +211,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             sv.setPeerNum(par.getPeerNum());
             sv.setCarNum(par.getCarNum());
             sv.setVisitReason(par.getVisitReason());
-            sv.setStatu(eApproveStatu.Audit.getValue());
+//            sv.setStatu(eApproveStatu.Audit.getValue());
             sv.setVisitorTime(TimeExchange.StringToDate(par.getVisitorTime(), "yyyy-MM-dd HH:mm:ss"));
             sv.setVisitorDeadline(TimeExchange.StringToDate(TimeExchange.AddTimeDesH(sv.getVisitorTime(), 4), "yyyy-MM-dd HH:mm:ss"));
             sv.setRespondent(student.getId());
@@ -218,9 +220,36 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             //将第一个受访学生的部门ID带过去
             sv.setDepartmentId(student.getDepartmentId());
             sv.setVisitorType(eVisitorType.Parent.getValue());
+
+            //        获取受访者id
+            Integer respondent = sv.getRespondent();
+            SmartUser smartUser = smartUserService.getById(respondent);
+            Integer schoolClass = smartUser.getSchoolClass();
+            SmartVisitorParentsConfig svpc = smartVisitorParentsConfigService.getById(schoolClass);
+            Integer appAuditConfig = svpc.getAppAuditConfig();
+            if (1==appAuditConfig) {//需要审核
+                sv.setStatu(1);
+            }else {//不需要审核
+                Integer appPushConfig = svpc.getAppPushConfig();
+//                判断是否需要推送
+                if (5==appPushConfig) {//需要推送
+                    String content = sv.getRespondentName() + "你的家长将于" + TimeExchange.chineseDateTime(sv.getVisitorTime()) + "到校！";
+                    //将预约信息推送到希沃班牌
+                    CommonResult seewo = pushInfo(sv.getUserPhone(), sv.getResponcode(), content);
+                }
+//                核销
+                Integer appCancelConfig = svpc.getAppCancelConfig();
+                if (6==appCancelConfig) {//需要核销
+
+                }
+
+            }
+
             svs.add(sv);
         }
 
+
+
         boolean result = smartVisitorService.insertVisitorBatch(svs);
 
         return result ? CommonResult.ok("预约成功，等待审批通过") : CommonResult.fail("预约失败");

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

@@ -60,6 +60,15 @@ public class SmartAccess implements Serializable {
     @ApiModelProperty(value = "发生时间")
     private String dateTime;
 
+    @ApiModelProperty(value = "出入标识: 1-进, 0-出")
+    private Integer inout;
+
+    @ApiModelProperty(value = "开门方式：0-白名单比对，1-人证比对，2-IC卡比对")
+    private Integer openType;
+
+    @ApiModelProperty(value = "比对结果：1-成功，0-失败")
+    private Integer resultStatus;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

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

@@ -36,4 +36,5 @@ public class SmartVisitorParentsConfigServiceImpl extends ServiceImpl<SmartVisit
 
         return new PageUtils<>(page1);
     }
+
 }