合并

CODE/smart-community/app-api/pom.xml

@@ -196,6 +196,21 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+		<dependency>
+			<groupId>io.github.openfeign.form</groupId>
+			<artifactId>feign-form</artifactId>
+			<version>3.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>io.github.openfeign.form</groupId>
+			<artifactId>feign-form-spring</artifactId>
+			<version>3.0.3</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.3</version>
+		</dependency>
 
     </dependencies>
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/FeignUploadConfig.java

@@ -0,0 +1,20 @@
+package com.community.huiju.config;
+
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+
+public class FeignUploadConfig {
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+    @Bean
+    public Encoder feignEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/IFuShiServer.java

@@ -17,7 +17,7 @@ public interface IFuShiServer {
      * @return
      */
     @GetMapping("/car/getParkInfoByCarNo")
-    ResponseBean getParkInfoByCarNo(@RequestParam("carNo") String carNo);
+    String getParkInfoByCarNo(@RequestParam("carNo") String carNo);
 
     /**
      * 缴费
@@ -25,6 +25,6 @@ public interface IFuShiServer {
      * @return
      */
     @PostMapping("/car/apiThirdPartyMonthCardPay")
-    ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter);
+    String apiThirdPartyMonthCardPay(@RequestBody String parameter);
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/IHKServer.java

@@ -1,14 +1,17 @@
 package com.community.huiju.feign;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.config.FeignUploadConfig;
 import com.community.huiju.feign.impl.HKServerFallbackImpl;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
-@FeignClient(value = "hardware-server", fallback = HKServerFallbackImpl.class)
+@FeignClient(value = "hardware-server", fallback = HKServerFallbackImpl.class, configuration = FeignUploadConfig.class)
 public interface IHKServer {
 
     /**
@@ -32,8 +35,8 @@ public interface IHKServer {
      * @param jsonString
      * @return
      */
-    @PostMapping("/pushPerson")
-    ResponseBean pushPerson(@RequestBody String jsonString);
+    @PostMapping(value = "/pushPerson", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    String pushPerson(@RequestBody String jsonString);
 
     /**
      * 修改人员
@@ -56,8 +59,8 @@ public interface IHKServer {
      * @param jsonString
      * @return
      */
-    @PostMapping("/updatePerson")
-    ResponseBean updatePerson(@RequestBody String jsonString);
+    @PostMapping(value = "/updatePerson", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String updatePerson(@RequestBody String jsonString);
 
     /**
      * 添加人脸
@@ -121,8 +124,8 @@ public interface IHKServer {
      * @param jsonString json字符串
      * @return
      */
-    @PostMapping("/addFace")
-    ResponseBean addFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
+    @PostMapping(value = "/addFace", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String addFace(@RequestPart MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
 
 
     /**
@@ -169,8 +172,8 @@ public interface IHKServer {
      * @param jsonString json字符串
      * @return
      */
-    @PostMapping("/updateFace")
-    ResponseBean updateFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
+    @PostMapping(value = "/updateFace", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    String updateFace(@RequestPart MultipartFile faceImg, @RequestParam("jsonString") String jsonString);
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/impl/FuShiServerImpl.java

@@ -1,5 +1,6 @@
 package com.community.huiju.feign.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.feign.IFuShiServer;
 import lombok.extern.slf4j.Slf4j;
@@ -8,19 +9,19 @@ import lombok.extern.slf4j.Slf4j;
 public class FuShiServerImpl implements IFuShiServer {
 
     @Override
-    public ResponseBean getParkInfoByCarNo(String carNo) {
+    public String getParkInfoByCarNo(String carNo) {
         return back();
     }
 
     @Override
-    public ResponseBean apiThirdPartyMonthCardPay(String parameter) {
+    public String apiThirdPartyMonthCardPay(String parameter) {
         return back();
     }
 
-    private ResponseBean back() {
+    private String back() {
         log.error("hardware-server 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();
         responseBean.addError("hardware-server 远端服务请求失败！");
-        return responseBean;
+        return JSONObject.toJSONString(responseBean);
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/impl/HKServerFallbackImpl.java

@@ -1,6 +1,7 @@
 package com.community.huiju.feign.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.feign.IHKServer;
 import lombok.extern.slf4j.Slf4j;
@@ -10,29 +11,29 @@ import org.springframework.web.multipart.MultipartFile;
 public class HKServerFallbackImpl implements IHKServer {
 
     @Override
-    public ResponseBean pushPerson(String jsonString) {
-        return back();
+    public String pushPerson(String jsonString) {
+        return "444";
     }
 
     @Override
-    public ResponseBean updatePerson(String jsonString) {
+    public String updatePerson(String jsonString) {
         return back();
     }
 
     @Override
-    public ResponseBean addFace(MultipartFile faceImg, String jsonString) {
+    public String addFace(MultipartFile faceImg, String jsonString) {
         return back();
     }
 
     @Override
-    public ResponseBean updateFace(MultipartFile faceImg, String jsonString) {
+    public String updateFace(MultipartFile faceImg, String jsonString) {
         return back();
     }
 
-    private ResponseBean back() {
+    private String back() {
         log.error("hardware-server 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();
         responseBean.addError("hardware-server 远端服务请求失败！");
-        return responseBean;
+        return JSONObject.toJSONString(responseBean);
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpEquipment.java

@@ -92,6 +92,8 @@ public class TpEquipment {
      */
     private String factory;
 
+    private String device;
+
     public Integer getId() {
         return id;
     }
@@ -283,4 +285,12 @@ public class TpEquipment {
     public void setFactory(String factory) {
         this.factory = factory;
     }
+
+    public String getDevice() {
+        return device;
+    }
+
+    public void setDevice(String device) {
+        this.device = device;
+    }
 }

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

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 @Slf4j
@@ -25,6 +26,17 @@ public class EquipmentServiceImpl implements IEquipmentService {
     @Autowired
     private IHKServer ihkServer;
 
+    private ResponseBean getResponseBean(String result){
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        ResponseBean responseBean = jsonObject.toJavaObject(ResponseBean.class);
+        if ("1".equals(responseBean.getCode())) {
+            throw new WisdomException(responseBean.getMessage());
+        }
+
+        responseBean.addSuccess(jsonObject.getJSONObject("data").getInnerMap());
+        return responseBean;
+    }
+
     @Override
     public String pushPerson(TpEquipmentTree tpEquipmentTree, TpUnitHkSetting unitHkSetting, TaUser user, TaUserHk taUserHk, Integer expirationTime) {
 
@@ -45,10 +57,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
         pushPerson.setType(tpEquipmentTree.getFactory());
         pushPerson.setPerson(personBean);
 
-        ResponseBean responseBean = ihkServer.pushPerson(JSONObject.toJSONString(pushPerson));
-        if ("1".equals(responseBean.getCode())) {
-            throw new WisdomException(responseBean.getMessage());
-        }
+        String result = ihkServer.pushPerson(JSONObject.toJSONString(pushPerson));
+        ResponseBean responseBean = getResponseBean(result);
         return JSONObject.toJSONString(responseBean.getData());
     }
 
@@ -63,8 +73,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
         // 人脸图片
         AddFace.FaceBean.PersonBean person = new AddFace.FaceBean.PersonBean();
-        person.setAppkey(tpEquipmentTree.getSecret());
-        person.setSecret(tpEquipmentTree.getAppkey());
+        person.setAppkey(tpEquipmentTree.getAppkey());
+        person.setSecret(tpEquipmentTree.getSecret());
         person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
         person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
         person.setPersonId(taUserHk.getHkUserId());
@@ -78,8 +88,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
         if (CollectionUtils.isNotEmpty(visualList)) {
             // 门口机卡权限(可是对讲)
             AddFace.FaceBean.DoorPermissionsBean doorPermissionsBean = new AddFace.FaceBean.DoorPermissionsBean();
-            doorPermissionsBean.setAppkey(tpEquipmentTree.getSecret());
-            doorPermissionsBean.setSecret(tpEquipmentTree.getAppkey());
+            doorPermissionsBean.setAppkey(tpEquipmentTree.getAppkey());
+            doorPermissionsBean.setSecret(tpEquipmentTree.getSecret());
             doorPermissionsBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
             doorPermissionsBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
             doorPermissionsBean.setAuthName(user.getUserName()+userVerify.getId());
@@ -88,8 +98,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
             // 门口机人脸权限(可视对讲)
             AddFace.FaceBean.DoorFaceBean doorFaceBean = new AddFace.FaceBean.DoorFaceBean();
-            doorFaceBean.setAppkey(tpEquipmentTree.getSecret());
-            doorFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            doorFaceBean.setAppkey(tpEquipmentTree.getAppkey());
+            doorFaceBean.setSecret(tpEquipmentTree.getSecret());
             doorFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
             doorFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
             doorFaceBean.setOpType(1);
@@ -104,8 +114,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
             // 门禁卡权限下发
             AddFace.FaceBean.EntranceGuardPermissionsBean entranceGuardPermissionsBean = new AddFace.FaceBean.EntranceGuardPermissionsBean();
-            entranceGuardPermissionsBean.setAppkey(tpEquipmentTree.getSecret());
-            entranceGuardPermissionsBean.setSecret(tpEquipmentTree.getAppkey());
+            entranceGuardPermissionsBean.setAppkey(tpEquipmentTree.getAppkey());
+            entranceGuardPermissionsBean.setSecret(tpEquipmentTree.getSecret());
             entranceGuardPermissionsBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
             entranceGuardPermissionsBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
             entranceGuardPermissionsBean.setPersonIds(String.valueOf(taUserHk.getHkUserId()));
@@ -118,8 +128,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
             // 门禁人脸权限下发
             AddFace.FaceBean.EntranceGuardFaceBean entranceGuardFaceBean = new AddFace.FaceBean.EntranceGuardFaceBean();
-            entranceGuardFaceBean.setAppkey(tpEquipmentTree.getSecret());
-            entranceGuardFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            entranceGuardFaceBean.setAppkey(tpEquipmentTree.getAppkey());
+            entranceGuardFaceBean.setSecret(tpEquipmentTree.getSecret());
             entranceGuardFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
             entranceGuardFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
             entranceGuardFaceBean.setDeviceUuids(deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
@@ -132,10 +142,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
         addFace.setType(tpEquipmentTree.getFactory());
         addFace.setFace(faceBean);
         // 添加人脸
-        ResponseBean responseBean = ihkServer.addFace(faceImg, JSONObject.toJSONString(addFace));
-        if ("1".equals(responseBean.getCode())) {
-            throw new WisdomException(responseBean.getMessage());
-        }
+        String result = ihkServer.addFace(faceImg, JSONObject.toJSONString(addFace));
+        ResponseBean responseBean = getResponseBean(result);
         return JSONObject.toJSONString(responseBean.getData());
     }
 
@@ -147,8 +155,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
         // 人脸图片
         UpdateFace.FaceBean.PersonBean person = new UpdateFace.FaceBean.PersonBean();
-        person.setAppkey(tpEquipmentTree.getSecret());
-        person.setSecret(tpEquipmentTree.getAppkey());
+        person.setAppkey(tpEquipmentTree.getAppkey());
+        person.setSecret(tpEquipmentTree.getSecret());
         person.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
         person.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
         person.setPersonId(taUserHk.getHkUserId());
@@ -163,8 +171,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
             // 门口机人脸权限(可视对讲)
             UpdateFace.FaceBean.DoorFaceBean doorFaceBean = new UpdateFace.FaceBean.DoorFaceBean();
-            doorFaceBean.setAppkey(tpEquipmentTree.getSecret());
-            doorFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            doorFaceBean.setAppkey(tpEquipmentTree.getAppkey());
+            doorFaceBean.setSecret(tpEquipmentTree.getSecret());
             doorFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
             doorFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
             doorFaceBean.setOpType(1);
@@ -178,8 +186,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
             // 门禁人脸权限下发
             UpdateFace.FaceBean.EntranceGuardFaceBean entranceGuardFaceBean = new UpdateFace.FaceBean.EntranceGuardFaceBean();
-            entranceGuardFaceBean.setAppkey(tpEquipmentTree.getSecret());
-            entranceGuardFaceBean.setSecret(tpEquipmentTree.getAppkey());
+            entranceGuardFaceBean.setAppkey(tpEquipmentTree.getAppkey());
+            entranceGuardFaceBean.setSecret(tpEquipmentTree.getSecret());
             entranceGuardFaceBean.setOpenapi_ip_port_http(tpEquipmentTree.getHttpServer());
             entranceGuardFaceBean.setOpUserUuid(tpEquipmentTree.getOpUserUuid());
             entranceGuardFaceBean.setDeviceUuids(deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
@@ -192,10 +200,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
         addFace.setType(tpEquipmentTree.getFactory());
         addFace.setFace(faceBean);
         // 添加人脸
-        ResponseBean responseBean = ihkServer.updateFace(faceImg, JSONObject.toJSONString(addFace));
-        if ("1".equals(responseBean.getCode())) {
-            throw new WisdomException(responseBean.getMessage());
-        }
+        String result = ihkServer.updateFace(faceImg, JSONObject.toJSONString(addFace));
+        ResponseBean responseBean = getResponseBean(result);
         return JSONObject.toJSONString(responseBean.getData());
     }
 }

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

@@ -238,7 +238,7 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             // 等待 1s
-            Thread.sleep(1000);
+            // Thread.sleep(1000);
 
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
@@ -247,12 +247,18 @@ public class FaceServicelimpl implements FaceServiceI {
                 List<TpEquipment> doorEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
                 List<Map<String, Object>> equipmentUUID = getEquipmentUUID(doorEquipments);
                 StringBuilder doorUuids = new StringBuilder();
-                StringBuilder deviceUuids = new StringBuilder();
                 equipmentUUID.forEach(e-> {
                     doorUuids.append(e.get("doorUuid"));
                     doorUuids.append(",");
-                    deviceUuids.append(e.get("deviceUuid"));
-                    deviceUuids.append(",");
+                });
+
+                // 门禁人脸设备
+                List<TpEquipment> doorFaceEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
+                List<Map<String, Object>> doorFaceEquipmentUUID = getEquipmentUUID(doorFaceEquipments);
+                StringBuilder doorFaceDeviceUuids = new StringBuilder();
+                doorFaceEquipmentUUID.forEach(e-> {
+                    doorFaceDeviceUuids.append(e.get("deviceUuid"));
+                    doorFaceDeviceUuids.append(",");
                 });
 
                 // 单元门口机
@@ -266,12 +272,12 @@ public class FaceServicelimpl implements FaceServiceI {
                     /**
                      * 添加人脸的时候下发可视对讲卡权限，修改人脸的时候不下发卡权限
                      */
-                    iEquipmentService.addFace(uploadFile, unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user,visualList,doorUuids.toString(), deviceUuids.toString());
+                    iEquipmentService.addFace(uploadFile, unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user,visualList,doorUuids.toString(), doorFaceDeviceUuids.toString());
 
                     taFaceMapper.insertSelective(taFace);
                 } else {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
-                    iEquipmentService.updateFace(uploadFile, unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user,visualList, deviceUuids.toString());
+                    iEquipmentService.updateFace(uploadFile, unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user,visualList, doorFaceDeviceUuids.toString());
                 }
 
                 responseBean.addSuccess(taFace);

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

@@ -17,7 +17,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -256,11 +256,15 @@ public class HKServiceImpl implements IHKService {
         // 开卡 卡号
         long cardNo = System.currentTimeMillis();
 
+        if (StringUtils.isBlank(taUserHk.getHkCardNo())) {
+            taUserHk.setHkCardNo(cardNo + "");
+        }
+
         String resultString = iEquipmentService.pushPerson(tpEquipmentTree, unitHkSetting, user, taUserHk, 0);
         Map<String, Object> resultMap = JSONObject.parseObject(resultString, HashMap.class);
-        Integer errorCode = (Integer) resultMap.get("errorCode");
-        if (errorCode == 0) {
-            Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+        if (null != resultMap) {
+            JSONObject jsonObject = (JSONObject)resultMap.get("person");
+            Map<String, Object> resultDataMap =  jsonObject.getJSONObject("data").getInnerMap();
 
             // 海康人员ID
             Integer personId = (Integer) resultDataMap.get("personId");
@@ -274,7 +278,7 @@ public class HKServiceImpl implements IHKService {
                 taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
                 taUserHk.setCreateDate(new Date());
                 taUserHk.setUpdateDate(new Date());
-                taUserHk.setHkCardNo(cardNo + "");
+
                 // 存储海康人员ID
                 row = taUserHkMapper.insertSelective(taUserHk);
             } else {

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TaUserLicenseMapper;
@@ -17,6 +18,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.SimpleFormatter;
@@ -128,7 +130,8 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
     private TaUserLicense getTaUserLicense(String carNo, TaUserLicense taUserLicense) {
 
         // 查询车牌
-        ResponseBean responseBean = iFuShiServer.getParkInfoByCarNo(carNo);
+        String result = iFuShiServer.getParkInfoByCarNo(carNo);
+        ResponseBean responseBean = JSONObject.parseObject(result, ResponseBean.class);
         Object resultCar = responseBean.getData();
         if (null == resultCar) {
             throw new WisdomException("无此车牌记录！");

CODE/smart-community/app-api/src/main/resources/bootstrap.yml

@@ -21,3 +21,16 @@ eureka:
     service-url:
       defaultZone: http://localhost:8080/eureka/
 
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 180000
+
+ribbon:
+  ReadTimeout: 38000
+  ConnectTimeout: 38000
+  eureka.enabled: true
+

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/controller/HardwareController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -174,8 +175,8 @@ public class HardwareController {
                     "}")
     })
 	@ApiOperation(value = "添加人脸", notes = "添加人脸")
-	@PostMapping("/addFace")
-	public ResponseBean addFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString) {
+	@PostMapping(value = "/addFace", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	public ResponseBean addFace(@RequestPart("uploadFile") MultipartFile faceImg, @RequestParam("jsonString") String jsonString) {
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject jsonObject = JSONObject.parseObject(jsonString);
 		String type = jsonObject.getString("type");
@@ -226,8 +227,8 @@ public class HardwareController {
                             "}")
     })
     @ApiOperation(value = "修改人脸", notes = "修改人脸")
-    @PostMapping("/updateFace")
-    public ResponseBean updateFace(@RequestParam("faceImg") MultipartFile faceImg, @RequestParam("jsonString") String jsonString) {
+    @PostMapping(value = "/updateFace", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseBean updateFace(@RequestPart("uploadFile") MultipartFile faceImg, @RequestParam("jsonString") String jsonString) {
         ResponseBean responseBean = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(jsonString);
         String type = jsonObject.getString("type");

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/impl/HkHardwareServiceImpl.java

@@ -191,8 +191,8 @@ public class HkHardwareServiceImpl implements HkHardwareServiceI {
         openCard(appkey, secret, openapi_ip_port_http, opUserUuid,(Integer) resultPersonDataMap.get("personId") ,card,0);
 
         Map<String, Object> map = new HashMap<>();
-        map.put("person", resultPersonDataMap);
-        map.put("card", card);
+        map.put("person", resultPersonMap);
+        map.put("card", card + "");
 
         responseBean.addSuccess(map);
         return responseBean;

CODE/smart-community/property-api/src/main/java/com/community/huiju/PropertyApplication.java

@@ -39,10 +39,10 @@ public class PropertyApplication {
 	/**
 	 * 文件上传临时路径
 	 */
-	//@Bean
-	//public MultipartConfigElement multipartConfigElement() {
-	//	MultipartConfigFactory factory = new MultipartConfigFactory();
-	//	factory.setLocation("/tmp/smart-community");
-	//	return factory.createMultipartConfig();
-	//}
+	@Bean
+	public MultipartConfigElement multipartConfigElement() {
+		MultipartConfigFactory factory = new MultipartConfigFactory();
+		factory.setLocation("/tmp/smart-community");
+		return factory.createMultipartConfig();
+	}
 }