修复 bug

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

@@ -81,6 +81,18 @@ public class UserLicenseController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "获取用户车牌信息", notes = "获取用户车牌信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "licenseId", value = "车牌id"),
+    })
+    @RequestMapping(value = "/license/user/{licenseId}", method = RequestMethod.GET)
+    public ResponseBean getUserLicenseAndUserId(HttpSession session, @PathVariable("licenseId") Integer licenseId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.getUserLicenseAndUserId(userElement, licenseId);
+        return responseBean;
+    }
 
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -82,4 +82,21 @@ public interface TpEquipmentMapper {
             "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType}")
     List<TpEquipment> selectByCommunityIdAndUnitId(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
 
+    /**
+     * 根据小区 和 单元号 查询所有人脸设备
+     * @param communityId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "te.* " +
+            "from tp_unit_equipment trne left join tp_equipment te " +
+            "on trne.equipment_id = te.id " +
+            "LEFT JOIN tp_configuration tc ON te.uuid_id = tc.id " +
+            "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType} " +
+            "AND tc.device_type = 1")
+    List<TpEquipment> selectByCommunityIdAndUnitIdAndFace(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
+
+
 }

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

@@ -38,4 +38,12 @@ public interface ITaUserLicenseService {
      */
     ResponseBean deleteUserLicense(UserElement userElement, Integer licenseId);
 
+    /**
+     * 查询 车牌
+     * @param userElement
+     * @param licenseId
+     * @return
+     */
+    ResponseBean getUserLicenseAndUserId(UserElement userElement, Integer licenseId);
+
 }

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

@@ -15,6 +15,7 @@ import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ImageServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -216,7 +217,8 @@ public class FaceServicelimpl implements FaceServiceI {
                 // 设备树
                 TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
                 // 所有设备
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+                // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
                 List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
                 StringBuilder doorUuids = new StringBuilder();
                 StringBuilder deviceUuids = new StringBuilder();
@@ -243,12 +245,14 @@ public class FaceServicelimpl implements FaceServiceI {
 
                 // 单元门口机
                 List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
-                List<String> visualList = visualEquipments.stream()
-                        .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
-                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(visualEquipments)) {
+                    List<String> visualList = visualEquipments.stream()
+                            .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                            .collect(Collectors.toList());
 //                List<String> visualList = new ArrayList<>();
 //                visualList.add("10010100000");
-                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                    HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                }
             } else {
                 responseBean.addError("请录入正确图片");
             }

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

@@ -104,6 +104,10 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         //2. 更新车牌信息
 
         taUserLicenses = taUserLicenses.stream().map(e-> {
+            TaUserLicense userLicense = getTaUserLicense(e.getLicensePlate(), e);
+            userLicense.setUpdateDate(new Date());
+            userLicense.setUpdateUser(userElement.getId());
+            taUserLicenseMapper.updateByPrimaryKeySelective(userLicense);
             e.setUnitPrice(String.valueOf(Double.valueOf(e.getUnitPrice()) / 100));
             return e;
         }).collect(Collectors.toList());
@@ -140,7 +144,6 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         taUserLicense.setLicensePlate(carNo);
         String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
         taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
-        taUserLicense.setCreateDate(new Date());
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
         taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
 
@@ -169,4 +172,20 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getUserLicenseAndUserId(UserElement userElement, Integer licenseId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserLicense taUserLicense = taUserLicenseMapper.selectByUserIdAndCommunityIdAndLicenseId(userElement.getCommunityId(), userElement.getId(), licenseId);
+        if (null == taUserLicense) {
+            responseBean.addError("没有关联此车牌！");
+            return responseBean;
+        }
+
+        taUserLicense = getTaUserLicense(taUserLicense.getLicensePlate(), taUserLicense);
+        taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
+        responseBean.addSuccess(taUserLicense);
+        return responseBean;
+    }
 }