增加网关负载

陶汉栋
1 parent a2a3d070
Showing 51 changed files with 2386 additions and 1073 deletions Show diff stats
cloud/dahua/src/main/java/com/example/dahua/MyTask.java
cloud/dahua/src/main/java/com/example/dahua/async/MyScheduledTask.java
cloud/dahua/src/main/java/com/example/dahua/bean/PermissionBean.java
cloud/dahua/src/main/java/com/example/dahua/bean/PermissionFaceBean.java
cloud/dahua/src/main/java/com/example/dahua/bean/PermissionHKBean.java
cloud/dahua/src/main/java/com/example/dahua/bean/ResponseBean.java
cloud/dahua/src/main/java/com/example/dahua/bean/ResponseBeanList.java
cloud/dahua/src/main/java/com/example/dahua/bean/UserAndPermission.java
cloud/dahua/src/main/java/com/example/dahua/bean/WeekDay.java
cloud/dahua/src/main/java/com/example/dahua/bean/WeekTime.java
cloud/dahua/src/main/java/com/example/dahua/control/FaceUnifyController.java
cloud/dahua/src/main/java/com/example/dahua/control/FileControl.java
cloud/dahua/src/main/java/com/example/dahua/control/UserControl.java
cloud/dahua/src/main/java/com/example/dahua/dao/PermissionFaceDao.java
cloud/dahua/src/main/java/com/example/dahua/module/GateModule.java
cloud/dahua/src/main/java/com/example/dahua/service/AttendanceImp.java
cloud/dahua/src/main/java/com/example/dahua/service/DeviceServiceImp.java
cloud/dahua/src/main/java/com/example/dahua/service/PermissFaceService.java
cloud/dahua/src/main/java/com/example/dahua/service/UserServiceImp.java
cloud/dahua/src/main/java/com/example/dahua/service/imp/AttendanceImp.java
 package com.example.dahua;
-import com.example.dahua.Gate.Gate;
-import com.example.dahua.alarmListen.AlarmListenModule;
 import com.example.dahua.bean.CardBean;
 import com.example.dahua.bean.DeviceInfoBean;
 import com.example.dahua.bean.TeacherBean;
@@ -14,9 +12,7 @@ import com.example.dahua.module.AutoRegisterModule;
 import com.example.dahua.module.GateModule;
 import com.example.dahua.module.LoginModule;
 import com.example.dahua.service.AttendanceService;
-import com.example.dahua.utils.FileUtils;
 import com.example.dahua.xiananDao.SendRecordDao;
