权限模板增加

陶汉栋
1 parent cd07eb23
Showing 26 changed files with 768 additions and 236 deletions Show diff stats
cloud/dahua/src/main/java/com/example/dahua/bean/StudentBean.java
cloud/dahua/src/main/java/com/example/dahua/control/FaceUnifyController.java
cloud/dahua/src/main/java/com/example/dahua/control/UserControl.java
cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java
cloud/dahua/src/main/java/com/example/dahua/service/PermissFaceService.java
cloud/dahua/src/main/java/com/example/dahua/service/imp/PermissFaceServiceImp.java
cloud/dahua/src/main/java/com/example/dahua/utils/BaiduUtils.java
cloud/dahua/src/main/java/com/example/dahua/utils/HttpUtils.java
cloud/dahua/src/test/java/com/example/dahua/DahuaApplicationTests.java
cloud/haikangface/mvnw
cloud/haikangface/mvnw.cmd
cloud/haikangface/src/main/java/com/sincere/haikangface/CMSServer.java
cloud/haikangface/src/main/java/com/sincere/haikangface/async/SendUserAsync.java
cloud/haikangface/src/main/java/com/sincere/haikangface/bean/TeacherBean.java
cloud/haikangface/src/main/java/com/sincere/haikangface/bean/face/BaiduUserInfoBean.java
cloud/haikangface/src/main/java/com/sincere/haikangface/bean/face/BaiduUserInfoDataBean.java
cloud/haikangface/src/main/java/com/sincere/haikangface/bean/face/BaiduUserInfoListBean.java
cloud/haikangface/src/main/java/com/sincere/haikangface/bean/face/BaiduUserInfoResultBean.java
cloud/haikangface/src/main/java/com/sincere/haikangface/control/FileControl.java
cloud/haikangface/src/main/java/com/sincere/haikangface/control/UserControl.java
@@ -39,7 +39,7 @@ public class StudentBean implements Serializable {
     private String Face;
-    private String StudentCode;
+//    private String StudentCode;
     private String student_num;
@@ -201,13 +201,13 @@ public class StudentBean implements Serializable {
         Face = face;
     }
-    public String getStudentCode() {
-        return StudentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        StudentCode = studentCode;
-    }
+//    public String getStudentCode() {
+//        return StudentCode;
+//    }
+//
+//    public void setStudentCode(String studentCode) {
+//        StudentCode = studentCode;
+//    }
     public long getID() {
         return ID;
@@ -245,7 +245,7 @@ public class StudentBean implements Serializable {
                 ", AddTime=" + AddTime +
                 ", Sex=" + Sex +
                 ", Face='" + Face + '\'' +
-                ", StudentCode='" + StudentCode + '' +
+//                ", StudentCode='" + StudentCode + '' +
                 ", student_num='" + student_num + '\'' +
                 ", student_id='" + student_id + '\'' +
                 ", user_id='" + user_id + '\'' +
@@ -44,4 +44,12 @@ public class FaceUnifyController {
         return JSON.toJSONString(permissFaceService.getPermissions(schoolId));
     }
+
+    @RequestMapping(value = "addFace",method = RequestMethod.POST)
+    @ApiOperation("上传学生/老师人脸")
+    public String addFace(@RequestParam("imgUrl")String imgUrl,@RequestParam("userId")String userId) throws UnsupportedEncodingException {
+        return JSON.toJSONString(permissFaceService.addFace(imgUrl,userId));
+    }
+
+
 }
@@ -115,186 +115,15 @@ public class UserControl {
     @RequestMapping(value = "checkFace", method = RequestMethod.GET)
     @ApiOperation("在线活体检测")
     public boolean checkFace(@RequestParam("url") String httpurl) {
-        // 请求url
-        String url = "https://aip.baidubce.com/rest/2.0/face/v3/faceverify";
-        try {
-
-            List list = new ArrayList();
-            Map<String, String> map = new HashMap<>();
-            String image_type = "";
-            String imgFilePath = httpurl;
-            File target = new File("./huoti/");
-            if (!target.exists()) target.mkdirs();
-            File target1 = new File(target.getAbsolutePath(), new File(httpurl).getName());
-            if (httpurl.startsWith("http")) image_type = "URL";
-            else {
-                CompressPic.CompressPic(httpurl, target1.getAbsolutePath(), "");//压缩后的图片
-                image_type = "BASE64";
-                httpurl = Base64Util.encode(image2byte(target1.getAbsolutePath()));
-            }
-            map.put("image", httpurl);
-            map.put("image_type", image_type);
-//            map.put("face_field","");
-//            map.put("option","GATE");
-            list.add(map);
-            String param = GsonUtils.toJson(list);
-            // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。
-            String accessToken = getAuth();
-
-            String result1 = HttpUtil.post(url, accessToken, "application/json", param);
-            JSONObject jsonObject = new JSONObject(result1);
-            String error_msg = jsonObject.optString("error_msg");
-            JSONObject result = jsonObject.optJSONObject("result");
-            if (error_msg.equals("SUCCESS")) {
-                double face_liveness = result.optDouble("face_liveness", 0.00);//活体分数值
-                JSONArray face_list = result.optJSONArray("face_list");
-                JSONObject location = face_list.optJSONObject(0).optJSONObject("location");
-                double rotation = location.optDouble("rotation", 0.0);//竖直方向旋转角度
-                System.out.println(" face_liveness:" + face_liveness);
-                if (face_liveness > 0.4) {
-                    int angel = 0;
-                    if (45 < rotation && rotation < 135) {//右向横图,需要旋转270度
-                        System.out.println("旋转270度");
-                        angel = 270;
-                    } else if (rotation > -135 && rotation < -45) {//左向横图,需要旋转90度
-                        System.out.println("旋转90度");
-                        angel = 90;
-                    } else if (rotation >= -180 && rotation <= -135 || rotation >= 135 && rotation <= 180) {//倒向图片,需要旋转180度
-                        System.out.println("旋转180度");
-                        angel = 180;
-                    }
-                    System.out.println("图片检验成功");
-                    FileUtils.getInstance().writeLogs("检测成功:" + imgFilePath, FileUtils.checkSuc);
-                    //E:\wwwhtdocs\SmartCampus\face17e50\School
-                    //http://campus.myjxt.com//face17e5/School861/Student/GBZX20171134.jpg
-                    //F:\wwwroot\smartcampus\face17e5
-//                    imgFilePath =httpurl.replace("http://campus.myjxt.com","E:\\wwwhtdocs\\SmartCampus");
-//                    imgFilePath = httpurl.replace("http://60.190.202.57:1000","F:\\wwwroot\\smartcampus");
-//                    System.out.println("图片是否存在:" + imgFilePath);
-                    if (angel != 0)
-                        ImageUtils.rotatePhonePhoto(imgFilePath, angel);
-                    return true;
-                } else {
-                    FileUtils.getInstance().writeLogs("检测失败,活体分数:" + face_liveness + " " + imgFilePath, FileUtils.checkFail);
-                    System.out.println("图片不合格" + imgFilePath);
-                    deleteImgFile(imgFilePath);
-                    return false;
-                }
-            } else {
-                System.out.println("检测失败");
-                FileUtils.getInstance().writeLogs("检测失败:" + error_msg + imgFilePath, FileUtils.checkFail);
-                deleteImgFile(imgFilePath);
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-    private boolean deleteImgFile(String imgFilePath) {
-        imgFilePath = imgFilePath.replace("http://campus.myjxt.com", "E:\\wwwhtdocs\\SmartCampus");
-        File file = new File(imgFilePath);
-        if (file.exists()) {
-            return file.delete();
-        }
-        return false;
-    }
+       return BaiduUtils.getBaiduUtils().checkImg(httpurl);
-    //图片到byte数组
-    public byte[] image2byte(String path) {
-        byte[] data = null;
-        FileImageInputStream input = null;
-        try {
-            input = new FileImageInputStream(new File(path));
-            ByteArrayOutputStream output = new ByteArrayOutputStream();
-            byte[] buf = new byte[1024];
-            int numBytesRead = 0;
-            while ((numBytesRead = input.read(buf)) != -1) {
-                output.write(buf, 0, numBytesRead);
-            }
-            data = output.toByteArray();
-            output.close();
-            input.close();
-        } catch (FileNotFoundException ex1) {
-            ex1.printStackTrace();
-        } catch (IOException ex1) {
-            ex1.printStackTrace();
-        }
-        return data;
     }
-    /**
-     * 获取权限token
-     *
-     * @return 返回示例：
-     * {
-     * "access_token": "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567",
-     * "expires_in": 2592000
-     * }
-     */
-    public String getAuth() {
-        // 官网获取的 API Key 更新为你注册的
-        String clientId = "u6rV4YxRZmwzKj56N0DCW8eO";
-        // 官网获取的 Secret Key 更新为你注册的
-        String clientSecret = "Krp3KhmIBdnNEsRa1LavMHuZl0KhQGVm";
-        return getAuth(clientId, clientSecret);
-    }
-    /**
-     * 获取API访问token
-     * 该token有一定的有效期，需要自行管理，当失效时需重新获取.
-     *
-     * @param ak - 百度云官网获取的 API Key
-     * @param sk - 百度云官网获取的 Securet Key
-     * @return assess_token 示例：
-     * "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567"
-     */
-    public static String getAuth(String ak, String sk) {
-        // 获取token地址
-        String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
-        String getAccessTokenUrl = authHost
-                // 1. grant_type为固定参数
-                + "grant_type=client_credentials"
-                // 2. 官网获取的 API Key
-                + "&client_id=" + ak
-                // 3. 官网获取的 Secret Key
-                + "&client_secret=" + sk;
-        try {
-            URL realUrl = new URL(getAccessTokenUrl);
-            // 打开和URL之间的连接
-            HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
-            connection.setRequestMethod("GET");
-            connection.connect();
-            // 获取所有响应头字段
-            Map<String, List<String>> map = connection.getHeaderFields();
-            // 遍历所有的响应头字段
-//            for (String key : map.keySet()) {
-//                System.err.println(key + "--->" + map.get(key));
-//            }
-            // 定义 BufferedReader输入流来读取URL的响应
-            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String result = "";
-            String line;
-            while ((line = in.readLine()) != null) {
-                result += line;
-            }
-            /**
-             * 返回结果示例
-             */
-//            System.err.println("result:" + result);
-            JSONObject jsonObject = new JSONObject(result);
-            String access_token = jsonObject.getString("access_token");
-            return access_token;
-        } catch (Exception e) {
-            System.err.printf("获取token失败！");
-            e.printStackTrace(System.err);
-        }
-        return null;
-    }
-    @RequestMapping(value = "tranpic", method = RequestMethod.GET)
+    /*@RequestMapping(value = "tranpic", method = RequestMethod.GET)
     @ApiOperation("旋转图片")
     public void tranPic(@RequestParam("path") String httpurl) {
         // 请求url
@@ -366,7 +195,7 @@ public class UserControl {
         } catch (Exception e) {
             e.printStackTrace();
         }
-    }
+    }*/
 //    @RequestMapping(value = "deleteFace", method = RequestMethod.GET)
 //    @ApiOperation("删除人脸")
@@ -377,7 +206,7 @@ public class UserControl {
 //    }
-    @RequestMapping(value = "FaceSearch", method = RequestMethod.POST)
+  /*  @RequestMapping(value = "FaceSearch", method = RequestMethod.POST)
     @ApiOperation("人脸搜索")
     public String FaceSearch(@RequestPart("file") MultipartFile file) {
@@ -401,7 +230,7 @@ public class UserControl {
         }
         return null;
-    }
+    }*/
     @RequestMapping(value = "movePic", method = RequestMethod.GET)
@@ -451,7 +280,7 @@ public class UserControl {
     }
-    @RequestMapping(value = "translatePic", method = RequestMethod.POST)
+   /* @RequestMapping(value = "translatePic", method = RequestMethod.POST)
     @ApiOperation("图片转文字")
     public String translatePic(@RequestPart MultipartFile file) {
         try {
@@ -479,13 +308,13 @@ public class UserControl {
             e.printStackTrace();
         }
         return "解析失败";
-    }
+    }*/
     private String url = "https://aip.baidubce.com/rest/2.0/ocr/v1/general_basic?access_token=" + AuthService.getAuth();
 //            + AuthService.getAuth();
-    private String getAnswer(String imgUrl, int type) {
+   /* private String getAnswer(String imgUrl, int type) {
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
@@ -521,6 +350,6 @@ public class UserControl {
             System.out.println("result:" + stringBuilder.toString());
         }
         return stringBuilder.toString().equals("") ? "" : stringBuilder.toString();
-    }
+    }*/
 }
@@ -23,6 +23,9 @@ public interface UserDao {
     @Select(" select Top(1)* from SZ_V_School_Student where school_id = #{school_id} and studentcode = #{studentcode}")
     UserInfoBean getUserInfo(@Param("school_id") String school_id, @Param("studentcode") String studentcode);
+    @Select("select * from SZ_V_School_Student where school_id = 1066 and class_id between 78506 and 78514")
+    List<UserInfoBean> getStuUserInfos();
+
     @Select(" select Top(1)* from SZ_V_School_Teacher where school_id = #{school_id} and num = #{num}")
     TeacherBean getTeacher(@Param("school_id") String school_id, @Param("num") String num);
@@ -88,6 +91,9 @@ public interface UserDao {
     @Select("select * from SZ_Attendance where clint_type = #{clint_type} and school_id = #{school_id}")
     List<AttendanceBean> selectDeviceWithschool_id(@Param("clint_type") String clint_type, @Param("school_id") String school_id);
+    @Select("select * from SZ_Attendance where school_id = #{school_id}")
+    List<AttendanceBean> getAllDevices(@Param("school_id") String school_id);
+
     @Select("select * from SZ_V_School_Student where school_id = #{school_id} and len(photo)>0 and len(student_num)>0")
     List<StudentBean> getAllStudentsWithSchoolId(@Param("school_id") String school_id);
@@ -118,4 +124,13 @@ public interface UserDao {
     @Select(" select * from SZ_V_School_Teacher where school_id = #{school_id}")
     List<TeacherBean> getTeachers(@Param("school_id") String school_id);
+
+    @Select("select * from SZ_User where user_id =#{userId} and state = 1")
+    void getUserWidthUserId(@Param("userId") String userId);
+
+    @Select("select * from SZ_V_School_Student where user_id = #{userId}")
+    List<StudentBean> getStudentWithUserId(@Param("userId")String userId);
+
+    @Select("select * from SZ_V_School_Teacher where user_id = #{userId}")
+    List<TeacherBean> getTeaWithUserId(@Param("userId")String userId);
 }
@@ -16,4 +16,5 @@ public interface PermissFaceService {
     public ResponseBeanList<PermissionFaceBean> getPermissionDetail(int permissionId);
+    ResponseBean<String> addFace(String imgUrl, String userId);
 }
@@ -5,12 +5,22 @@ 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.BaiduUtils;
+import com.example.dahua.utils.HttpUtil;
 import com.example.dahua.utils.HttpUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 @Slf4j
@@ -114,8 +124,6 @@ public class PermissFaceServiceImp implements PermissFaceService {
     }
-
-
     @Override
     public ResponseBeanList<PermissionFaceBean> getPermissions(int schoolId) {
         ResponseBeanList responseBeanList = new ResponseBeanList();
@@ -149,4 +157,93 @@ public class PermissFaceServiceImp implements PermissFaceService {
         }
         return responseBeanList;
     }
+
+    @Override
+    public ResponseBean<String> addFace(String imgUrl, String userId) {
+
+        RestTemplate restTemplate = new RestTemplate();
+        try {
+            URI uri = new URI(imgUrl);
+            ResponseEntity<byte[]> responseEntity = restTemplate.exchange(uri, HttpMethod.GET, null, byte[].class);
+
+            byte[] bytes = responseEntity.getBody();
+
+            String savePath = "./imgsave/";
+            File saveFile = new File(savePath);
+            if (!saveFile.exists()) saveFile.mkdirs();
+            File saveImgFile = new File(savePath, System.currentTimeMillis() + ".jpg");
+            if (!saveImgFile.exists()) saveImgFile.createNewFile();
+            FileOutputStream fileOutputStream = new FileOutputStream(saveImgFile);
+
+            fileOutputStream.write(bytes);
+
+            //检测图片
+            BaiduUtils.getBaiduUtils().checkImg(saveImgFile.getAbsolutePath());
+
+            List<StudentBean> studentBeans = userDao.getStudentWithUserId(userId);
+
+            if (null != studentBeans && studentBeans.size() > 0) {
+                log.error("学生下发");
+                for (int i = 0; i < studentBeans.size(); i++) {
+                    StudentBean studentBean = studentBeans.get(i);
+                    int schoolId = studentBean.getSchool_id();
+                    uploadImgs(saveImgFile, schoolId + "", studentBean.getStudentcode(), 2, studentBean.getCard(), studentBean.getName());
+                }
+
+            } else {
+                List<TeacherBean> teacherBeans = userDao.getTeaWithUserId(userId);
+log.error("教师下发");
+                if (null != teacherBeans && teacherBeans.size() > 0) {
+
+                    for (int i = 0; i < teacherBeans.size(); i++) {
+                        TeacherBean teacherBean = teacherBeans.get(i);
+
+                        String schoolId = teacherBean.getSchool_id();
+                        uploadImgs(saveImgFile, schoolId, teacherBean.getNum(), 1, teacherBean.getTeacher_num(), teacherBean.getName());
+
+                    }
+
+                }
+
+            }
+
+            fileOutputStream.close();
+        } catch (URISyntaxException | IOException e) {
+            e.printStackTrace();
+        }
+
+//        userDao.getUserWidthUserId(userId);
+
+//        HttpUtils.uploadImgs()
+
+        ResponseBean responseBean = new ResponseBean();
+
+        responseBean.setData(1);
+        responseBean.setMessage("下发成功");
+        responseBean.setData(true);
+
+        return responseBean;
+    }
+
+    private void uploadImgs(File saveImgFile, String schoolId, String studentcode, int userType, String card, String name) {
+        List<AttendanceBean> attendanceBeanList = userDao.getAllDevices(schoolId + "");
+        if (null != attendanceBeanList && attendanceBeanList.size() > 0)
+            for (int i = 0; i < attendanceBeanList.size(); i++) {
+                AttendanceBean attendanceBean = attendanceBeanList.get(i);
+
+                String clintType = attendanceBean.getClint_type();
+                //根据设备类型上传人脸
+                log.error("设备:{}",clintType);
+                if (clintType.equals("18") || clintType.equals("28")) {
+                    HttpUtils.uploadImg2HK(saveImgFile.getAbsolutePath(), card, name, attendanceBean.getClint_id(), String.valueOf(userType));
+
+                } else if (clintType.equals("22") || clintType.equals("29")) {
+                    HttpUtils.uploadImgs(saveImgFile, schoolId, studentcode
+                            , clintType, userType);
+                }
+
+            }
+
+
+    }
 }
@@ -0,0 +1,211 @@
+package com.example.dahua.utils;
+
+import com.example.dahua.async.ImageUtils;
+import com.example.dahua.lib.CompressPic;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import javax.imageio.stream.FileImageInputStream;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BaiduUtils {
+
+    private static BaiduUtils baiduUtils;
+
+    public static BaiduUtils getBaiduUtils(){
+
+        if (null==baiduUtils){
+            synchronized (BaiduUtils.class){
+                if (null==baiduUtils)baiduUtils=new BaiduUtils();
+            }
+        }
+        return baiduUtils;
+    }
+
+
+    public boolean checkImg(String httpurl){
+        // 请求url
+        String url = "https://aip.baidubce.com/rest/2.0/face/v3/faceverify";
+        try {
+
+            List list = new ArrayList();
+            Map<String, String> map = new HashMap<>();
+            String image_type = "";
+            String imgFilePath = httpurl;
+            File target = new File("./huoti/");
+            if (!target.exists()) target.mkdirs();
+            File target1 = new File(target.getAbsolutePath(), new File(httpurl).getName());
+            if (httpurl.startsWith("http")) image_type = "URL";
+            else {
+                CompressPic.CompressPic(httpurl, target1.getAbsolutePath(), "");//压缩后的图片
+                image_type = "BASE64";
+                httpurl = Base64Util.encode(image2byte(target1.getAbsolutePath()));
+            }
+            map.put("image", httpurl);
+            map.put("image_type", image_type);
+//            map.put("face_field","");
+//            map.put("option","GATE");
+            list.add(map);
+            String param = GsonUtils.toJson(list);
+            // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。
+            String accessToken = getAuth();
+
+            String result1 = HttpUtil.post(url, accessToken, "application/json", param);
+            JSONObject jsonObject = new JSONObject(result1);
+            String error_msg = jsonObject.optString("error_msg");
+            JSONObject result = jsonObject.optJSONObject("result");
+            if (error_msg.equals("SUCCESS")) {
+                double face_liveness = result.optDouble("face_liveness", 0.00);//活体分数值
+                JSONArray face_list = result.optJSONArray("face_list");
+                JSONObject location = face_list.optJSONObject(0).optJSONObject("location");
+                double rotation = location.optDouble("rotation", 0.0);//竖直方向旋转角度
+                System.out.println(" face_liveness:" + face_liveness);
+                if (face_liveness > 0.4) {
+                    int angel = 0;
+                    if (45 < rotation && rotation < 135) {//右向横图,需要旋转270度
+                        System.out.println("旋转270度");
+                        angel = 270;
+                    } else if (rotation > -135 && rotation < -45) {//左向横图,需要旋转90度
+                        System.out.println("旋转90度");
+                        angel = 90;
+                    } else if (rotation >= -180 && rotation <= -135 || rotation >= 135 && rotation <= 180) {//倒向图片,需要旋转180度
+                        System.out.println("旋转180度");
+                        angel = 180;
+                    }
+                    System.out.println("图片检验成功");
+                    FileUtils.getInstance().writeLogs("检测成功:" + imgFilePath, FileUtils.checkSuc);
+                    //E:\wwwhtdocs\SmartCampus\face17e50\School
+                    //http://campus.myjxt.com//face17e5/School861/Student/GBZX20171134.jpg
+                    //F:\wwwroot\smartcampus\face17e5
+//                    imgFilePath =httpurl.replace("http://campus.myjxt.com","E:\\wwwhtdocs\\SmartCampus");
+//                    imgFilePath = httpurl.replace("http://60.190.202.57:1000","F:\\wwwroot\\smartcampus");
+//                    System.out.println("图片是否存在:" + imgFilePath);
+                    if (angel != 0)
+                        ImageUtils.rotatePhonePhoto(imgFilePath, angel);
+                    return true;
+                } else {
+                    FileUtils.getInstance().writeLogs("检测失败,活体分数:" + face_liveness + " " + imgFilePath, FileUtils.checkFail);
+                    System.out.println("图片不合格" + imgFilePath);
+                    deleteImgFile(imgFilePath);
+                    return false;
+                }
+            } else {
+                System.out.println("检测失败");
+                FileUtils.getInstance().writeLogs("检测失败:" + error_msg + imgFilePath, FileUtils.checkFail);
+                deleteImgFile(imgFilePath);
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    //图片到byte数组
+    public byte[] image2byte(String path) {
+        byte[] data = null;
+        FileImageInputStream input = null;
+        try {
+            input = new FileImageInputStream(new File(path));
+            ByteArrayOutputStream output = new ByteArrayOutputStream();
+            byte[] buf = new byte[1024];
+            int numBytesRead = 0;
+            while ((numBytesRead = input.read(buf)) != -1) {
+                output.write(buf, 0, numBytesRead);
+            }
+            data = output.toByteArray();
+            output.close();
+            input.close();
+        } catch (FileNotFoundException ex1) {
+            ex1.printStackTrace();
+        } catch (IOException ex1) {
+            ex1.printStackTrace();
+        }
+        return data;
+    }
+
+    private boolean deleteImgFile(String imgFilePath) {
+        imgFilePath = imgFilePath.replace("http://campus.myjxt.com", "E:\\wwwhtdocs\\SmartCampus");
+        File file = new File(imgFilePath);
+        if (file.exists()) {
+            return file.delete();
+        }
+        return false;
+    }
+
+    /**
+     * 获取权限token
+     *
+     * @return 返回示例：
+     * {
+     * "access_token": "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567",
+     * "expires_in": 2592000
+     * }
+     */
+    public String getAuth() {
+        // 官网获取的 API Key 更新为你注册的
+        String clientId = "u6rV4YxRZmwzKj56N0DCW8eO";
+        // 官网获取的 Secret Key 更新为你注册的
+        String clientSecret = "Krp3KhmIBdnNEsRa1LavMHuZl0KhQGVm";
+        return getAuth(clientId, clientSecret);
+    }
+
+    /**
+     * 获取API访问token
+     * 该token有一定的有效期，需要自行管理，当失效时需重新获取.
+     *
+     * @param ak - 百度云官网获取的 API Key
+     * @param sk - 百度云官网获取的 Securet Key
+     * @return assess_token 示例：
+     * "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567"
+     */
+    public static String getAuth(String ak, String sk) {
+        // 获取token地址
+        String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
+        String getAccessTokenUrl = authHost
+                // 1. grant_type为固定参数
+                + "grant_type=client_credentials"
+                // 2. 官网获取的 API Key
+                + "&client_id=" + ak
+                // 3. 官网获取的 Secret Key
+                + "&client_secret=" + sk;
+        try {
+            URL realUrl = new URL(getAccessTokenUrl);
+            // 打开和URL之间的连接
+            HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
+            connection.setRequestMethod("GET");
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+//            for (String key : map.keySet()) {
+//                System.err.println(key + "--->" + map.get(key));
+//            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String result = "";
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+            /**
+             * 返回结果示例
+             */
+//            System.err.println("result:" + result);
+            JSONObject jsonObject = new JSONObject(result);
+            String access_token = jsonObject.getString("access_token");
+            return access_token;
+        } catch (Exception e) {
+            System.err.printf("获取token失败！");
+            e.printStackTrace(System.err);
+        }
+        return null;
+    }
+
+}
@@ -63,6 +63,20 @@ public class HttpUtils {
     }
+    public static String uploadImg2HK(String filePath,String card,String name,String deviceId,String userType){
+
+        String url = String.format("http://114.55.30.100:8089/facereco/sendCardAndImg1?filePath=%s&card=%s&name=%s&userType=%s&deviceId=%s",
+                filePath,card,name,userType,deviceId);
+
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
+
+        System.out.println("responseEntity:" + responseEntity.getBody());
+        return responseEntity.getBody();
+    }
+
+
     public static boolean imgsSend(String schoolId, int type) {
         String url = "http://121.40.109.21:8991/file/imgsSend?schoolId=" + schoolId + "&type=" + type;
         RestTemplate restTemplate = new RestTemplate();
@@ -23,6 +23,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.client.RestTemplate;
+import java.io.*;
 import java.util.*;
 @RunWith(SpringRunner.class)
@@ -368,7 +369,7 @@ public class DahuaApplicationTests {
                     sendCards.setStartTime("2020-06-23 00:07:59");
                     sendCards.setType("1");
-                    Map<String, String> body = new HashMap<String,String>();
+                    Map<String, String> body = new HashMap<String, String>();
                     body.put("cardNo", teacherBean.getTeacher_num());
                     body.put("endTime", "2030-06-23T00:07:59");
                     body.put("id", "5");
@@ -413,7 +414,7 @@ public class DahuaApplicationTests {
                 for (int j = 0; j < deviceids.length; j++) {
                     String deviceId = deviceids[j];
-                    Map<String, String> body = new HashMap<String,String>();
+                    Map<String, String> body = new HashMap<String, String>();
                     body.put("cardNo", teacherBean.getStudent_num());
                     body.put("id", "8");
                     body.put("sn", deviceId);
@@ -454,7 +455,7 @@ public class DahuaApplicationTests {
                 for (int j = 0; j < deviceids.length; j++) {
                     String deviceId = deviceids[j];
-                    Map<String, String> body = new HashMap<String,String>();
+                    Map<String, String> body = new HashMap<String, String>();
                     body.put("cardNo", teacherBean.getStudent_num());
                     body.put("id", "8");
                     body.put("sn", deviceId);
@@ -486,14 +487,37 @@ public class DahuaApplicationTests {
 //
 //        System.out.println("list:" + list.toString());
-        List<AttendanceBean> attendanceBeanList = userDao.getAttendanceBeans("479","4");
+//        List<AttendanceBean> attendanceBeanList = userDao.getAttendanceBeans("479","4");
+//
+//        for (int i = 0; i < attendanceBeanList.size(); i++) {
+//            AttendanceBean attendanceBean = attendanceBeanList.get(i);
+//
+//
+//        }
-        for (int i = 0; i < attendanceBeanList.size(); i++) {
-            AttendanceBean attendanceBean = attendanceBeanList.get(i);
+        File file = new File("D:\\新七年级\\名字.txt");
+        try {
+            FileReader fileReader = new FileReader(file);
+            BufferedReader bufferedReader = new BufferedReader(fileReader);
+            List<UserInfoBean> userInfoBeans = userDao.getStuUserInfos();
+            String content = null;
+            while ((content = bufferedReader.readLine()) != null) {
-        }
+                for (int i = 0; i < userInfoBeans.size(); i++) {
+                    UserInfoBean userInfoBean = userInfoBeans.get(i);
+                    if (content.equals(userInfoBean.getName())){
+                        System.out.println(userInfoBean.getStudentcode()+"\t");
+                    }
+                }
+
+            }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
@@ -506,7 +530,7 @@ public class DahuaApplicationTests {
         mqttManager.init();
-        List<String> stringList = userDao.getAllDecWithSch(479);
+        List<String> stringList = userDao.getAllDecWithSch(27);
         System.out.println("stringList:" + stringList.size());
         for (int i = 0; i < stringList.size(); i++) {
             String devId = stringList.get(i);
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 # ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# Maven Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -114,7 +114,6 @@ if $mingw ; then
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  # TODO classpath?
 fi
 if [ -z "$JAVA_HOME" ]; then
@@ -212,7 +211,11 @@ else
     if [ "$MVNW_VERBOSE" = true ]; then
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
-    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
       esac
@@ -221,22 +224,38 @@ else
       echo "Downloading from: $jarUrl"
     fi
     wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
     if command -v wget > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found wget ... using wget"
         fi
-        wget "$jarUrl" -O "$wrapperJarPath"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found curl ... using curl"
         fi
-        curl -o "$wrapperJarPath" "$jarUrl"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"
         fi
         javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
         if [ -e "$javaClass" ]; then
             if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
                 if [ "$MVNW_VERBOSE" = true ]; then
@@ -277,6 +296,11 @@ if $cygwin; then
     MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
 fi
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 exec "$JAVACMD" \
@@ -18,7 +18,7 @@
 @REM ----------------------------------------------------------------------------
 @REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
+@REM Maven Start Up Batch script
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
@@ -26,7 +26,7 @@
 @REM Optional ENV vars
 @REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
 @REM     e.g. to debug Maven itself, use
 @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -37,7 +37,7 @@
 @echo off
 @REM set title of command window
 title %0
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 @REM set %HOME% to equivalent of $HOME
@@ -120,23 +120,44 @@ SET MAVEN_JAVA_EXE=&quot;%JAVA_HOME%\bin\java.exe&quot;
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
-FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
-	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
 @REM This allows using the maven wrapper in projects that prohibit checking in binary data.
 if exist %WRAPPER_JAR% (
-    echo Found %WRAPPER_JAR%
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
 ) else (
-    echo Couldn't find %WRAPPER_JAR%, downloading it ...
-	echo Downloading from: %DOWNLOAD_URL%
-    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
-    echo Finished downloading %WRAPPER_JAR%
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
 )
 @REM End of extension
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
 %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 package com.sincere.haikangface;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sincere.haikangface.bean.*;
+import com.sincere.haikangface.bean.face.BaiduUserInfoBean;
 import com.sincere.haikangface.bean.xiaoan.Face_Recoder;
 import com.sincere.haikangface.dao.DeviceDao;
 import com.sincere.haikangface.dao.UserDao;
@@ -21,8 +23,14 @@ 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.core.io.FileSystemResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
@@ -30,6 +38,8 @@ import java.io.*;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
+import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -54,8 +64,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 = "172.16.2.53";
-    //        private String ip_cloud = "114.55.30.100";
+//    private String ip_cloud = "192.168.71.242";
+            private String ip_cloud = "114.55.30.100";
     private String ip;
     {
@@ -144,6 +154,7 @@ public class CMSServer implements ApplicationRunner {
                 pInBuffer.dwSize = pInBuffer.size();
                 AttendanceBean attendanceBean = new AttendanceBean();
                 attendanceBean.setClint_id(deviceId);
+
                 if (deviceId.startsWith("ytj"))
                     attendanceBean.setClint_type("28");
                 else
@@ -291,6 +302,7 @@ public class CMSServer implements ApplicationRunner {
     public class PSS_Storage_Callback implements HCEHomeSS.EHomeSSStorageCallBack {
         public boolean invoke(NativeLong iHandle, String pFileName, Pointer pFileBuf, int dwFileLen, Pointer pFilePath, Pointer pUser) {
+            log.error("图片进来:{}" , pFileName);
             String strPath = "C://EhomePicServer/";
 //            System.out.println("pFileName:" + pFileName);
             pFileName = pFileName.replace("_", "");
@@ -335,6 +347,9 @@ public class CMSServer implements ApplicationRunner {
                     buffers.get(bytes);
                     fout.write(bytes);
                     fout.close();
+
+                    sendToKB(strFilePathFile);
+
                 } catch (FileNotFoundException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
@@ -354,6 +369,77 @@ public class CMSServer implements ApplicationRunner {
         }
     }
+    /**
+     * 发送人脸到看板
+     *
+     * @param strFilePathFile
+     */
+    public void sendToKB(File strFilePathFile) {
+        try {
+
+        log.error("开始识别.....");
+        String url = "http://120.26.116.253:9214/baiduapi/search/16";
+
+        RestTemplate restTemplate = new RestTemplate();
+
+        HttpHeaders headers = new HttpHeaders();
+        MediaType mediaType = MediaType.parseMediaType(MediaType.MULTIPART_FORM_DATA_VALUE);
+        headers.setContentType(mediaType);
+        MultiValueMap<String, Object> multiValueMap = new LinkedMultiValueMap<>();
+        FileSystemResource fileSystemResource = new FileSystemResource(strFilePathFile);
+
+        multiValueMap.add("file ", fileSystemResource);
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(multiValueMap, headers);
+
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, httpEntity, String.class);
+            log.error("识别结果:{}" , responseEntity.getBody());
+        JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
+
+       String face = jsonObject.getString("data");
+       if (face.startsWith("face"))return;
+
+        JSONObject data = jsonObject.getJSONObject("data");
+        String error_msg = data.getString("error_msg");
+
+        if (error_msg.equals("SUCCESS")) {//识别成功
+            JSONObject result = data.getJSONObject("result");
+            JSONArray user_list = result.getJSONArray("user_list");
+
+            if (user_list != null && user_list.size() > 0) {
+
+                for (int i = 0; i < user_list.size(); i++) {
+                    JSONObject user = user_list.getJSONObject(i);
+
+                    String user_id = user.getString("user_id");
+                    String score = user.getString("score");
+                    double sc = Double.valueOf(score.split("\\.")[0]);
+                    if (sc >= 60) {
+                        System.out.println("user_id:" + user_id);
+                        TeacherBean teacherBean = userDao.getTeacherWithUserId1(user_id);
+                        if (null != teacherBean) {
+                            if (TextUtils.isEmpty(teacherBean.getTeacer_num()))teacherBean.setTeacer_num(user_id);
+                            MqtUtils.getInstance().sendMsg("09EA8EB5142F2964", 1, teacherBean.toString());
+                        } else {
+                            System.out.println("用户身份信息不存在");
+                        }
+                    }else {
+                        System.out.println("用户身份信息不存在"+score);
+                    }
+
+                }
+
+            }
+        } else {
+            System.out.println("识别失败:" + error_msg);
+        }
+        log.error("发送成功.....");
+//        System.out.println("responseEntity:"+responseEntity.getBody());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
     HCEHomeAlarm.NET_EHOME_ALARM_LISTEN_PARAM net_ehome_alarm_listen_param = new HCEHomeAlarm.NET_EHOME_ALARM_LISTEN_PARAM();
     EHomeMsgCallBack cbEHomeMsgCallBack;
     ;//报警监听回调函数实现
@@ -420,8 +506,8 @@ public class CMSServer implements ApplicationRunner {
                 strXMLData.read();
                 String strXML = new String(strXMLData.byValue);
-                System.out.println(strXML);
-
+//                System.out.println(strXML);
+//                log.error("报警监听:{}",strXML);
                 if (null == alarmUtils) {
                     alarmUtils = new AlarmUtils(deviceDao);
                     alarmUtils.setCallBack(new AlarmUtils.AlarmCallBack() {
@@ -477,7 +563,7 @@ public class CMSServer implements ApplicationRunner {
                 cardNo = sendRecoderUtils.getCard(card);
                 StudentBean studentBean = userDao.getStudentWithCard(cardNo);
-
+                log.error("studentBean:{}",studentBean);
                 if (null != studentBean) {
                     FileUtils.getInstance().writeLogs(studentBean.getName() + " " + cardNo, FileUtils.facerecoder);
@@ -501,7 +587,6 @@ public class CMSServer implements ApplicationRunner {
                 } else {
                     //教师点名
                     isTeacher(cardNo, deviceID);
-                    FileUtils.getInstance().writeLogs("card:" + card, FileUtils.faceSuccess);
                 }
                 if (deviceID.startsWith("qj")) {//枪击 用来抓拍人脸考勤用
@@ -529,10 +614,12 @@ public class CMSServer implements ApplicationRunner {
     public void isTeacher(String cardNo, String deviceID) {
         List<String> devLists = userDao.getDeviceRoomRelation(deviceID);
+        log.error("cardNo:{},devLists{}",cardNo,devLists);
         if (null != devLists && devLists.size() > 0) {
             StudentBean teacher = userDao.getTeacherWithCard(cardNo);
+            FileUtils.getInstance().writeLogs("teacher:" + teacher+"----"+cardNo, "教师点名.txt");
             if (null != teacher) {
                 String url = String.format("http://campus.myjxt.com/api/RollCall/AddRollCallPersonnelRecord?userId=%s&deviceId=%s", teacher.getUser_id(), deviceID);
@@ -540,7 +627,7 @@ public class CMSServer implements ApplicationRunner {
                 String res = restTemplate.getForObject(url, String.class);
                 JSONObject jsonObject = JSON.parseObject(res);
-
+                FileUtils.getInstance().writeLogs("card:" + res, "教师点名.txt");
                 System.out.println("result:" + res + "------url:" + jsonObject.getBoolean("data"));
             }
@@ -657,11 +744,11 @@ public class CMSServer implements ApplicationRunner {
                 "<password>MTIzNDU2</password>\r\n" +
                 "<maxSwipeTime></maxSwipeTime>\r\n" +
                 "<swipeTime></swipeTime>\r\n" +
-                "<groupNo>5</groupNo>\r\n" +
+                "<groupNo></groupNo>\r\n" +
                 "<name>";
         String nameAfter = "</name>\r\n" +
                 "<employeeNo>" + employeeNo + "</employeeNo>\r\n" +
-                "<departmentNo>3</departmentNo>\r\n" +
+                "<departmentNo></departmentNo>\r\n" +
                 "<schedulePlanNo></schedulePlanNo>\r\n" +
                 "<schedulePlanType></schedulePlanType>\r\n" +
                 "</CardCfg>\r\n" +
@@ -105,7 +105,7 @@ public class SendUserAsync {
             if (weekDay.getDeviceIds() != null && weekDay.getDeviceIds().size() > 0) {
                 permissionBean.setDeviceIds(weekDay.getDeviceIds());
             }
-            List<String> deviceIds = permissionBean.getDeviceIds();
+            List<String> deviceIds = weekDay.getDeviceIds();
             List<String> cardNumList = new ArrayList<>();
             String sex = weekDay.getSex();
             if (userType.equals("1")) {
@@ -10,6 +10,16 @@ public class TeacherBean implements Serializable {
     private String num;
+    private String face;
+
+    public String getTeacher_num() {
+        return teacher_num;
+    }
+
+    public void setTeacher_num(String teacher_num) {
+        this.teacher_num = teacher_num;
+    }
+
     public String getNum() {
         return num;
     }
@@ -33,4 +43,20 @@ public class TeacherBean implements Serializable {
     public void setTeacer_num(String teacer_num) {
         this.teacher_num = teacer_num;
     }
+
+    public String getFace() {
+        return face;
+    }
+
+    public void setFace(String face) {
+        this.face = face;
+    }
+
+    @Override
+    public String toString() {
+        return "{\"name\":\"" + name + '\"' +
+                ", \"teacher_num\":\"" + teacher_num + '\"' +
+                ", \"num\":\"" + num + '\"' +
+                ", \"face\":\"" + face + '\"' +"}";
+    }
 }
@@ -0,0 +1,45 @@
+package com.sincere.haikangface.bean.face;
+
+import java.io.Serializable;
+
+public class BaiduUserInfoBean implements Serializable {
+
+    private int status;
+
+    private String message;
+
+    private BaiduUserInfoDataBean 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 BaiduUserInfoDataBean getData() {
+        return data;
+    }
+
+    public void setData(BaiduUserInfoDataBean data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "BaiduUserInfoBean{" +
+                "status=" + status +
+                ", message='" + message + '\'' +
+                ", data=" + data +
+                '}';
+    }
+}
@@ -0,0 +1,45 @@
+package com.sincere.haikangface.bean.face;
+
+import java.io.Serializable;
+
+public class BaiduUserInfoDataBean implements Serializable {
+
+    private String error_msg;
+
+    private int error_code;
+
+    private BaiduUserInfoResultBean data;
+
+    public String getError_msg() {
+        return error_msg;
+    }
+
+    public void setError_msg(String error_msg) {
+        this.error_msg = error_msg;
+    }
+
+    public int getError_code() {
+        return error_code;
+    }
+
+    public void setError_code(int error_code) {
+        this.error_code = error_code;
+    }
+
+    public BaiduUserInfoResultBean getData() {
+        return data;
+    }
+
+    public void setData(BaiduUserInfoResultBean data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "BaiduUserInfoDataBean{" +
+                "error_msg='" + error_msg + '\'' +
+                ", error_code=" + error_code +
+                ", data=" + data +
+                '}';
+    }
+}
@@ -0,0 +1,23 @@
+package com.sincere.haikangface.bean.face;
+
+import java.io.Serializable;
+
+public class BaiduUserInfoListBean implements Serializable {
+
+    private String user_id;
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    @Override
+    public String toString() {
+        return "BaiduUserInfoListBean{" +
+                "user_id='" + user_id + '\'' +
+                '}';
+    }
+}
@@ -0,0 +1,24 @@
+package com.sincere.haikangface.bean.face;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class BaiduUserInfoResultBean implements Serializable {
+
+    private List<BaiduUserInfoListBean> user_list;
+
+    public List<BaiduUserInfoListBean> getUser_list() {
+        return user_list;
+    }
+
+    public void setUser_list(List<BaiduUserInfoListBean> user_list) {
+        this.user_list = user_list;
+    }
+
+    @Override
+    public String toString() {
+        return "BaiduUserInfoResultBean{" +
+                "user_list=" + user_list +
+                '}';
+    }
+}
@@ -81,7 +81,7 @@ public class FileControl {
             String filePath = dest.getAbsolutePath();
             FileUtils.getInstance().writeLogs("filePath:" + filePath + " card:" + card + " name:" + name + " deviceId:" + deviceId, FileUtils.sendUserInfo);
             long time = System.currentTimeMillis();
-            if (filePath.contains(".jpg")) filePath = filePath.replace(".jpg", ".png");
+//            if (filePath.contains(".jpg")) filePath = filePath.replace(".jpg", ".png");
             if (new File(filePath.trim()).exists()) {
                 String targetPath = FileUtils.picPathComp + new File(filePath).getName().replace(".png", ".jpg");
@@ -67,6 +67,7 @@ public class UserControl {
     @ApiOperation("下发权限给设备")
     public boolean sendPermiss(@RequestBody PermissionBean permissionBean) {
         log.error("permissionBean:{}", JSON.toJSONString(permissionBean));
+        FileUtils.getInstance().writeLogs("传入权限模板:"+JSON.toJSONString(permissionBean),"设置权限内容.txt");
         if (!StringUtils.isEmpty(permissionBean.getDeviceIds())) {
 //            List<String> cardNumList = userDao.getStudentCardsWidthSchoolId(permissionBean.getSchoolId());
             return sendUserAsync.sendPermiss(permissionBean, 0);
@@ -97,6 +98,16 @@ public class UserControl {
         }
     }
+    @RequestMapping(value = "sendToKB", method = RequestMethod.GET)
+    @ApiOperation("发送数据到看板")
+    public void sendToKB(@RequestParam("filePath") String filePath) {
+        try {
+            cmsServer.sendToKB(new File(filePath));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @RequestMapping(value = "sendStuCardAndImg", method = RequestMethod.GET)
     @ApiOperation("下发人脸给设备")
@@ -106,10 +117,18 @@ public class UserControl {
         return sendImg2Device(filePath, card, name, deviceId, userType);
     }
+    @RequestMapping(value = "sendCardAndImg1", method = RequestMethod.GET)
+    @ApiOperation("下发人脸给设备")
+    public boolean sendCardAndImg1(@RequestParam("filePath") String filePath, @RequestParam("card") String card
+            , @RequestParam("name") String name, @RequestParam("deviceId") String deviceId, @RequestParam("userType") String userType) {
+        log.error("sendCardAndImg1:---------------------------------");
+        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");
+//            if (filePath.contains(".jpg")) filePath = filePath.replace(".jpg", ".png");
             if (new File(filePath.trim()).exists()) {
                 String targetPath = FileUtils.picPathComp + new File(filePath).getName();
                 try {
@@ -239,6 +239,9 @@ public interface UserDao {
     @Select("select Top(1) * from SZ_V_School_Teacher where user_id = #{userId} and teacher_num<>''")
     TeacherBean getTeacherWithUserId(@Param("userId") String userId);
+    @Select("select Top(1) * from SZ_V_School_Teacher where user_id = #{userId}")
+    TeacherBean getTeacherWithUserId1(@Param("userId") String userId);
+
     List<String> getStudentWiSidAndSex(@Param("schoolId") String schoolId, @Param("sexs") List<String> sexs);
@@ -20,6 +20,22 @@ public class MqttManager {
     private static int qosLevel;
+    private static MqttManager mqttManager;
+
+//    public static MqttManager getInstance(){
+//
+//        if (null==mqttManager){
+//            synchronized (MqttManager.class){
+//                if (null==mqttManager) {
+//                    mqttManager = new MqttManager();
+//                    init();
+//                }
+//            }
+//        }
+//        return mqttManager;
+//    }
+
+
     public void init() {
         final String brokerUrl = "tcp://post-cn-4590mq2hr03.mqtt.aliyuncs.com:1883";
         groupId = "GID_HFJSIURFHAQO110";
@@ -95,7 +111,7 @@ public class MqttManager {
     public void sendMq(String deviceId, int cmd, String msg) {
         String recvClientId = groupId + "@@@" + deviceId;
         final String p2pSendTopic = topic + "/p2p/" + recvClientId;
-        String content = "{\"cmd\":\"" + cmd + "\",\"clientId\":\"\",\"data\": \"" + msg + "\"}";
+        String content = "{\"cmd\":\"" + cmd + "\",\"clientId\":\"\",\"data\": " + msg + "}";
         MqttMessage message = new MqttMessage(content.getBytes());
         message.setQos(qosLevel);
         System.out.println("发送内容:" + p2pSendTopic + " msg:---------" + msg);
@@ -22,10 +22,10 @@ public class CompressPic {
         int width = bufferedImage.getWidth(null);
         int height = bufferedImage.getHeight(null);
         long fileLength = file.length();
-        System.out.println("fileLength:" + fileLength);
-        System.out.println("原始宽高:" + "width:" + width + "--height:" + height);
+//        System.out.println("fileLength:" + fileLength);
+//        System.out.println("原始宽高:" + "width:" + width + "--height:" + height);
         if ((fileLength / 1024) < 200) {
-            System.out.println("小于200k压缩:" + "width:" + width + "--height:" + height);
+//            System.out.println("小于200k压缩:" + "width:" + width + "--height:" + height);
             writeImgToFile(bufferedImage, width, height, targetPath);
         } else {
             while ((fileLength / 1024) >= 200) {
@@ -40,8 +40,8 @@ public class CompressPic {
                 width = bufferedImage1.getWidth(null);
                 height = bufferedImage1.getHeight(null);
                 fileLength = file1.length();
-                System.out.println("最终宽高:" + "width:" + width + "--height:" + height);
-                System.out.println("fileLength1:" + fileLength);
+//                System.out.println("最终宽高:" + "width:" + width + "--height:" + height);
+//                System.out.println("fileLength1:" + fileLength);
                 fileInputStream.close();
             }
         }
@@ -124,7 +124,7 @@ public class HttpUtil {
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, httpEntity, String.class);
-        System.out.println("responseEntity:" + responseEntity.getBody());
+        System.out.println("responseEntity:" + responseEntity.getBody()+name);
         return responseEntity.getBody().equals("1");
     }
@@ -19,7 +19,7 @@
     </select>
     <select id="getDeviceRoomRelation" resultType="java.lang.String">
-        select clint_id from SZ_DeviceRoomRelation where clint_id = #{clint_id};
+        select clint_id from SZ_DeviceRoomRelation where clint_id = #{clint_id} and state = 1;
     </select>
 </mapper>
@@ -40,7 +40,7 @@ public class MyRunnerableInt implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        initMqConsumer();
+//        initMqConsumer();
     }
     /**
	@@ -44,4 +44,12 @@ public class FaceUnifyController {		@@ -44,4 +44,12 @@ public class FaceUnifyController {
44	return JSON.toJSONString(permissFaceService.getPermissions(schoolId));	44	return JSON.toJSONString(permissFaceService.getPermissions(schoolId));
45	}	45	}
46		46
		47	+
		48	+ @RequestMapping(value = "addFace",method = RequestMethod.POST)
		49	+ @ApiOperation("上传学生/老师人脸")
		50	+ public String addFace(@RequestParam("imgUrl")String imgUrl,@RequestParam("userId")String userId) throws UnsupportedEncodingException {
		51	+ return JSON.toJSONString(permissFaceService.addFace(imgUrl,userId));
		52	+ }
		53	+
		54	+
47	}	55	}
	@@ -115,186 +115,15 @@ public class UserControl {		@@ -115,186 +115,15 @@ public class UserControl {
115	@RequestMapping(value = "checkFace", method = RequestMethod.GET)	115	@RequestMapping(value = "checkFace", method = RequestMethod.GET)
116	@ApiOperation("在线活体检测")	116	@ApiOperation("在线活体检测")
117	public boolean checkFace(@RequestParam("url") String httpurl) {	117	public boolean checkFace(@RequestParam("url") String httpurl) {
118	- // 请求url
119	- String url = "https://aip.baidubce.com/rest/2.0/face/v3/faceverify";
120	- try {
121	-
122	- List list = new ArrayList();
123	- Map<String, String> map = new HashMap<>();
124	- String image_type = "";
125	- String imgFilePath = httpurl;
126	- File target = new File("./huoti/");
127	- if (!target.exists()) target.mkdirs();
128	- File target1 = new File(target.getAbsolutePath(), new File(httpurl).getName());
129	- if (httpurl.startsWith("http")) image_type = "URL";
130	- else {
131	- CompressPic.CompressPic(httpurl, target1.getAbsolutePath(), "");//压缩后的图片
132	- image_type = "BASE64";
133	- httpurl = Base64Util.encode(image2byte(target1.getAbsolutePath()));
134	- }
135	- map.put("image", httpurl);
136	- map.put("image_type", image_type);
137	-// map.put("face_field","");
138	-// map.put("option","GATE");
139	- list.add(map);
140	- String param = GsonUtils.toJson(list);
141	- // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间，客户端可自行缓存，过期后重新获取。
142	- String accessToken = getAuth();
143	-
144	- String result1 = HttpUtil.post(url, accessToken, "application/json", param);
145	- JSONObject jsonObject = new JSONObject(result1);
146	- String error_msg = jsonObject.optString("error_msg");
147	- JSONObject result = jsonObject.optJSONObject("result");
148	- if (error_msg.equals("SUCCESS")) {
149	- double face_liveness = result.optDouble("face_liveness", 0.00);//活体分数值
150	- JSONArray face_list = result.optJSONArray("face_list");
151	- JSONObject location = face_list.optJSONObject(0).optJSONObject("location");
152	- double rotation = location.optDouble("rotation", 0.0);//竖直方向旋转角度
153	- System.out.println(" face_liveness:" + face_liveness);
154	- if (face_liveness > 0.4) {
155	- int angel = 0;
156	- if (45 < rotation && rotation < 135) {//右向横图,需要旋转270度
157	- System.out.println("旋转270度");
158	- angel = 270;
159	- } else if (rotation > -135 && rotation < -45) {//左向横图,需要旋转90度
160	- System.out.println("旋转90度");
161	- angel = 90;
162	- } else if (rotation >= -180 && rotation <= -135 \|\| rotation >= 135 && rotation <= 180) {//倒向图片,需要旋转180度
163	- System.out.println("旋转180度");
164	- angel = 180;
165	- }
166	- System.out.println("图片检验成功");
167	- FileUtils.getInstance().writeLogs("检测成功:" + imgFilePath, FileUtils.checkSuc);
168	- //E:\wwwhtdocs\SmartCampus\face17e50\School
169	- //http://campus.myjxt.com//face17e5/School861/Student/GBZX20171134.jpg
170	- //F:\wwwroot\smartcampus\face17e5
171	-// imgFilePath =httpurl.replace("http://campus.myjxt.com","E:\\wwwhtdocs\\SmartCampus");
172	-// imgFilePath = httpurl.replace("http://60.190.202.57:1000","F:\\wwwroot\\smartcampus");
173	-// System.out.println("图片是否存在:" + imgFilePath);
174	- if (angel != 0)
175	- ImageUtils.rotatePhonePhoto(imgFilePath, angel);
176	- return true;
177	- } else {
178	- FileUtils.getInstance().writeLogs("检测失败,活体分数:" + face_liveness + " " + imgFilePath, FileUtils.checkFail);
179	- System.out.println("图片不合格" + imgFilePath);
180	- deleteImgFile(imgFilePath);
181	- return false;
182	- }
183	- } else {
184	- System.out.println("检测失败");
185	- FileUtils.getInstance().writeLogs("检测失败:" + error_msg + imgFilePath, FileUtils.checkFail);
186	- deleteImgFile(imgFilePath);
187	- return false;
188	- }
189	- } catch (Exception e) {
190	- e.printStackTrace();
191	- }
192	- return true;
193	- }
194		118
195	- private boolean deleteImgFile(String imgFilePath) {
196	- imgFilePath = imgFilePath.replace("http://campus.myjxt.com", "E:\\wwwhtdocs\\SmartCampus");
197	- File file = new File(imgFilePath);
198	- if (file.exists()) {
199	- return file.delete();
200	- }
201	- return false;
202	- }	119	+ return BaiduUtils.getBaiduUtils().checkImg(httpurl);
203		120
204	- //图片到byte数组
205	- public byte[] image2byte(String path) {
206	- byte[] data = null;
207	- FileImageInputStream input = null;
208	- try {
209	- input = new FileImageInputStream(new File(path));
210	- ByteArrayOutputStream output = new ByteArrayOutputStream();
211	- byte[] buf = new byte[1024];
212	- int numBytesRead = 0;
213	- while ((numBytesRead = input.read(buf)) != -1) {
214	- output.write(buf, 0, numBytesRead);
215	- }
216	- data = output.toByteArray();
217	- output.close();
218	- input.close();
219	- } catch (FileNotFoundException ex1) {
220	- ex1.printStackTrace();
221	- } catch (IOException ex1) {
222	- ex1.printStackTrace();
223	- }
224	- return data;
225	}	121	}
226		122
227	- /**
228	- * 获取权限token
229	- *
230	- * @return 返回示例：
231	- * {
232	- * "access_token": "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567",
233	- * "expires_in": 2592000
234	- * }
235	- */
236	- public String getAuth() {
237	- // 官网获取的 API Key 更新为你注册的
238	- String clientId = "u6rV4YxRZmwzKj56N0DCW8eO";
239	- // 官网获取的 Secret Key 更新为你注册的
240	- String clientSecret = "Krp3KhmIBdnNEsRa1LavMHuZl0KhQGVm";
241	- return getAuth(clientId, clientSecret);
242	- }
243		123
244	- /**
245	- * 获取API访问token
246	- * 该token有一定的有效期，需要自行管理，当失效时需重新获取.
247	- *
248	- * @param ak - 百度云官网获取的 API Key
249	- * @param sk - 百度云官网获取的 Securet Key
250	- * @return assess_token 示例：
251	- * "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567"
252	- */
253	- public static String getAuth(String ak, String sk) {
254	- // 获取token地址
255	- String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
256	- String getAccessTokenUrl = authHost
257	- // 1. grant_type为固定参数
258	- + "grant_type=client_credentials"
259	- // 2. 官网获取的 API Key
260	- + "&client_id=" + ak
261	- // 3. 官网获取的 Secret Key
262	- + "&client_secret=" + sk;
263	- try {
264	- URL realUrl = new URL(getAccessTokenUrl);
265	- // 打开和URL之间的连接
266	- HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
267	- connection.setRequestMethod("GET");
268	- connection.connect();
269	- // 获取所有响应头字段
270	- Map<String, List<String>> map = connection.getHeaderFields();
271	- // 遍历所有的响应头字段
272	-// for (String key : map.keySet()) {
273	-// System.err.println(key + "--->" + map.get(key));
274	-// }
275	- // 定义 BufferedReader输入流来读取URL的响应
276	- BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
277	- String result = "";
278	- String line;
279	- while ((line = in.readLine()) != null) {
280	- result += line;
281	- }
282	- /**
283	- * 返回结果示例
284	- */
285	-// System.err.println("result:" + result);
286	- JSONObject jsonObject = new JSONObject(result);
287	- String access_token = jsonObject.getString("access_token");
288	- return access_token;
289	- } catch (Exception e) {
290	- System.err.printf("获取token失败！");
291	- e.printStackTrace(System.err);
292	- }
293	- return null;
294	- }
295		124
296		125
297	- @RequestMapping(value = "tranpic", method = RequestMethod.GET)	126	+ /*@RequestMapping(value = "tranpic", method = RequestMethod.GET)
298	@ApiOperation("旋转图片")	127	@ApiOperation("旋转图片")
299	public void tranPic(@RequestParam("path") String httpurl) {	128	public void tranPic(@RequestParam("path") String httpurl) {
300	// 请求url	129	// 请求url
	@@ -366,7 +195,7 @@ public class UserControl {		@@ -366,7 +195,7 @@ public class UserControl {
366	} catch (Exception e) {	195	} catch (Exception e) {
367	e.printStackTrace();	196	e.printStackTrace();
368	}	197	}
369	- }	198	+ }*/
370		199
371	// @RequestMapping(value = "deleteFace", method = RequestMethod.GET)	200	// @RequestMapping(value = "deleteFace", method = RequestMethod.GET)
372	// @ApiOperation("删除人脸")	201	// @ApiOperation("删除人脸")
	@@ -377,7 +206,7 @@ public class UserControl {		@@ -377,7 +206,7 @@ public class UserControl {
377	// }	206	// }
378		207
379		208
380	- @RequestMapping(value = "FaceSearch", method = RequestMethod.POST)	209	+ /* @RequestMapping(value = "FaceSearch", method = RequestMethod.POST)
381	@ApiOperation("人脸搜索")	210	@ApiOperation("人脸搜索")
382	public String FaceSearch(@RequestPart("file") MultipartFile file) {	211	public String FaceSearch(@RequestPart("file") MultipartFile file) {
383		212
	@@ -401,7 +230,7 @@ public class UserControl {		@@ -401,7 +230,7 @@ public class UserControl {
401	}	230	}
402	return null;	231	return null;
403		232
404	- }	233	+ }*/
405		234
406		235
407	@RequestMapping(value = "movePic", method = RequestMethod.GET)	236	@RequestMapping(value = "movePic", method = RequestMethod.GET)
	@@ -451,7 +280,7 @@ public class UserControl {		@@ -451,7 +280,7 @@ public class UserControl {
451		280
452	}	281	}
453		282
454	- @RequestMapping(value = "translatePic", method = RequestMethod.POST)	283	+ /* @RequestMapping(value = "translatePic", method = RequestMethod.POST)
455	@ApiOperation("图片转文字")	284	@ApiOperation("图片转文字")
456	public String translatePic(@RequestPart MultipartFile file) {	285	public String translatePic(@RequestPart MultipartFile file) {
457	try {	286	try {
	@@ -479,13 +308,13 @@ public class UserControl {		@@ -479,13 +308,13 @@ public class UserControl {
479	e.printStackTrace();	308	e.printStackTrace();
480	}	309	}
481	return "解析失败";	310	return "解析失败";
482	- }	311	+ }*/
483		312
484		313
485	private String url = "https://aip.baidubce.com/rest/2.0/ocr/v1/general_basic?access_token=" + AuthService.getAuth();	314	private String url = "https://aip.baidubce.com/rest/2.0/ocr/v1/general_basic?access_token=" + AuthService.getAuth();
486	// + AuthService.getAuth();	315	// + AuthService.getAuth();
487		316
488	- private String getAnswer(String imgUrl, int type) {	317	+ /* private String getAnswer(String imgUrl, int type) {
489	RestTemplate restTemplate = new RestTemplate();	318	RestTemplate restTemplate = new RestTemplate();
490		319
491	HttpHeaders headers = new HttpHeaders();	320	HttpHeaders headers = new HttpHeaders();
	@@ -521,6 +350,6 @@ public class UserControl {		@@ -521,6 +350,6 @@ public class UserControl {
521	System.out.println("result:" + stringBuilder.toString());	350	System.out.println("result:" + stringBuilder.toString());
522	}	351	}
523	return stringBuilder.toString().equals("") ? "" : stringBuilder.toString();	352	return stringBuilder.toString().equals("") ? "" : stringBuilder.toString();
524	- }	353	+ }*/
525		354
526	}	355	}
	@@ -23,6 +23,9 @@ public interface UserDao {		@@ -23,6 +23,9 @@ public interface UserDao {
23	@Select(" select Top(1)* from SZ_V_School_Student where school_id = #{school_id} and studentcode = #{studentcode}")	23	@Select(" select Top(1)* from SZ_V_School_Student where school_id = #{school_id} and studentcode = #{studentcode}")
24	UserInfoBean getUserInfo(@Param("school_id") String school_id, @Param("studentcode") String studentcode);	24	UserInfoBean getUserInfo(@Param("school_id") String school_id, @Param("studentcode") String studentcode);
25		25
		26	+ @Select("select * from SZ_V_School_Student where school_id = 1066 and class_id between 78506 and 78514")
		27	+ List<UserInfoBean> getStuUserInfos();
		28	+
26	@Select(" select Top(1)* from SZ_V_School_Teacher where school_id = #{school_id} and num = #{num}")	29	@Select(" select Top(1)* from SZ_V_School_Teacher where school_id = #{school_id} and num = #{num}")
27	TeacherBean getTeacher(@Param("school_id") String school_id, @Param("num") String num);	30	TeacherBean getTeacher(@Param("school_id") String school_id, @Param("num") String num);
28		31
	@@ -88,6 +91,9 @@ public interface UserDao {		@@ -88,6 +91,9 @@ public interface UserDao {
88	@Select("select * from SZ_Attendance where clint_type = #{clint_type} and school_id = #{school_id}")	91	@Select("select * from SZ_Attendance where clint_type = #{clint_type} and school_id = #{school_id}")
89	List<AttendanceBean> selectDeviceWithschool_id(@Param("clint_type") String clint_type, @Param("school_id") String school_id);	92	List<AttendanceBean> selectDeviceWithschool_id(@Param("clint_type") String clint_type, @Param("school_id") String school_id);
90		93
		94	+ @Select("select * from SZ_Attendance where school_id = #{school_id}")
		95	+ List<AttendanceBean> getAllDevices(@Param("school_id") String school_id);
		96	+
91	@Select("select * from SZ_V_School_Student where school_id = #{school_id} and len(photo)>0 and len(student_num)>0")	97	@Select("select * from SZ_V_School_Student where school_id = #{school_id} and len(photo)>0 and len(student_num)>0")
92	List<StudentBean> getAllStudentsWithSchoolId(@Param("school_id") String school_id);	98	List<StudentBean> getAllStudentsWithSchoolId(@Param("school_id") String school_id);
93		99
	@@ -118,4 +124,13 @@ public interface UserDao {		@@ -118,4 +124,13 @@ public interface UserDao {
118		124
119	@Select(" select * from SZ_V_School_Teacher where school_id = #{school_id}")	125	@Select(" select * from SZ_V_School_Teacher where school_id = #{school_id}")
120	List<TeacherBean> getTeachers(@Param("school_id") String school_id);	126	List<TeacherBean> getTeachers(@Param("school_id") String school_id);
		127	+
		128	+ @Select("select * from SZ_User where user_id =#{userId} and state = 1")
		129	+ void getUserWidthUserId(@Param("userId") String userId);
		130	+
		131	+ @Select("select * from SZ_V_School_Student where user_id = #{userId}")
		132	+ List<StudentBean> getStudentWithUserId(@Param("userId")String userId);
		133	+
		134	+ @Select("select * from SZ_V_School_Teacher where user_id = #{userId}")
		135	+ List<TeacherBean> getTeaWithUserId(@Param("userId")String userId);
121	}	136	}
	@@ -16,4 +16,5 @@ public interface PermissFaceService {		@@ -16,4 +16,5 @@ public interface PermissFaceService {
16	public ResponseBeanList<PermissionFaceBean> getPermissionDetail(int permissionId);	16	public ResponseBeanList<PermissionFaceBean> getPermissionDetail(int permissionId);
17		17
18		18
		19	+ ResponseBean<String> addFace(String imgUrl, String userId);
19	}	20	}
	@@ -5,12 +5,22 @@ import com.example.dahua.bean.*;		@@ -5,12 +5,22 @@ import com.example.dahua.bean.*;
5	import com.example.dahua.dao.PermissionFaceDao;	5	import com.example.dahua.dao.PermissionFaceDao;
6	import com.example.dahua.dao.UserDao;	6	import com.example.dahua.dao.UserDao;
7	import com.example.dahua.service.PermissFaceService;	7	import com.example.dahua.service.PermissFaceService;
		8	+import com.example.dahua.utils.BaiduUtils;
		9	+import com.example.dahua.utils.HttpUtil;
8	import com.example.dahua.utils.HttpUtils;	10	import com.example.dahua.utils.HttpUtils;
9	import lombok.extern.slf4j.Slf4j;	11	import lombok.extern.slf4j.Slf4j;
10	import org.springframework.beans.factory.annotation.Autowired;	12	import org.springframework.beans.factory.annotation.Autowired;
		13	+import org.springframework.http.HttpMethod;
		14	+import org.springframework.http.ResponseEntity;
11	import org.springframework.stereotype.Service;	15	import org.springframework.stereotype.Service;
12	import org.springframework.util.StringUtils;	16	import org.springframework.util.StringUtils;
		17	+import org.springframework.web.client.RestTemplate;
13		18
		19	+import java.io.File;
		20	+import java.io.FileOutputStream;
		21	+import java.io.IOException;
		22	+import java.net.URI;
		23	+import java.net.URISyntaxException;
14	import java.util.List;	24	import java.util.List;
15		25
16	@Slf4j	26	@Slf4j
	@@ -114,8 +124,6 @@ public class PermissFaceServiceImp implements PermissFaceService {		@@ -114,8 +124,6 @@ public class PermissFaceServiceImp implements PermissFaceService {
114	}	124	}
115		125
116		126
117	-
118	-
119	@Override	127	@Override
120	public ResponseBeanList<PermissionFaceBean> getPermissions(int schoolId) {	128	public ResponseBeanList<PermissionFaceBean> getPermissions(int schoolId) {
121	ResponseBeanList responseBeanList = new ResponseBeanList();	129	ResponseBeanList responseBeanList = new ResponseBeanList();
	@@ -149,4 +157,93 @@ public class PermissFaceServiceImp implements PermissFaceService {		@@ -149,4 +157,93 @@ public class PermissFaceServiceImp implements PermissFaceService {
149	}	157	}
150	return responseBeanList;	158	return responseBeanList;
151	}	159	}
		160	+
		161	+ @Override
		162	+ public ResponseBean<String> addFace(String imgUrl, String userId) {
		163	+
		164	+ RestTemplate restTemplate = new RestTemplate();
		165	+ try {
		166	+ URI uri = new URI(imgUrl);
		167	+ ResponseEntity<byte[]> responseEntity = restTemplate.exchange(uri, HttpMethod.GET, null, byte[].class);
		168	+
		169	+ byte[] bytes = responseEntity.getBody();
		170	+
		171	+ String savePath = "./imgsave/";
		172	+ File saveFile = new File(savePath);
		173	+ if (!saveFile.exists()) saveFile.mkdirs();
		174	+ File saveImgFile = new File(savePath, System.currentTimeMillis() + ".jpg");
		175	+ if (!saveImgFile.exists()) saveImgFile.createNewFile();
		176	+ FileOutputStream fileOutputStream = new FileOutputStream(saveImgFile);
		177	+
		178	+ fileOutputStream.write(bytes);
		179	+
		180	+ //检测图片
		181	+ BaiduUtils.getBaiduUtils().checkImg(saveImgFile.getAbsolutePath());
		182	+
		183	+ List<StudentBean> studentBeans = userDao.getStudentWithUserId(userId);
		184	+
		185	+ if (null != studentBeans && studentBeans.size() > 0) {
		186	+ log.error("学生下发");
		187	+ for (int i = 0; i < studentBeans.size(); i++) {
		188	+ StudentBean studentBean = studentBeans.get(i);
		189	+ int schoolId = studentBean.getSchool_id();
		190	+ uploadImgs(saveImgFile, schoolId + "", studentBean.getStudentcode(), 2, studentBean.getCard(), studentBean.getName());
		191	+ }
		192	+
		193	+ } else {
		194	+ List<TeacherBean> teacherBeans = userDao.getTeaWithUserId(userId);
		195	+log.error("教师下发");
		196	+ if (null != teacherBeans && teacherBeans.size() > 0) {
		197	+
		198	+ for (int i = 0; i < teacherBeans.size(); i++) {
		199	+ TeacherBean teacherBean = teacherBeans.get(i);
		200	+
		201	+ String schoolId = teacherBean.getSchool_id();
		202	+ uploadImgs(saveImgFile, schoolId, teacherBean.getNum(), 1, teacherBean.getTeacher_num(), teacherBean.getName());
		203	+
		204	+ }
		205	+
		206	+ }
		207	+
		208	+ }
		209	+
		210	+ fileOutputStream.close();
		211	+ } catch (URISyntaxException \| IOException e) {
		212	+ e.printStackTrace();
		213	+ }
		214	+
		215	+// userDao.getUserWidthUserId(userId);
		216	+
		217	+// HttpUtils.uploadImgs()
		218	+
		219	+ ResponseBean responseBean = new ResponseBean();
		220	+
		221	+ responseBean.setData(1);
		222	+ responseBean.setMessage("下发成功");
		223	+ responseBean.setData(true);
		224	+
		225	+ return responseBean;
		226	+ }
		227	+
		228	+ private void uploadImgs(File saveImgFile, String schoolId, String studentcode, int userType, String card, String name) {
		229	+ List<AttendanceBean> attendanceBeanList = userDao.getAllDevices(schoolId + "");
		230	+ if (null != attendanceBeanList && attendanceBeanList.size() > 0)
		231	+ for (int i = 0; i < attendanceBeanList.size(); i++) {
		232	+ AttendanceBean attendanceBean = attendanceBeanList.get(i);
		233	+
		234	+ String clintType = attendanceBean.getClint_type();
		235	+ //根据设备类型上传人脸
		236	+ log.error("设备:{}",clintType);
		237	+ if (clintType.equals("18") \|\| clintType.equals("28")) {
		238	+ HttpUtils.uploadImg2HK(saveImgFile.getAbsolutePath(), card, name, attendanceBean.getClint_id(), String.valueOf(userType));
		239	+
		240	+ } else if (clintType.equals("22") \|\| clintType.equals("29")) {
		241	+ HttpUtils.uploadImgs(saveImgFile, schoolId, studentcode
		242	+ , clintType, userType);
		243	+ }
		244	+
		245	+ }
		246	+
		247	+
		248	+ }
152	}	249	}
@@ -0,0 +1,211 @@		@@ -0,0 +1,211 @@
	1	+package com.example.dahua.utils;
	2	+
	3	+import com.example.dahua.async.ImageUtils;
	4	+import com.example.dahua.lib.CompressPic;
	5	+import org.json.JSONArray;
	6	+import org.json.JSONObject;
	7	+
	8	+import javax.imageio.stream.FileImageInputStream;
	9	+import java.io.*;
	10	+import java.net.HttpURLConnection;
	11	+import java.net.URL;
	12	+import java.util.ArrayList;
	13	+import java.util.HashMap;
	14	+import java.util.List;
	15	+import java.util.Map;
	16	+
	17	+public class BaiduUtils {
	18	+
	19	+ private static BaiduUtils baiduUtils;
	20	+
	21	+ public static BaiduUtils getBaiduUtils(){
	22	+
	23	+ if (null==baiduUtils){
	24	+ synchronized (BaiduUtils.class){
	25	+ if (null==baiduUtils)baiduUtils=new BaiduUtils();
	26	+ }
	27	+ }
	28	+ return baiduUtils;
	29	+ }
	30	+
	31	+
	32	+ public boolean checkImg(String httpurl){
	33	+ // 请求url
	34	+ String url = "https://aip.baidubce.com/rest/2.0/face/v3/faceverify";
	35	+ try {
	36	+
	37	+ List list = new ArrayList();
	38	+ Map<String, String> map = new HashMap<>();
	39	+ String image_type = "";
	40	+ String imgFilePath = httpurl;
	41	+ File target = new File("./huoti/");
	42	+ if (!target.exists()) target.mkdirs();
	43	+ File target1 = new File(target.getAbsolutePath(), new File(httpurl).getName());
	44	+ if (httpurl.startsWith("http")) image_type = "URL";
	45	+ else {
	46	+ CompressPic.CompressPic(httpurl, target1.getAbsolutePath(), "");//压缩后的图片
	47	+ image_type = "BASE64";
	48	+ httpurl = Base64Util.encode(image2byte(target1.getAbsolutePath()));
	49	+ }
	50	+ map.put("image", httpurl);
	51	+ map.put("image_type", image_type);
	52	+// map.put("face_field","");
	53	+// map.put("option","GATE");
	54	+ list.add(map);
	55	+ String param = GsonUtils.toJson(list);
	56	+ // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间，客户端可自行缓存，过期后重新获取。
	57	+ String accessToken = getAuth();
	58	+
	59	+ String result1 = HttpUtil.post(url, accessToken, "application/json", param);
	60	+ JSONObject jsonObject = new JSONObject(result1);
	61	+ String error_msg = jsonObject.optString("error_msg");
	62	+ JSONObject result = jsonObject.optJSONObject("result");
	63	+ if (error_msg.equals("SUCCESS")) {
	64	+ double face_liveness = result.optDouble("face_liveness", 0.00);//活体分数值
	65	+ JSONArray face_list = result.optJSONArray("face_list");
	66	+ JSONObject location = face_list.optJSONObject(0).optJSONObject("location");
	67	+ double rotation = location.optDouble("rotation", 0.0);//竖直方向旋转角度
	68	+ System.out.println(" face_liveness:" + face_liveness);
	69	+ if (face_liveness > 0.4) {
	70	+ int angel = 0;
	71	+ if (45 < rotation && rotation < 135) {//右向横图,需要旋转270度
	72	+ System.out.println("旋转270度");
	73	+ angel = 270;
	74	+ } else if (rotation > -135 && rotation < -45) {//左向横图,需要旋转90度
	75	+ System.out.println("旋转90度");
	76	+ angel = 90;
	77	+ } else if (rotation >= -180 && rotation <= -135 \|\| rotation >= 135 && rotation <= 180) {//倒向图片,需要旋转180度
	78	+ System.out.println("旋转180度");
	79	+ angel = 180;
	80	+ }
	81	+ System.out.println("图片检验成功");
	82	+ FileUtils.getInstance().writeLogs("检测成功:" + imgFilePath, FileUtils.checkSuc);
	83	+ //E:\wwwhtdocs\SmartCampus\face17e50\School
	84	+ //http://campus.myjxt.com//face17e5/School861/Student/GBZX20171134.jpg
	85	+ //F:\wwwroot\smartcampus\face17e5
	86	+// imgFilePath =httpurl.replace("http://campus.myjxt.com","E:\\wwwhtdocs\\SmartCampus");
	87	+// imgFilePath = httpurl.replace("http://60.190.202.57:1000","F:\\wwwroot\\smartcampus");
	88	+// System.out.println("图片是否存在:" + imgFilePath);
	89	+ if (angel != 0)
	90	+ ImageUtils.rotatePhonePhoto(imgFilePath, angel);
	91	+ return true;
	92	+ } else {
	93	+ FileUtils.getInstance().writeLogs("检测失败,活体分数:" + face_liveness + " " + imgFilePath, FileUtils.checkFail);
	94	+ System.out.println("图片不合格" + imgFilePath);
	95	+ deleteImgFile(imgFilePath);
	96	+ return false;
	97	+ }
	98	+ } else {
	99	+ System.out.println("检测失败");
	100	+ FileUtils.getInstance().writeLogs("检测失败:" + error_msg + imgFilePath, FileUtils.checkFail);
	101	+ deleteImgFile(imgFilePath);
	102	+ return false;
	103	+ }
	104	+ } catch (Exception e) {
	105	+ e.printStackTrace();
	106	+ }
	107	+ return true;
	108	+ }
	109	+
	110	+ //图片到byte数组
	111	+ public byte[] image2byte(String path) {
	112	+ byte[] data = null;
	113	+ FileImageInputStream input = null;
	114	+ try {
	115	+ input = new FileImageInputStream(new File(path));
	116	+ ByteArrayOutputStream output = new ByteArrayOutputStream();
	117	+ byte[] buf = new byte[1024];
	118	+ int numBytesRead = 0;
	119	+ while ((numBytesRead = input.read(buf)) != -1) {
	120	+ output.write(buf, 0, numBytesRead);
	121	+ }
	122	+ data = output.toByteArray();
	123	+ output.close();
	124	+ input.close();
	125	+ } catch (FileNotFoundException ex1) {
	126	+ ex1.printStackTrace();
	127	+ } catch (IOException ex1) {
	128	+ ex1.printStackTrace();
	129	+ }
	130	+ return data;
	131	+ }
	132	+
	133	+ private boolean deleteImgFile(String imgFilePath) {
	134	+ imgFilePath = imgFilePath.replace("http://campus.myjxt.com", "E:\\wwwhtdocs\\SmartCampus");
	135	+ File file = new File(imgFilePath);
	136	+ if (file.exists()) {
	137	+ return file.delete();
	138	+ }
	139	+ return false;
	140	+ }
	141	+
	142	+ /**
	143	+ * 获取权限token
	144	+ *
	145	+ * @return 返回示例：
	146	+ * {
	147	+ * "access_token": "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567",
	148	+ * "expires_in": 2592000
	149	+ * }
	150	+ */
	151	+ public String getAuth() {
	152	+ // 官网获取的 API Key 更新为你注册的
	153	+ String clientId = "u6rV4YxRZmwzKj56N0DCW8eO";
	154	+ // 官网获取的 Secret Key 更新为你注册的
	155	+ String clientSecret = "Krp3KhmIBdnNEsRa1LavMHuZl0KhQGVm";
	156	+ return getAuth(clientId, clientSecret);
	157	+ }
	158	+
	159	+ /**
	160	+ * 获取API访问token
	161	+ * 该token有一定的有效期，需要自行管理，当失效时需重新获取.
	162	+ *
	163	+ * @param ak - 百度云官网获取的 API Key
	164	+ * @param sk - 百度云官网获取的 Securet Key
	165	+ * @return assess_token 示例：
	166	+ * "24.460da4889caad24cccdb1fea17221975.2592000.1491995545.282335-1234567"
	167	+ */
	168	+ public static String getAuth(String ak, String sk) {
	169	+ // 获取token地址
	170	+ String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
	171	+ String getAccessTokenUrl = authHost
	172	+ // 1. grant_type为固定参数
	173	+ + "grant_type=client_credentials"
	174	+ // 2. 官网获取的 API Key
	175	+ + "&client_id=" + ak
	176	+ // 3. 官网获取的 Secret Key
	177	+ + "&client_secret=" + sk;
	178	+ try {
	179	+ URL realUrl = new URL(getAccessTokenUrl);
	180	+ // 打开和URL之间的连接
	181	+ HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
	182	+ connection.setRequestMethod("GET");
	183	+ connection.connect();
	184	+ // 获取所有响应头字段
	185	+ Map<String, List<String>> map = connection.getHeaderFields();
	186	+ // 遍历所有的响应头字段
	187	+// for (String key : map.keySet()) {
	188	+// System.err.println(key + "--->" + map.get(key));
	189	+// }
	190	+ // 定义 BufferedReader输入流来读取URL的响应
	191	+ BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
	192	+ String result = "";
	193	+ String line;
	194	+ while ((line = in.readLine()) != null) {
	195	+ result += line;
	196	+ }
	197	+ /**
	198	+ * 返回结果示例
	199	+ */
	200	+// System.err.println("result:" + result);
	201	+ JSONObject jsonObject = new JSONObject(result);
	202	+ String access_token = jsonObject.getString("access_token");
	203	+ return access_token;
	204	+ } catch (Exception e) {
	205	+ System.err.printf("获取token失败！");
	206	+ e.printStackTrace(System.err);
	207	+ }
	208	+ return null;
	209	+ }
	210	+
	211	+}
	@@ -63,6 +63,20 @@ public class HttpUtils {		@@ -63,6 +63,20 @@ public class HttpUtils {
63	}	63	}
64		64
65		65
		66	+ public static String uploadImg2HK(String filePath,String card,String name,String deviceId,String userType){
		67	+
		68	+ String url = String.format("http://114.55.30.100:8089/facereco/sendCardAndImg1?filePath=%s&card=%s&name=%s&userType=%s&deviceId=%s",
		69	+ filePath,card,name,userType,deviceId);
		70	+
		71	+ RestTemplate restTemplate = new RestTemplate();
		72	+
		73	+ ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
		74	+
		75	+ System.out.println("responseEntity:" + responseEntity.getBody());
		76	+ return responseEntity.getBody();
		77	+ }
		78	+
		79	+
66	public static boolean imgsSend(String schoolId, int type) {	80	public static boolean imgsSend(String schoolId, int type) {
67	String url = "http://121.40.109.21:8991/file/imgsSend?schoolId=" + schoolId + "&type=" + type;	81	String url = "http://121.40.109.21:8991/file/imgsSend?schoolId=" + schoolId + "&type=" + type;
68	RestTemplate restTemplate = new RestTemplate();	82	RestTemplate restTemplate = new RestTemplate();
	@@ -105,7 +105,7 @@ public class SendUserAsync {		@@ -105,7 +105,7 @@ public class SendUserAsync {
105	if (weekDay.getDeviceIds() != null && weekDay.getDeviceIds().size() > 0) {	105	if (weekDay.getDeviceIds() != null && weekDay.getDeviceIds().size() > 0) {
106	permissionBean.setDeviceIds(weekDay.getDeviceIds());	106	permissionBean.setDeviceIds(weekDay.getDeviceIds());
107	}	107	}
108	- List<String> deviceIds = permissionBean.getDeviceIds();	108	+ List<String> deviceIds = weekDay.getDeviceIds();
109	List<String> cardNumList = new ArrayList<>();	109	List<String> cardNumList = new ArrayList<>();
110	String sex = weekDay.getSex();	110	String sex = weekDay.getSex();
111	if (userType.equals("1")) {	111	if (userType.equals("1")) {
	@@ -10,6 +10,16 @@ public class TeacherBean implements Serializable {		@@ -10,6 +10,16 @@ public class TeacherBean implements Serializable {
10		10
11	private String num;	11	private String num;
12		12
		13	+ private String face;
		14	+
		15	+ public String getTeacher_num() {
		16	+ return teacher_num;
		17	+ }
		18	+
		19	+ public void setTeacher_num(String teacher_num) {
		20	+ this.teacher_num = teacher_num;
		21	+ }
		22	+
13	public String getNum() {	23	public String getNum() {
14	return num;	24	return num;
15	}	25	}
	@@ -33,4 +43,20 @@ public class TeacherBean implements Serializable {		@@ -33,4 +43,20 @@ public class TeacherBean implements Serializable {
33	public void setTeacer_num(String teacer_num) {	43	public void setTeacer_num(String teacer_num) {
34	this.teacher_num = teacer_num;	44	this.teacher_num = teacer_num;
35	}	45	}
		46	+
		47	+ public String getFace() {
		48	+ return face;
		49	+ }
		50	+
		51	+ public void setFace(String face) {
		52	+ this.face = face;
		53	+ }
		54	+
		55	+ @Override
		56	+ public String toString() {
		57	+ return "{\"name\":\"" + name + '\"' +
		58	+ ", \"teacher_num\":\"" + teacher_num + '\"' +
		59	+ ", \"num\":\"" + num + '\"' +
		60	+ ", \"face\":\"" + face + '\"' +"}";
		61	+ }
36	}	62	}
@@ -0,0 +1,45 @@		@@ -0,0 +1,45 @@
	1	+package com.sincere.haikangface.bean.face;
	2	+
	3	+import java.io.Serializable;
	4	+
	5	+public class BaiduUserInfoBean implements Serializable {
	6	+
	7	+ private int status;
	8	+
	9	+ private String message;
	10	+
	11	+ private BaiduUserInfoDataBean data;
	12	+
	13	+ public int getStatus() {
	14	+ return status;
	15	+ }
	16	+
	17	+ public void setStatus(int status) {
	18	+ this.status = status;
	19	+ }
	20	+
	21	+ public String getMessage() {
	22	+ return message;
	23	+ }
	24	+
	25	+ public void setMessage(String message) {
	26	+ this.message = message;
	27	+ }
	28	+
	29	+ public BaiduUserInfoDataBean getData() {
	30	+ return data;
	31	+ }
	32	+
	33	+ public void setData(BaiduUserInfoDataBean data) {
	34	+ this.data = data;
	35	+ }
	36	+
	37	+ @Override
	38	+ public String toString() {
	39	+ return "BaiduUserInfoBean{" +
	40	+ "status=" + status +
	41	+ ", message='" + message + '\'' +
	42	+ ", data=" + data +
	43	+ '}';
	44	+ }
	45	+}