change

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/PicUtils.java

@@ -18,14 +18,6 @@ public class PicUtils {
 
     private static Logger logger = LoggerFactory.getLogger(PicUtils.class);
 
-   /*public static void main(String[] args) throws IOException {
-        byte[] bytes = FileUtils.readFileToByteArray(new File("C:\\Users\\DELL\\Pictures\\timg.jpg"));
-      long l = System.currentTimeMillis();
-       bytes = PicUtils.compressPicForScale(bytes, 20, "x");// 图片小于300kb
-        System.out.println(System.currentTimeMillis() - l);
-        FileUtils.writeByteArrayToFile(new File("C:\\Users\\DELL\\Pictures\\timg.jpg"), bytes);
-   }*/
-
     /**
      * 根据指定大小压缩图片
      *
@@ -77,5 +69,14 @@ public class PicUtils {
         }
         return accuracy;
     }
-
+    
+    /**
+     * 将本地图片进行Base64位编码
+     * @param fileBytes
+     * @return
+     */
+    public static String getImgStr(byte [] fileBytes) {
+        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
+    }
+    
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -43,48 +43,6 @@ public class HKOpenApi {
         return data;
     }
 
-    /**
-     *
-     * @param img_path 获取图片的扩展名
-     * @return
-     */
-    public static String getPicSuffix(String img_path){
-        if (img_path == null || img_path.indexOf(".") == -1){
-            //如果图片地址为null或者地址中没有"."就返回""
-            return "";
-        }
-        return img_path.substring(img_path.lastIndexOf(".") + 1).
-                trim().toLowerCase();
-    }
-    
-    /**
-     * 将本地图片进行Base64位编码
-     */
-    public static String getImgStr(MultipartFile imgFile){
-        //将图片文件转化为字节数组字符串，并对其进行Base64编码处理
-        byte[] data = null;
-        //读取图片字节数组
-        try
-        {
-            data = imgFile.getBytes();
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
-    }
-    
-    /**
-     * 将本地图片进行Base64位编码
-     * @param fileBytes
-     * @return
-     */
-    public static String getImgStr(byte [] fileBytes) {
-        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
-    }
-
-
     /**
      * 根据部门名称分页获取部门
      *      第几页, 一页多少行, 操作用户uuid
@@ -115,60 +73,7 @@ public class HKOpenApi {
 
         return data;
     }
-
-
-    /**
-     * 根据指定大小压缩图片
-     *
-     * @param imageBytes  源图片字节数组
-     * @param desFileSize 指定图片大小，单位kb
-     * @param imageId     影像编号
-     * @return 压缩质量后的图片字节数组
-     */
-    public static byte[] compressPicForScale(byte[] imageBytes, long desFileSize, String imageId) {
-        if (imageBytes == null || imageBytes.length <= 0 || imageBytes.length < desFileSize * 1024) {
-            return imageBytes;
-        }
-        long srcSize = imageBytes.length;
-        double accuracy = getAccuracy(srcSize / 1024);
-        try {
-            while (imageBytes.length > desFileSize * 1024) {
-                ByteArrayInputStream inputStream = new ByteArrayInputStream(imageBytes);
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(imageBytes.length);
-                Thumbnails.of(inputStream)
-                        .scale(accuracy)
-                        .outputQuality(accuracy)
-                        .toOutputStream(outputStream);
-                imageBytes = outputStream.toByteArray();
-            }
-            log.info("【图片压缩】imageId={} | 图片原大小={}kb | 压缩后大小={}kb",
-                    imageId, srcSize / 1024, imageBytes.length / 1024);
-        } catch (Exception e) {
-            log.error("【图片压缩】msg=图片压缩失败!", e);
-        }
-        return imageBytes;
-    }
-
-    /**
-     * 自动调节精度(经验数值)
-     *
-     * @param size 源图片大小
-     * @return 图片压缩质量比
-     */
-    private static double getAccuracy(long size) {
-        double accuracy;
-        if (size < 900) {
-            accuracy = 0.85;
-        } else if (size < 2047) {
-            accuracy = 0.6;
-        } else if (size < 3275) {
-            accuracy = 0.44;
-        } else {
-            accuracy = 0.4;
-        }
-        return accuracy;
-    }
-
+    
     /**
      *
      * 添加人员
@@ -433,14 +338,6 @@ public class HKOpenApi {
         return data;
     }
 
-
     public static void main(String[] args) {
-        Map<String,Object> parMap = Maps.newHashMap();
-        parMap.put("pageNo",1);
-        parMap.put("pageSize",100);
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("deptName","住户");
-        String result = HKOpenApi.getDeptName(parMap);
-        System.out.println(result);
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -1,18 +1,14 @@
 package com.community.huiju.controller;
+
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.model.TaAgreement;
-import com.community.huiju.model.TaFace;
-import com.community.huiju.service.FaceServicel;
-import com.community.huiju.service.FaceServicel;
+import com.community.huiju.service.FaceServiceI;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -24,12 +20,13 @@ import javax.servlet.http.HttpSession;
 @Api(value = "人脸相关API", description = "人脸相关API")
 public class FaceController {
     @Autowired
-    private FaceServicel faceServicel;
+    private FaceServiceI faceServicel;
 
     @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
+    
     @RequestMapping(value = "/addFace",method = RequestMethod.POST)
     public Object getTaFace(HttpSession session,
                             @ApiParam(value = "file" ,required = true) MultipartFile uploadFile){

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/FaceServicel.java → CODE/smart-community/app-api/src/main/java/com/community/huiju/service/FaceServiceI.java

@@ -4,7 +4,7 @@ package com.community.huiju.service;
 import com.community.commom.mode.ResponseBean;
 import org.springframework.web.multipart.MultipartFile;
 
-public interface FaceServicel {
+public interface FaceServiceI {
     /**
      * 添加人脸
      * @param userId

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -7,15 +7,14 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.PicUtils;
 import com.community.huiju.common.hk.HKConstant;
-import com.community.huiju.common.hk.HKOpenApi;
 import com.community.huiju.dao.TaFaceMapper;
 import com.community.huiju.dao.TaSysRoleMapper;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
+import com.community.huiju.service.FaceServiceI;
 import com.community.huiju.service.ImageServiceI;
-import com.community.huiju.service.FaceServicel;
 import com.hikvision.cms.api.common.util.Digests;
 import com.hikvision.cms.api.common.util.HttpClientSSLUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +27,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-@Service
-public class FaceServicelimpl implements FaceServicel {
+@Service("faceServicel")
+@Transactional
+public class FaceServicelimpl implements FaceServiceI {
 
 
     @Autowired
@@ -45,7 +45,6 @@ public class FaceServicelimpl implements FaceServicel {
     private ImageServiceI imageServiceI;
 
     @Override
-    @Transactional
     public ResponseBean addFace(Integer userid,MultipartFile uploadFile) {
         String faceImg = null;
         try {
@@ -85,7 +84,7 @@ public class FaceServicelimpl implements FaceServicel {
 
         //查询当前用户是否有人脸记录
         TaFace User = taFaceMapper.getByUserId(userid);
-        if (null == User) {   //为业主，已认证
+        if (null == User) {
             boolean isA=true;
             if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
                 ResponseBean responseBean = new ResponseBean();
@@ -117,24 +116,11 @@ public class FaceServicelimpl implements FaceServicel {
                 }
                 return responseBeans;
             }
-        } else {
-            //为业主，未认证情况下
-            if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
-                response.addError("8885", "您的信息已存在");
-                return response;
-            }
-            //家属或者租客，未认证情况下
-            if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getDescription()) && "1".equals(taUser.getVerifyStatus())) {
-                response.addError("8885", "您的信息已存在");
-                return response;
-            }
         }
-        response.addError("9995", "无法确认您的身份，请联系物业");
         return response;
     }
 
     @Override
-    @Transactional
     public ResponseBean upDateFace(Integer userId,MultipartFile uploadFile) {
         boolean isA=false;
         String faceImg = null;
@@ -162,14 +148,15 @@ public class FaceServicelimpl implements FaceServicel {
         }
         return responseBean;
     }
-
-    //人脸录入验证
-    @Transactional
+    
+    /**
+     * 人脸录入验证
+     */
     public Object checKout(String faceImg, TaFace taFace, boolean isA,Integer user,String name,MultipartFile uploadFile) {
         AESDecode aesd = new AESDecode();
-                String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
+        String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
         try {
-             ResponseBean responseBean = aesd.send(body);
+            ResponseBean responseBean = aesd.send(body);
             JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
             Integer type = (Integer) jsonObject.get("errno");
             Integer faceNum= (Integer) jsonObject.get("face_num");
@@ -198,7 +185,13 @@ public class FaceServicelimpl implements FaceServicel {
         }
         return false;
     }
-    //在图片验证通过的情况下，推送到海康
+    
+    /**
+     * 在图片验证通过的情况下，推送到海康
+     * @param name
+     * @param uploadFile
+     * @return
+     */
     public Object imgPush(String name,MultipartFile uploadFile){
         //把图片压缩成100K以下
         // 压缩后的图片字节数组
@@ -211,22 +204,22 @@ public class FaceServicelimpl implements FaceServicel {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        // String imgs = hkOpenApi.getImgStr(uploadFile);
-        String imgs = HKOpenApi.getImgStr(picByte);
+        // 推送海康服务器
+        String imgs = PicUtils.getImgStr(picByte);
         String pgId= (String) HKpersonGroupId();
         JSONObject jsonObject = JSONObject.parseObject(pgId);
         Integer personGroupId = (Integer) jsonObject.get("personGroupId");
         System.out.println(personGroupId);
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.OP_IMG;
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("appkey", HKConstant.APPKEY);//设置APPKEY
-        map.put("time", System.currentTimeMillis());//设置时间参数
-        map.put("token", HKConstant.SECRET);//认证token
-        map.put("opUserUuid",HKConstant.OP_USER_UUID);//操作用户UUID
-        map.put("facePhotos", imgs); //bs64转码
-        map.put("personName",name);//名字
-        map.put("personGroupId",personGroupId);//分组用户ID
-        map.put("birthday",System.currentTimeMillis());//时间取毫秒
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid",HKConstant.OP_USER_UUID);
+        map.put("facePhotos", imgs);
+        map.put("personName",name);
+        map.put("personGroupId",personGroupId);
+        map.put("birthday",System.currentTimeMillis());
         String params =  JSON.toJSONString(map);
         System.out.println(" ====== testGetDefaultUserUUID 请求参数：【" + params + "】");
         String data = null;
@@ -239,20 +232,21 @@ public class FaceServicelimpl implements FaceServicel {
         System.out.println(" ====== testGetDefaultUserUUID 请求返回结果：【{" + data + "}】");
         return data;
     }
-
-    //把图片推送海康，需要获得海康人员分组下的
-    // **personGroupId**
-    @Transactional
+    
+    /**
+     * 把图片推送海康，需要获得海康人员分组下的
+     * @return
+     */
     public Object HKpersonGroupId(){
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.OP_PERSON_ID;
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("appkey", HKConstant.APPKEY);//设置APPKEY
-        map.put("time", System.currentTimeMillis());//设置时间参数
-        map.put("token", HKConstant.SECRET);//认证token
-        map.put("opUserUuid",HKConstant.OP_USER_UUID);//操作用户UUID
-        map.put("pageNo",1);//当前页码
-        map.put("pageSize",100);//每页数据记录数
-        map.put("birthday",System.currentTimeMillis());//时间取毫秒
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid",HKConstant.OP_USER_UUID);
+        map.put("pageNo",1);
+        map.put("pageSize",100);
+        map.put("birthday",System.currentTimeMillis());
         String params =  JSON.toJSONString(map);
         String data = null;
         try {

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java

@@ -2,6 +2,7 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.hk.HKConstant;
+import com.community.huiju.common.hk.HKOpenApi;
 import com.community.huiju.service.IMonitoringService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;