-import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
@@ -25,7 +21,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import javax.imageio.ImageIO;
-import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -190,7 +190,7 @@ public class MyScheduledTask {
             File file = new File(filePath);
             try {
                 if (!file.exists()) {
-                    System.out.println("文件不存在:" + filePath);
+//                    System.out.println("文件不存在:" + filePath);
                     return;
                 }
                 FileInputStream fileInputStream = new FileInputStream(file);
 package com.example.dahua.bean;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.List;
 public class PermissionBean implements Serializable {
+    @ApiModelProperty(value = "设备id",required = true)
     private List<String> deviceIds;
     private List<WeekDay> weekDays;
+    @ApiModelProperty("用逗号隔开，1：通校生，2：住校生，3：全部")
+    private String studentType;
+
+    public String getStudentType() {
+        return studentType;
+    }
+
+    public void setStudentType(String studentType) {
+        this.studentType = studentType;
+    }
+
     public List<String> getDeviceIds() {
         return deviceIds;
     }
@@ -0,0 +1,108 @@
+package com.example.dahua.bean;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.ibatis.annotations.Result;
+
+import java.io.Serializable;
+
+/**
+ * 人脸设备权限表
+ * create table PermissionFace (
+ *      id int not null PRIMARY KEY ,
+ *      permissionJSON varchar(max) not null ,
+ *      schoolId int not null ,
+ *      perrmissName varchar(50) not null ,
+ *      createTime varchar(50) not null ,
+ *      updateTime varchar(50) not null ,
+ * )
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class PermissionFaceBean implements Serializable {
+
+    @ApiModelProperty(value = "删除和编辑时需要传")
+    private int id;
+
+    @ApiModelProperty(required = true)
+    private PermissionBean permissionBean;
+
+    @ApiModelProperty(required = true)
+    private int schoolId;
+
+    @ApiModelProperty(value = "权限模板名称",required = true)
+    private String perrmissName;
+
+    private String createTime;
+
+    private String updateTime;
+
+    @ApiModelProperty(notes = "备用字段，不用传")
+    private String permissionJson;
+
+    @ApiModelProperty(value = "0-新增；1-编辑；2-删除",required = true)
+    private int type;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public PermissionBean getPermissionBean() {
+        return permissionBean;
+    }
+
+    public void setPermissionBean(PermissionBean permissionBean) {
+        this.permissionBean = permissionBean;
+    }
+
+    public int getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(int schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getPerrmissName() {
+        return perrmissName;
+    }
+
+    public void setPerrmissName(String perrmissName) {
+        this.perrmissName = perrmissName;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getPermissionJson() {
+        return permissionJson;
+    }
+
+    public void setPermissionJson(String permissionJson) {
+        this.permissionJson = permissionJson;
+    }
+}
@@ -0,0 +1,48 @@
+package com.example.dahua.bean;
+
+import java.util.List;
+
+/**
+ * 海康人脸请求参数
+ */
+public class PermissionHKBean {
+    private List<String> deviceIds;
+
+    private String schoolId;
+
+    private String userType;//学生类型
+
+    private List<WeekDay> weekDays;
+
+    public List<String> getDeviceIds() {
+        return deviceIds;
+    }
+
+    public void setDeviceIds(List<String> deviceIds) {
+        this.deviceIds = deviceIds;
+    }
+
+    public String getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public List<WeekDay> getWeekDays() {
+        return weekDays;
+    }
+
+    public void setWeekDays(List<WeekDay> weekDays) {
+        this.weekDays = weekDays;
+    }
+}
@@ -0,0 +1,34 @@
+package com.example.dahua.bean;
+
+public class ResponseBean<T> {
+
+    private int status;
+
+    private String message;
+
+    private T data;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,37 @@
+package com.example.dahua.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ResponseBeanList<T> implements Serializable {
+
+    private int status;
+
+    private String message;
+
+    private List<T> data;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public List<T> getData() {
+        return data;
+    }
+
+    public void setData(List<T> data) {
+        this.data = data;
+    }
+}
@@ -0,0 +1,58 @@
+package com.example.dahua.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class UserAndPermission implements Serializable {
+
+    private List<String> deviceIds;
+
+    private int userType;
+
+    private String userIds;
+
+    private List<WeekDay> weekDays;
+
+    private String schoolId;
+
+
+    public List<String> getDeviceIds() {
+        return deviceIds;
+    }
+
+    public void setDeviceIds(List<String> deviceIds) {
+        this.deviceIds = deviceIds;
+    }
+
+    public int getUserType() {
+        return userType;
+    }
+
+    public void setUserType(int userType) {
+        this.userType = userType;
+    }
+
+    public String getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(String userIds) {
+        this.userIds = userIds;
+    }
+
+    public List<WeekDay> getWeekDays() {
+        return weekDays;
+    }
+
+    public void setWeekDays(List<WeekDay> weekDays) {
+        this.weekDays = weekDays;
+    }
+
+    public String getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
+    }
+}
 package com.example.dahua.bean;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.List;
 public class WeekDay implements Serializable {
-    private int weekDay;
+    @ApiModelProperty("用逗号隔开，1：男，2：女")
+    private String sex;
+
+    @ApiModelProperty("用逗号隔开，0-6表示周日到周六")
+    private String weekDay;
     private List<WeekTime> weekTimes;
-    public int getWeekDay() {
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getWeekDay() {
         return weekDay;
     }
-    public void setWeekDay(int weekDay) {
+    public void setWeekDay(String weekDay) {
         this.weekDay = weekDay;
     }
 package com.example.dahua.bean;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 public class WeekTime implements Serializable {
+    @ApiModelProperty("例: 10:00:00")
     private String startTime;
+    @ApiModelProperty("例: 10:00:00")
     private String endTime;
     public String getStartTime() {
@@ -0,0 +1,47 @@
+package com.example.dahua.control;
+
+import com.alibaba.fastjson.JSON;
+import com.example.dahua.bean.PermissionBean;
+import com.example.dahua.bean.PermissionFaceBean;
+import com.example.dahua.bean.ResponseBean;
+import com.example.dahua.bean.ResponseBeanList;
+import com.example.dahua.service.PermissFaceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+
+@Api(tags = "人脸统一处理接口")
+@RestController
+@RequestMapping(value = "faceUnify/*",produces = "text/plain;charset=UTF-8")
+@Slf4j
+public class FaceUnifyController {
+
+    @Autowired
+    PermissFaceService permissFaceService;
+
+    @RequestMapping(value = "sendPermission",method = RequestMethod.POST)
+    @ApiOperation("添加/编辑/删除权限")
+    public String sendPermission(@RequestBody PermissionFaceBean permissionFaceBean) throws UnsupportedEncodingException {
+        return JSON.toJSONString(permissFaceService.addPermissionFace(permissionFaceBean));
+    }
+
+
+    @RequestMapping(value = "getPermissionDetail",method = RequestMethod.POST)
+    @ApiOperation("获取权限详情")
+    @ResponseBody
+    public String getPermissionDetail(@RequestParam("permissionId")int permissionId) throws UnsupportedEncodingException {
+        log.error("{}",JSON.toJSONString(permissFaceService.getPermissionDetail(permissionId)));
+        return JSON.toJSONString(permissFaceService.getPermissionDetail(permissionId));
+    }
+
+    @RequestMapping(value = "getPermissions",method = RequestMethod.POST)
+    @ApiOperation("获取权限列表")
+    public String getPermissions(@RequestParam("schoolId")int schoolId) throws UnsupportedEncodingException {
+        return JSON.toJSONString(permissFaceService.getPermissions(schoolId));
+    }
+
+}
@@ -4,12 +4,14 @@ import com.example.dahua.MyTask;
 import com.example.dahua.async.SendUserInfoTask;
 import com.example.dahua.attendance.Attendance;
 import com.example.dahua.bean.AttendanceBean;
+import com.example.dahua.bean.PermissionBean;
 import com.example.dahua.bean.TeacherBean;
 import com.example.dahua.bean.UploadImg;
 import com.example.dahua.dao.UserDao;
 import com.example.dahua.lib.ToolKits;
 import com.example.dahua.module.GateModule;
 import com.example.dahua.service.UserService;
+import com.example.dahua.utils.HttpUtils;
 import com.sun.jna.Memory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -63,6 +65,12 @@ public class FileControl {
         return "0";
     }
+    @RequestMapping(value = "sendPermission", method = RequestMethod.POST)
+    @ApiOperation(value = "设置权限")
+    public boolean sendPermission(@RequestBody PermissionBean permissionBean) {
+        userService.sendPermission(permissionBean);
+        return true;
+    }
     @RequestMapping(method = RequestMethod.POST, value = "uploadImgToDev")
     public String uploadImgToDev(@RequestParam("file") MultipartFile file, @RequestParam("schoolId") String schoolId, @RequestParam("studentCode") String studentCode,
@@ -4,6 +4,7 @@ import com.example.dahua.MyTask;
 import com.example.dahua.async.ImageUtils;
 import com.example.dahua.async.SendUserInfoTask;
 import com.example.dahua.bean.PermissionBean;
+import com.example.dahua.bean.UserAndPermission;
 import com.example.dahua.lib.CompressPic;
 import com.example.dahua.service.UserService;
 import com.example.dahua.utils.*;
@@ -22,6 +23,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
@@ -60,11 +62,9 @@ public class UserControl {
     @RequestMapping(value = "sendPermission", method = RequestMethod.POST)
     @ApiOperation(value = "设置权限")
     public boolean sendPermission(@RequestBody PermissionBean permissionBean) {
-        userService.sendPermission(permissionBean);
-        return true;
+        return  HttpUtils.sendPermission(permissionBean);
     }
-
     @RequestMapping(value = "imgsSend", method = RequestMethod.GET)
     @ApiOperation(value = "照片下放")
     public boolean imgsSend(@RequestParam("schoolId") String schoolId, @RequestParam("type") int type) {
@@ -0,0 +1,26 @@
+package com.example.dahua.dao;
+
+import com.example.dahua.bean.PermissionFaceBean;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PermissionFaceDao {
+
+
+    public int addPermissionFace(PermissionFaceBean permissionFaceBean);
+
+    public int updatePermissionFace(PermissionFaceBean permissionFaceBean);
+
+    public int deletePermissionFace(PermissionFaceBean permissionFaceBean);
+
+    public PermissionFaceBean getPerFaceWithId(@Param("id")int id);
+
+    public List<PermissionFaceBean> getPermissFaces(@Param("schoolId") int schoolId);
+
+    public List<PermissionFaceBean> getPermissionDetail(@Param("permissionId") int permissionId);
+
+}
 package com.example.dahua.module;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import com.example.dahua.bean.PermissionBean;
 import com.example.dahua.bean.WeekDay;
@@ -189,8 +192,8 @@ public class GateModule {
         accessCardInfo.sznDoors[0] = 0;
         accessCardInfo.sznDoors[1] = 1;
         accessCardInfo.nTimeSectionNum = 2;      // 与门数对应
-        accessCardInfo.sznTimeSectionNo[0] = 255; // 表示第一个门全天有效
-        accessCardInfo.sznTimeSectionNo[1] = 255; // 表示第二个门全天有效
+        accessCardInfo.sznTimeSectionNo[0] = 120; // 表示第一个门全天有效
+        accessCardInfo.sznTimeSectionNo[1] = 120; // 表示第二个门全天有效
         // 卡状态
         accessCardInfo.emStatus = cardStatus;
@@ -254,61 +257,151 @@ public class GateModule {
      * 门禁刷卡时间段设置
      */
     public static void setAccessTimeSchedule(LLong lLong, PermissionBean permissionBean) {
+        try {
-        CFG_ACCESS_TIMESCHEDULE_INFO msg = new CFG_ACCESS_TIMESCHEDULE_INFO();
-        String strCmd = NetSDKLib.CFG_CMD_ACCESSTIMESCHEDULE;
-        int nChannel = 120; // 通道号
-
+            CFG_ACCESS_TIMESCHEDULE_INFO msg = new CFG_ACCESS_TIMESCHEDULE_INFO();
+            String strCmd = NetSDKLib.CFG_CMD_ACCESSTIMESCHEDULE;
+            int nChannel = 120; // 通道号
 //            msg.stuTimeWeekDay[0].stuTimeSection[0].dwRecordMask
-        String name = "权限模板";
-        System.arraycopy(name.getBytes(), 0, msg.szName, 0, name.getBytes().length);
-
-        List<WeekDay> weekDays = permissionBean.getWeekDays();
-
-        for (WeekDay weekDay :
-                weekDays) {
-            List<WeekTime> weekTimes = weekDay.getWeekTimes();
-            for (int i = 0; i < weekTimes.size(); i++) {
-                WeekTime weekTime = weekTimes.get(i);
-                String startTime = weekTime.getStartTime();
-                String endTime = weekTime.getEndTime();
-                msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginHour = Integer.parseInt(startTime.split(":")[0]);
-                msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginMin = Integer.parseInt(startTime.split(":")[1]);
-                msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginSec = 0;
-
-                msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndHour = Integer.parseInt(endTime.split(":")[0]);
-                msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndMin = Integer.parseInt(endTime.split(":")[1]);
-                msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndSec = 0;
-
+            String name = "3";
+            System.arraycopy(name.getBytes(), 0, msg.szName, 0, name.getBytes().length);
+            msg.bEnable = 1;
+
+            List<WeekDay> weekDays = permissionBean.getWeekDays();
+            Map<Integer, List<WeekTime>> map = new HashMap<>();
+
+            for (WeekDay weekDay :
+                    weekDays) {
+                //整理时间
+                initWeedayAndTimes(weekDay, map);
+                //设置周计划信息
+                for (Map.Entry<Integer, List<WeekTime>> entry :
+                        map.entrySet()) {
+
+                    int weekDayIndex = entry.getKey();
+
+                    List<WeekTime> weekTimes = entry.getValue();
+
+                    for (int i = 0; i < weekTimes.size(); i++) {
+                        WeekTime weekTime = weekTimes.get(i);
+                        String startTime = weekTime.getStartTime();
+                        String endTime = weekTime.getEndTime();
+                        msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nBeginHour = Integer.parseInt(startTime.split(":")[0]);
+                        msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nBeginMin = Integer.parseInt(startTime.split(":")[1]);
+                        msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nBeginSec = 0;
+
+                        msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nEndHour = Integer.parseInt(endTime.split(":")[0]);
+                        msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nEndMin = Integer.parseInt(endTime.split(":")[1]);
+                        msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nEndSec = 0;
+                    }
+
+                }
             }
-        }
+
+
+           /* for (WeekDay weekDay :
+                    weekDays) {
+                List<WeekTime> weekTimes = weekDay.getWeekTimes();
+                for (int i = 0; i < weekTimes.size(); i++) {
+                    WeekTime weekTime = weekTimes.get(i);
+                    String startTime = weekTime.getStartTime();
+                    String endTime = weekTime.getEndTime();
+                    msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginHour = Integer.parseInt(startTime.split(":")[0]);
+                    msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginMin = Integer.parseInt(startTime.split(":")[1]);
+                    msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginSec = 0;
+
+                    msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndHour = Integer.parseInt(endTime.split(":")[0]);
+                    msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndMin = Integer.parseInt(endTime.split(":")[1]);
+                    msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndSec = 0;
+
+                }
+            }*/
 // 获取
 //        if (ToolKits.GetDevConfig(lLong, nChannel, strCmd, msg)) {
-        System.out.println("Enable:" + msg.bEnable);
-        try {
-            System.out.println("自定义名称:" + new String(msg.szName, "UTF-8").trim());
-        } catch (UnsupportedEncodingException e) {
+//            System.out.println("Enable:" + msg.bEnable);
+//            try {
+//                System.out.println("自定义名称:" + new String(msg.szName, "UTF-8").trim());
+//            } catch (UnsupportedEncodingException e) {
+//                e.printStackTrace();
+//            }
+//            for (int i = 0; i < 7; i++) {
+//                for (int j = 0; j < 4; j++) {
+//                    System.out.println("dwRecordMask:" + msg.stuTimeWeekDay[i].stuTimeSection[j].dwRecordMask);
+//                    System.out.println(msg.stuTimeWeekDay[i].stuTimeSection[j].startTime() + "-" + msg.stuTimeWeekDay[i].stuTimeSection[j].endTime() + "\n");
+//                }
+//            }
+//        msg.write();
+            boolean set = ToolKits.SetDevConfig(lLong, nChannel, strCmd, msg);
+//        msg.read();
+            // 设置
+            if (set) {
+                System.out.println("Set AccessTimeSchedule Succeed!");
+            } else {
+                System.err.println("Set AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
+            }
+//        } else {
+//            System.err.println("Get AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
+//        }
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        for (int i = 0; i < 7; i++) {
-            for (int j = 0; j < 4; j++) {
-                System.out.println("dwRecordMask:" + msg.stuTimeWeekDay[i].stuTimeSection[j].dwRecordMask);
-                System.out.println(msg.stuTimeWeekDay[i].stuTimeSection[j].startTime() + "-" + msg.stuTimeWeekDay[i].stuTimeSection[j].endTime() + "\n");
+    }
+
+    private static void initWeedayAndTimes(WeekDay weekDay, Map<Integer, List<WeekTime>> map) {
+
+        String weekDayStr = weekDay.getWeekDay();
+        String[] weekDays = weekDayStr.split(",");
+
+        List<WeekTime> weekTimes = weekDay.getWeekTimes();
+
+        for (int i = 0; i < weekDays.length; i++) {
+            int weekDayIndex = Integer.parseInt(weekDays[i]);
+            if (map.containsKey(weekDayIndex)) {//周已经有时间段
+                List<WeekTime> weekTimeList = map.get(weekDayIndex);
+                for (WeekTime wee :
+                        weekTimes) {
+                    weekTimeList.add(wee);
+                }
+                map.put(weekDayIndex, weekTimeList);
+            } else {
+                List<WeekTime> weekTimes1 = new ArrayList<>();
+                weekTimes1.addAll(weekTimes);
+                map.put(weekDayIndex, weekTimes1);
             }
         }
-        msg.write();
-        boolean set = ToolKits.SetDevConfig(lLong, nChannel, strCmd, msg);
-        msg.read();
-        // 设置
-        if (set) {
-            System.out.println("Set AccessTimeSchedule Succeed!");
+
+    }
+
+    public static void getAccessTimeSchedule1(LLong lLong) {
+        CFG_ACCESS_TIMESCHEDULE_INFO msg = new CFG_ACCESS_TIMESCHEDULE_INFO();
+        String strCmd = NetSDKLib.CFG_CMD_ACCESSTIMESCHEDULE;
+        int nChannel = 120; // 通道号
+
+        // 获取
+        if (ToolKits.GetDevConfig(lLong, nChannel, strCmd, msg)) {
+            System.out.println("Enable:" + msg.bEnable);
+            try {
+                System.out.println("自定义名称:" + new String(msg.szName, "utf-8").trim());
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            for (int i = 0; i < 7; i++) {
+                for (int j = 0; j < 4; j++) {
+                    System.out.println("dwRecordMask:" + msg.stuTimeWeekDay[i].stuTimeSection[j].dwRecordMask);
+                    System.out.println(msg.stuTimeWeekDay[i].stuTimeSection[j].startTime() + "-" +
+                            msg.stuTimeWeekDay[i].stuTimeSection[j].endTime() + "\n");
+                }
+            }
+            // 设置
+            if (ToolKits.SetDevConfig(lLong, nChannel, strCmd, msg)) {
+                System.out.println("Set AccessTimeSchedule Succeed!");
+            } else {
+                System.err.println("Set AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
+            }
         } else {
-            System.err.println("Set AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
+            System.err.println("Get AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
         }
-//        } else {
-//            System.err.println("Get AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
-//        }
     }
     /**
@@ -450,8 +543,8 @@ public class GateModule {
         accessCardInfo.sznDoors[0] = 0;
         accessCardInfo.sznDoors[1] = 1;
         accessCardInfo.nTimeSectionNum = 2;      // 与门数对应
-        accessCardInfo.sznTimeSectionNo[0] = 255; // 表示第一个门全天有效
-        accessCardInfo.sznTimeSectionNo[1] = 255; // 表示第二个门全天有效
+        accessCardInfo.sznTimeSectionNo[0] = 120; // 表示第一个门全天有效
+        accessCardInfo.sznTimeSectionNo[1] = 120; // 表示第二个门全天有效
         // 卡状态
         accessCardInfo.emStatus = cardStatus;
@@ -1,70 +0,0 @@
-package com.example.dahua.service;
-
-import com.example.dahua.bean.AttendanceBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class AttendanceImp implements AttendanceService {
-
-    @Autowired
-    JdbcTemplate jdbcTemplate;
-
-    @Override
-    public int insert(String clint_id, String clint_type, String ip, String port, String intime, String school_id, String state) {
-        try {
-            String selectSql = String.format("select * from SZ_Attendance where clint_id =\'%s\'", clint_id);
-            List<AttendanceBean> attendanceBeans = jdbcTemplate.query(selectSql, new Object[]{}, new BeanPropertyRowMapper<AttendanceBean>(AttendanceBean.class));
-            if (attendanceBeans.size() == 0) {//设备不存在
-//                insert SZ_Attendance(clint_id, clint_type, ip, port, intime, school_id, state)
-//     * values(@clint_id,@clint_type,@ip,@port,GETDATE(),-1,1)
-                String insertSql = String.format("insert into SZ_Attendance(clint_id, clint_type, ip, port, intime, school_id, state,isConnection) values ('%s','%s','%s','%s','%s','%s','%s','%s')", clint_id, clint_type, ip, port, intime, school_id, state, 1);
-                return jdbcTemplate.update(insertSql);
-            } else {//设备 已经存在,更新在线状态
-                updateConnectStateWithDevid(1, clint_id);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return 0;
-    }
-
-    /**
-     * @param isConnection 连接状态
-     * @param ip
-     * @param port
-     * @return
-     */
-    @Override
-    public int updateConnectState(int isConnection, String ip, String port) {
-
-        int index = 0;
-        try {
-            String updateSql = String.format("  update SZ_Attendance set isConnection = %d where ip = '%s' and port = '%s' ", isConnection, ip, port);
-            index = jdbcTemplate.update(updateSql);
-//            System.out.println("updateIndex:"+index+" isConnection:"+isConnection+"updateSql:"+updateSql);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return index;
-    }
-
-    @Override
-    public int updateConnectStateWithDevid(int isConnection, String clint_id) {
-        int index = 0;
-        try {
-            String updateSql = String.format("  update SZ_Attendance set isConnection = %d where clint_id = '%s' ", isConnection, clint_id);
-            index = jdbcTemplate.update(updateSql);
-//            System.out.println("updateIndex:"+index+" isConnection:"+isConnection+"updateSql:"+updateSql);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return index;
-    }
-}
@@ -1,23 +0,0 @@
-package com.example.dahua.service;
-
-import com.example.dahua.MyTask;
-import com.example.dahua.module.DeviceControlModule;
-import org.springframework.stereotype.Repository;
-import org.springframework.stereotype.Service;
-
-@Repository
-@Service
-public class DeviceServiceImp implements DeviceService {
-
-    @Override
-    public boolean restart(String deviceId) {
-        return DeviceControlModule.reboot(MyTask.lLongMap.get(deviceId));
-    }
-
-    @Override
-    public boolean setDVRIPConfig(String deviceId, String ip, int port) {
-
-        return DeviceControlModule.setDVRIPConfig(deviceId, ip, port);
-    }
-
-}
@@ -0,0 +1,19 @@
+package com.example.dahua.service;
+
+import com.example.dahua.bean.PermissionFaceBean;
+import com.example.dahua.bean.ResponseBean;
+import com.example.dahua.bean.ResponseBeanList;
+
+import java.util.List;
+
+public interface PermissFaceService {
+
+
+    public ResponseBean<PermissionFaceBean> addPermissionFace(PermissionFaceBean permissionFaceBean);
+
+    public ResponseBeanList<PermissionFaceBean> getPermissions(int schoolId);
+
+    public ResponseBeanList<PermissionFaceBean> getPermissionDetail(int permissionId);
+
+
+}
@@ -1,117 +0,0 @@
-package com.example.dahua.service;
-
-import com.example.dahua.MyTask;
-import com.example.dahua.async.SendUserInfoTask;
-import com.example.dahua.bean.*;
-import com.example.dahua.dao.UserDao;
-import com.example.dahua.lib.NetSDKLib;
-import com.example.dahua.module.GateModule;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Repository
-@Service
-public class UserServiceImp implements UserService {
-
-    @Autowired
-    UserDao userDao;
-
-    @Autowired
-    SendUserInfoTask myTask;
-
-    @Override
-    public List<AttendanceBean> getAttendanceBeans(String schoolId, String clint_type, String devid) {
-
-        if (!StringUtils.isEmpty(devid)) return userDao.getAttendanceBeanWithId(schoolId, clint_type, devid);
-
-        return userDao.getAttendanceBeans(schoolId, clint_type);
-    }
-
-    @Override
-    public UserInfoBean getUserInfo(String schoolId, String studentCode) {
-        return userDao.getUserInfo(schoolId, studentCode);
-    }
-
-    /**
-     * 单个用户信息下发
-     *
-     * @param file
-     * @param schoolId
-     * @param studentCode
-     * @param clint_type
-     * @return
-     */
-    @Override
-    public boolean uploadImgAndUserInfo(String file, String schoolId, String studentCode, String clint_type, int userType, String devid) {
-        List<AttendanceBean> attendanceBeans = getAttendanceBeans(schoolId, clint_type, devid);//获取学校下的大华设备
-        System.out.println("设备数量:" + attendanceBeans.size());
-        UserInfoBean userInfoBean = null;
-        try {
-            if (userType == 2) {
-                //根据文件命名来判断学籍号
-                String studentCodes = file.split("\\.")[0];
-                String[] studentInfo = studentCodes.split("_");
-
-                if (studentInfo.length > 1) {//附属卡
-
-                    String studentCodeF = studentInfo[0];
-                    String CardType = studentInfo[1];
-                    userInfoBean = getUserInfo(schoolId, studentCodeF);
-                    String cardNum = userDao.getCardNum(userInfoBean.getStudent_id(), CardType);
-                    userInfoBean.setStudent_num(cardNum);
-
-                } else {
-
-                    userInfoBean = getUserInfo(schoolId, studentCode);//获取用户信息
-
-                }
-            } else if (userType == 1) {
-                TeacherBean teacher = userDao.getTeacher(schoolId, studentCode);
-                if (null != teacher) {
-                    userInfoBean = new UserInfoBean();
-                    userInfoBean.setStudent_num(teacher.getTeacher_num());
-                    userInfoBean.setName(teacher.getName());
-                    userInfoBean.setUser_id(teacher.getUser_id());
-                    userInfoBean.setStudentcode(teacher.getNum());
-                    userInfoBean.setStudent_id(teacher.getTeacher_id());
-                }
-            }
-
-            myTask.doTaskOne(file, attendanceBeans, userInfoBean, schoolId, -1, userType);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-    /**
-     * 照片下放
-     *
-     * @param schoolId
-     * @param clint_type
-     * @param type       0:主卡 1:副卡
-     */
-    @Override
-    public void sendUserInfos(String schoolId, String clint_type, int type) {
-        myTask.doTaskSendUserInfos(schoolId, clint_type, type, -1);
-    }
-
-    @Override
-    public boolean sendPermission(PermissionBean permissionBean) {
-
-        List<String> deviceIds = permissionBean.getDeviceIds();
-        for (String deviceId :
-                deviceIds) {
-            NetSDKLib.LLong loginHandleLong = MyTask.lLongMap.get(deviceId);
-            GateModule.setAccessTimeSchedule(loginHandleLong,permissionBean);
-        }
-
-
-        return false;
-    }
-
-}
@@ -0,0 +1,71 @@
+package com.example.dahua.service.imp;
+
+import com.example.dahua.bean.AttendanceBean;
+import com.example.dahua.service.AttendanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AttendanceImp implements AttendanceService {
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    @Override
+    public int insert(String clint_id, String clint_type, String ip, String port, String intime, String school_id, String state) {
+        try {
+            String selectSql = String.format("select * from SZ_Attendance where clint_id =\'%s\'", clint_id);
+            List<AttendanceBean> attendanceBeans = jdbcTemplate.query(selectSql, new Object[]{}, new BeanPropertyRowMapper<AttendanceBean>(AttendanceBean.class));
+            if (attendanceBeans.size() == 0) {//设备不存在
+//                insert SZ_Attendance(clint_id, clint_type, ip, port, intime, school_id, state)
+//     * values(@clint_id,@clint_type,@ip,@port,GETDATE(),-1,1)
+                String insertSql = String.format("insert into SZ_Attendance(clint_id, clint_type, ip, port, intime, school_id, state,isConnection) values ('%s','%s','%s','%s','%s','%s','%s','%s')", clint_id, clint_type, ip, port, intime, school_id, state, 1);
+                return jdbcTemplate.update(insertSql);
+            } else {//设备 已经存在,更新在线状态
+                updateConnectStateWithDevid(1, clint_id);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    /**
+     * @param isConnection 连接状态
+     * @param ip
+     * @param port
+     * @return
+     */
+    @Override
+    public int updateConnectState(int isConnection, String ip, String port) {
+
+        int index = 0;
+        try {
+            String updateSql = String.format("  update SZ_Attendance set isConnection = %d where ip = '%s' and port = '%s' ", isConnection, ip, port);
+            index = jdbcTemplate.update(updateSql);
+//            System.out.println("updateIndex:"+index+" isConnection:"+isConnection+"updateSql:"+updateSql);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return index;
+    }
+
+    @Override
+    public int updateConnectStateWithDevid(int isConnection, String clint_id) {
+        int index = 0;
+        try {
+            String updateSql = String.format("  update SZ_Attendance set isConnection = %d where clint_id = '%s' ", isConnection, clint_id);
+            index = jdbcTemplate.update(updateSql);
+//            System.out.println("updateIndex:"+index+" isConnection:"+isConnection+"updateSql:"+updateSql);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return index;
+    }
+}
@@ -0,0 +1,24 @@
+package com.example.dahua.service.imp;
+
+import com.example.dahua.MyTask;
+import com.example.dahua.module.DeviceControlModule;
+import com.example.dahua.service.DeviceService;
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+
+@Repository
+@Service
+public class DeviceServiceImp implements DeviceService {
+
+    @Override
+    public boolean restart(String deviceId) {
+        return DeviceControlModule.reboot(MyTask.lLongMap.get(deviceId));
+    }
+
+    @Override
+    public boolean setDVRIPConfig(String deviceId, String ip, int port) {
+
+        return DeviceControlModule.setDVRIPConfig(deviceId, ip, port);
+    }
+
+}
@@ -0,0 +1,152 @@
+package com.example.dahua.service.imp;
+
+import com.alibaba.fastjson.JSON;
+import com.example.dahua.bean.*;
+import com.example.dahua.dao.PermissionFaceDao;
+import com.example.dahua.dao.UserDao;
+import com.example.dahua.service.PermissFaceService;
+import com.example.dahua.utils.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class PermissFaceServiceImp implements PermissFaceService {
+
+    @Autowired
+    PermissionFaceDao permissionFaceDao;
+
+    @Autowired
+    UserDao userDao;
+
+    @Override
+    public ResponseBean<PermissionFaceBean> addPermissionFace(PermissionFaceBean permissionFaceBean) {
+        ResponseBean<PermissionFaceBean> responseBean = new ResponseBean<>();
+        try {
+            int id = permissionFaceBean.getId();
+
+            String permissName = permissionFaceBean.getPerrmissName();
+
+            int schoolId = permissionFaceBean.getSchoolId();
+
+            PermissionBean permissionBean = permissionFaceBean.getPermissionBean();
+
+            int type = permissionFaceBean.getType();
+            if (null != permissionBean)
+                permissionFaceBean.setPermissionJson(JSON.toJSON(permissionBean).toString());
+
+            if ((type == 0 || type == 1) && (StringUtils.isEmpty(permissName) || schoolId == 0 || (null != permissionBean && permissionBean.getWeekDays().size() == 0))) {
+
+                responseBean.setStatus(0);
+                responseBean.setMessage("传入的参数错误");
+                responseBean.setData(null);
+                return responseBean;
+            }
+            switch (type) {
+                case 0://新增
+                    permissionFaceDao.addPermissionFace(permissionFaceBean);
+                    responseBean.setMessage("添加权限模板成功");
+                    responseBean.setData(null);
+                    sendPermiss2Dev(permissionFaceBean);
+                    responseBean.setStatus(1);
+                    break;
+                case 1://编辑
+                    if (null == permissionFaceDao.getPerFaceWithId(id)) {
+                        responseBean.setMessage("模板不存在");
+                    } else {
+                        responseBean.setMessage("编辑权限模板成功");
+                        permissionFaceDao.updatePermissionFace(permissionFaceBean);
+                    }
+                    responseBean.setData(null);
+                    sendPermiss2Dev(permissionFaceBean);
+                    responseBean.setStatus(1);
+                    break;
+                case 2://删除
+                    if (null == permissionFaceDao.getPerFaceWithId(id)) {
+                        responseBean.setMessage("模板不存在");
+                    } else {
+                        permissionFaceDao.deletePermissionFace(permissionFaceBean);
+                        responseBean.setMessage("删除权限模板成功");
+                    }
+                    responseBean.setData(null);
+                    responseBean.setStatus(1);
+                    break;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            responseBean.setStatus(0);
+            responseBean.setMessage(e.getMessage());
+            responseBean.setData(null);
+        }
+        return responseBean;
+    }
+
+    /**
+     * 下发权限到设备
+     *
+     * @param permissionFaceBean
+     */
+    private void sendPermiss2Dev(PermissionFaceBean permissionFaceBean) {
+        int schoolId = permissionFaceBean.getSchoolId();
+
+        PermissionBean permissionBean = permissionFaceBean.getPermissionBean();
+
+        //查询海康人脸权限一体机
+        List<AttendanceBean> attendanceBeanList = userDao.getAttendanceBeans(schoolId + "", "28");
+
+        //查询大华人脸权限一体机
+        List<AttendanceBean> attendanceBeanList1 = userDao.getAttendanceBeans(schoolId + "", "29");
+
+        if (null != attendanceBeanList && attendanceBeanList.size() > 0) {
+            if (null != permissionBean)
+                HttpUtils.sendPermission2HK(permissionFaceBean);
+        }
+
+        if (null != attendanceBeanList1 && attendanceBeanList1.size() > 0) {
+            if (null != permissionBean)
+                HttpUtils.sendPermission(permissionBean);
+        }
+
+    }
+
+
+
+
+    @Override
+    public ResponseBeanList<PermissionFaceBean> getPermissions(int schoolId) {
+        ResponseBeanList responseBeanList = new ResponseBeanList();
+        try {
+
+            List<PermissionFaceBean> permissionFaceBeans = permissionFaceDao.getPermissFaces(schoolId);
+
+            responseBeanList.setData(permissionFaceBeans);
+
+            responseBeanList.setMessage("");
+            responseBeanList.setStatus(1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return responseBeanList;
+    }
+
+    @Override
+    public ResponseBeanList<PermissionFaceBean> getPermissionDetail(int permissionId) {
+        ResponseBeanList responseBeanList = new ResponseBeanList();
+        try {
+
+            List<PermissionFaceBean> permissionFaceBeans = permissionFaceDao.getPermissionDetail(permissionId);
+
+            responseBeanList.setData(permissionFaceBeans);
+
+            responseBeanList.setMessage("");
+            responseBeanList.setStatus(1);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return responseBeanList;
+    }
+}
@@ -0,0 +1,120 @@
+package com.example.dahua.service.imp;
+
+import com.example.dahua.MyTask;
+import com.example.dahua.async.SendUserInfoTask;
+import com.example.dahua.bean.*;
+import com.example.dahua.dao.UserDao;
+import com.example.dahua.lib.NetSDKLib;
+import com.example.dahua.module.GateModule;
+import com.example.dahua.service.UserService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Repository
+@Service
+public class UserServiceImp implements UserService {
+
+    @Autowired
+    UserDao userDao;
+
+    @Autowired
+    SendUserInfoTask myTask;
+
+    @Override
+    public List<AttendanceBean> getAttendanceBeans(String schoolId, String clint_type, String devid) {
+
+        if (!StringUtils.isEmpty(devid)) return userDao.getAttendanceBeanWithId(schoolId, clint_type, devid);
+
+        return userDao.getAttendanceBeans(schoolId, clint_type);
+    }
+
+    @Override
+    public UserInfoBean getUserInfo(String schoolId, String studentCode) {
+        return userDao.getUserInfo(schoolId, studentCode);
+    }
+
+    /**
+     * 单个用户信息下发
+     *
+     * @param file
+     * @param schoolId
+     * @param studentCode
+     * @param clint_type
+     * @return
+     */
+    @Override
+    public boolean uploadImgAndUserInfo(String file, String schoolId, String studentCode, String clint_type, int userType, String devid) {
+        List<AttendanceBean> attendanceBeans = getAttendanceBeans(schoolId, clint_type, devid);//获取学校下的大华设备
+        System.out.println("设备数量:" + attendanceBeans.size());
+        UserInfoBean userInfoBean = null;
+        try {
+            if (userType == 2) {
+                //根据文件命名来判断学籍号
+                String studentCodes = file.split("\\.")[0];
+                String[] studentInfo = studentCodes.split("_");
+
+                if (studentInfo.length > 1) {//附属卡
+
+                    String studentCodeF = studentInfo[0];
+                    String CardType = studentInfo[1];
+                    userInfoBean = getUserInfo(schoolId, studentCodeF);
+                    String cardNum = userDao.getCardNum(userInfoBean.getStudent_id(), CardType);
+                    userInfoBean.setStudent_num(cardNum);
+
+                } else {
+
+                    userInfoBean = getUserInfo(schoolId, studentCode);//获取用户信息
+
+                }
+            } else if (userType == 1) {
+                TeacherBean teacher = userDao.getTeacher(schoolId, studentCode);
+                if (null != teacher) {
+                    userInfoBean = new UserInfoBean();
+                    userInfoBean.setStudent_num(teacher.getTeacher_num());
+                    userInfoBean.setName(teacher.getName());
+                    userInfoBean.setUser_id(teacher.getUser_id());
+                    userInfoBean.setStudentcode(teacher.getNum());
+                    userInfoBean.setStudent_id(teacher.getTeacher_id());
+                }
+            }
+
+            myTask.doTaskOne(file, attendanceBeans, userInfoBean, schoolId, -1, userType);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    /**
+     * 照片下放
+     *
+     * @param schoolId
+     * @param clint_type
+     * @param type       0:主卡 1:副卡
+     */
+    @Override
+    public void sendUserInfos(String schoolId, String clint_type, int type) {
+        myTask.doTaskSendUserInfos(schoolId, clint_type, type, -1);
+    }
+
+    @Override
+    public boolean sendPermission(PermissionBean permissionBean) {
+
+        List<String> deviceIds = permissionBean.getDeviceIds();
+        if (null != deviceIds)
+            for (String deviceId :
+                    deviceIds) {
+                NetSDKLib.LLong loginHandleLong = MyTask.lLongMap.get(deviceId);
+                GateModule.setAccessTimeSchedule(loginHandleLong, permissionBean);
+                GateModule.getAccessTimeSchedule1(loginHandleLong);
+            }
+
+
+        return false;
+    }
+
+}
 package com.example.dahua.utils;
+import com.example.dahua.bean.PermissionBean;
+import com.example.dahua.bean.PermissionFaceBean;
+import com.example.dahua.bean.PermissionHKBean;
 import com.example.dahua.lib.CompressPic;
 import com.example.dahua.lib.FilePath;
 import org.springframework.core.io.FileSystemResource;
@@ -69,4 +72,52 @@ public class HttpUtils {
     }
+    public static boolean sendPermission(PermissionBean permissionBean) {
+        String url = "http://121.40.109.21:8991/file/sendPermission";
+        RestTemplate restTemplate = new RestTemplate();
+
+        HttpHeaders headers = new HttpHeaders();
+
+        MediaType mediaType = MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+
+        headers.setContentType(mediaType);
+
+        HttpEntity<PermissionBean> httpEntity = new HttpEntity<>(permissionBean, headers);
+
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, httpEntity, String.class);
+
+        System.out.println("大华设备下发权限:" + responseEntity.getBody());
+        return responseEntity.getBody().equals("1");
+    }
+
+    public static void sendPermission2HK(PermissionFaceBean permissionFaceBean) {
+        String url = "http://114.55.30.100:8089/facereco/sendPermiss";
+        PermissionBean permissionBean = permissionFaceBean.getPermissionBean();
+
+        if (null!=permissionBean){
+
+            PermissionHKBean permissionHKBean = new PermissionHKBean();
+
+            permissionHKBean.setDeviceIds(permissionBean.getDeviceIds());
+            permissionHKBean.setSchoolId(permissionFaceBean.getSchoolId()+"");
+            permissionHKBean.setUserType("2");
+            permissionHKBean.setWeekDays(permissionBean.getWeekDays());
+
+            RestTemplate restTemplate = new RestTemplate();
+
+            HttpHeaders headers = new HttpHeaders();
+
+            MediaType mediaType = MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+
+            headers.setContentType(mediaType);
+
+            HttpEntity<PermissionHKBean> httpEntity = new HttpEntity<>(permissionHKBean, headers);
+
+            ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, httpEntity, String.class);
+
+            System.out.println("海康设备下发权限:" + responseEntity.getBody());
+
+        }
+
+    }
 }
@@ -14,10 +14,10 @@ spring:
       password: RQminVCJota3H1u8bBYH
       jdbc-url: jdbc:sqlserver://116.62.155.137:33419;database=SmartCampus
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    #        username: SZJXTUSER
-    #        password: xst200919
-    #        jdbc-url: jdbc:sqlserver://60.190.202.57:14333;database=SmartCampusSZ
-    #        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      username: SZJXTUSER
+#      password: xst200919
+#      jdbc-url: jdbc:sqlserver://60.190.202.57:14333;database=SmartCampusSZ
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     xiaoan:
       jdbc-url: jdbc:sqlserver://116.62.241.27:33419;database=xiaoanhxy
       username: szjxtuser
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.example.dahua.dao.PermissionFaceDao">
+
+<!--    create table PermissionFace (-->
+<!--    id int not null PRIMARY KEY ,-->
+<!--    permissionJSON varchar(max) not null ,-->
+<!--    schoolId int not null ,-->
+<!--    perrmissName varchar(50) not null ,-->
+<!--    createTime varchar(50) not null ,-->
+<!--    updateTime varchar(50) not null ,-->
+<!--    )-->
+    <resultMap id="permissFaceBase" type="com.example.dahua.bean.PermissionFaceBean">
+
+        <result column="id" property="id"/>
+        <result column="permissionJSON" property="permissionJson"/>
+        <result column="schoolId" property="schoolId"/>
+        <result column="perrmissName" property="perrmissName"/>
+        <result column="createTime" property="createTime"/>
+        <result column="updateTime" property="updateTime"/>
+
+    </resultMap>
+
+    <insert id="addPermissionFace" parameterType="com.example.dahua.bean.PermissionFaceBean">
+
+        insert into PermissionFace values (#{permissionJson},#{schoolId},#{perrmissName},#{createTime},#{updateTime})
+
+    </insert>
+
+
+    <select id="getPermissFaces" parameterType="java.lang.Integer" resultMap="permissFaceBase">
+
+        select * from PermissionFace where schoolId = #{schoolId};
+
+    </select>
+    <select id="getPermissionDetail" parameterType="java.lang.Integer" resultMap="permissFaceBase">
+
+        select * from PermissionFace where id = #{permissionId};
+
+    </select>
+    <update id="updatePermissionFace" parameterType="com.example.dahua.bean.PermissionFaceBean">
+
+        update PermissionFace set permissionJson = #{permissionJson},updateTime=#{updateTime},perrmissName=#{perrmissName} where id = #{id}
+
+    </update>
+
+    <delete id="deletePermissionFace" parameterType="java.lang.Integer">
+        delete from PermissionFace where id = #{id}
+    </delete>
+
+    <select id="getPerFaceWithId" parameterType="java.lang.Integer" resultType="com.example.dahua.bean.PermissionFaceBean">
+        select * from PermissionFace where id =#{id};
+    </select>
+
+</mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.example.dahua.dao">
+<mapper namespace="com.example.dahua.dao.UserDao">
     <!--<select id="getStudentNum" resultType="String" parameterType="String">-->
     <!--select student_num-->
@@ -9,4 +9,14 @@
     <!--and studentcode = #{studentcode}-->
     <!--</select>-->
+    <select id="getStudentWiSidAndSex" resultType="java.lang.String">
+
+        select student_num from SZ_V_School_Student where school_id = #{schoolId} and sex in
+        <foreach collection="sexs" item="sex" index="index" open="(" separator="," close=")">
+            #{sex}
+        </foreach>
+
+    </select>
+
+    
 </mapper>
 \ No newline at end of file
@@ -0,0 +1,37 @@
+package com.sincere.file.config;
+
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 用于解决跨域问题
+ *
+ * @author chen
+ * @version 1.0
+ * @date 2019/10/11 0011 10:17
+ */
+@Component
+@WebFilter(urlPatterns = "/*", filterName = "authFilter")
+public class AllowOriginFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
+        HttpServletResponse response = (HttpServletResponse) res;
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "*");
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Headers", "*");
+        chain.doFilter(req, res);
+    }
+
+    @Override
+    public void destroy() {
+    }
+}
@@ -69,6 +69,12 @@ spring:
             - Path=/haikang/**
           filters:
             - StripPrefix=1
+        - id: haikangface
+          uri: http://120.26.116.253:8089
+          predicates:
+            - Path=/haikangface/**
+          filters:
+            - StripPrefix=1
 #      default-filters:
 #        - DedupeResponseHeader=Access-Control-Allow-Origin, RETAIN_UNIQUE
 #      discovery:
@@ -92,4 +98,4 @@ ribbon:
 url:
-  ignored: /SmartCampusWebApi/**,/authserver/**,/NewSmartCampus/**,/file-center/**,/dahua/**,/haikang/**
 \ No newline at end of file
+  ignored: /SmartCampusWebApi/**,/authserver/**,/NewSmartCampus/**,/file-center/**,/dahua/**,/haikang/**,/haikangface/**
 \ No newline at end of file
@@ -19,8 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
 import java.io.*;
 import java.net.InetAddress;
@@ -29,6 +31,7 @@ import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -48,7 +51,8 @@ public class CMSServer implements ApplicationRunner {
     //114.55.30.100
     //120.26.116.253
     private String ip_cloud = "120.26.116.253";
-    //    private String ip_cloud = "114.55.30.100";
+    //        private String ip_cloud = "172.16.2.56";
+//        private String ip_cloud = "114.55.30.100";
     private String ip;
     {
@@ -122,7 +126,7 @@ public class CMSServer implements ApplicationRunner {
     public class FRegisterCallBack implements HCEHomeCMS.DEVICE_REGISTER_CB {
         public boolean invoke(NativeLong lUserID, int dwDataType, Pointer pOutBuffer, int dwOutLen, HCEHomeCMS.NET_EHOME_SERVER_INFO pInBuffer, int dwInLen, Pointer pUser) {
             String deviceId = "";
-            System.out.println("dwDataType:" + dwDataType);
+//            System.out.println("dwDataType:" + dwDataType);
             if (dwDataType == 0) {
                 HCEHomeCMS.NET_EHOME_DEV_REG_INFO strDevRegInfo = new HCEHomeCMS.NET_EHOME_DEV_REG_INFO();
                 strDevRegInfo.write();
@@ -137,7 +141,10 @@ public class CMSServer implements ApplicationRunner {
                 pInBuffer.dwSize = pInBuffer.size();
                 AttendanceBean attendanceBean = new AttendanceBean();
                 attendanceBean.setClint_id(deviceId);
-                attendanceBean.setClint_type("18");
+                if (deviceId.startsWith("ytj"))
+                    attendanceBean.setClint_type("28");
+                else
+                    attendanceBean.setClint_type("18");
                 attendanceBean.setIntime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
                 attendanceBean.setIsConnection(1);
                 attendanceBean.setSchool_id("-1");
@@ -280,7 +287,7 @@ public class CMSServer implements ApplicationRunner {
         public boolean invoke(NativeLong iHandle, String pFileName, Pointer pFileBuf, int dwFileLen, Pointer pFilePath, Pointer pUser) {
             String strPath = "C://EhomePicServer/";
-            System.out.println("pFileName:" + pFileName);
+//            System.out.println("pFileName:" + pFileName);
             pFileName = pFileName.replace("_", "");
             boolean isZhuaPai = false;
             if (pFileName.contains("-")) {//人脸抓拍机抓拍到的图片
@@ -405,7 +412,7 @@ public class CMSServer implements ApplicationRunner {
                 strXMLData.read();
                 String strXML = new String(strXMLData.byValue);
-                System.out.println(strXML);
+//                System.out.println(strXML);
                 if (null == alarmUtils) {
                     alarmUtils = new AlarmUtils(deviceDao);
@@ -439,7 +446,7 @@ public class CMSServer implements ApplicationRunner {
                 }
             }
-            System.out.println("监听回调");
+//            System.out.println("监听回调");
             return true;
         }
     }
@@ -484,8 +491,11 @@ public class CMSServer implements ApplicationRunner {
                                 face_recoder.getImgurl(), face_recoder.getInOrOut(), face_recoder.getTime(), face_recoder.getCardNum(), currTemperature);
                     }
                 } else {
+                    //教师点名
+                    isTeacher(cardNo, deviceID);
                     FileUtils.getInstance().writeLogs("card:" + card, FileUtils.faceSuccess);
                 }
+
             }
         } catch (Exception e) {
@@ -493,6 +503,29 @@ public class CMSServer implements ApplicationRunner {
         }
     }
+    public void isTeacher(String cardNo, String deviceID) {
+
+
+        List<String> devLists = userDao.getDeviceRoomRelation(deviceID);
+
+        if (null != devLists && devLists.size() > 0) {
+
+            StudentBean teacher = userDao.getTeacherWithCard(cardNo);
+            if (null != teacher) {
+                String url = String.format("http://60.190.202.57:1000/api/RollCall/AddRollCallPersonnelRecord?userId=%s&deviceId=%s", teacher.getUser_id(), deviceID);
+
+                RestTemplate restTemplate = new RestTemplate();
+
+
+                String res = restTemplate.getForObject(url, String.class);
+
+                System.out.println("result:" + res + "------url:" + url);
+
+            }
+        }
+
+    }
+
     /**
      * 生成图片服务路径
      *
@@ -602,17 +635,17 @@ public class CMSServer implements ApplicationRunner {
                 "<password>MTIzNDU2</password>\r\n" +
                 "<maxSwipeTime></maxSwipeTime>\r\n" +
                 "<swipeTime></swipeTime>\r\n" +
-                "<groupNo></groupNo>\r\n" +
-                "<employeeNo>" + employeeNo + "</employeeNo>\r\n" +
+                "<groupNo>5</groupNo>\r\n" +
                 "<name>";
         String nameAfter = "</name>\r\n" +
-                "<departmentNo></departmentNo>\r\n" +
+                "<employeeNo>" + employeeNo + "</employeeNo>\r\n" +
+                "<departmentNo>3</departmentNo>\r\n" +
                 "<schedulePlanNo></schedulePlanNo>\r\n" +
                 "<schedulePlanType></schedulePlanType>\r\n" +
                 "</CardCfg>\r\n" +
                 "</ConfigXML>\r\n" +
                 "</Params>";
-//        System.out.println("strConfigXMLCard:" + strConfigXMLCard + name + nameAfter);
+        System.out.println("strConfigXMLCard:" + strConfigXMLCard + name + nameAfter);
         byte[] nameBeforBy = null;
         byte[] resultBy = null;
         try {
@@ -676,50 +709,50 @@ public class CMSServer implements ApplicationRunner {
     public void SetCardWeekPlan(String clint_id, String card, String userType, String strConfigXMLCard, String content) {
         try {
-        HCEHomeCMS.NET_EHOME_XML_CFG struXMLCard = new HCEHomeCMS.NET_EHOME_XML_CFG();
-
-        HCEHomeCMS.NET_DVR_STRING_POINTER stringRequestCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
-        stringRequestCard.read();
-        String strRequestCard = "SETDEVICECONFIG";
-        stringRequestCard.byString = strRequestCard.getBytes();
-        stringRequestCard.write();
-
-        struXMLCard.pCmdBuf = stringRequestCard.getPointer();
-        struXMLCard.dwCmdLen = stringRequestCard.byString.length;
-        struXMLCard.write();
-
-        HCEHomeCMS.NET_DVR_STRING_POINTER struConfigXMLCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
-        struConfigXMLCard.read();
-        struConfigXMLCard.byString = strConfigXMLCard.getBytes();
-        struConfigXMLCard.write();
-
-        struXMLCard.pInBuf = struConfigXMLCard.getPointer();
-        struXMLCard.dwInSize = struConfigXMLCard.byString.length;
-        struXMLCard.dwRecvTimeOut = 5000;
-        struXMLCard.dwSendTimeOut = 5000;
-        struXMLCard.write();
-
-        HCEHomeCMS.NET_DVR_STRING_POINTER stringOutCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
-        stringOutCard.write();
-        struXMLCard.pOutBuf = stringOutCard.getPointer();
-        struXMLCard.dwOutSize = stringOutCard.size();
-        struXMLCard.write();
-
-        HCEHomeCMS.NET_DVR_STRING_POINTER stringStatusCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
-        stringStatusCard.write();
-        struXMLCard.pStatusBuf = stringStatusCard.getPointer();
-        struXMLCard.dwStatusSize = stringStatusCard.size();
-        struXMLCard.write();
-
-        int i = struXMLCard.size();
-        if (!hCEhomeCMS.NET_ECMS_XMLConfig(map.get(clint_id), struXMLCard, struXMLCard.size())) {
-            int iErr = hCEhomeCMS.NET_ECMS_GetLastError();
-            System.err.println(content + "失败：" + iErr);
-            sendRecoderUtils.sendFail(sendRecordDao, card, "", clint_id, userDao, content + "失败：" + iErr, userType);
-        } else {
-            System.out.println(content + "成功");
-        }
-        }catch (Exception e){
+            HCEHomeCMS.NET_EHOME_XML_CFG struXMLCard = new HCEHomeCMS.NET_EHOME_XML_CFG();
+
+            HCEHomeCMS.NET_DVR_STRING_POINTER stringRequestCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
+            stringRequestCard.read();
+            String strRequestCard = "SETDEVICECONFIG";
+            stringRequestCard.byString = strRequestCard.getBytes();
+            stringRequestCard.write();
+
+            struXMLCard.pCmdBuf = stringRequestCard.getPointer();
+            struXMLCard.dwCmdLen = stringRequestCard.byString.length;
+            struXMLCard.write();
+
+            HCEHomeCMS.NET_DVR_STRING_POINTER struConfigXMLCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
+            struConfigXMLCard.read();
+            struConfigXMLCard.byString = strConfigXMLCard.getBytes();
+            struConfigXMLCard.write();
+
+            struXMLCard.pInBuf = struConfigXMLCard.getPointer();
+            struXMLCard.dwInSize = struConfigXMLCard.byString.length;
+            struXMLCard.dwRecvTimeOut = 5000;
+            struXMLCard.dwSendTimeOut = 5000;
+            struXMLCard.write();
+
+            HCEHomeCMS.NET_DVR_STRING_POINTER stringOutCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
+            stringOutCard.write();
+            struXMLCard.pOutBuf = stringOutCard.getPointer();
+            struXMLCard.dwOutSize = stringOutCard.size();
+            struXMLCard.write();
+
+            HCEHomeCMS.NET_DVR_STRING_POINTER stringStatusCard = new HCEHomeCMS.NET_DVR_STRING_POINTER();
+            stringStatusCard.write();
+            struXMLCard.pStatusBuf = stringStatusCard.getPointer();
+            struXMLCard.dwStatusSize = stringStatusCard.size();
+            struXMLCard.write();
+
+            int i = struXMLCard.size();
+            if (!hCEhomeCMS.NET_ECMS_XMLConfig(map.get(clint_id), struXMLCard, struXMLCard.size())) {
+                int iErr = hCEhomeCMS.NET_ECMS_GetLastError();
+                System.err.println(content + "失败：" + iErr);
+                sendRecoderUtils.sendFail(sendRecordDao, card, "", clint_id, userDao, content + "失败：" + iErr, userType);
+            } else {
+                System.out.println(content + "成功");
+            }
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 package com.sincere.haikangface.async;
+import com.alibaba.fastjson.JSON;
 import com.sincere.haikangface.CMSServer;
+import com.sincere.haikangface.bean.StudentBean;
+import com.sincere.haikangface.bean.TeacherBean;
 import com.sincere.haikangface.bean.face.PermissionBean;
 import com.sincere.haikangface.bean.face.WeekDay;
 import com.sincere.haikangface.bean.face.WeekTime;
@@ -10,18 +13,11 @@ import com.sincere.haikangface.dao.UserDao;
 import com.sincere.haikangface.utils.*;
 import com.sincere.haikangface.xiananDao.SendRecordDao;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.WeekdayFunc;
-import org.json.JSONArray;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.util.StringUtils;
-import javax.imageio.stream.FileImageInputStream;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.*;
 @Component
@@ -53,13 +49,30 @@ public class SendUserAsync {
             //根据设备是5603 还是新设备
             String employeeNo = "";
             if (deviceId.contains("ymzx") || deviceId.contains("5607") || deviceId.contains("5671") || deviceId.contains("5604")) {
-                employeeNo = System.currentTimeMillis() + "";
-                cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardTemplate(), "设置卡权限计划模板");
-                cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardWeekPlan(), "卡权限周计划");
-                for (int i = 0; i < 7; i++) {
-                    cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardWeekPlanTime(HKXmlUtils.getInstance().SetCardWeekPlanTimes("00:00:00", "23:00:00"), "" + i), "设置卡权限周计划时间");
+                long lon = Long.parseLong(card);
+                //十六进制卡号
+                String resultCard = getCard(String.format("%08x", lon)).toUpperCase();
+                String time = System.currentTimeMillis() + "";
+                if (userType.equals("1")) {
+                    StudentBean studentBean = userDao.getTeacherWithCard(resultCard);
+                    log.error("studentBean:{}", studentBean == null ? "-------" : studentBean.toString());
+                    if (null == studentBean) {
+                        employeeNo = time.substring(time.length() - 6, time.length());
+                    } else
+                        employeeNo = studentBean.getTeacher_id();
+                } else if (userType.equals("2")) {
+                    StudentBean studentBean = userDao.getStudentWithCard(resultCard);
+                    if (null == studentBean) {
+                        employeeNo = time.substring(time.length() - 6, time.length());
+                    } else
+                        employeeNo = studentBean.getStudent_id();
                 }
-                cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardRightCfg(card), "设置卡权限");
+//                cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardTemplate(), "设置卡权限计划模板");
+//                cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardWeekPlan(), "卡权限周计划");
+//                for (int i = 0; i < 7; i++) {
+//                    cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardWeekPlanTime(HKXmlUtils.getInstance().SetCardWeekPlanTimes("00:00:00", "23:00:00"), "" + i), "设置卡权限周计划时间");
+//                }
+//                cmsServer.SetCardWeekPlan(deviceId, card, userType, HKXmlUtils.getInstance().SetCardRightCfg(card), "设置卡权限");
             }
             boolean result = cmsServer.createImgPath(srcFile, picUrl, card, startTime, endTime, validTimeEnabled, name, deviceId, userType, employeeNo);
@@ -72,52 +85,202 @@ public class SendUserAsync {
     /**
      * 下发权限
+     *
      * @param permissionBean
+     * @param i              1:不需要重新下发，0需要重新下发
      */
-    public boolean sendPermiss(PermissionBean permissionBean) {
+    @Async("taskExecutor")
+    public boolean sendPermiss(PermissionBean permissionBean, int i) {
+
+        String userType = permissionBean.getUserType();
+
+        List<WeekDay> weekDays = permissionBean.getWeekDays();
+
+        Map<Integer, List<WeekTime>> map = new HashMap<>();
+
+        String schoolId = permissionBean.getSchoolId();
+
+        for (WeekDay weekDay :
+                weekDays) {
+            if (weekDay.getDeviceIds() != null && weekDay.getDeviceIds().size() > 0) {
+                permissionBean.setDeviceIds(weekDay.getDeviceIds());
+            }
+            List<String> deviceIds = permissionBean.getDeviceIds();
+            List<String> cardNumList = new ArrayList<>();
+            String sex = weekDay.getSex();
+            if (userType.equals("1")) {
+                List<String> cardList = getUserCard(weekDay.getUserIds(), 1);
+                cardNumList.addAll(cardList);
+            } else if (userType.equals("2")) {
+                cardNumList = getCards(sex, userType, schoolId);
+            }
+            //整理周和时间段
+            initWeedayAndTimes(weekDay, map);
+            senPsermiss(permissionBean, map, deviceIds, cardNumList, i);
+        }
+        log.error("map{}", JSON.toJSONString(map));
+        return true;
+    }
+
+    private List<String> getUserCard(String userIds, int userType) {
+        List<String> cards = new ArrayList<>();
+        try {
+
+            String[] userIdsStr = userIds.split(",");
+
+            for (String userId :
+                    userIdsStr) {
+                TeacherBean teacherBean = null;
+                if (userType == 1) {//教师
+                    teacherBean = userDao.getTeacherWithUserId(userId);
+                    if (null != teacherBean) {
+                        String card = teacherBean.getTeacer_num();
+                        if (!StringUtils.isEmpty(card)) {
+                            cards.add(card);
+                        }
+                    } else {
+                        log.error("教师用户不存在");
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return cards;
+    }
+
+    /**
+     * 把卡号和权限下发到对应的设备
+     *
+     * @param permissionBean
+     * @param map
+     * @param deviceIds
+     * @param cardNumList
+     * @param i
+     * @return
+     */
+    private boolean senPsermiss(PermissionBean permissionBean, Map<Integer, List<WeekTime>> map, List<String> deviceIds, List<String> cardNumList, int i) {
+        String userType = permissionBean.getUserType();
+
+        if (deviceIds == null || deviceIds.size() == 0) {
+            log.error("设备不存在");
+            return false;
+        }
-       String cardNum = permissionBean.getCardNum();
-       List<String> deviceIds = permissionBean.getDeviceIds();
-       String userType = permissionBean.getUserType();
-       List<WeekDay> weekDays = permissionBean.getWeekDays();
+        if (null == cardNumList || cardNumList.size() == 0) {
+            log.error("卡号为空");
+            return false;
+        }
         for (String deviceId :
                 deviceIds) {
-            if (!cmsServer.getIsDeviceOnline(deviceId)){//设备在线
-                cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, HKXmlUtils.getInstance().SetCardTemplate(), "设置卡权限计划模板");
-                cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, HKXmlUtils.getInstance().SetCardWeekPlan(), "卡权限周计划");
+            if (cmsServer.getIsDeviceOnline(deviceId)) {//设备在线
+
+                for (String cardNum :
+                        cardNumList) {
-                for (WeekDay weekDay:
-                        weekDays) {
+                    if (!StringUtils.isEmpty(cardNum)) {
+                        cardNum = Long.parseLong(getCard(cardNum), 16) + "";
-                    List<WeekTime> weekTimes = weekDay.getWeekTimes();
-                    int weekdayIndex = weekDay.getWeekDay();
+                        cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, HKXmlUtils.getInstance().SetCardTemplate(), "设置卡权限计划模板");
+                        cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, HKXmlUtils.getInstance().SetCardWeekPlan(), "卡权限周计划");
-                    StringBuffer stringBuffer = new StringBuffer();//添加时间集
+                        for (Map.Entry<Integer, List<WeekTime>> weeKdayMap :
+                                map.entrySet()) {
-                    for (WeekTime weetTime :
-                            weekTimes) {
+                            int week = weeKdayMap.getKey();
+                            List<WeekTime> weekTimes = weeKdayMap.getValue();
-                        String weekPlanTimes = HKXmlUtils.getInstance().SetCardWeekPlanTimes(weetTime.getStartTime(),weetTime.getEndTime());
-                        log.error("weekPlanTimes:{}",weekPlanTimes);
-                        stringBuffer.append(weekPlanTimes);
+                            StringBuffer stringBuffer = new StringBuffer();//添加时间集
+                            for (WeekTime weekTime :
+                                    weekTimes) {
+                                String weekPlanTimes = HKXmlUtils.getInstance().SetCardWeekPlanTimes(weekTime.getStartTime(), weekTime.getEndTime());
+//                            log.error("weekPlanTimes:{}", weekPlanTimes);
+                                stringBuffer.append(weekPlanTimes);
+                            }
+                            String weekPlanTime = HKXmlUtils.getInstance().SetCardWeekPlanTime(stringBuffer.toString(), "" + week);
+                            String serCardRightCfg = HKXmlUtils.getInstance().SetCardRightCfg(cardNum);
+//                            log.error("serCardRightCfg：{}", serCardRightCfg);
+                            FileUtils.getInstance().writeLogs(weekPlanTime,"设置卡权限周计划时间.txt");
+                            cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, weekPlanTime, "设置卡权限周计划时间");
+                            cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, serCardRightCfg, "设置卡权限");
+
+                        }
                     }
-                    String weekPlanTime = HKXmlUtils.getInstance().SetCardWeekPlanTime(stringBuffer.toString(), "" + weekdayIndex);
-                    log.error("weekPlanTime:{}",weekPlanTime);
-                    cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, weekPlanTime, "设置卡权限周计划时间");
-                    cmsServer.SetCardWeekPlan(deviceId, cardNum, userType, HKXmlUtils.getInstance().SetCardRightCfg(cardNum), "设置卡权限");
+
                 }
-            }else {//设备不在线
-                log.error("deviceId:{}",deviceId+"不在线");
+            } else {//设备不在线
+                if (i == 0)
+                    HttpUtil.sendPermission2HK(permissionBean);
+                log.error("deviceId:{}", deviceId + "不在线");
             }
         }
-
         return true;
     }
+    private List<String> getCards(String sex, String userType, String schoolId) {
+
+        List<String> cardList = new ArrayList<>();
+
+        switch (userType) {
+            case "2"://学生
+                String[] sexs = sex.split(",");
+                List<String> sexList = new ArrayList<>();
+                for (int i = 0; i < sexs.length; i++) {
+                    sexList.add(sexs[i]);
+                }
+                cardList = userDao.getStudentWiSidAndSex(schoolId, sexList);
+                break;
+        }
+
+        return cardList;
+    }
+
+
+    private void initWeedayAndTimes(WeekDay weekDay, Map<Integer, List<WeekTime>> map) {
+
+        String weekDayStr = weekDay.getWeekDay();
+        String[] weekDays = weekDayStr.split(",");
+
+        List<WeekTime> weekTimes = weekDay.getWeekTimes();
+
+        for (int i = 0; i < weekDays.length; i++) {
+            int weekDayIndex = Integer.parseInt(weekDays[i]);
+            if (map.containsKey(weekDayIndex)) {//周已经有时间段
+                List<WeekTime> weekTimeList = map.get(weekDayIndex);
+                for (WeekTime wee :
+                        weekTimes) {
+                    weekTimeList.add(wee);
+                }
+                map.put(weekDayIndex, weekTimeList);
+            } else {
+                List<WeekTime> weekTimes1 = new ArrayList<>();
+                weekTimes1.addAll(weekTimes);
+                map.put(weekDayIndex, weekTimes1);
+            }
+        }
+
+    }
+
+    private String getCard(String card) {
+
+        if (card.length() == 8) {
+            int length = card.length();
+            String result = card.substring(length - 2, length) + card.substring(length - 4, length - 2) + card.substring(length - 6, length - 4)
+                    + card.substring(length - 8, length - 6);
+            return result;
+
+        } else {
+            System.out.println("卡号位数不对:" + card);
+            return "";
+        }
+
+    }
     /**
      * 调用传图片接口
@@ -0,0 +1,36 @@
+package com.sincere.haikangface.bean;
+
+import java.io.Serializable;
+
+public class TeacherBean implements Serializable {
+
+    private String name;
+
+    private String teacher_num;
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTeacer_num() {
+        return teacher_num;
+    }
+
+    public void setTeacer_num(String teacer_num) {
+        this.teacher_num = teacer_num;
+    }
+}
 package com.sincere.haikangface.bean.face;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.List;
@@ -7,10 +9,13 @@ public class PermissionBean implements Serializable {
     private List<String> deviceIds;
-    private String cardNum;
+    private String schoolId;
     private String userType;//学生类型
+//    @ApiModelProperty("用逗号隔开，1：男，2：女")
+//    private String sex;
+
     private List<WeekDay> weekDays;
     public List<String> getDeviceIds() {
@@ -21,12 +26,12 @@ public class PermissionBean implements Serializable {
         this.deviceIds = deviceIds;
     }
-    public String getCardNum() {
-        return cardNum;
+    public String getSchoolId() {
+        return schoolId;
     }
-    public void setCardNum(String cardNum) {
-        this.cardNum = cardNum;
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
     }
     public String getUserType() {
@@ -0,0 +1,38 @@
+package com.sincere.haikangface.bean.face;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class UserAndPermission implements Serializable {
+
+    private int userType;
+
+    private List<WeekDay> weekDays;
+
+    private String schoolId;
+
+
+    public int getUserType() {
+        return userType;
+    }
+
+    public void setUserType(int userType) {
+        this.userType = userType;
+    }
+
+    public List<WeekDay> getWeekDays() {
+        return weekDays;
+    }
+
+    public void setWeekDays(List<WeekDay> weekDays) {
+        this.weekDays = weekDays;
+    }
+
+    public String getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
+    }
+}
 package com.sincere.haikangface.bean.face;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.List;
 public class WeekDay implements Serializable {
+    @ApiModelProperty("用逗号隔开，1：男，2：女")
+    private String sex;
-    private int weekDay;
+    @ApiModelProperty("用逗号隔开，0-6表示周日到周六")
+    private String weekDay;
     private List<WeekTime> weekTimes;
-    public int getWeekDay() {
+    @ApiModelProperty("教师点名专用")
+    private String userIds;
+
+    private List<String> deviceIds;
+    public List<String> getDeviceIds() {
+        return deviceIds;
+    }
+
+    public void setDeviceIds(List<String> deviceIds) {
+        this.deviceIds = deviceIds;
+    }
+
+    public String getUserIds() {
+        return userIds;
+    }
+
+    public void setUserIds(String userIds) {
+        this.userIds = userIds;
+    }
+
+    public String getWeekDay() {
         return weekDay;
     }
-    public void setWeekDay(int weekDay) {
+    public void setWeekDay(String weekDay) {
         this.weekDay = weekDay;
     }
@@ -25,4 +50,12 @@ public class WeekDay implements Serializable {
     public void setWeekTimes(List<WeekTime> weekTimes) {
         this.weekTimes = weekTimes;
     }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
 }
 package com.sincere.haikangface.control;
+import com.alibaba.fastjson.JSON;
 import com.sincere.haikangface.CMSServer;
 import com.sincere.haikangface.async.SendUserAsync;
 import com.sincere.haikangface.bean.Images2Ddevices;
 import com.sincere.haikangface.bean.StudentBean;
 import com.sincere.haikangface.bean.UploadBean;
+import com.sincere.haikangface.bean.face.PermissionBean;
 import com.sincere.haikangface.dao.UserDao;
 import com.sincere.haikangface.utils.CompressPic;
 import com.sincere.haikangface.utils.FileUtils;
@@ -12,9 +14,11 @@ import com.sincere.haikangface.utils.SendRecoderUtils;
 import com.sincere.haikangface.xiananDao.SendRecordDao;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,6 +30,7 @@ import java.util.*;
 @RestController
 @Api("文件管理器")
 @RequestMapping("file/*")
+@Slf4j
 public class FileControl {
     @Autowired
@@ -44,6 +49,16 @@ public class FileControl {
     Queue<UploadBean> uploadBeanQueue = new LinkedList<>();
+    @RequestMapping(value = "sendPermiss", method = RequestMethod.POST)
+    @ApiOperation("下发权限给设备")
+    public boolean sendPermiss(@RequestBody PermissionBean permissionBean) {
+        log.error("permissionBean:{}", JSON.toJSONString(permissionBean));
+        if (!StringUtils.isEmpty(permissionBean)) {
+            return sendUserAsync.sendPermiss(permissionBean,1);
+        }
+        return false;
+    }
+
     @RequestMapping(method = RequestMethod.POST, value = "uploadImg")
     public String uploadImg(@RequestParam("file") MultipartFile file, @RequestParam("card") String card
             , @RequestParam("name") String name, @RequestParam("deviceId") String deviceId, @RequestParam("startTime") String startTime,
@@ -2,13 +2,16 @@ package com.sincere.haikangface.control;
 //import com.sincere.common.dto.smartCampus.SZ_AttendanceDto;
+import com.alibaba.fastjson.JSON;
 import com.sincere.haikangface.bean.Images2Ddevices;
 //import com.sincere.haikangface.utils.BaiduApiUtiols;
 import com.sincere.haikangface.CMSServer;
 import com.sincere.haikangface.async.SendUserAsync;
 import com.sincere.haikangface.bean.StudentBean;
 import com.sincere.haikangface.bean.StudentInfo;
+import com.sincere.haikangface.bean.TeacherBean;
 import com.sincere.haikangface.bean.face.PermissionBean;
+import com.sincere.haikangface.bean.face.UserAndPermission;
 import com.sincere.haikangface.dao.UserDao;
 import com.sincere.haikangface.fegin.HaikangfaceFegin;
 import com.sincere.haikangface.utils.*;
@@ -17,16 +20,20 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -34,6 +41,7 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/facereco/*", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api("用户控制")
+@Slf4j
 public class UserControl {
     @Autowired
@@ -58,20 +66,47 @@ public class UserControl {
     @RequestMapping(value = "sendPermiss", method = RequestMethod.POST)
     @ApiOperation("下发权限给设备")
     public boolean sendPermiss(@RequestBody PermissionBean permissionBean) {
-
-        if (!StringUtils.isEmpty(permissionBean)) {
-           return sendUserAsync.sendPermiss(permissionBean);
+        log.error("permissionBean:{}", JSON.toJSONString(permissionBean));
+        if (!StringUtils.isEmpty(permissionBean.getDeviceIds())) {
+//            List<String> cardNumList = userDao.getStudentCardsWidthSchoolId(permissionBean.getSchoolId());
+            return sendUserAsync.sendPermiss(permissionBean, 0);
         }
         return false;
     }
+    @RequestMapping(value = "sendUsersAndPermiss", method = RequestMethod.POST)
+    @ApiOperation("下发指定教师用户权限给设备")
+    public boolean sendUsersAndPermiss(@RequestBody UserAndPermission userAndPermission) {
+        log.error("sendUsersAndPermiss:{}", JSON.toJSONString(userAndPermission));
+        FileUtils.getInstance().writeLogs(JSON.toJSONString(userAndPermission),"下发指定教师用户权限给设备.txt");
+        PermissionBean permissionBean = new PermissionBean();
+        permissionBean.setSchoolId(userAndPermission.getSchoolId());
+        permissionBean.setUserType(String.valueOf(userAndPermission.getUserType()));
+        permissionBean.setWeekDays(userAndPermission.getWeekDays());
+        return sendUserAsync.sendPermiss(permissionBean, 0);
+    }
+
+
+    @RequestMapping(value = "isTeacher", method = RequestMethod.GET)
+    @ApiOperation("测试教师点名")
+    public void isTeacher(@RequestParam("deviceId") String deviceId, @RequestParam("cardNo") String cardNo) {
+        try {
+            cmsServer.isTeacher(cardNo,deviceId);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
     @RequestMapping(value = "sendStuCardAndImg", method = RequestMethod.GET)
     @ApiOperation("下发人脸给设备")
     public boolean sendCardAndImg(@RequestParam("filePath") String filePath, @RequestParam("card") String card
             , @RequestParam("name") String name, @RequestParam("deviceId") String deviceId, @RequestParam("startTime") String startTime,
                                   @RequestParam("endTime") String endTime, @RequestParam("validTimeEnabled") int validTimeEnabled, @RequestParam("userType") String userType) {
+        return sendImg2Device(filePath, card, name, deviceId, userType);
+    }
+    private boolean sendImg2Device(String filePath, String card, String name, String deviceId, String userType) {
         try {
             if (filePath.contains(".jpg")) filePath = filePath.replace(".jpg", ".png");
@@ -222,4 +222,28 @@ public interface UserDao {
     @Insert("insert into CW_StuTemperatureReocrd values (#{UserId},#{StudentId},#{Name},#{ClassId},#{ClassName},#{Temperature},#{Type},#{SchoolId},#{Intime})")
     void addWGTem(@Param("UserId") String UserId, @Param("StudentId") String StudentId, @Param("Name") String Name, @Param("ClassId") String ClassId,
                   @Param("ClassName") String ClassName, @Param("Temperature") String Temperature, @Param("Type") String Type, @Param("SchoolId") String SchoolId, @Param("Intime") String Intime);
+
+    @Select("select student_num from SZ_V_School_Student where school_id = #{schoolId} and student_num<>''")
+    List<String> getStudentCardsWidthSchoolId(@Param("schoolId") String schoolId);
+
+    @Select("select student_num from SZ_V_School_Teacher where school_id = #{schoolId} and student_num<>''")
+    List<String> getTeaCardsWidthSchoolId(@Param("schoolId") String schoolId);
+
+    @Select("select Top(1) teacher_num from SZ_V_School_Teacher where user_id = #{userId}")
+    String getTeaCardWithUserId(@Param("userId") String userId);
+
+
+    @Select("select student_num from SZ_V_School_Student where user_id = #{userId}")
+    String getStudentCardWithUserId(@Param("userId") String userId);
+
+    @Select("select Top(1) * from SZ_V_School_Teacher where user_id = #{userId} and teacher_num<>''")
+    TeacherBean getTeacherWithUserId(@Param("userId") String userId);
+
+
+    List<String> getStudentWiSidAndSex(@Param("schoolId")String schoolId , @Param("sexs")List<String> sexs);
+
+
+    List<String> getDeviceRoomRelation(@Param("clint_id")String clint_id);
+
+
 }
@@ -118,7 +118,7 @@ public class AlarmUtils {
      */
     private void shijian(String minorType, String deviceID, String cardNo, String time, String picDataUrl, String currTemperature) {
         String content = "";
-        System.out.println("=-=============================minorType:" + minorType);
+//        System.out.println("=-=============================minorType:" + minorType);
         switch (minorType) {
             case "0x01"://合法卡认证通过
                 content = "合法卡认证通过";
@@ -54,6 +54,13 @@ public class CompressPic {
         try {
             File targetFile = new File(targetPath);
             if (!targetFile.exists()) targetFile.createNewFile();
+
+            if (width>height){
+                int width1 = width;
+                width = height;
+                height = width1;
+            }
+
             BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
             tag.getGraphics().drawImage(bufferedImage, 0, 0, width, height, null); // 绘制缩小后的图
             FileOutputStream deskImage = new FileOutputStream(targetPath); // 输出到文件流
@@ -151,7 +151,7 @@ public class HKXmlUtils {
      * @return
      */
     public String SetCardWeekPlanTimes(String startTime, String endTime) {
-        return "<startTime>" + startTime + "</startTime>\n" +
-                "<endTime>" + endTime + "</endTime>\n";
+        return "<startTime>" + startTime.trim() + "</startTime>\n" +
+                "<endTime>" + endTime.trim() + "</endTime>\n";
     }
 }
 package com.sincere.haikangface.utils;
+import com.alibaba.fastjson.JSON;
+import com.sincere.haikangface.bean.face.PermissionBean;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -162,4 +164,34 @@ public class HttpUtil {
         return restTemplate.getForObject(url, String.class).equals("1");
     }
+
+    public static void sendPermission2HK(PermissionBean permissionBean) {
+        try {
+
+            String url = "http://120.26.116.253:8089/file/sendPermiss";
+
+            if (null != permissionBean) {
+
+                RestTemplate restTemplate = new RestTemplate();
+
+                HttpHeaders headers = new HttpHeaders();
+
+                MediaType mediaType = MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE);
+
+                headers.setContentType(mediaType);
+
+                HttpEntity<PermissionBean> httpEntity = new HttpEntity<>(permissionBean, headers);
+
+                System.out.println("PermissionBean:"+JSON.toJSONString(permissionBean));
+
+                ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, httpEntity, String.class);
+
+                System.out.println("responseEntity:" + responseEntity.getBody());
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }
@@ -10,10 +10,10 @@ spring:
       password: RQminVCJota3H1u8bBYH
       jdbc-url: jdbc:sqlserver://116.62.155.137:33419;database=SmartCampus
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    #      username: SZJXTUSER
-    #      password: xst200919
-    #      jdbc-url: jdbc:sqlserver://60.190.202.57:14333;database=SmartCampusSZ
-    #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      username: SZJXTUSER
+#      password: xst200919
+#      jdbc-url: jdbc:sqlserver://60.190.202.57:14333;database=SmartCampusSZ
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     xiaoan:
       jdbc-url: jdbc:sqlserver://116.62.241.27:33419;database=xiaoanhxy
       username: szjxtuser
@@ -9,4 +9,17 @@
     <!--and studentcode = #{studentcode}-->
     <!--</select>-->
+    <select id="getStudentWiSidAndSex" resultType="java.lang.String">
+
+        select student_num from SZ_V_School_Student where school_id = #{schoolId} and sex in
+        <foreach collection="sexs" item="sex" index="index" open="(" separator="," close=")">
+            #{sex}
+        </foreach>
+
+    </select>
+
+    <select id="getDeviceRoomRelation" resultType="java.lang.String">
+        select clint_id from SZ_DeviceRoomRelation where clint_id = #{clint_id};
+    </select>
+
 </mapper>
@@ -40,7 +40,7 @@
         <!--        <module>mypulsar</module>-->
         <!--        <module>weigeng</module>-->
         <!--        <module>independence</module>-->
-        <!--        <module>quartz</module>-->
+                <module>quartz</module>
         <!--                <module>zkAttendance</module>-->
         <module>user_search</module>
         <module>fIle-center</module>
@@ -0,0 +1,36 @@
+package com.sincere.quartz;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class Swagger2 {
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.sincere.quartz.control"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("大华人脸接口")
+                .description("")
+                .termsOfServiceUrl("")
+                .version("1.0")
+                .build();
+    }
+
+}
@@ -0,0 +1,22 @@
+package com.sincere.quartz.control;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("faceUnify/*")
+@Slf4j
+public class FaceUnifyController {
+
+
+    @RequestMapping(value = "sendPermission",method = RequestMethod.GET)
+    @ApiOperation("添加/编辑/删除权限")
+    public void sendPermission(){
+        log.error("ssssssssssssssssssssssssssssssssssssssssss:{}","2222222222222");
+    }
+
+
+}
-package com.sincere.quartz.job;
-
-import com.sincere.common.dto.smartCampus.BindPushDto;
-import com.sincere.common.dto.smartCampus.ParentDto;
-import com.sincere.common.enums.PushTypeEnums;
-import com.sincere.common.util.DateUtils;
-import com.sincere.quartz.feign.ScFeign;
-import com.sincere.quartz.model.ShortMsg;
-import com.sincere.quartz.service.SmsService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 用户注册激活提醒
- *
- * @author chen
- * @version 1.0
- * @date 2019/12/10 0010 8:31
- */
-@Service
-public class BindPushJob {
-
-    private Logger logger = LoggerFactory.getLogger(BindPushJob.class);
-
-
-    @Autowired
-    ScFeign scFeign;
-
-    @Autowired
-    SmsService smsService;
-
-    private static Map<String, String> intervalDaysMap = new HashMap<>();  //redis  持久化   替换 可避免重启导致间隔的错误
-
-    @Scheduled(cron = "0 0-59 * * * ? ")
-    public void bindPush() {
-        Date nowDate = new Date();
-        List<BindPushDto> schoolList = scFeign.selectBindPushSchool();
-        for (BindPushDto school : schoolList) {
-            if (school.getBeginDate().compareTo(nowDate) <= 0 && school.getEndDate().compareTo(nowDate) >= 0) {
-                String lastDate = intervalDaysMap.get(school.getSchoolId() + "_" + school.getType());
-                if (StringUtils.isBlank(lastDate)) {
-                    //下发推送
-                    bindPush(school, nowDate);
-                } else {
-                    int day = DateUtils.getDateDifference(nowDate, DateUtils.string2Date(lastDate, DateUtils.format1), "day");
-                    if (day == school.getIntervalDays() + 1) {
-                        //下发推送
-                        bindPush(school, nowDate);
-                    }
-                }
-            }
-        }
-    }
-
-    private void bindPush(BindPushDto bindPushDto, Date nowDate) {
-        if (bindPushDto.getPushTime().equals(DateUtils.date2String(nowDate, DateUtils.format4))) {
-            intervalDaysMap.put(bindPushDto.getSchoolId() + "_" + bindPushDto.getType(), DateUtils.date2String(nowDate, DateUtils.format1));
-            //未关注
-            List<ParentDto> unFollowList = scFeign.selectNotFollow(bindPushDto.getSchoolId());
-            logger.info(bindPushDto.getSchoolName() + "未关注人数" + unFollowList.size());
-            for (ParentDto parentDto : unFollowList) {
-                sendMessage(parentDto, bindPushDto.getMsg());
-            }
-            //未绑定
-            List<ParentDto> unBindList = scFeign.selectNotBind(bindPushDto.getSchoolId(), getThirdType(bindPushDto.getType()));
-            logger.info(bindPushDto.getSchoolName() + "未绑定人数" + unBindList.size());
-            for (ParentDto parentDto : unBindList) {
-                sendMessage(parentDto, bindPushDto.getMsg());
-            }
-        }
-    }
-
-    private void sendMessage(ParentDto parentDto, String message) {
-        //手机号为空
-        if (StringUtils.isNotBlank(parentDto.getMobile())) {
-            String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
-            ShortMsg shortMsg = new ShortMsg();
-            shortMsg.setTableName("smsNew" + tableSuffix);
-            shortMsg.setSchoolId(parentDto.getSchoolId());
-            shortMsg.setMobile(parentDto.getMobile());
-            shortMsg.setMsg(message);
-            smsService.insertSMS(shortMsg);
-            logger.info("----学校Id---" + parentDto.getSchoolId() + "----手机号----" + parentDto.getMobile() + "---" + message);
-        }
-    }
-
-    // 0是企业号，1是钉钉
-    private int getThirdType(int type) {
-        if (type == 0) {
-            return PushTypeEnums.QIYEHAO.getType();
-        } else {
-            return PushTypeEnums.DING.getType();
-        }
-    }
-
-}
+//package com.sincere.quartz.job;
+//
+//import com.sincere.common.dto.smartCampus.BindPushDto;
+//import com.sincere.common.dto.smartCampus.ParentDto;
+//import com.sincere.common.enums.PushTypeEnums;
+//import com.sincere.common.util.DateUtils;
+//import com.sincere.quartz.feign.ScFeign;
+//import com.sincere.quartz.model.ShortMsg;
+//import com.sincere.quartz.service.SmsService;
+//import org.apache.commons.lang3.StringUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * 用户注册激活提醒
+// *
+// * @author chen
+// * @version 1.0
+// * @date 2019/12/10 0010 8:31
+// */
+//@Service
+//public class BindPushJob {
+//
+//    private Logger logger = LoggerFactory.getLogger(BindPushJob.class);
+//
+//
+//    @Autowired
+//    ScFeign scFeign;
+//
+//    @Autowired
+//    SmsService smsService;
+//
+//    private static Map<String, String> intervalDaysMap = new HashMap<>();  //redis  持久化   替换 可避免重启导致间隔的错误
+//
+//    @Scheduled(cron = "0 0-59 * * * ? ")
+//    public void bindPush() {
+//        Date nowDate = new Date();
+//        List<BindPushDto> schoolList = scFeign.selectBindPushSchool();
+//        for (BindPushDto school : schoolList) {
+//            if (school.getBeginDate().compareTo(nowDate) <= 0 && school.getEndDate().compareTo(nowDate) >= 0) {
+//                String lastDate = intervalDaysMap.get(school.getSchoolId() + "_" + school.getType());
+//                if (StringUtils.isBlank(lastDate)) {
+//                    //下发推送
+//                    bindPush(school, nowDate);
+//                } else {
+//                    int day = DateUtils.getDateDifference(nowDate, DateUtils.string2Date(lastDate, DateUtils.format1), "day");
+//                    if (day == school.getIntervalDays() + 1) {
+//                        //下发推送
+//                        bindPush(school, nowDate);
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    private void bindPush(BindPushDto bindPushDto, Date nowDate) {
+//        if (bindPushDto.getPushTime().equals(DateUtils.date2String(nowDate, DateUtils.format4))) {
+//            intervalDaysMap.put(bindPushDto.getSchoolId() + "_" + bindPushDto.getType(), DateUtils.date2String(nowDate, DateUtils.format1));
+//            //未关注
+//            List<ParentDto> unFollowList = scFeign.selectNotFollow(bindPushDto.getSchoolId());
+//            logger.info(bindPushDto.getSchoolName() + "未关注人数" + unFollowList.size());
+//            for (ParentDto parentDto : unFollowList) {
+//                sendMessage(parentDto, bindPushDto.getMsg());
+//            }
+//            //未绑定
+//            List<ParentDto> unBindList = scFeign.selectNotBind(bindPushDto.getSchoolId(), getThirdType(bindPushDto.getType()));
+//            logger.info(bindPushDto.getSchoolName() + "未绑定人数" + unBindList.size());
+//            for (ParentDto parentDto : unBindList) {
+//                sendMessage(parentDto, bindPushDto.getMsg());
+//            }
+//        }
+//    }
+//
+//    private void sendMessage(ParentDto parentDto, String message) {
+//        //手机号为空
+//        if (StringUtils.isNotBlank(parentDto.getMobile())) {
+//            String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+//            ShortMsg shortMsg = new ShortMsg();
+//            shortMsg.setTableName("smsNew" + tableSuffix);
+//            shortMsg.setSchoolId(parentDto.getSchoolId());
+//            shortMsg.setMobile(parentDto.getMobile());
+//            shortMsg.setMsg(message);
+//            smsService.insertSMS(shortMsg);
+//            logger.info("----学校Id---" + parentDto.getSchoolId() + "----手机号----" + parentDto.getMobile() + "---" + message);
+//        }
+//    }
+//
+//    // 0是企业号，1是钉钉
+//    private int getThirdType(int type) {
+//        if (type == 0) {
+//            return PushTypeEnums.QIYEHAO.getType();
+//        } else {
+//            return PushTypeEnums.DING.getType();
+//        }
+//    }
+//
+//}
-package com.sincere.quartz.job;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.sincere.common.dto.smartCampus.*;
-import com.sincere.common.enums.PushTypeEnums;
-import com.sincere.common.util.DateUtils;
-import com.sincere.common.util.HttpClientUtils;
-import com.sincere.quartz.enums.KqTypeEnums;
-import com.sincere.quartz.enums.TypeEnums;
-import com.sincere.quartz.feign.ScFeign;
-import com.sincere.quartz.model.DingSms;
-import com.sincere.quartz.model.ShortMsg;
-import com.sincere.quartz.model.WeChatSms;
-import com.sincere.quartz.service.ManagerService;
-import com.sincere.quartz.service.SmsService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * 考勤任务推送调用
- * 主要推送盯盯以及企业号
- *
- * @author chen
- * @version 1.0
- * @date 2019/11/27 0027 17:05
- */
-@Service
-public class KQJob {
-
-    private Logger logger = LoggerFactory.getLogger(KQJob.class);
-
-    @Autowired
-    ScFeign scFeign;
-
-    @Autowired
-    SmsService smsService;
-
-    @Autowired
-    ManagerService managerService;
-
-    private static String iotUrl = "http://60.190.202.57:8035";
-
-    private static String date;
-    private static Map<String, String> map = new HashMap<>();   //学校 考勤推送map
-
-    private static String alarmDate;
-    private static Map<String, String> alarmMap = new HashMap<>();   //考勤告警推送map
-    private static Map<String, BigDecimal> templateMap = new HashMap<>(); // 考勤比例
-
-    private static List<String> opexList;
-    private static String integration;
-
-    static {
-        opexList = new ArrayList<>();
-        opexList.add("15857566147");  //王汉栋
-        opexList.add("13858485977");  //王楠彬
-
-        integration = "18767117554";  //林炜
-    }
-
-    @Scheduled(cron = "0 0-59 * * * ? ")
-    public void kaoQing() {
-        String now = DateUtils.date2String(new Date(), DateUtils.format1);
-        if (StringUtils.isBlank(date)) {
-            initMap();
-            date = now;
-        }
-        if (!DateUtils.date2String(new Date(), DateUtils.format1).equals(date)) {
-            initMap();
-            date = DateUtils.date2String(new Date(), DateUtils.format1);
-        }
-        //开始过滤数据  推送
-        List<String> keyList = new ArrayList<>();
-        for (Map.Entry<String, String> entity : map.entrySet()) {
-            String endTime = entity.getValue().split("_")[1];
-            if (DateUtils.getDateDifference(new Date(), DateUtils.string2Date(now + " " + endTime + ":00", DateUtils.format2), "m") >= 2
-                    && DateUtils.getDateDifference(new Date(), DateUtils.string2Date(now + " " + endTime + ":00", DateUtils.format2), "m") < 5) {
-                String key = entity.getKey();
-                String[] messageArray = key.split("_");
-                if (messageArray[2].contains(PushTypeEnums.QIYEHAO.getType() + "")) {
-                    logger.info("企业号推送：" + messageArray[0] + "__" + messageArray[1]);
-                    weChatBatchPush(messageArray[0], Integer.valueOf(messageArray[1]), entity.getValue());
-                }
-                if (messageArray[2].contains(PushTypeEnums.DING.getType() + "")) {
-                    logger.info(("盯盯推送：" + messageArray[0] + "__" + messageArray[1]));
-                    dingBatchPush(messageArray[0], Integer.valueOf(messageArray[1]), entity.getValue());
-                }
-                keyList.add(key);
-            }
-        }
-        for (String key : keyList) {
-            map.remove(key);
-        }
-    }
-
-    @Scheduled(cron = "0 0-59 * * * ? ")
-    public void alarmKaoQing() {
-        String now = DateUtils.date2String(new Date(), DateUtils.format1);
-        if (StringUtils.isBlank(alarmDate)) {
-            initAlarmMap();
-            alarmDate = now;
-        }
-        if (!DateUtils.date2String(new Date(), DateUtils.format1).equals(alarmDate)) {
-            initAlarmMap();
-            alarmDate = DateUtils.date2String(new Date(), DateUtils.format1);
-        }
-        //开始过滤数据  推送
-        List<String> keyList = new ArrayList<>();
-        for (Map.Entry<String, String> entity : alarmMap.entrySet()) {
-            String endTime = entity.getValue().split("_")[1];
-            if (DateUtils.getDateDifference(new Date(), DateUtils.string2Date(now + " " + endTime + ":00", DateUtils.format2), "m") >= 2
-            ) {
-                String key = entity.getKey();
-                keyList.add(key);
-                //alarm(entity);  //告警
-                //insertIOT(entity); //iot
-            }
-        }
-        for (String key : keyList) {
-            map.remove(key);
-        }
-    }
-
-    private void initAlarmMap() {
-        alarmMap = new HashMap<>();
-        List<TemplateDto> list = scFeign.getAllTemplateAlarm();
-        logger.info(("------考勤告警模板------"));
-        for (TemplateDto templateDto : list) {
-            String config = templateDto.getConfig();
-            String[] array = config.split("<Template");
-            for (int i = 1; i < array.length; i++) {
-                try {
-                    String msg = array[i];
-                    String beginTime = msg.substring(msg.indexOf("BeginTime") + 11, msg.indexOf("BeginTime") + 16);
-                    String endTime = msg.substring(msg.indexOf("EndTime") + 9, msg.indexOf("EndTime") + 14);
-                    String templateId = msg.substring(msg.indexOf("TemplateID") + 12, msg.indexOf("TemplateID") + 22);
-                    String Week = msg.substring(msg.indexOf("Week") + 6, msg.indexOf("Week") + 19);
-                    String type = msg.substring(msg.indexOf("Type") + 6, msg.indexOf("Type") + 8);
-                    type = type.replace("\"", "");
-                    int nowWeek = DateUtils.getWeek();
-                    if (Week.contains(nowWeek + "") && nowWeek != 6 && nowWeek != 0) {  //周末不告警
-                        logger.info((templateId + "_" + templateDto.getSchoolId() + "------" + beginTime + "_" + endTime));
-                        alarmMap.put(templateId + "_" + templateDto.getSchoolId() + "_" + templateDto.getTitle(), beginTime + "_" + endTime + "_" + type + "_" + templateDto.getId());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    //告警推送
-    private void alarm(Map.Entry<String, String> entry) {
-        String templateId = entry.getKey().split("_")[0];
-        String schoolId = entry.getKey().split("_")[1];
-        String id = entry.getValue().split("_")[3];
-        String type = entry.getValue().split("_")[2];
-
-        if (DateUtils.getWeek() == 2 || DateUtils.getWeek() == 5) {
-            //可以相差40%
-            BigDecimal percent = getAlarmCensus(Integer.valueOf(id), templateId, Integer.valueOf(schoolId), Integer.valueOf(type));
-            if (templateMap.get(templateId) != null) {
-                if (percent.subtract(templateMap.get(templateId)).compareTo(new BigDecimal(0.4)) > 0
-                        || templateMap.get(templateId).subtract(percent).compareTo(new BigDecimal(0.4)) > 0) {
-                    alarmPush(Integer.valueOf(schoolId));
-                }
-            }
-            templateMap.put(templateId, percent);
-        } else {
-            //相差30%
-            BigDecimal percent = getAlarmCensus(Integer.valueOf(id), templateId, Integer.valueOf(schoolId), Integer.valueOf(type));
-            if (templateMap.get(templateId) != null) {
-                if (percent.subtract(templateMap.get(templateId)).compareTo(new BigDecimal(0.3)) > 0
-                        || templateMap.get(templateId).subtract(percent).compareTo(new BigDecimal(0.3)) > 0) {
-                    alarmPush(Integer.valueOf(schoolId));
-                }
-            }
-            templateMap.put(templateId, percent);
-        }
-    }
-
-    private void insertIOT(Map.Entry<String, String> entry) {
-        String templateId = entry.getKey().split("_")[0];
-        String schoolId = entry.getKey().split("_")[1];
-        String title = entry.getKey().split("_")[2];
-        String id = entry.getValue().split("_")[3];
-        String type = entry.getValue().split("_")[2];
-        String beginTime = entry.getValue().split("_")[0];
-        String endTime = entry.getValue().split("_")[1];
-
-        List<Integer> list = getIOTCensus(Integer.valueOf(id), templateId, Integer.valueOf(schoolId), Integer.valueOf(type));
-        JSONObject object = new JSONObject();
-        object.put("strTime", beginTime);
-        object.put("endTime", endTime);
-        object.put("inTime", DateUtils.date2String(new Date(), DateUtils.format1));
-        object.put("noAttendanceCount", list.get(1));
-        object.put("attendanceCount", list.get(0));
-        object.put("leaveCount", list.get(2));
-        object.put("templateName", title);
-        object.put("qianDaoIdId", id);
-        object.put("schoolId", schoolId);
-        object.put("templateId", templateId);
-        HttpClientUtils.httpPostJson(iotUrl + "/api/Association/addIntelligenceAttendance", object.toJSONString());
-    }
-
-    //初始化要推送的模板
-    private void initMap() {
-        map = new HashMap<>();
-        List<TemplateDto> list = scFeign.getAllTemplate();
-        logger.info(("------需要推送的考勤模板------"));
-        for (TemplateDto templateDto : list) {
-            String config = templateDto.getConfig();
-            String[] array = config.split("<Template");
-            for (int i = 1; i < array.length; i++) {
-                try {
-                    String msg = array[i];
-                    String beginTime = msg.substring(msg.indexOf("BeginTime") + 11, msg.indexOf("BeginTime") + 16);
-                    String endTime = msg.substring(msg.indexOf("EndTime") + 9, msg.indexOf("EndTime") + 14);
-                    String templateId = msg.substring(msg.indexOf("TemplateID") + 12, msg.indexOf("TemplateID") + 22);
-                    String Week = msg.substring(msg.indexOf("Week") + 6, msg.indexOf("Week") + 19);
-                    String type = msg.substring(msg.indexOf("Type") + 6, msg.indexOf("Type") + 8);
-                    type = type.replace("\"", "");
-                    int nowWeek = DateUtils.getWeek();
-                    if (Week.contains(nowWeek + "")) {
-                        logger.info((templateId + "_" + templateDto.getSchoolId() + "_" + templateDto.getType() + "------" + beginTime + "_" + endTime));
-                        map.put(templateId + "_" + templateDto.getSchoolId() + "_" + templateDto.getType(), beginTime + "_" + endTime + "_" + type + "_" + templateDto.getId());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    //盯盯批量推送
-    private void dingBatchPush(String templateId, int schoolId, String key) {
-        String[] times = key.split("_");
-        AppDto appDto = scFeign.getApp(schoolId, 1);
-        if (Integer.valueOf(times[2]) < 7) {
-            //出入校   推班主任
-            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
-            for (KqTeacherDto teacher : list) {
-                dingSchoolPush(templateId, teacher, key, appDto, 0);
-            }
-        } else {
-            //出入寝  推班主任
-            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
-            for (KqTeacherDto teacher : list) {
-                dingSchoolPush(templateId, teacher, key, appDto, 1);
-            }
-            //推宿管
-            List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
-            for (KqTeacherDto teacher : chamberList) {
-                dingChamberPush(templateId, teacher, key, appDto);
-            }
-        }
-    }
-
-    //企业号批量推送
-    private void weChatBatchPush(String templateId, int schoolId, String key) {
-        String[] times = key.split("_");
-        AppDto appDto = scFeign.getApp(schoolId, 0);
-        if (Integer.valueOf(times[2]) < 7) {
-            //出入校   推班主任
-            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
-            for (KqTeacherDto teacher : list) {
-                weChatSchoolPush(templateId, teacher, key, appDto, 0);
-            }
-        } else {
-            //出入寝  推班主任
-            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
-            for (KqTeacherDto teacher : list) {
-                weChatSchoolPush(templateId, teacher, key, appDto, 1);
-            }
-            //推宿管
-            List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
-            for (KqTeacherDto teacher : chamberList) {
-                weChatChamberPush(templateId, teacher, key, appDto);
-            }
-        }
-    }
-
-    //盯盯推送班主任
-    private void dingSchoolPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto, int type) {
-        String[] times = key.split("_");
-        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
-        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 0);
-        if (StringUtils.isNotBlank(thirdOpenId)) {
-            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), type);
-            if (censusKqDtos != null && censusKqDtos.size() > 0) {
-                String message = "";
-                for (CensusKqDto censusKqDto : censusKqDtos) {
-                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
-                }
-                DingSms dingSms = new DingSms();
-                dingSms.setName(teacher.getName());
-                dingSms.setTableName("DingSmsNew" + tableSuffix);
-                dingSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
-                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
-                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
-                        "整体数据：" + message);
-                String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
-                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
-                        "&data=" + thirdOpenId + "&type=1&stype=4&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
-                        "&face=&sourcetype=16&soutype=3&timestamp=" + DateUtils.getDate() + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
-                dingSms.setSchoolId(teacher.getSchoolId());
-                dingSms.setDingUserId(thirdOpenId);
-                dingSms.setAgentId(appDto.getAgentId());
-                dingSms.setWapUrl(wapUrl);
-                dingSms.setReceiveUserId(teacher.getUserId());
-                dingSms.setTdType(TypeEnums.kaoqing.getType());
-                this.insertDing(dingSms);
-                logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName());
-            }
-        }
-    }
-
-    //盯盯推送宿管
-    private void dingChamberPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto) {
-        String[] times = key.split("_");
-        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
-        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 0);
-        if (StringUtils.isNotBlank(thirdOpenId)) {
-            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), 1);
-            if (censusKqDtos != null && censusKqDtos.size() > 0) {
-                String message = "";
-                for (CensusKqDto censusKqDto : censusKqDtos) {
-                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
-                }
-                DingSms dingSms = new DingSms();
-                dingSms.setName(teacher.getName());
-                dingSms.setTableName("DingSmsNew" + tableSuffix);
-                dingSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
-                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
-                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
-                        "整体数据：" + message);
-                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
-                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
-                        "&pass=" + teacher.getPass() + "&type=4&soutype=3&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
-                dingSms.setSchoolId(teacher.getSchoolId());
-                dingSms.setDingUserId(thirdOpenId);
-                dingSms.setAgentId(appDto.getAgentId());
-                dingSms.setWapUrl(msgUrl);
-                dingSms.setReceiveUserId(teacher.getUserId());
-                dingSms.setTdType(TypeEnums.kaoqing.getType());
-                this.insertDing(dingSms);
-                logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName());
-            }
-        }
-    }
-
-    //企业号推送班主任
-    private void weChatSchoolPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto, int type) {
-        String[] times = key.split("_");
-        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
-        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 1);
-        if (StringUtils.isNotBlank(thirdOpenId)) {
-            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), type);
-            if (censusKqDtos != null && censusKqDtos.size() > 0) {
-                String message = "";
-                for (CensusKqDto censusKqDto : censusKqDtos) {
-                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
-                }
-                WeChatSms weChatSms = new WeChatSms();
-                weChatSms.setTableName("qyhSmsNew" + tableSuffix);
-                weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
-                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
-                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
-                        "整体数据：" + message);
-                weChatSms.setSchoolId(teacher.getSchoolId());
-                weChatSms.setName(teacher.getName());
-                weChatSms.setQiYeHaoUserId(thirdOpenId);
-                weChatSms.setReceiveUserId(teacher.getUserId());
-                weChatSms.setAppId(appDto.getAgentId());
-                weChatSms.setSecret(appDto.getAgentSecret());
-                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
-                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
-                        "&data=" + thirdOpenId + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
-                        "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2&timestamp=" + DateUtils.getDate() + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1) + "&";
-                weChatSms.setMsgUrl(msgUrl);
-                weChatSms.setTdType(TypeEnums.kaoqing.getType());
-                this.insertQYH(weChatSms);
-                logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName());
-            }
-        }
-    }
-
-    //企业号推送宿管
-    private void weChatChamberPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto) {
-        String[] times = key.split("_");
-        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
-        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 1);
-        if (StringUtils.isNotBlank(thirdOpenId)) {
-            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), 1);
-            if (censusKqDtos != null && censusKqDtos.size() > 0) {
-                String message = "";
-                for (CensusKqDto censusKqDto : censusKqDtos) {
-                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
-                }
-                WeChatSms weChatSms = new WeChatSms();
-                weChatSms.setTableName("qyhSmsNew" + tableSuffix);
-                weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
-                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
-                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
-                        "整体数据：" + message);
-                weChatSms.setSchoolId(teacher.getSchoolId());
-                weChatSms.setName(teacher.getName());
-                weChatSms.setQiYeHaoUserId(thirdOpenId);
-                weChatSms.setReceiveUserId(teacher.getUserId());
-                weChatSms.setAppId(appDto.getAgentId());
-                weChatSms.setSecret(appDto.getAgentSecret());
-                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
-                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
-                        "&pass=" + teacher.getPass() + "&type=4&soutype=2&time=" + DateUtils.date2String(new Date(), DateUtils.format1) + "&";
-                weChatSms.setMsgUrl(msgUrl);
-                weChatSms.setTdType(TypeEnums.kaoqing.getType());
-                this.insertQYH(weChatSms);
-                logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName());
-            }
-        }
-    }
-
-    //type  0 出入校 1 出入寝
-    private List<CensusKqDto> getCensus(int id, String templateId, int schoolId, String userId, int type) {
-        List<CensusKqDto> list = new ArrayList<>();
-        String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetailNew?schoolId=" + schoolId +
-                "&id=" + id + "&templateID=" + templateId + "&type=" + type + "&userId=" + userId + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
-        JSONObject jsonObject = HttpClientUtils.httpGet(url);
-        try {
-            JSONArray data = (JSONArray) jsonObject.get("data");
-            for (int i = 0; i < data.size(); i++) {
-                CensusKqDto censusKqDto = new CensusKqDto();
-                JSONObject object = data.getJSONObject(i);
-                censusKqDto.setLeaveCount((Integer) object.get("leaveCount"));
-                censusKqDto.setNotAttendCount((Integer) object.get("noAttendCount"));
-                censusKqDto.setTargetName((String) object.get("name"));
-                list.add(censusKqDto);
-            }
-        } catch (Exception e) {
-
-        }
-        return list;
-    }
-
-    private BigDecimal getAlarmCensus(int id, String templateId, int schoolId, int type) {
-        int allNumber = 0, attendNumber = 0;
-        List<Integer> list = scFeign.selectClassBySchoolId(schoolId);
-        for (Integer classId : list) {
-            String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetail?classId=" + classId +
-                    "&id=" + id + "&templateID=" + templateId + "&type=" + type + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
-            JSONObject jsonObject = HttpClientUtils.httpGet(url);
-            try {
-                JSONObject data = (JSONObject) jsonObject.get("data");
-                attendNumber = attendNumber + (Integer) data.get("stuAttendCount");
-                allNumber = allNumber + (Integer) data.get("stuCount");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        if (allNumber != 0) {
-            BigDecimal pecrent = new BigDecimal(attendNumber).divide(new BigDecimal(allNumber), 10, BigDecimal.ROUND_HALF_DOWN);
-            return pecrent;
-        } else {
-            return BigDecimal.ZERO;
-        }
-
-    }
-
-    /**
-     * @param id
-     * @param templateId
-     * @param schoolId
-     * @param type
-     * @return list(0)  出勤 list(1) 未出勤  List(2) 请假
-     */
-    private List<Integer> getIOTCensus(int id, String templateId, int schoolId, int type) {
-        List<Integer> result = new ArrayList<>();
-        int attend = 0, unattend = 0, leave = 0;
-        List<Integer> list = scFeign.selectClassBySchoolId(schoolId);
-        for (Integer classId : list) {
-            String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetail?classId=" + classId +
-                    "&id=" + id + "&templateID=" + templateId + "&type=" + type + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
-            JSONObject jsonObject = HttpClientUtils.httpGet(url);
-            try {
-                JSONObject data = (JSONObject) jsonObject.get("data");
-                attend = attend + (Integer) data.get("stuAttendCount");
-                unattend = unattend + (Integer) data.get("noAttendCount");
-                leave = leave + (Integer) data.get("leaveCount");
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        result.add(attend);
-        result.add(unattend);
-        result.add(leave);
-        return result;
-    }
-
-
-    private void insertDing(DingSms dingSms) {
-        try {
-            smsService.insertDing(dingSms);
-        } catch (Exception e) {
-            logger.info(e.toString());
-        }
-    }
-
-    private void insertQYH(WeChatSms weChatSms) {
-        try {
-            smsService.insertWeChat(weChatSms);
-        } catch (Exception e) {
-            logger.info(e.toString());
-        }
-    }
-
-    private void alarmPush(int schoolId) {
-        String msg = "【考勤异动】";
-        try {
-            SchoolDto schoolDto = scFeign.selectSchoolBySchoolId(schoolId);
-            msg += schoolDto.getSchoolName() + "考勤有异动，请关注！";
-            sendMessage(schoolDto.getSchoolId(), opexList.get(0), msg);
-            sendMessage(schoolDto.getSchoolId(), opexList.get(1), msg);
-            sendMessage(schoolDto.getSchoolId(), integration, msg);
-            String managerPhone = managerService.selectManagerById(schoolDto.getManagerUserId());
-            if (StringUtils.isNotBlank(managerPhone)) {
-                sendMessage(schoolDto.getSchoolId(), managerPhone, msg);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    private void sendMessage(int schoolId, String mobile, String msg) {
-        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
-        ShortMsg shortMsg = new ShortMsg();
-        shortMsg.setTableName("smsNew" + tableSuffix);
-        shortMsg.setSchoolId(schoolId);
-        shortMsg.setMobile(mobile);
-        shortMsg.setMsg(msg);
-        smsService.insertSMS(shortMsg);
-    }
-}
+//package com.sincere.quartz.job;
+//
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//import com.sincere.common.dto.smartCampus.*;
+//import com.sincere.common.enums.PushTypeEnums;
+//import com.sincere.common.util.DateUtils;
+//import com.sincere.common.util.HttpClientUtils;
+//import com.sincere.quartz.enums.KqTypeEnums;
+//import com.sincere.quartz.enums.TypeEnums;
+//import com.sincere.quartz.feign.ScFeign;
+//import com.sincere.quartz.model.DingSms;
+//import com.sincere.quartz.model.ShortMsg;
+//import com.sincere.quartz.model.WeChatSms;
+//import com.sincere.quartz.service.ManagerService;
+//import com.sincere.quartz.service.SmsService;
+//import org.apache.commons.lang3.StringUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Service;
+//
+//import java.math.BigDecimal;
+//import java.util.*;
+//
+///**
+// * 考勤任务推送调用
+// * 主要推送盯盯以及企业号
+// *
+// * @author chen
+// * @version 1.0
+// * @date 2019/11/27 0027 17:05
+// */
+//@Service
+//public class KQJob {
+//
+//    private Logger logger = LoggerFactory.getLogger(KQJob.class);
+//
+//    @Autowired
+//    ScFeign scFeign;
+//
+//    @Autowired
+//    SmsService smsService;
+//
+//    @Autowired
+//    ManagerService managerService;
+//
+//    private static String iotUrl = "http://60.190.202.57:8035";
+//
+//    private static String date;
+//    private static Map<String, String> map = new HashMap<>();   //学校 考勤推送map
+//
+//    private static String alarmDate;
+//    private static Map<String, String> alarmMap = new HashMap<>();   //考勤告警推送map
+//    private static Map<String, BigDecimal> templateMap = new HashMap<>(); // 考勤比例
+//
+//    private static List<String> opexList;
+//    private static String integration;
+//
+//    static {
+//        opexList = new ArrayList<>();
+//        opexList.add("15857566147");  //王汉栋
+//        opexList.add("13858485977");  //王楠彬
+//
+//        integration = "18767117554";  //林炜
+//    }
+//
+//    @Scheduled(cron = "0 0-59 * * * ? ")
+//    public void kaoQing() {
+//        String now = DateUtils.date2String(new Date(), DateUtils.format1);
+//        if (StringUtils.isBlank(date)) {
+//            initMap();
+//            date = now;
+//        }
+//        if (!DateUtils.date2String(new Date(), DateUtils.format1).equals(date)) {
+//            initMap();
+//            date = DateUtils.date2String(new Date(), DateUtils.format1);
+//        }
+//        //开始过滤数据  推送
+//        List<String> keyList = new ArrayList<>();
+//        for (Map.Entry<String, String> entity : map.entrySet()) {
+//            String endTime = entity.getValue().split("_")[1];
+//            if (DateUtils.getDateDifference(new Date(), DateUtils.string2Date(now + " " + endTime + ":00", DateUtils.format2), "m") >= 2
+//                    && DateUtils.getDateDifference(new Date(), DateUtils.string2Date(now + " " + endTime + ":00", DateUtils.format2), "m") < 5) {
+//                String key = entity.getKey();
+//                String[] messageArray = key.split("_");
+//                if (messageArray[2].contains(PushTypeEnums.QIYEHAO.getType() + "")) {
+//                    logger.info("企业号推送：" + messageArray[0] + "__" + messageArray[1]);
+//                    weChatBatchPush(messageArray[0], Integer.valueOf(messageArray[1]), entity.getValue());
+//                }
+//                if (messageArray[2].contains(PushTypeEnums.DING.getType() + "")) {
+//                    logger.info(("盯盯推送：" + messageArray[0] + "__" + messageArray[1]));
+//                    dingBatchPush(messageArray[0], Integer.valueOf(messageArray[1]), entity.getValue());
+//                }
+//                keyList.add(key);
+//            }
+//        }
+//        for (String key : keyList) {
+//            map.remove(key);
+//        }
+//    }
+//
+//    @Scheduled(cron = "0 0-59 * * * ? ")
+//    public void alarmKaoQing() {
+//        String now = DateUtils.date2String(new Date(), DateUtils.format1);
+//        if (StringUtils.isBlank(alarmDate)) {
+//            initAlarmMap();
+//            alarmDate = now;
+//        }
+//        if (!DateUtils.date2String(new Date(), DateUtils.format1).equals(alarmDate)) {
+//            initAlarmMap();
+//            alarmDate = DateUtils.date2String(new Date(), DateUtils.format1);
+//        }
+//        //开始过滤数据  推送
+//        List<String> keyList = new ArrayList<>();
+//        for (Map.Entry<String, String> entity : alarmMap.entrySet()) {
+//            String endTime = entity.getValue().split("_")[1];
+//            if (DateUtils.getDateDifference(new Date(), DateUtils.string2Date(now + " " + endTime + ":00", DateUtils.format2), "m") >= 2
+//            ) {
+//                String key = entity.getKey();
+//                keyList.add(key);
+//                //alarm(entity);  //告警
+//                //insertIOT(entity); //iot
+//            }
+//        }
+//        for (String key : keyList) {
+//            map.remove(key);
+//        }
+//    }
+//
+//    private void initAlarmMap() {
+//        alarmMap = new HashMap<>();
+//        List<TemplateDto> list = scFeign.getAllTemplateAlarm();
+//        logger.info(("------考勤告警模板------"));
+//        for (TemplateDto templateDto : list) {
+//            String config = templateDto.getConfig();
+//            String[] array = config.split("<Template");
+//            for (int i = 1; i < array.length; i++) {
+//                try {
+//                    String msg = array[i];
+//                    String beginTime = msg.substring(msg.indexOf("BeginTime") + 11, msg.indexOf("BeginTime") + 16);
+//                    String endTime = msg.substring(msg.indexOf("EndTime") + 9, msg.indexOf("EndTime") + 14);
+//                    String templateId = msg.substring(msg.indexOf("TemplateID") + 12, msg.indexOf("TemplateID") + 22);
+//                    String Week = msg.substring(msg.indexOf("Week") + 6, msg.indexOf("Week") + 19);
+//                    String type = msg.substring(msg.indexOf("Type") + 6, msg.indexOf("Type") + 8);
+//                    type = type.replace("\"", "");
+//                    int nowWeek = DateUtils.getWeek();
+//                    if (Week.contains(nowWeek + "") && nowWeek != 6 && nowWeek != 0) {  //周末不告警
+//                        logger.info((templateId + "_" + templateDto.getSchoolId() + "------" + beginTime + "_" + endTime));
+//                        alarmMap.put(templateId + "_" + templateDto.getSchoolId() + "_" + templateDto.getTitle(), beginTime + "_" + endTime + "_" + type + "_" + templateDto.getId());
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//    }
+//
+//    //告警推送
+//    private void alarm(Map.Entry<String, String> entry) {
+//        String templateId = entry.getKey().split("_")[0];
+//        String schoolId = entry.getKey().split("_")[1];
+//        String id = entry.getValue().split("_")[3];
+//        String type = entry.getValue().split("_")[2];
+//
+//        if (DateUtils.getWeek() == 2 || DateUtils.getWeek() == 5) {
+//            //可以相差40%
+//            BigDecimal percent = getAlarmCensus(Integer.valueOf(id), templateId, Integer.valueOf(schoolId), Integer.valueOf(type));
+//            if (templateMap.get(templateId) != null) {
+//                if (percent.subtract(templateMap.get(templateId)).compareTo(new BigDecimal(0.4)) > 0
+//                        || templateMap.get(templateId).subtract(percent).compareTo(new BigDecimal(0.4)) > 0) {
+//                    alarmPush(Integer.valueOf(schoolId));
+//                }
+//            }
+//            templateMap.put(templateId, percent);
+//        } else {
+//            //相差30%
+//            BigDecimal percent = getAlarmCensus(Integer.valueOf(id), templateId, Integer.valueOf(schoolId), Integer.valueOf(type));
+//            if (templateMap.get(templateId) != null) {
+//                if (percent.subtract(templateMap.get(templateId)).compareTo(new BigDecimal(0.3)) > 0
+//                        || templateMap.get(templateId).subtract(percent).compareTo(new BigDecimal(0.3)) > 0) {
+//                    alarmPush(Integer.valueOf(schoolId));
+//                }
+//            }
+//            templateMap.put(templateId, percent);
+//        }
+//    }
+//
+//    private void insertIOT(Map.Entry<String, String> entry) {
+//        String templateId = entry.getKey().split("_")[0];
+//        String schoolId = entry.getKey().split("_")[1];
+//        String title = entry.getKey().split("_")[2];
+//        String id = entry.getValue().split("_")[3];
+//        String type = entry.getValue().split("_")[2];
+//        String beginTime = entry.getValue().split("_")[0];
+//        String endTime = entry.getValue().split("_")[1];
+//
+//        List<Integer> list = getIOTCensus(Integer.valueOf(id), templateId, Integer.valueOf(schoolId), Integer.valueOf(type));
+//        JSONObject object = new JSONObject();
+//        object.put("strTime", beginTime);
+//        object.put("endTime", endTime);
+//        object.put("inTime", DateUtils.date2String(new Date(), DateUtils.format1));
+//        object.put("noAttendanceCount", list.get(1));
+//        object.put("attendanceCount", list.get(0));
+//        object.put("leaveCount", list.get(2));
+//        object.put("templateName", title);
+//        object.put("qianDaoIdId", id);
+//        object.put("schoolId", schoolId);
+//        object.put("templateId", templateId);
+//        HttpClientUtils.httpPostJson(iotUrl + "/api/Association/addIntelligenceAttendance", object.toJSONString());
+//    }
+//
+//    //初始化要推送的模板
+//    private void initMap() {
+//        map = new HashMap<>();
+//        List<TemplateDto> list = scFeign.getAllTemplate();
+//        logger.info(("------需要推送的考勤模板------"));
+//        for (TemplateDto templateDto : list) {
+//            String config = templateDto.getConfig();
+//            String[] array = config.split("<Template");
+//            for (int i = 1; i < array.length; i++) {
+//                try {
+//                    String msg = array[i];
+//                    String beginTime = msg.substring(msg.indexOf("BeginTime") + 11, msg.indexOf("BeginTime") + 16);
+//                    String endTime = msg.substring(msg.indexOf("EndTime") + 9, msg.indexOf("EndTime") + 14);
+//                    String templateId = msg.substring(msg.indexOf("TemplateID") + 12, msg.indexOf("TemplateID") + 22);
+//                    String Week = msg.substring(msg.indexOf("Week") + 6, msg.indexOf("Week") + 19);
+//                    String type = msg.substring(msg.indexOf("Type") + 6, msg.indexOf("Type") + 8);
+//                    type = type.replace("\"", "");
+//                    int nowWeek = DateUtils.getWeek();
+//                    if (Week.contains(nowWeek + "")) {
+//                        logger.info((templateId + "_" + templateDto.getSchoolId() + "_" + templateDto.getType() + "------" + beginTime + "_" + endTime));
+//                        map.put(templateId + "_" + templateDto.getSchoolId() + "_" + templateDto.getType(), beginTime + "_" + endTime + "_" + type + "_" + templateDto.getId());
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//    }
+//
+//    //盯盯批量推送
+//    private void dingBatchPush(String templateId, int schoolId, String key) {
+//        String[] times = key.split("_");
+//        AppDto appDto = scFeign.getApp(schoolId, 1);
+//        if (Integer.valueOf(times[2]) < 7) {
+//            //出入校   推班主任
+//            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
+//            for (KqTeacherDto teacher : list) {
+//                dingSchoolPush(templateId, teacher, key, appDto, 0);
+//            }
+//        } else {
+//            //出入寝  推班主任
+//            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
+//            for (KqTeacherDto teacher : list) {
+//                dingSchoolPush(templateId, teacher, key, appDto, 1);
+//            }
+//            //推宿管
+//            List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
+//            for (KqTeacherDto teacher : chamberList) {
+//                dingChamberPush(templateId, teacher, key, appDto);
+//            }
+//        }
+//    }
+//
+//    //企业号批量推送
+//    private void weChatBatchPush(String templateId, int schoolId, String key) {
+//        String[] times = key.split("_");
+//        AppDto appDto = scFeign.getApp(schoolId, 0);
+//        if (Integer.valueOf(times[2]) < 7) {
+//            //出入校   推班主任
+//            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
+//            for (KqTeacherDto teacher : list) {
+//                weChatSchoolPush(templateId, teacher, key, appDto, 0);
+//            }
+//        } else {
+//            //出入寝  推班主任
+//            List<KqTeacherDto> list = scFeign.getTeacherList(schoolId);
+//            for (KqTeacherDto teacher : list) {
+//                weChatSchoolPush(templateId, teacher, key, appDto, 1);
+//            }
+//            //推宿管
+//            List<KqTeacherDto> chamberList = scFeign.selectChamberTeacher(schoolId);
+//            for (KqTeacherDto teacher : chamberList) {
+//                weChatChamberPush(templateId, teacher, key, appDto);
+//            }
+//        }
+//    }
+//
+//    //盯盯推送班主任
+//    private void dingSchoolPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto, int type) {
+//        String[] times = key.split("_");
+//        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+//        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 0);
+//        if (StringUtils.isNotBlank(thirdOpenId)) {
+//            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), type);
+//            if (censusKqDtos != null && censusKqDtos.size() > 0) {
+//                String message = "";
+//                for (CensusKqDto censusKqDto : censusKqDtos) {
+//                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
+//                }
+//                DingSms dingSms = new DingSms();
+//                dingSms.setName(teacher.getName());
+//                dingSms.setTableName("DingSmsNew" + tableSuffix);
+//                dingSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
+//                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
+//                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
+//                        "整体数据：" + message);
+//                String wapUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
+//                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
+//                        "&data=" + thirdOpenId + "&type=1&stype=4&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
+//                        "&face=&sourcetype=16&soutype=3&timestamp=" + DateUtils.getDate() + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
+//                dingSms.setSchoolId(teacher.getSchoolId());
+//                dingSms.setDingUserId(thirdOpenId);
+//                dingSms.setAgentId(appDto.getAgentId());
+//                dingSms.setWapUrl(wapUrl);
+//                dingSms.setReceiveUserId(teacher.getUserId());
+//                dingSms.setTdType(TypeEnums.kaoqing.getType());
+//                this.insertDing(dingSms);
+//                logger.info("盯盯推送班主任—————" + templateId + "--------" + teacher.getName());
+//            }
+//        }
+//    }
+//
+//    //盯盯推送宿管
+//    private void dingChamberPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto) {
+//        String[] times = key.split("_");
+//        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+//        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 0);
+//        if (StringUtils.isNotBlank(thirdOpenId)) {
+//            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), 1);
+//            if (censusKqDtos != null && censusKqDtos.size() > 0) {
+//                String message = "";
+//                for (CensusKqDto censusKqDto : censusKqDtos) {
+//                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
+//                }
+//                DingSms dingSms = new DingSms();
+//                dingSms.setName(teacher.getName());
+//                dingSms.setTableName("DingSmsNew" + tableSuffix);
+//                dingSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
+//                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
+//                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
+//                        "整体数据：" + message);
+//                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
+//                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
+//                        "&pass=" + teacher.getPass() + "&type=4&soutype=3&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
+//                dingSms.setSchoolId(teacher.getSchoolId());
+//                dingSms.setDingUserId(thirdOpenId);
+//                dingSms.setAgentId(appDto.getAgentId());
+//                dingSms.setWapUrl(msgUrl);
+//                dingSms.setReceiveUserId(teacher.getUserId());
+//                dingSms.setTdType(TypeEnums.kaoqing.getType());
+//                this.insertDing(dingSms);
+//                logger.info("盯盯推送宿管—————" + templateId + "--------" + teacher.getName());
+//            }
+//        }
+//    }
+//
+//    //企业号推送班主任
+//    private void weChatSchoolPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto, int type) {
+//        String[] times = key.split("_");
+//        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+//        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 1);
+//        if (StringUtils.isNotBlank(thirdOpenId)) {
+//            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), type);
+//            if (censusKqDtos != null && censusKqDtos.size() > 0) {
+//                String message = "";
+//                for (CensusKqDto censusKqDto : censusKqDtos) {
+//                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
+//                }
+//                WeChatSms weChatSms = new WeChatSms();
+//                weChatSms.setTableName("qyhSmsNew" + tableSuffix);
+//                weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
+//                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
+//                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
+//                        "整体数据：" + message);
+//                weChatSms.setSchoolId(teacher.getSchoolId());
+//                weChatSms.setName(teacher.getName());
+//                weChatSms.setQiYeHaoUserId(thirdOpenId);
+//                weChatSms.setReceiveUserId(teacher.getUserId());
+//                weChatSms.setAppId(appDto.getAgentId());
+//                weChatSms.setSecret(appDto.getAgentSecret());
+//                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
+//                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
+//                        "&data=" + thirdOpenId + "&type=1&stype=3&mobile=" + teacher.getMobile() + "&pass=" + teacher.getPass() +
+//                        "&face=" + teacher.getFace() + "&sourcetype=16&soutype=2&timestamp=" + DateUtils.getDate() + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1) + "&";
+//                weChatSms.setMsgUrl(msgUrl);
+//                weChatSms.setTdType(TypeEnums.kaoqing.getType());
+//                this.insertQYH(weChatSms);
+//                logger.info("企业号推送班主任—————" + templateId + "--------" + teacher.getName());
+//            }
+//        }
+//    }
+//
+//    //企业号推送宿管
+//    private void weChatChamberPush(String templateId, KqTeacherDto teacher, String key, AppDto appDto) {
+//        String[] times = key.split("_");
+//        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+//        String thirdOpenId = scFeign.getThirdId(teacher.getUserId(), 1);
+//        if (StringUtils.isNotBlank(thirdOpenId)) {
+//            List<CensusKqDto> censusKqDtos = getCensus(Integer.valueOf(times[3]), templateId, teacher.getSchoolId(), teacher.getUserId(), 1);
+//            if (censusKqDtos != null && censusKqDtos.size() > 0) {
+//                String message = "";
+//                for (CensusKqDto censusKqDto : censusKqDtos) {
+//                    message += "[" + censusKqDto.getTargetName() + "]未考勤" + censusKqDto.getNotAttendCount() + "人，请假" + censusKqDto.getLeaveCount() + "人；";
+//                }
+//                WeChatSms weChatSms = new WeChatSms();
+//                weChatSms.setTableName("qyhSmsNew" + tableSuffix);
+//                weChatSms.setMsg("报告类型：" + KqTypeEnums.getName(Integer.valueOf(times[2])) + "出勤报告 \n - " +
+//                        "签到日期：" + DateUtils.date2String(new Date(), DateUtils.format1) + "(" + DateUtils.getWeekName() + ") \n - " +
+//                        "签到时间：" + times[0] + "-" + times[1] + " \n - " +
+//                        "整体数据：" + message);
+//                weChatSms.setSchoolId(teacher.getSchoolId());
+//                weChatSms.setName(teacher.getName());
+//                weChatSms.setQiYeHaoUserId(thirdOpenId);
+//                weChatSms.setReceiveUserId(teacher.getUserId());
+//                weChatSms.setAppId(appDto.getAgentId());
+//                weChatSms.setSecret(appDto.getAgentSecret());
+//                String msgUrl = "http://campus.myjxt.com/studentRecord/znxwwebapp/index.html?" +
+//                        "schoolid=" + teacher.getSchoolId() + "&userId=" + teacher.getUserId() + "&name=" + teacher.getName() + "&TemplateId=" + templateId +
+//                        "&pass=" + teacher.getPass() + "&type=4&soutype=2&time=" + DateUtils.date2String(new Date(), DateUtils.format1) + "&";
+//                weChatSms.setMsgUrl(msgUrl);
+//                weChatSms.setTdType(TypeEnums.kaoqing.getType());
+//                this.insertQYH(weChatSms);
+//                logger.info("企业号推送宿管—————" + templateId + "--------" + teacher.getName());
+//            }
+//        }
+//    }
+//
+//    //type  0 出入校 1 出入寝
+//    private List<CensusKqDto> getCensus(int id, String templateId, int schoolId, String userId, int type) {
+//        List<CensusKqDto> list = new ArrayList<>();
+//        String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetailNew?schoolId=" + schoolId +
+//                "&id=" + id + "&templateID=" + templateId + "&type=" + type + "&userId=" + userId + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
+//        JSONObject jsonObject = HttpClientUtils.httpGet(url);
+//        try {
+//            JSONArray data = (JSONArray) jsonObject.get("data");
+//            for (int i = 0; i < data.size(); i++) {
+//                CensusKqDto censusKqDto = new CensusKqDto();
+//                JSONObject object = data.getJSONObject(i);
+//                censusKqDto.setLeaveCount((Integer) object.get("leaveCount"));
+//                censusKqDto.setNotAttendCount((Integer) object.get("noAttendCount"));
+//                censusKqDto.setTargetName((String) object.get("name"));
+//                list.add(censusKqDto);
+//            }
+//        } catch (Exception e) {
+//
+//        }
+//        return list;
+//    }
+//
+//    private BigDecimal getAlarmCensus(int id, String templateId, int schoolId, int type) {
+//        int allNumber = 0, attendNumber = 0;
+//        List<Integer> list = scFeign.selectClassBySchoolId(schoolId);
+//        for (Integer classId : list) {
+//            String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetail?classId=" + classId +
+//                    "&id=" + id + "&templateID=" + templateId + "&type=" + type + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
+//            JSONObject jsonObject = HttpClientUtils.httpGet(url);
+//            try {
+//                JSONObject data = (JSONObject) jsonObject.get("data");
+//                attendNumber = attendNumber + (Integer) data.get("stuAttendCount");
+//                allNumber = allNumber + (Integer) data.get("stuCount");
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        if (allNumber != 0) {
+//            BigDecimal pecrent = new BigDecimal(attendNumber).divide(new BigDecimal(allNumber), 10, BigDecimal.ROUND_HALF_DOWN);
+//            return pecrent;
+//        } else {
+//            return BigDecimal.ZERO;
+//        }
+//
+//    }
+//
+//    /**
+//     * @param id
+//     * @param templateId
+//     * @param schoolId
+//     * @param type
+//     * @return list(0)  出勤 list(1) 未出勤  List(2) 请假
+//     */
+//    private List<Integer> getIOTCensus(int id, String templateId, int schoolId, int type) {
+//        List<Integer> result = new ArrayList<>();
+//        int attend = 0, unattend = 0, leave = 0;
+//        List<Integer> list = scFeign.selectClassBySchoolId(schoolId);
+//        for (Integer classId : list) {
+//            String url = "http://campus.myjxt.com/api/EasyN/GeAttendDetail?classId=" + classId +
+//                    "&id=" + id + "&templateID=" + templateId + "&type=" + type + "&time=" + DateUtils.date2String(new Date(), DateUtils.format1);
+//            JSONObject jsonObject = HttpClientUtils.httpGet(url);
+//            try {
+//                JSONObject data = (JSONObject) jsonObject.get("data");
+//                attend = attend + (Integer) data.get("stuAttendCount");
+//                unattend = unattend + (Integer) data.get("noAttendCount");
+//                leave = leave + (Integer) data.get("leaveCount");
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        result.add(attend);
+//        result.add(unattend);
+//        result.add(leave);
+//        return result;
+//    }
+//
+//
+//    private void insertDing(DingSms dingSms) {
+//        try {
+//            smsService.insertDing(dingSms);
+//        } catch (Exception e) {
+//            logger.info(e.toString());
+//        }
+//    }
+//
+//    private void insertQYH(WeChatSms weChatSms) {
+//        try {
+//            smsService.insertWeChat(weChatSms);
+//        } catch (Exception e) {
+//            logger.info(e.toString());
+//        }
+//    }
+//
+//    private void alarmPush(int schoolId) {
+//        String msg = "【考勤异动】";
+//        try {
+//            SchoolDto schoolDto = scFeign.selectSchoolBySchoolId(schoolId);
+//            msg += schoolDto.getSchoolName() + "考勤有异动，请关注！";
+//            sendMessage(schoolDto.getSchoolId(), opexList.get(0), msg);
+//            sendMessage(schoolDto.getSchoolId(), opexList.get(1), msg);
+//            sendMessage(schoolDto.getSchoolId(), integration, msg);
+//            String managerPhone = managerService.selectManagerById(schoolDto.getManagerUserId());
+//            if (StringUtils.isNotBlank(managerPhone)) {
+//                sendMessage(schoolDto.getSchoolId(), managerPhone, msg);
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//    }
+//
+//    private void sendMessage(int schoolId, String mobile, String msg) {
+//        String tableSuffix = DateUtils.date2String(new Date(), DateUtils.format);
+//        ShortMsg shortMsg = new ShortMsg();
+//        shortMsg.setTableName("smsNew" + tableSuffix);
+//        shortMsg.setSchoolId(schoolId);
+//        shortMsg.setMobile(mobile);
+//        shortMsg.setMsg(msg);
+//        smsService.insertSMS(shortMsg);
+//    }
+//}
-package com.sincere.quartz.job;
-
-import com.sincere.quartz.third.yixueyun.YXYReadService;
-import com.sincere.quartz.third.yixueyun.YXYWriteService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-/**
- * @author chen
- * @version 1.0
- * @date 2019/12/24 0024 10:54
- */
-@Service
-public class SyncJob {
-
-    @Autowired
-    YXYWriteService yxyWriteService;
-
-    @Autowired
-    YXYReadService yxyReadService;
-
-    @Scheduled(cron = "30 1 22 * * ? ")
-    public void Sync(){
-        //翼校通的同步 之后还有钉钉的同步等等
-        yxyReadService.sync();
-        yxyWriteService.sync();
-    }
-}
+//package com.sincere.quartz.job;
+//
+//import com.sincere.quartz.third.yixueyun.YXYReadService;
+//import com.sincere.quartz.third.yixueyun.YXYWriteService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * @author chen
+// * @version 1.0
+// * @date 2019/12/24 0024 10:54
+// */
+//@Service
+//public class SyncJob {
+//
+//    @Autowired
+//    YXYWriteService yxyWriteService;
+//
+//    @Autowired
+//    YXYReadService yxyReadService;
+//
+//    @Scheduled(cron = "30 1 22 * * ? ")
+//    public void Sync(){
+//        //翼校通的同步 之后还有钉钉的同步等等
+//        yxyReadService.sync();
+//        yxyWriteService.sync();
+//    }
+//}
 server:
-  port: 9001
+  port: 9002
 spring:
   application:
	@@ -190,7 +190,7 @@ public class MyScheduledTask {		@@ -190,7 +190,7 @@ public class MyScheduledTask {
190	File file = new File(filePath);	190	File file = new File(filePath);
191	try {	191	try {
192	if (!file.exists()) {	192	if (!file.exists()) {
193	- System.out.println("文件不存在:" + filePath);	193	+// System.out.println("文件不存在:" + filePath);
194	return;	194	return;
195	}	195	}
196	FileInputStream fileInputStream = new FileInputStream(file);	196	FileInputStream fileInputStream = new FileInputStream(file);
@@ -0,0 +1,108 @@		@@ -0,0 +1,108 @@
	1	+package com.example.dahua.bean;
	2	+
	3	+import com.fasterxml.jackson.annotation.JsonInclude;
	4	+import io.swagger.annotations.ApiModelProperty;
	5	+import org.apache.ibatis.annotations.Result;
	6	+
	7	+import java.io.Serializable;
	8	+
	9	+/**
	10	+ * 人脸设备权限表
	11	+ * create table PermissionFace (
	12	+ * id int not null PRIMARY KEY ,
	13	+ * permissionJSON varchar(max) not null ,
	14	+ * schoolId int not null ,
	15	+ * perrmissName varchar(50) not null ,
	16	+ * createTime varchar(50) not null ,
	17	+ * updateTime varchar(50) not null ,
	18	+ * )
	19	+ */
	20	+@JsonInclude(JsonInclude.Include.NON_EMPTY)
	21	+public class PermissionFaceBean implements Serializable {
	22	+
	23	+ @ApiModelProperty(value = "删除和编辑时需要传")
	24	+ private int id;
	25	+
	26	+ @ApiModelProperty(required = true)
	27	+ private PermissionBean permissionBean;
	28	+
	29	+ @ApiModelProperty(required = true)
	30	+ private int schoolId;
	31	+
	32	+ @ApiModelProperty(value = "权限模板名称",required = true)
	33	+ private String perrmissName;
	34	+
	35	+ private String createTime;
	36	+
	37	+ private String updateTime;
	38	+
	39	+ @ApiModelProperty(notes = "备用字段，不用传")
	40	+ private String permissionJson;
	41	+
	42	+ @ApiModelProperty(value = "0-新增；1-编辑；2-删除",required = true)
	43	+ private int type;
	44	+
	45	+ public int getType() {
	46	+ return type;
	47	+ }
	48	+
	49	+ public void setType(int type) {
	50	+ this.type = type;
	51	+ }
	52	+
	53	+ public int getId() {
	54	+ return id;
	55	+ }
	56	+
	57	+ public void setId(int id) {
	58	+ this.id = id;
	59	+ }
	60	+
	61	+ public PermissionBean getPermissionBean() {
	62	+ return permissionBean;
	63	+ }
	64	+
	65	+ public void setPermissionBean(PermissionBean permissionBean) {
	66	+ this.permissionBean = permissionBean;
	67	+ }
	68	+
	69	+ public int getSchoolId() {
	70	+ return schoolId;
	71	+ }
	72	+
	73	+ public void setSchoolId(int schoolId) {
	74	+ this.schoolId = schoolId;
	75	+ }
	76	+
	77	+ public String getPerrmissName() {
	78	+ return perrmissName;
	79	+ }
	80	+
	81	+ public void setPerrmissName(String perrmissName) {
	82	+ this.perrmissName = perrmissName;
	83	+ }
	84	+
	85	+ public String getCreateTime() {
	86	+ return createTime;
	87	+ }
	88	+
	89	+ public void setCreateTime(String createTime) {
	90	+ this.createTime = createTime;
	91	+ }
	92	+
	93	+ public String getUpdateTime() {
	94	+ return updateTime;
	95	+ }
	96	+
	97	+ public void setUpdateTime(String updateTime) {
	98	+ this.updateTime = updateTime;
	99	+ }
	100	+
	101	+ public String getPermissionJson() {
	102	+ return permissionJson;
	103	+ }
	104	+
	105	+ public void setPermissionJson(String permissionJson) {
	106	+ this.permissionJson = permissionJson;
	107	+ }
	108	+}
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+package com.example.dahua.bean;
	2	+
	3	+import java.util.List;
	4	+
	5	+/**
	6	+ * 海康人脸请求参数
	7	+ */
	8	+public class PermissionHKBean {
	9	+ private List<String> deviceIds;
	10	+
	11	+ private String schoolId;
	12	+
	13	+ private String userType;//学生类型
	14	+
	15	+ private List<WeekDay> weekDays;
	16	+
	17	+ public List<String> getDeviceIds() {
	18	+ return deviceIds;
	19	+ }
	20	+
	21	+ public void setDeviceIds(List<String> deviceIds) {
	22	+ this.deviceIds = deviceIds;
	23	+ }
	24	+
	25	+ public String getSchoolId() {
	26	+ return schoolId;
	27	+ }
	28	+
	29	+ public void setSchoolId(String schoolId) {
	30	+ this.schoolId = schoolId;
	31	+ }
	32	+
	33	+ public String getUserType() {
	34	+ return userType;
	35	+ }
	36	+
	37	+ public void setUserType(String userType) {
	38	+ this.userType = userType;
	39	+ }
	40	+
	41	+ public List<WeekDay> getWeekDays() {
	42	+ return weekDays;
	43	+ }
	44	+
	45	+ public void setWeekDays(List<WeekDay> weekDays) {
	46	+ this.weekDays = weekDays;
	47	+ }
	48	+}
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+package com.example.dahua.bean;
	2	+
	3	+public class ResponseBean<T> {
	4	+
	5	+ private int status;
	6	+
	7	+ private String message;
	8	+
	9	+ private T data;
	10	+
	11	+ public int getStatus() {
	12	+ return status;
	13	+ }
	14	+
	15	+ public void setStatus(int status) {
	16	+ this.status = status;
	17	+ }
	18	+
	19	+ public String getMessage() {
	20	+ return message;
	21	+ }
	22	+
	23	+ public void setMessage(String message) {
	24	+ this.message = message;
	25	+ }
	26	+
	27	+ public T getData() {
	28	+ return data;
	29	+ }
	30	+
	31	+ public void setData(T data) {
	32	+ this.data = data;
	33	+ }
	34	+}
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+package com.example.dahua.bean;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.List;
	5	+
	6	+public class ResponseBeanList<T> implements Serializable {
	7	+
	8	+ private int status;
	9	+
	10	+ private String message;
	11	+
	12	+ private List<T> data;
	13	+
	14	+ public int getStatus() {
	15	+ return status;
	16	+ }
	17	+
	18	+ public void setStatus(int status) {
	19	+ this.status = status;
	20	+ }
	21	+
	22	+ public String getMessage() {
	23	+ return message;
	24	+ }
	25	+
	26	+ public void setMessage(String message) {
	27	+ this.message = message;
	28	+ }
	29	+
	30	+ public List<T> getData() {
	31	+ return data;
	32	+ }
	33	+
	34	+ public void setData(List<T> data) {
	35	+ this.data = data;
	36	+ }
	37	+}
@@ -0,0 +1,58 @@		@@ -0,0 +1,58 @@
	1	+package com.example.dahua.bean;
	2	+
	3	+import java.io.Serializable;
	4	+import java.util.List;
	5	+
	6	+public class UserAndPermission implements Serializable {
	7	+
	8	+ private List<String> deviceIds;
	9	+
	10	+ private int userType;
	11	+
	12	+ private String userIds;
	13	+
	14	+ private List<WeekDay> weekDays;
	15	+
	16	+ private String schoolId;
	17	+
	18	+
	19	+ public List<String> getDeviceIds() {
	20	+ return deviceIds;
	21	+ }
	22	+
	23	+ public void setDeviceIds(List<String> deviceIds) {
	24	+ this.deviceIds = deviceIds;
	25	+ }
	26	+
	27	+ public int getUserType() {
	28	+ return userType;
	29	+ }
	30	+
	31	+ public void setUserType(int userType) {
	32	+ this.userType = userType;
	33	+ }
	34	+
	35	+ public String getUserIds() {
	36	+ return userIds;
	37	+ }
	38	+
	39	+ public void setUserIds(String userIds) {
	40	+ this.userIds = userIds;
	41	+ }
	42	+
	43	+ public List<WeekDay> getWeekDays() {
	44	+ return weekDays;
	45	+ }
	46	+
	47	+ public void setWeekDays(List<WeekDay> weekDays) {
	48	+ this.weekDays = weekDays;
	49	+ }
	50	+
	51	+ public String getSchoolId() {
	52	+ return schoolId;
	53	+ }
	54	+
	55	+ public void setSchoolId(String schoolId) {
	56	+ this.schoolId = schoolId;
	57	+ }
	58	+}
@@ -0,0 +1,47 @@		@@ -0,0 +1,47 @@
	1	+package com.example.dahua.control;
	2	+
	3	+import com.alibaba.fastjson.JSON;
	4	+import com.example.dahua.bean.PermissionBean;
	5	+import com.example.dahua.bean.PermissionFaceBean;
	6	+import com.example.dahua.bean.ResponseBean;
	7	+import com.example.dahua.bean.ResponseBeanList;
	8	+import com.example.dahua.service.PermissFaceService;
	9	+import io.swagger.annotations.Api;
	10	+import io.swagger.annotations.ApiOperation;
	11	+import lombok.extern.slf4j.Slf4j;
	12	+import org.springframework.beans.factory.annotation.Autowired;
	13	+import org.springframework.web.bind.annotation.*;
	14	+
	15	+import java.io.UnsupportedEncodingException;
	16	+
	17	+@Api(tags = "人脸统一处理接口")
	18	+@RestController
	19	+@RequestMapping(value = "faceUnify/*",produces = "text/plain;charset=UTF-8")
	20	+@Slf4j
	21	+public class FaceUnifyController {
	22	+
	23	+ @Autowired
	24	+ PermissFaceService permissFaceService;
	25	+
	26	+ @RequestMapping(value = "sendPermission",method = RequestMethod.POST)
	27	+ @ApiOperation("添加/编辑/删除权限")
	28	+ public String sendPermission(@RequestBody PermissionFaceBean permissionFaceBean) throws UnsupportedEncodingException {
	29	+ return JSON.toJSONString(permissFaceService.addPermissionFace(permissionFaceBean));
	30	+ }
	31	+
	32	+
	33	+ @RequestMapping(value = "getPermissionDetail",method = RequestMethod.POST)
	34	+ @ApiOperation("获取权限详情")
	35	+ @ResponseBody
	36	+ public String getPermissionDetail(@RequestParam("permissionId")int permissionId) throws UnsupportedEncodingException {
	37	+ log.error("{}",JSON.toJSONString(permissFaceService.getPermissionDetail(permissionId)));
	38	+ return JSON.toJSONString(permissFaceService.getPermissionDetail(permissionId));
	39	+ }
	40	+
	41	+ @RequestMapping(value = "getPermissions",method = RequestMethod.POST)
	42	+ @ApiOperation("获取权限列表")
	43	+ public String getPermissions(@RequestParam("schoolId")int schoolId) throws UnsupportedEncodingException {
	44	+ return JSON.toJSONString(permissFaceService.getPermissions(schoolId));
	45	+ }
	46	+
	47	+}
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+package com.example.dahua.dao;
	2	+
	3	+import com.example.dahua.bean.PermissionFaceBean;
	4	+import org.apache.ibatis.annotations.Mapper;
	5	+import org.apache.ibatis.annotations.Param;
	6	+import org.springframework.stereotype.Repository;
	7	+
	8	+import java.util.List;
	9	+
	10	+@Repository
	11	+public interface PermissionFaceDao {
	12	+
	13	+
	14	+ public int addPermissionFace(PermissionFaceBean permissionFaceBean);
	15	+
	16	+ public int updatePermissionFace(PermissionFaceBean permissionFaceBean);
	17	+
	18	+ public int deletePermissionFace(PermissionFaceBean permissionFaceBean);
	19	+
	20	+ public PermissionFaceBean getPerFaceWithId(@Param("id")int id);
	21	+
	22	+ public List<PermissionFaceBean> getPermissFaces(@Param("schoolId") int schoolId);
	23	+
	24	+ public List<PermissionFaceBean> getPermissionDetail(@Param("permissionId") int permissionId);
	25	+
	26	+}
1	package com.example.dahua.module;	1	package com.example.dahua.module;
2		2
3	import java.io.UnsupportedEncodingException;	3	import java.io.UnsupportedEncodingException;
		4	+import java.util.ArrayList;
		5	+import java.util.HashMap;
4	import java.util.List;	6	import java.util.List;
		7	+import java.util.Map;
5		8
6	import com.example.dahua.bean.PermissionBean;	9	import com.example.dahua.bean.PermissionBean;
7	import com.example.dahua.bean.WeekDay;	10	import com.example.dahua.bean.WeekDay;
	@@ -189,8 +192,8 @@ public class GateModule {		@@ -189,8 +192,8 @@ public class GateModule {
189	accessCardInfo.sznDoors[0] = 0;	192	accessCardInfo.sznDoors[0] = 0;
190	accessCardInfo.sznDoors[1] = 1;	193	accessCardInfo.sznDoors[1] = 1;
191	accessCardInfo.nTimeSectionNum = 2; // 与门数对应	194	accessCardInfo.nTimeSectionNum = 2; // 与门数对应
192	- accessCardInfo.sznTimeSectionNo[0] = 255; // 表示第一个门全天有效
193	- accessCardInfo.sznTimeSectionNo[1] = 255; // 表示第二个门全天有效	195	+ accessCardInfo.sznTimeSectionNo[0] = 120; // 表示第一个门全天有效
		196	+ accessCardInfo.sznTimeSectionNo[1] = 120; // 表示第二个门全天有效
194		197
195	// 卡状态	198	// 卡状态
196	accessCardInfo.emStatus = cardStatus;	199	accessCardInfo.emStatus = cardStatus;
	@@ -254,61 +257,151 @@ public class GateModule {		@@ -254,61 +257,151 @@ public class GateModule {
254	* 门禁刷卡时间段设置	257	* 门禁刷卡时间段设置
255	*/	258	*/
256	public static void setAccessTimeSchedule(LLong lLong, PermissionBean permissionBean) {	259	public static void setAccessTimeSchedule(LLong lLong, PermissionBean permissionBean) {
		260	+ try {
257		261
258	- CFG_ACCESS_TIMESCHEDULE_INFO msg = new CFG_ACCESS_TIMESCHEDULE_INFO();
259	- String strCmd = NetSDKLib.CFG_CMD_ACCESSTIMESCHEDULE;
260	- int nChannel = 120; // 通道号
261	-	262	+ CFG_ACCESS_TIMESCHEDULE_INFO msg = new CFG_ACCESS_TIMESCHEDULE_INFO();
		263	+ String strCmd = NetSDKLib.CFG_CMD_ACCESSTIMESCHEDULE;
		264	+ int nChannel = 120; // 通道号
262	// msg.stuTimeWeekDay[0].stuTimeSection[0].dwRecordMask	265	// msg.stuTimeWeekDay[0].stuTimeSection[0].dwRecordMask
263	- String name = "权限模板";
264	- System.arraycopy(name.getBytes(), 0, msg.szName, 0, name.getBytes().length);
265	-
266	- List<WeekDay> weekDays = permissionBean.getWeekDays();
267	-
268	- for (WeekDay weekDay :
269	- weekDays) {
270	- List<WeekTime> weekTimes = weekDay.getWeekTimes();
271	- for (int i = 0; i < weekTimes.size(); i++) {
272	- WeekTime weekTime = weekTimes.get(i);
273	- String startTime = weekTime.getStartTime();
274	- String endTime = weekTime.getEndTime();
275	- msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginHour = Integer.parseInt(startTime.split(":")[0]);
276	- msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginMin = Integer.parseInt(startTime.split(":")[1]);
277	- msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginSec = 0;
278	-
279	- msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndHour = Integer.parseInt(endTime.split(":")[0]);
280	- msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndMin = Integer.parseInt(endTime.split(":")[1]);
281	- msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndSec = 0;
282	-	266	+ String name = "3";
		267	+ System.arraycopy(name.getBytes(), 0, msg.szName, 0, name.getBytes().length);
		268	+ msg.bEnable = 1;
		269	+
		270	+ List<WeekDay> weekDays = permissionBean.getWeekDays();
		271	+ Map<Integer, List<WeekTime>> map = new HashMap<>();
		272	+
		273	+ for (WeekDay weekDay :
		274	+ weekDays) {
		275	+ //整理时间
		276	+ initWeedayAndTimes(weekDay, map);
		277	+ //设置周计划信息
		278	+ for (Map.Entry<Integer, List<WeekTime>> entry :
		279	+ map.entrySet()) {
		280	+
		281	+ int weekDayIndex = entry.getKey();
		282	+
		283	+ List<WeekTime> weekTimes = entry.getValue();
		284	+
		285	+ for (int i = 0; i < weekTimes.size(); i++) {
		286	+ WeekTime weekTime = weekTimes.get(i);
		287	+ String startTime = weekTime.getStartTime();
		288	+ String endTime = weekTime.getEndTime();
		289	+ msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nBeginHour = Integer.parseInt(startTime.split(":")[0]);
		290	+ msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nBeginMin = Integer.parseInt(startTime.split(":")[1]);
		291	+ msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nBeginSec = 0;
		292	+
		293	+ msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nEndHour = Integer.parseInt(endTime.split(":")[0]);
		294	+ msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nEndMin = Integer.parseInt(endTime.split(":")[1]);
		295	+ msg.stuTimeWeekDay[weekDayIndex].stuTimeSection[i].nEndSec = 0;
		296	+ }
		297	+
		298	+ }
283	}	299	}
284	- }	300	+
		301	+
		302	+ /* for (WeekDay weekDay :
		303	+ weekDays) {
		304	+ List<WeekTime> weekTimes = weekDay.getWeekTimes();
		305	+ for (int i = 0; i < weekTimes.size(); i++) {
		306	+ WeekTime weekTime = weekTimes.get(i);
		307	+ String startTime = weekTime.getStartTime();
		308	+ String endTime = weekTime.getEndTime();
		309	+ msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginHour = Integer.parseInt(startTime.split(":")[0]);
		310	+ msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginMin = Integer.parseInt(startTime.split(":")[1]);
		311	+ msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nBeginSec = 0;
		312	+
		313	+ msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndHour = Integer.parseInt(endTime.split(":")[0]);
		314	+ msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndMin = Integer.parseInt(endTime.split(":")[1]);
		315	+ msg.stuTimeWeekDay[weekDay.getWeekDay()].stuTimeSection[i].nEndSec = 0;
		316	+
		317	+ }
		318	+ }*/
285		319
286	// 获取	320	// 获取
287	// if (ToolKits.GetDevConfig(lLong, nChannel, strCmd, msg)) {	321	// if (ToolKits.GetDevConfig(lLong, nChannel, strCmd, msg)) {
288	- System.out.println("Enable:" + msg.bEnable);
289	- try {
290	- System.out.println("自定义名称:" + new String(msg.szName, "UTF-8").trim());
291	- } catch (UnsupportedEncodingException e) {	322	+// System.out.println("Enable:" + msg.bEnable);
		323	+// try {
		324	+// System.out.println("自定义名称:" + new String(msg.szName, "UTF-8").trim());
		325	+// } catch (UnsupportedEncodingException e) {
		326	+// e.printStackTrace();
		327	+// }
		328	+// for (int i = 0; i < 7; i++) {
		329	+// for (int j = 0; j < 4; j++) {
		330	+// System.out.println("dwRecordMask:" + msg.stuTimeWeekDay[i].stuTimeSection[j].dwRecordMask);
		331	+// System.out.println(msg.stuTimeWeekDay[i].stuTimeSection[j].startTime() + "-" + msg.stuTimeWeekDay[i].stuTimeSection[j].endTime() + "\n");
		332	+// }
		333	+// }
		334	+// msg.write();
		335	+ boolean set = ToolKits.SetDevConfig(lLong, nChannel, strCmd, msg);
		336	+// msg.read();
		337	+ // 设置
		338	+ if (set) {
		339	+ System.out.println("Set AccessTimeSchedule Succeed!");
		340	+ } else {
		341	+ System.err.println("Set AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
		342	+ }
		343	+// } else {
		344	+// System.err.println("Get AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
		345	+// }
		346	+ } catch (Exception e) {
292	e.printStackTrace();	347	e.printStackTrace();
293	}	348	}
294	- for (int i = 0; i < 7; i++) {
295	- for (int j = 0; j < 4; j++) {
296	- System.out.println("dwRecordMask:" + msg.stuTimeWeekDay[i].stuTimeSection[j].dwRecordMask);
297	- System.out.println(msg.stuTimeWeekDay[i].stuTimeSection[j].startTime() + "-" + msg.stuTimeWeekDay[i].stuTimeSection[j].endTime() + "\n");	349	+ }
		350	+
		351	+ private static void initWeedayAndTimes(WeekDay weekDay, Map<Integer, List<WeekTime>> map) {
		352	+
		353	+ String weekDayStr = weekDay.getWeekDay();
		354	+ String[] weekDays = weekDayStr.split(",");
		355	+
		356	+ List<WeekTime> weekTimes = weekDay.getWeekTimes();
		357	+
		358	+ for (int i = 0; i < weekDays.length; i++) {
		359	+ int weekDayIndex = Integer.parseInt(weekDays[i]);
		360	+ if (map.containsKey(weekDayIndex)) {//周已经有时间段
		361	+ List<WeekTime> weekTimeList = map.get(weekDayIndex);
		362	+ for (WeekTime wee :
		363	+ weekTimes) {
		364	+ weekTimeList.add(wee);
		365	+ }
		366	+ map.put(weekDayIndex, weekTimeList);
		367	+ } else {
		368	+ List<WeekTime> weekTimes1 = new ArrayList<>();
		369	+ weekTimes1.addAll(weekTimes);
		370	+ map.put(weekDayIndex, weekTimes1);
298	}	371	}
299	}	372	}
300	- msg.write();
301	- boolean set = ToolKits.SetDevConfig(lLong, nChannel, strCmd, msg);
302	- msg.read();
303	- // 设置
304	- if (set) {
305	- System.out.println("Set AccessTimeSchedule Succeed!");	373	+
		374	+ }
		375	+
		376	+ public static void getAccessTimeSchedule1(LLong lLong) {
		377	+ CFG_ACCESS_TIMESCHEDULE_INFO msg = new CFG_ACCESS_TIMESCHEDULE_INFO();
		378	+ String strCmd = NetSDKLib.CFG_CMD_ACCESSTIMESCHEDULE;
		379	+ int nChannel = 120; // 通道号
		380	+
		381	+ // 获取
		382	+ if (ToolKits.GetDevConfig(lLong, nChannel, strCmd, msg)) {
		383	+ System.out.println("Enable:" + msg.bEnable);
		384	+ try {
		385	+ System.out.println("自定义名称:" + new String(msg.szName, "utf-8").trim());
		386	+ } catch (UnsupportedEncodingException e) {
		387	+ e.printStackTrace();
		388	+ }
		389	+ for (int i = 0; i < 7; i++) {
		390	+ for (int j = 0; j < 4; j++) {
		391	+ System.out.println("dwRecordMask:" + msg.stuTimeWeekDay[i].stuTimeSection[j].dwRecordMask);
		392	+ System.out.println(msg.stuTimeWeekDay[i].stuTimeSection[j].startTime() + "-" +
		393	+ msg.stuTimeWeekDay[i].stuTimeSection[j].endTime() + "\n");
		394	+ }
		395	+ }
		396	+ // 设置
		397	+ if (ToolKits.SetDevConfig(lLong, nChannel, strCmd, msg)) {
		398	+ System.out.println("Set AccessTimeSchedule Succeed!");
		399	+ } else {
		400	+ System.err.println("Set AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
		401	+ }
306	} else {	402	} else {
307	- System.err.println("Set AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());	403	+ System.err.println("Get AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
308	}	404	}
309	-// } else {
310	-// System.err.println("Get AccessTimeSchedule Failed!" + ToolKits.getErrorCodePrint());
311	-// }
312	}	405	}
313		406
314	/**	407	/**
	@@ -450,8 +543,8 @@ public class GateModule {		@@ -450,8 +543,8 @@ public class GateModule {
450	accessCardInfo.sznDoors[0] = 0;	543	accessCardInfo.sznDoors[0] = 0;
451	accessCardInfo.sznDoors[1] = 1;	544	accessCardInfo.sznDoors[1] = 1;
452	accessCardInfo.nTimeSectionNum = 2; // 与门数对应	545	accessCardInfo.nTimeSectionNum = 2; // 与门数对应
453	- accessCardInfo.sznTimeSectionNo[0] = 255; // 表示第一个门全天有效
454	- accessCardInfo.sznTimeSectionNo[1] = 255; // 表示第二个门全天有效	546	+ accessCardInfo.sznTimeSectionNo[0] = 120; // 表示第一个门全天有效
		547	+ accessCardInfo.sznTimeSectionNo[1] = 120; // 表示第二个门全天有效
455		548
456	// 卡状态	549	// 卡状态
457	accessCardInfo.emStatus = cardStatus;	550	accessCardInfo.emStatus = cardStatus;
	@@ -1,70 +0,0 @@	@@ -1,70 +0,0 @@
1	-package com.example.dahua.service;
2	-
3	-import com.example.dahua.bean.AttendanceBean;
4	-import org.springframework.beans.factory.annotation.Autowired;
5	-import org.springframework.jdbc.core.BeanPropertyRowMapper;
6	-import org.springframework.jdbc.core.JdbcTemplate;
7	-import org.springframework.stereotype.Service;
8	-
9	-import java.util.List;
10	-
11	-@Service
12	-public class AttendanceImp implements AttendanceService {
13	-
14	- @Autowired
15	- JdbcTemplate jdbcTemplate;
16	-
17	- @Override
18	- public int insert(String clint_id, String clint_type, String ip, String port, String intime, String school_id, String state) {
19	- try {
20	- String selectSql = String.format("select * from SZ_Attendance where clint_id =\'%s\'", clint_id);
21	- List<AttendanceBean> attendanceBeans = jdbcTemplate.query(selectSql, new Object[]{}, new BeanPropertyRowMapper<AttendanceBean>(AttendanceBean.class));
22	- if (attendanceBeans.size() == 0) {//设备不存在
23	-// insert SZ_Attendance(clint_id, clint_type, ip, port, intime, school_id, state)
24	-// * values(@clint_id,@clint_type,@ip,@port,GETDATE(),-1,1)
25	- String insertSql = String.format("insert into SZ_Attendance(clint_id, clint_type, ip, port, intime, school_id, state,isConnection) values ('%s','%s','%s','%s','%s','%s','%s','%s')", clint_id, clint_type, ip, port, intime, school_id, state, 1);
26	- return jdbcTemplate.update(insertSql);
27	- } else {//设备已经存在,更新在线状态
28	- updateConnectStateWithDevid(1, clint_id);
29	- }
30	- } catch (Exception e) {
31	- e.printStackTrace();
32	- }
33	- return 0;
34	- }
35	-
36	- /**
37	- * @param isConnection 连接状态
38	- * @param ip
39	- * @param port
40	- * @return
41	- */
42	- @Override
43	- public int updateConnectState(int isConnection, String ip, String port) {
44	-
45	- int index = 0;
46	- try {
47	- String updateSql = String.format(" update SZ_Attendance set isConnection = %d where ip = '%s' and port = '%s' ", isConnection, ip, port);
48	- index = jdbcTemplate.update(updateSql);
49	-// System.out.println("updateIndex:"+index+" isConnection:"+isConnection+"updateSql:"+updateSql);
50	- } catch (Exception e) {
51	- e.printStackTrace();
52	- }
53	-
54	- return index;
55	- }
56	-
57	- @Override
58	- public int updateConnectStateWithDevid(int isConnection, String clint_id) {
59	- int index = 0;
60	- try {
61	- String updateSql = String.format(" update SZ_Attendance set isConnection = %d where clint_id = '%s' ", isConnection, clint_id);
62	- index = jdbcTemplate.update(updateSql);
63	-// System.out.println("updateIndex:"+index+" isConnection:"+isConnection+"updateSql:"+updateSql);
64	- } catch (Exception e) {
65	- e.printStackTrace();
66	- }
67	-
68	- return index;
69	- }
70	-}