优化代码

java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesDto.java

@@ -17,6 +17,8 @@ import java.util.List;
  **/
 public class AttendanceClassesDto extends PageDto implements Serializable {
 
+    public static final String CLASSES_OBJ_TYPE_PARTMENT = "1003";
+
     private String timeOffset;
     private String clockCount;
     private String classesObjType;

java110-bean/src/main/java/com/java110/dto/org/OrgStaffRelDto.java

@@ -19,6 +19,7 @@ public class OrgStaffRelDto extends PageDto implements Serializable {
     private String storeId;
     private String orgId;
     private String staffId;
+    private String staffName;
     private String[] staffIds;
     private String relCd;
     private String departmentId;
@@ -137,4 +138,12 @@ public class OrgStaffRelDto extends PageDto implements Serializable {
     public void setParentOrgId(String parentOrgId) {
         this.parentOrgId = parentOrgId;
     }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -64,7 +64,7 @@
         ps.num,pa.pa_id paId,pa.num areaNum,ps.state,t.start_time startTime,t.end_time endTime
         from owner_car t
         INNER JOIN building_owner bo on t.owner_id = bo.member_id and t.status_cd = '0'
-        left join parking_space ps on t.ps_id = t.ps_id and ps.status_cd = '0'
+        left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
         left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
         where t.status_cd = '0'
         <if test="state !=null and state != ''">

java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml

@@ -76,9 +76,12 @@
     <!-- 查询组织员工关系信息 add by wuxw 2018-07-03 -->
     <select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
         select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id
-        bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId
-        from u_org_staff_rel t,u_org uo
+        bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId,
+        uu.name staffName
+        from u_org_staff_rel t,u_org uo,u_user uu
         where t.org_id = uo.org_id
+        and t.staff_id = uu.staff_id
+        and uu.status_cd = '0'
         and uo.status_cd = '0'
         <if test="relId !=null and relId != ''">
             and t.rel_id= #{relId}

service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/IIotSendAsyn.java

@@ -130,4 +130,11 @@ public interface IIotSendAsyn {
     void updateTempCarFeeConfig(JSONObject postParameters);
 
     void deleteTempCarFeeConfig(JSONObject postParameters);
+
+    /**
+     * 考勤班组同步
+     * @param postParameters
+     * @param staffs
+     */
+    void addAttendance(JSONObject postParameters, List<JSONObject> staffs);
 }

service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java

@@ -1046,6 +1046,53 @@ public class IotSendAsynImpl implements IIotSendAsyn {
         }
     }
 
+    @Override
+    public void addAttendance(JSONObject postParameters, List<JSONObject> staffs) {
+        MachineTranslateDto machineTranslateDto = getMachineTranslateDto(postParameters,
+                MachineTranslateDto.CMD_DELETE_TEAM_CAR_FEE_CONFIG,
+                DEFAULT_MACHINE_CODE,
+                DEFAULT_MACHINE_ID,
+                "extBwId",
+                "carNum",
+                MachineTranslateDto.TYPE_TEAM_CAR_FEE_CONFIG);
+        ResponseEntity<String> responseEntity = null;
+        String url = IotConstant.getUrl(IotConstant.DELETE_TEAM_CAR_FEE_CONFIG);
+        try {
+            postParameters.put("taskId", machineTranslateDto.getMachineTranslateId());
+            HttpEntity httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders());
+            responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+
+            logger.debug("调用HC IOT信息：" + responseEntity);
+
+            if (responseEntity.getStatusCode() != HttpStatus.OK) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(responseEntity.getBody());
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+                return;
+            }
+            JSONObject tokenObj = JSONObject.parseObject(responseEntity.getBody());
+
+            if (!tokenObj.containsKey("code") || ResultVo.CODE_OK != tokenObj.getInteger("code")) {
+                machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+                machineTranslateDto.setRemark(tokenObj.getString("msg"));
+                //保存 失败报文
+                saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+                return;
+            }
+        } catch (Exception e) {
+            machineTranslateDto.setState(MachineTranslateDto.STATE_ERROR);
+            machineTranslateDto.setRemark(e.getLocalizedMessage());
+            //保存 失败报文
+            saveTranslateError(machineTranslateDto, postParameters.toJSONString(), responseEntity != null ? responseEntity.getBody() : "", url);
+
+            return;
+        } finally {
+            saveTranslateLog(machineTranslateDto);
+            refreshAccessToken(responseEntity);
+        }
+    }
+
     private MachineTranslateDto getMachineTranslateDto(JSONObject postParameters, String cmd,
                                                        String machineCode,
                                                        String machineId,

service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java

@@ -0,0 +1,147 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.job.adapt.hcIot.attendance;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.attendanceClasses.AttendanceClassesDto;
+import com.java110.dto.org.OrgStaffRelDto;
+import com.java110.entity.order.Business;
+import com.java110.intf.common.IAttendanceClassesInnerServiceSMO;
+import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
+import com.java110.job.adapt.DatabusAdaptImpl;
+import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
+import com.java110.po.attendanceClasses.AttendanceClassesPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * HC iot 车辆同步适配器
+ * <p>
+ * 接口协议地址： https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
+ *
+ * @desc add by 吴学文 18:58
+ */
+@Component(value = "addAttendanceToIotAdapt")
+public class AddAttendanceToIotAdapt extends DatabusAdaptImpl {
+
+    @Autowired
+    private IIotSendAsyn hcOwnerAttendanceAsynImpl;
+
+
+    @Autowired
+    private IAttendanceClassesInnerServiceSMO attendanceClassesInnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl;
+
+
+    /**
+     * accessToken={access_token}
+     * &extCommunityUuid=01000
+     * &extCommunityId=1
+     * &devSn=111111111
+     * &name=设备名称
+     * &positionType=0
+     * &positionUuid=1
+     *
+     * @param business   当前处理业务
+     * @param businesses 所有业务信息
+     */
+    @Override
+    public void execute(Business business, List<Business> businesses) {
+        JSONObject data = business.getData();
+        if (data.containsKey(AttendanceClassesPo.class.getSimpleName())) {
+            Object bObj = data.get(AttendanceClassesPo.class.getSimpleName());
+            JSONArray businessOwnerAttendances = null;
+            if (bObj instanceof JSONObject) {
+                businessOwnerAttendances = new JSONArray();
+                businessOwnerAttendances.add(bObj);
+            } else if (bObj instanceof List) {
+                businessOwnerAttendances = JSONArray.parseArray(JSONObject.toJSONString(bObj));
+            } else {
+                businessOwnerAttendances = (JSONArray) bObj;
+            }
+            //JSONObject businessOwnerAttendance = data.getJSONObject("businessOwnerAttendance");
+            for (int bOwnerAttendanceIndex = 0; bOwnerAttendanceIndex < businessOwnerAttendances.size(); bOwnerAttendanceIndex++) {
+                JSONObject businessOwnerAttendance = businessOwnerAttendances.getJSONObject(bOwnerAttendanceIndex);
+                doSendOwnerAttendance(business, businessOwnerAttendance);
+            }
+        }
+    }
+
+    private void doSendOwnerAttendance(Business business, JSONObject businessOwnerAttendance) {
+
+        AttendanceClassesPo ownerAttendancePo = BeanConvertUtil.covertBean(businessOwnerAttendance, AttendanceClassesPo.class);
+
+        AttendanceClassesDto ownerAttendanceDto = new AttendanceClassesDto();
+        ownerAttendanceDto.setClassesId(ownerAttendancePo.getClassesId());
+        ownerAttendanceDto.setStoreId(ownerAttendancePo.getStoreId());
+        List<AttendanceClassesDto> attendanceDtos = attendanceClassesInnerServiceSMOImpl.queryAttendanceClassess(ownerAttendanceDto);
+
+        Assert.listOnlyOne(attendanceDtos, "未找到考勤班组");
+
+        //查询考勤组下的员工
+        String classObjType = attendanceDtos.get(0).getClassesObjType();
+        List<JSONObject> staffs = null;
+        switch (classObjType) {
+            case AttendanceClassesDto.CLASSES_OBJ_TYPE_PARTMENT:
+                staffs = getPartmentStaff(attendanceDtos.get(0));
+                break;
+            default:
+                staffs = new ArrayList<>();
+        }
+
+
+        JSONObject postParameters = new JSONObject();
+        postParameters.put("classesName", attendanceDtos.get(0).getClassesName());
+        postParameters.put("timeOffset", attendanceDtos.get(0).getTimeOffset());
+        postParameters.put("clockCount", attendanceDtos.get(0).getClockCount());
+        postParameters.put("clockType", attendanceDtos.get(0).getClockType());
+        postParameters.put("clockTypeValue", attendanceDtos.get(0).getClockTypeValue());
+        postParameters.put("lateOffset", attendanceDtos.get(0).getLateOffset());
+        postParameters.put("leaveOffset", attendanceDtos.get(0).getLeaveOffset());
+        postParameters.put("extClassesId", attendanceDtos.get(0).getClassesId());
+        postParameters.put("extCommunityId", "-1");
+        postParameters.put("attrs", JSONArray.parseArray(JSONArray.toJSONString(attendanceDtos.get(0).getAttrs())));
+        hcOwnerAttendanceAsynImpl.addAttendance(postParameters, staffs);
+    }
+
+    private List<JSONObject> getPartmentStaff(AttendanceClassesDto attendanceClassesDto) {
+
+        OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+        orgStaffRelDto.setOrgId(attendanceClassesDto.getClassesObjId());
+        orgStaffRelDto.setStoreId(attendanceClassesDto.getStoreId());
+        List<OrgStaffRelDto> staffRelDtos = orgStaffRelInnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
+        List<JSONObject> staffObjs = new ArrayList<>();
+        JSONObject staffObj = null;
+        for (OrgStaffRelDto orgStaffRelDto1 : staffRelDtos) {
+            staffObj = new JSONObject();
+            staffObj.put("extClassesId", attendanceClassesDto.getClassesId());
+            staffObj.put("extStaffId", orgStaffRelDto1.getStaffId());
+            staffObj.put("staffName", orgStaffRelDto1.getStaffName());
+            staffObj.put("departmentId", orgStaffRelDto1.getDepartmentId());
+            staffObj.put("departmentName", orgStaffRelDto1.getDepartmentName());
+            staffObjs.add(staffObj);
+        }
+        return staffObjs;
+    }
+}

service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/DeleteAttendanceToIotAdapt.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.job.adapt.hcIot.attendance;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.entity.order.Business;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.job.adapt.DatabusAdaptImpl;
+import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
+import com.java110.po.car.OwnerCarPo;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * HC iot 设备同步适配器
+ * <p>
+ * 接口协议地址： https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
+ *
+ * @desc add by 吴学文 18:58
+ */
+@Component(value = "deleteAttendanceToIotAdapt")
+public class DeleteAttendanceToIotAdapt extends DatabusAdaptImpl {
+
+    @Autowired
+    private IIotSendAsyn hcOwnerCarAsynImpl;
+
+    @Autowired
+    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+    @Autowired
+    private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+    /**
+     * {
+     * "extOwnerCarId": "702020042194860037"
+     * }
+     *
+     * @param business   当前处理业务
+     * @param businesses 所有业务信息
+     */
+    @Override
+    public void execute(Business business, List<Business> businesses) {
+        JSONObject data = business.getData();
+        if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
+            Object bObj = data.get(OwnerCarPo.class.getSimpleName());
+            JSONArray businessOwnerCars = null;
+            if (bObj instanceof JSONObject) {
+                businessOwnerCars = new JSONArray();
+                businessOwnerCars.add(bObj);
+            } else if (bObj instanceof List) {
+                businessOwnerCars = JSONArray.parseArray(JSONObject.toJSONString(bObj));
+            } else {
+                businessOwnerCars = (JSONArray) bObj;
+            }
+            //JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar");
+            for (int bOwnerCarIndex = 0; bOwnerCarIndex < businessOwnerCars.size(); bOwnerCarIndex++) {
+                JSONObject businessOwnerCar = businessOwnerCars.getJSONObject(bOwnerCarIndex);
+                doSendOwnerCar(business, businessOwnerCar);
+            }
+        }
+    }
+
+    private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {
+        OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(businessOwnerCar, OwnerCarPo.class);
+        OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setCarId(ownerCarPo.getCarId());
+        ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+        List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+        Assert.listOnlyOne(ownerCarDtos, "未找到停车场");
+
+        //没有车位就不同步了
+        if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {
+            return;
+        }
+
+        ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+        parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
+        parkingSpaceDto.setCommunityId(ownerCarDtos.get(0).getCommunityId());
+        List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+        Assert.listOnlyOne(ownerCarDtos, "未找到车位");
+
+        JSONObject postParameters = new JSONObject();
+        postParameters.put("extCarId", ownerCarDtos.get(0).getCarId());
+        postParameters.put("carNum", ownerCarDtos.get(0).getCarNum());
+        postParameters.put("extPaId", parkingSpaceDtos.get(0).getPaId());
+        postParameters.put("extCommunityId", ownerCarDtos.get(0).getCommunityId());
+        hcOwnerCarAsynImpl.deleteOwnerCar(postParameters);
+    }
+}

service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/ModifyAttendanceToIotAdapt.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.job.adapt.hcIot.attendance;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parking.ParkingSpaceDto;
+import com.java110.entity.order.Business;
+import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
+import com.java110.intf.user.IOwnerCarInnerServiceSMO;
+import com.java110.job.adapt.DatabusAdaptImpl;
+import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
+import com.java110.po.car.OwnerCarPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * HC iot 车辆同步适配器
+ * 接口协议地址： https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
+ *
+ * @desc add by 吴学文 18:58
+ */
+@Component(value = "modifyAttendanceToIotAdapt")
+public class ModifyAttendanceToIotAdapt extends DatabusAdaptImpl {
+
+    @Autowired
+    private IIotSendAsyn hcOwnerCarAsynImpl;
+
+    @Autowired
+    private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
+
+    @Autowired
+    private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+
+    /**
+     * accessToken={access_token}
+     * &extCommunityUuid=01000
+     * &extCommunityId=1
+     * &devSn=111111111
+     * &name=车辆名称
+     * &positionType=0
+     * &positionUuid=1
+     *
+     * @param business   当前处理业务
+     * @param businesses 所有业务信息
+     */
+    @Override
+    public void execute(Business business, List<Business> businesses) {
+        JSONObject data = business.getData();
+        if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
+            Object bObj = data.get(OwnerCarPo.class.getSimpleName());
+            JSONArray businessOwnerCars = null;
+            if (bObj instanceof JSONObject) {
+                businessOwnerCars = new JSONArray();
+                businessOwnerCars.add(bObj);
+            } else if (bObj instanceof List) {
+                businessOwnerCars = JSONArray.parseArray(JSONObject.toJSONString(bObj));
+            } else {
+                businessOwnerCars = (JSONArray) bObj;
+            }
+            //JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar");
+            for (int bOwnerCarIndex = 0; bOwnerCarIndex < businessOwnerCars.size(); bOwnerCarIndex++) {
+                JSONObject businessOwnerCar = businessOwnerCars.getJSONObject(bOwnerCarIndex);
+                doSendOwnerCar(business, businessOwnerCar);
+            }
+        }
+    }
+
+    private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {
+
+        OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(businessOwnerCar, OwnerCarPo.class);
+
+        OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setCarNum(ownerCarPo.getCarNum());
+        ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+
+        Assert.listOnlyOne(ownerCarDtos, "未找到停车场");
+
+        //没有车位就不同步了
+        if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {
+            return;
+        }
+
+        //电动车
+        //三轮车 不同步物联网系统
+        if ("9904,9905".contains(ownerCarDtos.get(0).getCarType())) {
+            return;
+        }
+
+        ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
+        parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
+        parkingSpaceDto.setCommunityId(ownerCarDtos.get(0).getCommunityId());
+        List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
+        Assert.listOnlyOne(ownerCarDtos, "未找到车位");
+
+
+        JSONObject postParameters = new JSONObject();
+
+        postParameters.put("carNum", ownerCarDtos.get(0).getCarNum());
+        postParameters.put("startTime", DateUtil.getFormatTimeString(ownerCarDtos.get(0).getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
+        postParameters.put("endTime", DateUtil.getFormatTimeString(ownerCarDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+        postParameters.put("extPaId", parkingSpaceDtos.get(0).getPaId());
+        postParameters.put("personName", ownerCarDtos.get(0).getOwnerName());
+        postParameters.put("personTel", ownerCarDtos.get(0).getLink());
+        postParameters.put("extCarId", ownerCarDtos.get(0).getCarId());
+        postParameters.put("extCommunityId", ownerCarDtos.get(0).getCommunityId());
+        hcOwnerCarAsynImpl.updateOwnerCar(postParameters);
+    }
+}

service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeMonthStatisticsInnerServiceSMOImpl.java

@@ -268,7 +268,7 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
             reportFeeMonthStatisticsPo.setObjId(tmpReportCarDto.getCarId());
             reportFeeMonthStatisticsPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
             reportFeeMonthStatisticsPo.setFeeName(tmpReportFeeDto.getFeeName());
-            reportFeeMonthStatisticsPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "停车场" + tmpReportCarDto.getNum() + "车位");
+            reportFeeMonthStatisticsPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "停车场" + tmpReportCarDto.getNum() + "车位)");
             reportFeeMonthStatisticsPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
             reportFeeMonthStatisticsServiceDaoImpl.saveReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));
         }
@@ -358,7 +358,7 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
         reportFeeMonthStatisticsPo.setObjId(tmpReportCarDto.getCarId());
         reportFeeMonthStatisticsPo.setObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
         reportFeeMonthStatisticsPo.setFeeName(tmpReportFeeDto.getFeeName());
-        reportFeeMonthStatisticsPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "停车场" + tmpReportCarDto.getNum() + "车位");
+        reportFeeMonthStatisticsPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "停车场" + tmpReportCarDto.getNum() + "车位)");
         reportFeeMonthStatisticsPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         reportFeeMonthStatisticsServiceDaoImpl.saveReportFeeMonthStatisticsInfo(BeanConvertUtil.beanCovertMap(reportFeeMonthStatisticsPo));