优化代码

java110

2021-03-19 c121328501fe358d93dc404868d9638f48482388

优化代码

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

File was renamed from java110-bean/src/main/java/com/java110/dto/attendanceClassesAttr/AttendanceClassesAttrDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.attendanceClassesAttr;
package com.java110.dto.attendanceClasses;

import com.java110.dto.PageDto;


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

@@ -1,7 +1,6 @@
package com.java110.dto.attendanceClasses;

import com.java110.dto.PageDto;
import com.java110.dto.attendanceClassesAttr.AttendanceClassesAttrDto;

import java.io.Serializable;
import java.util.Date;

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

File was renamed from java110-bean/src/main/java/com/java110/dto/attendanceClassesTaskDetail/AttendanceClassesTaskDetailDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.attendanceClassesTaskDetail;
package com.java110.dto.attendanceClasses;

import com.java110.dto.PageDto;


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

File was renamed from java110-bean/src/main/java/com/java110/dto/attendanceClassesTask/AttendanceClassesTaskDto.java
@@ -1,7 +1,6 @@
package com.java110.dto.attendanceClassesTask;
package com.java110.dto.attendanceClasses;

import com.java110.dto.PageDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;

import java.io.Serializable;
import java.util.Date;

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

File was renamed from java110-bean/src/main/java/com/java110/dto/attendanceLog/AttendanceLogDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.attendanceLog;
package com.java110.dto.attendanceClasses;

import com.java110.dto.PageDto;
import java.io.Serializable;

 java110-bean/src/main/java/com/java110/dto/attrSpec/AttrValueDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/attrValue/AttrValueDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.attrValue;
package com.java110.dto.attrSpec;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/communityLocation/CommunityLocationDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.communityLocation;
package com.java110.dto.community;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/feeDiscount/ComputeDiscountDto.java

@@ -16,7 +16,6 @@
package com.java110.dto.feeDiscount;

import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;

import java.io.Serializable;
import java.util.List;

 java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountDto.java

@@ -1,7 +1,6 @@
package com.java110.dto.feeDiscount;

import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;

import java.io.Serializable;
import java.util.Date;

 java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountRuleDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/feeDiscountRule/FeeDiscountRuleDto.java
@@ -1,7 +1,6 @@
package com.java110.dto.feeDiscountRule;
package com.java110.dto.feeDiscount;

import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;

import java.io.Serializable;
import java.util.Date;

 java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountRuleSpecDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/feeDiscountRuleSpec/FeeDiscountRuleSpecDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.feeDiscountRuleSpec;
package com.java110.dto.feeDiscount;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/feeDiscount/FeeDiscountSpecDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/feeDiscountSpec/FeeDiscountSpecDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.feeDiscountSpec;
package com.java110.dto.feeDiscount;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/feeManualCollection/FeeManualCollectionDetailDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/feeManualCollectionDetail/FeeManualCollectionDetailDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.feeManualCollectionDetail;
package com.java110.dto.feeManualCollection;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDetailDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/feeReceiptDetail/FeeReceiptDetailDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.feeReceiptDetail;
package com.java110.dto.feeReceipt;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/importFee/ImportFeeDetailDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/importFeeDetail/ImportFeeDetailDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.importFeeDetail;
package com.java110.dto.importFee;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/inspectionPoint/InspectionDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.inspectionPoint;
package com.java110.dto.inspectionPlan;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionPlanStaffDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/inspectionPlanStaff/InspectionPlanStaffDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.inspectionPlanStaff;
package com.java110.dto.inspectionPlan;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionRouteDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRouteDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.inspectionRoute;
package com.java110.dto.inspectionPlan;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionRoutePointRelDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/inspectionRoute/InspectionRoutePointRelDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.inspectionRoute;
package com.java110.dto.inspectionPlan;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionTaskDetailDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/inspectionTaskDetail/InspectionTaskDetailDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.inspectionTaskDetail;
package com.java110.dto.inspectionPlan;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionTaskDto.java

File was renamed from java110-bean/src/main/java/com/java110/dto/inspectionTask/InspectionTaskDto.java
@@ -1,4 +1,4 @@
package com.java110.dto.inspectionTask;
package com.java110.dto.inspectionPlan;

import com.java110.dto.PageDto;


 java110-bean/src/main/java/com/java110/dto/payFeeConfigDiscount/PayFeeConfigDiscountDto.java

@@ -1,7 +1,7 @@
package com.java110.dto.payFeeConfigDiscount;

import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;

import java.io.Serializable;
import java.util.Date;

 java110-bean/src/main/java/com/java110/dto/payFeeDetailDiscount/PayFeeDetailDiscountDto.java

@@ -1,7 +1,7 @@
package com.java110.dto.payFeeDetailDiscount;

import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;

import java.io.Serializable;
import java.util.Date;

 java110-bean/src/main/java/com/java110/dto/tempCarFeeConfig/TempCarPayOrderDto.java

New file
@@ -0,0 +1,110 @@
package com.java110.dto.tempCarFeeConfig;

import com.java110.dto.PageDto;

import java.io.Serializable;
import java.util.Date;

public class TempCarPayOrderDto extends PageDto implements Serializable {

    private String orderId;
    private String paId;
    private String extPaId;
    private String carNum;
    private double stopTimeTotal;
    private double payCharge;
    private Date inTime;
    private Date queryTime;
    private double amount;
    private Date payTime;
    private String payType;


    public String getOrderId() {
        return orderId;
    }

    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }

    public String getPaId() {
        return paId;
    }

    public void setPaId(String paId) {
        this.paId = paId;
    }

    public String getCarNum() {
        return carNum;
    }

    public void setCarNum(String carNum) {
        this.carNum = carNum;
    }

    public double getStopTimeTotal() {
        return stopTimeTotal;
    }

    public void setStopTimeTotal(double stopTimeTotal) {
        this.stopTimeTotal = stopTimeTotal;
    }

    public double getPayCharge() {
        return payCharge;
    }

    public void setPayCharge(double payCharge) {
        this.payCharge = payCharge;
    }

    public Date getInTime() {
        return inTime;
    }

    public void setInTime(Date inTime) {
        this.inTime = inTime;
    }

    public Date getQueryTime() {
        return queryTime;
    }

    public void setQueryTime(Date queryTime) {
        this.queryTime = queryTime;
    }

    public String getExtPaId() {
        return extPaId;
    }

    public void setExtPaId(String extPaId) {
        this.extPaId = extPaId;
    }

    public double getAmount() {
        return amount;
    }

    public void setAmount(double amount) {
        this.amount = amount;
    }

    public Date getPayTime() {
        return payTime;
    }

    public void setPayTime(Date payTime) {
        this.payTime = payTime;
    }

    public String getPayType() {
        return payType;
    }

    public void setPayType(String payType) {
        this.payType = payType;
    }
}

 java110-interface/src/main/java/com/java110/intf/common/IAttendanceClassesAttrInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.common;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.attendanceClassesAttr.AttendanceClassesAttrDto;
import com.java110.dto.attendanceClasses.AttendanceClassesAttrDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/common/IAttendanceClassesTaskDetailInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.common;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/common/IAttendanceClassesTaskInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.common;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/common/IAttendanceLogInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.common;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.po.attendanceLog.AttendanceLogPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/common/IAttrValueInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.common;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.attrValue.AttrValueDto;
import com.java110.dto.attrSpec.AttrValueDto;
import com.java110.po.attrValue.AttrValuePo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/community/ICommunityLocationInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.community;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/community/IInspectionInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.community;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.dto.inspectionPlan.InspectionDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/community/IInspectionPlanStaffInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.community;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/community/IInspectionRouteInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.community;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionRoute.InspectionRouteDto;
import com.java110.dto.inspectionPlan.InspectionRouteDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/community/IInspectionRoutePointRelInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.community;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskDetailInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.community;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskInnerServiceSMO.java

@@ -2,7 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.po.inspection.InspectionTaskDetailPo;
import com.java110.po.inspection.InspectionTaskPo;
import org.springframework.cloud.openfeign.FeignClient;

 java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.fee;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
import com.java110.po.feeDiscountRule.FeeDiscountRulePo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountRuleSpecInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.fee;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import com.java110.po.feeDiscountRuleSpec.FeeDiscountRuleSpecPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/fee/IFeeDiscountSpecInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.fee;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.po.feeDiscountSpec.FeeDiscountSpecPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/fee/IFeeManualCollectionDetailInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.fee;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.po.feeManualCollectionDetail.FeeManualCollectionDetailPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/fee/IFeeReceiptDetailInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.fee;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/fee/IImportFeeDetailInnerServiceSMO.java

@@ -1,7 +1,7 @@
package com.java110.intf.fee;

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importFee.ImportFeeDetailDto;
import com.java110.po.importFeeDetail.ImportFeeDetailPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;

 java110-interface/src/main/java/com/java110/intf/job/IDataBusInnerServiceSMO.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.entity.order.Business;
import com.java110.vo.ResultVo;
import org.springframework.cloud.openfeign.FeignClient;
@@ -59,4 +60,16 @@
     */
    @RequestMapping(value = "/resendIot", method = RequestMethod.POST)
    ResultVo resendIot(@RequestBody JSONObject reqJson);

    /**
     * <p>查询待支付订单</p>
     *
     * @param tempCarPayOrderDto 请求信息
     * @return TaskDto 对象数据
     */
    @RequestMapping(value = "/getTempCarFeeOrder", method = RequestMethod.POST)
    ResultVo getTempCarFeeOrder(@RequestBody TempCarPayOrderDto tempCarPayOrderDto);

    @RequestMapping(value = "/notifyTempCarFeeOrder", method = RequestMethod.POST)
    ResultVo notifyTempCarFeeOrder(@RequestBody TempCarPayOrderDto tempCarPayOrderDto);
}

 java110-interface/src/main/java/com/java110/intf/report/IReportAttendanceInnerServiceSMO.java

@@ -1,11 +1,7 @@
package com.java110.intf.report;

import com.alibaba.fastjson.JSONObject;
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 service-api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.intf.community.IInspectionPlanInnerServiceSMO;
import com.java110.intf.community.IInspectionRoutePointRelInnerServiceSMO;
import com.java110.dto.inspectionPlan.InspectionPlanDto;
import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
import com.java110.po.inspection.InspectionPlanPo;
import com.java110.po.inspection.InspectionPointPo;
import com.java110.po.inspection.InspectionRoutePo;

 service-api/src/main/java/com/java110/api/bmo/inspectionPlanStaff/impl/InspectionPlanStaffBMOImpl.java

@@ -5,7 +5,7 @@
import com.java110.api.bmo.inspectionPlanStaff.IInspectionPlanStaffBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO;
import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
import com.java110.po.inspection.InspectionPlanStaffPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/bmo/inspectionTask/impl/InspectionTaskBMOImpl.java

@@ -5,7 +5,7 @@
import com.java110.api.bmo.inspectionTask.IInspectionTaskBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.po.file.FileRelPo;
import com.java110.po.inspection.InspectionTaskPo;
import com.java110.utils.constant.BusinessTypeConstant;

 service-api/src/main/java/com/java110/api/bmo/inspectionTaskDetail/impl/InspectionTaskDetailBMOImpl.java

@@ -5,7 +5,7 @@
import com.java110.api.bmo.inspectionTaskDetail.IInspectionTaskDetailBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.po.inspection.InspectionTaskDetailPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/attendanceClasses/ListAttendanceClassesAttrsListener.java

@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.attendanceClassesAttr.AttendanceClassesAttrDto;
import com.java110.dto.attendanceClasses.AttendanceClassesAttrDto;
import com.java110.intf.common.IAttendanceClassesAttrInnerServiceSMO;
import com.java110.utils.constant.ServiceCodeAttendanceClassesAttrConstant;
import com.java110.utils.util.BeanConvertUtil;

 service-api/src/main/java/com/java110/api/listener/communityLocation/ListCommunityLocationsListener.java

@@ -6,7 +6,7 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.vo.ResultVo;
import com.java110.utils.constant.ServiceCodeCommunityLocationConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/inspectionPlan/ListInspectionPlansListener.java

@@ -4,7 +4,7 @@
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
import com.java110.dto.inspectionRoute.InspectionRouteDto;
import com.java110.dto.inspectionPlan.InspectionRouteDto;
import com.java110.dto.org.OrgStaffRelDto;
import com.java110.utils.constant.ServiceCodeInspectionPlanConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/inspectionPlanStaff/ListInspectionPlanStaffsListener.java

@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO;
import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeInspectionPlanStaffConstant;
import com.java110.utils.util.BeanConvertUtil;

 service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java

@@ -8,7 +8,7 @@
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.dto.inspectionPlan.InspectionDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IInspectionInnerServiceSMO;

 service-api/src/main/java/com/java110/api/listener/inspectionRoute/ListInspectionRoutePointsListener.java

@@ -10,7 +10,7 @@
import com.java110.intf.community.IUnitInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeInspectionRouteConstant;

 service-api/src/main/java/com/java110/api/listener/inspectionRoute/ListInspectionRoutesListener.java

@@ -7,7 +7,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
import com.java110.dto.inspectionRoute.InspectionRouteDto;
import com.java110.dto.inspectionPlan.InspectionRouteDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.vo.api.inspectionRoute.ApiInspectionRouteDataVo;
import com.java110.vo.api.inspectionRoute.ApiInspectionRouteVo;

 service-api/src/main/java/com/java110/api/listener/inspectionTask/ListInspectionTasksListener.java

@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.constant.ServiceCodeInspectionTaskConstant;
import com.java110.utils.util.Assert;

 service-api/src/main/java/com/java110/api/listener/inspectionTaskDetail/ListInspectionTaskDetailsListener.java

@@ -7,7 +7,7 @@
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeInspectionTaskDetailConstant;
import com.java110.utils.util.BeanConvertUtil;

 service-api/src/main/java/com/java110/api/listener/inspectionTaskDetail/UpdateInspectionTaskDetailListener.java

@@ -13,8 +13,8 @@
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.entity.center.AppService;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.CommonConstant;

 service-api/src/main/java/com/java110/api/listener/machine/ListMachinesListener.java

@@ -7,7 +7,7 @@
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.unit.FloorAndUnitDto;
import com.java110.intf.common.IMachineInnerServiceSMO;

 service-common/src/main/java/com/java110/common/api/AttendanceClassApi.java

@@ -29,9 +29,9 @@
import com.java110.common.bmo.attendanceLog.IGetAttendanceLogBMO;
import com.java110.common.bmo.attendanceLog.ISaveAttendanceLogBMO;
import com.java110.common.bmo.attendanceLog.IUpdateAttendanceLogBMO;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.po.attendanceClassesTask.AttendanceClassesTaskPo;
import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
import com.java110.po.attendanceLog.AttendanceLogPo;

 service-common/src/main/java/com/java110/common/api/AttrValueApi.java

@@ -5,7 +5,7 @@
import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
import com.java110.common.bmo.attrValue.ISaveAttrValueBMO;
import com.java110.common.bmo.attrValue.IUpdateAttrValueBMO;
import com.java110.dto.attrValue.AttrValueDto;
import com.java110.dto.attrSpec.AttrValueDto;
import com.java110.po.attrValue.AttrValuePo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;

 service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/IGetAttendanceClassesTaskBMO.java

@@ -1,5 +1,5 @@
package com.java110.common.bmo.attendanceClassesTask;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import org.springframework.http.ResponseEntity;
public interface IGetAttendanceClassesTaskBMO {


 service-common/src/main/java/com/java110/common/bmo/attendanceClassesTask/impl/GetAttendanceClassesTaskBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.common.bmo.attendanceClassesTask.impl;

import com.java110.common.bmo.attendanceClassesTask.IGetAttendanceClassesTaskBMO;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

 service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/IGetAttendanceClassesTaskDetailBMO.java

@@ -1,7 +1,7 @@
package com.java110.common.bmo.attendanceClassesTaskDetail;

import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import org.springframework.http.ResponseEntity;

public interface IGetAttendanceClassesTaskDetailBMO {

 service-common/src/main/java/com/java110/common/bmo/attendanceClassesTaskDetail/impl/GetAttendanceClassesTaskDetailBMOImpl.java

@@ -1,8 +1,8 @@
package com.java110.common.bmo.attendanceClassesTaskDetail.impl;

import com.java110.common.bmo.attendanceClassesTaskDetail.IGetAttendanceClassesTaskDetailBMO;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
import com.java110.intf.report.IReportAttendanceInnerServiceSMO;
import com.java110.vo.ResultVo;

 service-common/src/main/java/com/java110/common/bmo/attendanceLog/IGetAttendanceLogBMO.java

@@ -1,5 +1,5 @@
package com.java110.common.bmo.attendanceLog;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import org.springframework.http.ResponseEntity;
public interface IGetAttendanceLogBMO {


 service-common/src/main/java/com/java110/common/bmo/attendanceLog/impl/GetAttendanceLogBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.common.bmo.attendanceLog.impl;

import com.java110.common.bmo.attendanceLog.IGetAttendanceLogBMO;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.intf.common.IAttendanceLogInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

 service-common/src/main/java/com/java110/common/bmo/attrValue/IGetAttrValueBMO.java

@@ -1,5 +1,5 @@
package com.java110.common.bmo.attrValue;
import com.java110.dto.attrValue.AttrValueDto;
import com.java110.dto.attrSpec.AttrValueDto;
import org.springframework.http.ResponseEntity;
public interface IGetAttrValueBMO {


 service-common/src/main/java/com/java110/common/bmo/attrValue/impl/GetAttrValueBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.common.bmo.attrValue.impl;

import com.java110.common.bmo.attrValue.IGetAttrValueBMO;
import com.java110.dto.attrValue.AttrValueDto;
import com.java110.dto.attrSpec.AttrValueDto;
import com.java110.intf.common.IAttrValueInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

 service-common/src/main/java/com/java110/common/bmo/machine/IMachineOpenDoorBMO.java

@@ -16,7 +16,6 @@
package com.java110.common.bmo.machine;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.attrValue.AttrValueDto;
import org.springframework.http.ResponseEntity;

public interface IMachineOpenDoorBMO {

 service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesAttrInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.common.dao.IAttendanceClassesAttrServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attendanceClassesAttr.AttendanceClassesAttrDto;
import com.java110.dto.attendanceClasses.AttendanceClassesAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IAttendanceClassesAttrInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;

 service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesInnerServiceSMOImpl.java

@@ -5,7 +5,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attendanceClasses.AttendanceClassesDto;
import com.java110.dto.attendanceClassesAttr.AttendanceClassesAttrDto;
import com.java110.dto.attendanceClasses.AttendanceClassesAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IAttendanceClassesAttrInnerServiceSMO;
import com.java110.intf.common.IAttendanceClassesInnerServiceSMO;

 service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskDetailInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.common.dao.IAttendanceClassesTaskDetailServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
import com.java110.po.attendanceClassesTaskDetail.AttendanceClassesTaskDetailPo;
import com.java110.utils.util.BeanConvertUtil;

 service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesTaskInnerServiceSMOImpl.java

@@ -4,8 +4,8 @@
import com.java110.common.dao.IAttendanceClassesTaskServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClassesTaskDetail.AttendanceClassesTaskDetailDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IAttendanceClassesTaskDetailInnerServiceSMO;
import com.java110.intf.common.IAttendanceClassesTaskInnerServiceSMO;

 service-common/src/main/java/com/java110/common/smo/impl/AttendanceLogInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.common.dao.IAttendanceLogServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attendanceLog.AttendanceLogDto;
import com.java110.dto.attendanceClasses.AttendanceLogDto;
import com.java110.intf.common.IAttendanceLogInnerServiceSMO;
import com.java110.po.attendanceLog.AttendanceLogPo;
import com.java110.utils.util.BeanConvertUtil;

 service-common/src/main/java/com/java110/common/smo/impl/AttrValueInnerServiceSMOImpl.java

@@ -4,7 +4,7 @@
import com.java110.common.dao.IAttrValueServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.attrValue.AttrValueDto;
import com.java110.dto.attrSpec.AttrValueDto;
import com.java110.intf.common.IAttrValueInnerServiceSMO;
import com.java110.po.attrValue.AttrValuePo;
import com.java110.utils.util.BeanConvertUtil;

 service-community/src/main/java/com/java110/community/bmo/assets/impl/QueryAssetsInspectionBMOImpl.java

@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.community.bmo.assets.IQueryAssetsInspectionBMO;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;

 service-community/src/main/java/com/java110/community/smo/impl/CommunityLocationInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@

import com.java110.community.dao.ICommunityLocationServiceDao;
import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.user.UserDto;

 service-community/src/main/java/com/java110/community/smo/impl/InspectionInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@

import com.java110.community.dao.IInspectionServiceDao;
import com.java110.intf.community.IInspectionInnerServiceSMO;
import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.dto.inspectionPlan.InspectionDto;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;

 service-community/src/main/java/com/java110/community/smo/impl/InspectionPlanStaffInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.intf.community.IInspectionPlanStaffInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-community/src/main/java/com/java110/community/smo/impl/InspectionRouteInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.intf.community.IInspectionRouteInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionRoute.InspectionRouteDto;
import com.java110.dto.inspectionPlan.InspectionRouteDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

 service-community/src/main/java/com/java110/community/smo/impl/InspectionRoutePointRelInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.intf.community.IInspectionRoutePointRelInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskDetailInnerServiceSMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.intf.community.IInspectionTaskDetailInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionTaskDetail.InspectionTaskDetailDto;
import com.java110.dto.inspectionPlan.InspectionTaskDetailDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;

 service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskInnerServiceSMOImpl.java

@@ -6,8 +6,8 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java

@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeDiscount.IDeleteFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;

 service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java

@@ -2,7 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollection.IDeleteFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.IGetFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.ISaveFeeManualCollectionBMO;

 service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeReceipt.FeeReceiptDto;
import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;

 service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java

@@ -2,7 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.importFee.ImportFeeDto;
import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importFee.ImportFeeDetailDto;
import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;

 service-fee/src/main/java/com/java110/fee/api/TempCarFeeApi.java

@@ -16,13 +16,12 @@
package com.java110.fee.api;

import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
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.bind.annotation.*;

/**
 * 临时车费接口类
@@ -51,4 +50,38 @@
        tempCarFeeRuleDto.setRuleId(ruleId);
        return getTempCarFeeRulesImpl.queryRules(tempCarFeeRuleDto);
    }


    /**
     * 查询；临时车停车收费规则
     *
     * @param paId 停车场ID
     * @return
     * @serviceCode /tempCarFee/queryTempCarFeeRules
     * @path /app/tempCarFee/queryTempCarFeeRules
     */
    @RequestMapping(value = "/getTempCarFeeOrder", method = RequestMethod.GET)
    public ResponseEntity<String> getTempCarFeeOrder(
            @RequestParam(value = "paId", required = false) String paId,
            @RequestParam(value = "carNum", required = false) String carNum
            ) {
        TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
        tempCarPayOrderDto.setPaId(paId);
        tempCarPayOrderDto.setCarNum(carNum);
        return getTempCarFeeRulesImpl.getTempCarFeeOrder(tempCarPayOrderDto);
    }

    /**
     * 缴费通知
     *
     * @param reqParam 停车场ID
     * @return
     * @serviceCode /tempCarFee/queryTempCarFeeRules
     * @path /app/tempCarFee/queryTempCarFeeRules
     */
    @RequestMapping(value = "/notifyTempCarFeeOrder", method = RequestMethod.POST)
    public ResponseEntity<String> notifyTempCarFeeOrder(@RequestBody String reqParam) {
        TempCarPayOrderDto tempCarPayOrderDto = BeanConvertUtil.covertBean(reqParam,TempCarPayOrderDto.class);
        return getTempCarFeeRulesImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
    }
}

 service-fee/src/main/java/com/java110/fee/bmo/feeDiscount/impl/GetFeeDiscountBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.fee.bmo.feeDiscount.impl;

import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
import com.java110.intf.fee.IFeeDiscountInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/IGetFeeDiscountRuleBMO.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeDiscountRule;

import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
import org.springframework.http.ResponseEntity;

public interface IGetFeeDiscountRuleBMO {

 service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRule/impl/GetFeeDiscountRuleBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.fee.bmo.feeDiscountRule.impl;

import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
import com.java110.intf.fee.IFeeDiscountRuleInnerServiceSMO;
import com.java110.intf.fee.IFeeDiscountRuleSpecInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/IGetFeeDiscountRuleSpecBMO.java

@@ -1,5 +1,5 @@
package com.java110.fee.bmo.feeDiscountRuleSpec;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import org.springframework.http.ResponseEntity;
public interface IGetFeeDiscountRuleSpecBMO {


 service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/GetFeeDiscountRuleSpecBMOImpl.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeDiscountRuleSpec.impl;

import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import com.java110.fee.bmo.feeDiscountRuleSpec.IGetFeeDiscountRuleSpecBMO;
import com.java110.intf.fee.IFeeDiscountRuleSpecInnerServiceSMO;
import com.java110.vo.ResultVo;

 service-fee/src/main/java/com/java110/fee/bmo/feeDiscountSpec/IGetFeeDiscountSpecBMO.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeDiscountSpec;

import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import org.springframework.http.ResponseEntity;

public interface IGetFeeDiscountSpecBMO {

 service-fee/src/main/java/com/java110/fee/bmo/feeDiscountSpec/impl/GetFeeDiscountSpecBMOImpl.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeDiscountSpec.impl;

import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.bmo.feeDiscountSpec.IGetFeeDiscountSpecBMO;
import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
import com.java110.vo.ResultVo;

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollection/impl/DeleteFeeManualCollectionBMOImpl.java

@@ -1,7 +1,6 @@
package com.java110.fee.bmo.feeManualCollection.impl;

import com.java110.core.annotation.Java110Transactional;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollection.IDeleteFeeManualCollectionBMO;
import com.java110.intf.fee.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollection/impl/GetFeeManualCollectionBMOImpl.java

@@ -1,7 +1,7 @@
package com.java110.fee.bmo.feeManualCollection.impl;

import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollection.IGetFeeManualCollectionBMO;
import com.java110.intf.fee.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollection/impl/SaveFeeManualCollectionBMOImpl.java

@@ -6,7 +6,7 @@
import com.java110.dto.RoomDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.fee.bmo.feeManualCollection.ISaveFeeManualCollectionBMO;

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/IGetExportCollectionBMO.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeManualCollectionDetail;

import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import org.springframework.http.ResponseEntity;

public interface IGetExportCollectionBMO {

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/IGetFeeManualCollectionDetailBMO.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeManualCollectionDetail;

import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import org.springframework.http.ResponseEntity;

public interface IGetFeeManualCollectionDetailBMO {

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java

@@ -4,7 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollectionDetail.IGetExportCollectionBMO;
import com.java110.intf.fee.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetFeeManualCollectionDetailBMOImpl.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeManualCollectionDetail.impl;

import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollectionDetail.IGetFeeManualCollectionDetailBMO;
import com.java110.intf.fee.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.vo.ResultVo;

 service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/IGetFeeReceiptDetailBMO.java

@@ -1,5 +1,5 @@
package com.java110.fee.bmo.feeReceiptDetail;
import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import org.springframework.http.ResponseEntity;
public interface IGetFeeReceiptDetailBMO {


 service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.feeReceiptDetail.impl;

import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.fee.bmo.feeReceiptDetail.IGetFeeReceiptDetailBMO;
import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
import com.java110.vo.ResultVo;

 service-fee/src/main/java/com/java110/fee/bmo/importFeeDetail/IGetImportFeeDetailBMO.java

@@ -1,5 +1,5 @@
package com.java110.fee.bmo.importFeeDetail;
import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importFee.ImportFeeDetailDto;
import org.springframework.http.ResponseEntity;
public interface IGetImportFeeDetailBMO {


 service-fee/src/main/java/com/java110/fee/bmo/importFeeDetail/impl/GetImportFeeDetailBMOImpl.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.importFeeDetail.impl;

import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importFee.ImportFeeDetailDto;
import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
import com.java110.vo.ResultVo;

 service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java

@@ -1,6 +1,6 @@
package com.java110.fee.bmo.payFeeConfigDiscount.impl;

import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
import com.java110.fee.bmo.payFeeConfigDiscount.IGetPayFeeConfigDiscountBMO;
import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;

 service-fee/src/main/java/com/java110/fee/bmo/tempCarFee/IGetTempCarFeeRules.java

@@ -15,6 +15,7 @@
 */

import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import org.springframework.http.ResponseEntity;

/**
@@ -29,4 +30,14 @@
     * @return 收费规则及规则规格
     */
    ResponseEntity<String> queryRules(TempCarFeeRuleDto tempCarFeeRuleDto);

    /**
     * 查询临时车支付订单
     *
     * @param tempCarPayOrderDto
     * @return
     */
    ResponseEntity<String> getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto);

    ResponseEntity<String> notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto);
}

 service-fee/src/main/java/com/java110/fee/bmo/tempCarFee/impl/GetTempCarFeeRulesImpl.java

@@ -16,8 +16,10 @@
package com.java110.fee.bmo.tempCarFee.impl;

import com.java110.dto.tempCarFeeConfig.TempCarFeeRuleDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.fee.bmo.tempCarFee.IGetTempCarFeeRules;
import com.java110.intf.fee.ITempCarFeeConfigInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -34,6 +36,9 @@
    @Autowired
    private ITempCarFeeConfigInnerServiceSMO tempCarFeeConfigInnerServiceSMOImpl;

    @Autowired
    private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;

    @Override
    public ResponseEntity<String> queryRules(TempCarFeeRuleDto tempCarFeeRuleDto) {

@@ -41,4 +46,23 @@

        return ResultVo.createResponseEntity(tempCarFeeRuleDtos);
    }

    /**
     * 查询是临时车支付订单
     *
     * @param tempCarPayOrderDto
     * @return
     */
    @Override
    public ResponseEntity<String> getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {

        ResultVo resultVo = dataBusInnerServiceSMOImpl.getTempCarFeeOrder(tempCarPayOrderDto);
        return ResultVo.createResponseEntity(resultVo);
    }

    @Override
    public ResponseEntity<String> notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {
        ResultVo resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
        return ResultVo.createResponseEntity(resultVo);
    }
}

 service-fee/src/main/java/com/java110/fee/discount/impl/DiscountFeeRule.java

@@ -19,7 +19,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;

 service-fee/src/main/java/com/java110/fee/discount/impl/DiscountWithoutArrearsRule.java

@@ -4,7 +4,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;

 service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByDayRule.java

@@ -19,7 +19,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.utils.util.DateUtil;

 service-fee/src/main/java/com/java110/fee/discount/impl/LateFeeByMonthRule.java

@@ -19,7 +19,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.utils.util.DateUtil;

 service-fee/src/main/java/com/java110/fee/discount/impl/ReductionFeeRule.java

@@ -17,7 +17,7 @@

import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;

 service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingDiscountImpl.java

@@ -4,7 +4,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;

 service-fee/src/main/java/com/java110/fee/discount/impl/VacantHousingReductionImpl.java

@@ -2,7 +2,7 @@

import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.discount.IComputeDiscount;
import org.springframework.stereotype.Component;


 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java

@@ -7,7 +7,7 @@
import com.java110.dto.fee.FeeDto;
import com.java110.dto.feeDiscount.ComputeDiscountDto;
import com.java110.dto.feeDiscount.FeeDiscountDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
import com.java110.fee.dao.IFeeDiscountServiceDao;
import com.java110.fee.discount.IComputeDiscount;

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@

import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
import com.java110.fee.dao.IFeeDiscountRuleServiceDao;
import com.java110.intf.fee.IFeeDiscountRuleInnerServiceSMO;
import com.java110.po.feeDiscountRule.FeeDiscountRulePo;

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountRuleSpecInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@

import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import com.java110.fee.dao.IFeeDiscountRuleSpecServiceDao;
import com.java110.intf.fee.IFeeDiscountRuleSpecInnerServiceSMO;
import com.java110.po.feeDiscountRuleSpec.FeeDiscountRuleSpecPo;

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountSpecInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@

import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
import com.java110.dto.feeDiscount.FeeDiscountSpecDto;
import com.java110.fee.dao.IFeeDiscountSpecServiceDao;
import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
import com.java110.po.feeDiscountSpec.FeeDiscountSpecPo;

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeManualCollectionDetailInnerServiceSMOImpl.java

@@ -3,15 +3,13 @@

import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.dao.IFeeManualCollectionDetailServiceDao;
import com.java110.intf.fee.IFeeManualCollectionDetailInnerServiceSMO;
import com.java110.po.feeManualCollectionDetail.FeeManualCollectionDetailPo;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeReceiptDetailInnerServiceSMOImpl.java

@@ -3,10 +3,9 @@

import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.fee.dao.IFeeReceiptDetailServiceDao;
import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
import com.java110.po.fee.PayFeePo;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;

 service-fee/src/main/java/com/java110/fee/smo/impl/ImportFeeDetailInnerServiceSMOImpl.java

@@ -3,7 +3,7 @@

import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
import com.java110.dto.importFee.ImportFeeDetailDto;
import com.java110.fee.dao.IImportFeeDetailServiceDao;
import com.java110.intf.fee.IImportFeeDetailInnerServiceSMO;
import com.java110.po.importFeeDetail.ImportFeeDetailPo;

 service-job/src/main/java/com/java110/job/adapt/DatabusAdaptImpl.java

@@ -17,6 +17,7 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.core.client.RestTemplate;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.entity.order.Business;
import com.java110.job.adapt.hcIot.GetToken;
import com.java110.vo.ResultVo;
@@ -36,7 +37,7 @@
     */
    protected HttpHeaders getHeaders(RestTemplate outRestTemplate) {
        HttpHeaders httpHeaders = new HttpHeaders();
        httpHeaders.add("access_token", GetToken.get(outRestTemplate,false));
        httpHeaders.add("access_token", GetToken.get(outRestTemplate, false));
        //httpHeaders.add("Content-Type", "application/x-www-form-urlencoded");
        return httpHeaders;
    }
@@ -75,6 +76,27 @@
        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
    }

    /**
     * 查询 临时车待支付订单
     *
     * @param tempCarPayOrderDto
     * @return
     */
    @Override
    public ResultVo getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {
        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
    }
    /**
     * 查询 临时车待支付订单
     *
     * @param tempCarPayOrderDto
     * @return
     */
    @Override
    public ResultVo notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {
        return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
    }


    /**
     * 业主处理执行

 service-job/src/main/java/com/java110/job/adapt/IDatabusAdapt.java

@@ -16,6 +16,7 @@
package com.java110.job.adapt;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.entity.order.Business;
import com.java110.vo.ResultVo;

@@ -53,4 +54,8 @@
    ResultVo restartMachine(JSONObject reqJson);

    ResultVo reSendToIot(JSONObject reqJson);

    ResultVo getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto);

    ResultVo notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto);
}

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

New file
@@ -0,0 +1,83 @@
/*
 * 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;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.client.RestTemplate;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;

/**
 * 查询临时停车费订单
 * 接口协议地址： https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
 *
 * @desc add by 吴学文 15:29
 */
@Component(value = "getTempCarFeeOrderAdapt")
public class GetTempCarFeeOrderAdapt extends DatabusAdaptImpl {

    @Autowired
    RestTemplate outRestTemplate;

    @Autowired
    private IMachineInnerServiceSMO machineInnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;

    @Autowired
    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;

    @Autowired
    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

    /**
     * 获取历史停车费订单
     *
     * @param tempCarPayOrderDto 业务信息
     * @return
     */
    @Override
    public ResultVo getTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {

        JSONObject postParameters = new JSONObject();
        postParameters.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
        postParameters.put("carNum", tempCarPayOrderDto.getCarNum());
        postParameters.put("extPaId", tempCarPayOrderDto.getExtPaId());
        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.GET_TEMP_CAR_FEE_ORDER), HttpMethod.POST, httpEntity, String.class);
        if (responseEntity.getStatusCode() != HttpStatus.OK) {
            return new ResultVo(ResultVo.CODE_ERROR, responseEntity.getBody());
        }
        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
        return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"), paramOut.getJSONObject("data"));

    }

}

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

@@ -77,6 +77,12 @@
    //重启接口
    public static final String RESTART_MACHINE = "/extApi/machine/restartMachine";

    //查询临时停车费订单
    public static final String GET_TEMP_CAR_FEE_ORDER = "/extApi/fee/getTempCarFeeOrder";

    //查询临时停车费订单
    public static final String NOTIFY_TEMP_CAR_FEE_ORDER = "/extApi/fee/notifyTempCarFeeOrder";

    //添加车辆
    public static final String ADD_TEAM_CAR_FEE_CONFIG = "/extApi/fee/addTempCarFee";
    //修改车辆

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

New file
@@ -0,0 +1,87 @@
/*
 * 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;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.client.RestTemplate;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;

/**
 * 查询临时停车费订单
 * 接口协议地址： https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
 *
 * @desc add by 吴学文 15:29
 */
@Component(value = "notifyTempCarFeeOrderAdapt")
public class NotifyTempCarFeeOrderAdapt extends DatabusAdaptImpl {

    @Autowired
    RestTemplate outRestTemplate;

    @Autowired
    private IMachineInnerServiceSMO machineInnerServiceSMOImpl;

    @Autowired
    private IUserInnerServiceSMO userInnerServiceSMOImpl;

    @Autowired
    private IMachineTranslateInnerServiceSMO machineTranslateInnerServiceSMOImpl;

    @Autowired
    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

    /**
     * 获取历史停车费订单
     *
     * @param tempCarPayOrderDto 业务信息
     * @return
     */
    @Override
    public ResultVo notifyTempCarFeeOrder(TempCarPayOrderDto tempCarPayOrderDto) {

        JSONObject postParameters = new JSONObject();
        postParameters.put("taskId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_machineTranslateId));
        postParameters.put("carNum", tempCarPayOrderDto.getCarNum());
        postParameters.put("extPaId", tempCarPayOrderDto.getExtPaId());
        postParameters.put("orderId", tempCarPayOrderDto.getOrderId());
        postParameters.put("amount", tempCarPayOrderDto.getAmount());
        postParameters.put("payTime", tempCarPayOrderDto.getPayTime());
        postParameters.put("payType", tempCarPayOrderDto.getPayType());
        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(postParameters.toJSONString(), getHeaders(outRestTemplate));
        ResponseEntity<String> responseEntity = outRestTemplate.exchange(IotConstant.getUrl(IotConstant.NOTIFY_TEMP_CAR_FEE_ORDER), HttpMethod.POST, httpEntity, String.class);
        if (responseEntity.getStatusCode() != HttpStatus.OK) {
            return new ResultVo(ResultVo.CODE_ERROR, responseEntity.getBody());
        }
        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
        return new ResultVo(paramOut.getInteger("code"), paramOut.getString("msg"), paramOut.getJSONObject("data"));

    }

}

 service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java

@@ -18,7 +18,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.RoomDto;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineAttrDto;

 service-job/src/main/java/com/java110/job/adapt/hcIot/machine/ModifyMachineToIotAdapt.java

@@ -17,7 +17,7 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.dto.machine.MachineAttrDto;
import com.java110.dto.machine.MachineDto;
import com.java110.entity.order.Business;
@@ -31,8 +31,6 @@
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;

import java.util.List;


 service-job/src/main/java/com/java110/job/adapt/hcIot/parkingArea/ModifyParkingAreaToIotAdapt.java

@@ -17,21 +17,13 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.machine.MachineAttrDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.parkingAreaAttr.ParkingAreaAttrDto;
import com.java110.entity.order.Business;
import com.java110.intf.common.IMachineAttrInnerServiceSMO;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
import com.java110.intf.community.IParkingAreaAttrInnerServiceSMO;
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.po.machine.MachinePo;
import com.java110.po.parking.ParkingAreaPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;

 service-job/src/main/java/com/java110/job/smo/impl/DataBusInnerServiceSMOImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.businessDatabus.BusinessDatabusDto;
import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
import com.java110.entity.order.Business;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.job.adapt.IDatabusAdapt;
@@ -32,6 +33,8 @@
    public static final String DEFAULT_OPEN_DOOR_PROTOCOL = "openDoorAdapt";//吸墨门禁
    public static final String DEFAULT_START_MACHINE_PROTOCOL = "restartMachineAdapt";//吸墨门禁
    public static final String DEFAULT_RESEND_IOT_PROTOCOL = "reSendIotAdapt";//重新送数据
    public static final String DEFAULT_GET_TEMP_CAR_FEE_ORDER_PROTOCOL = "getTempCarFeeOrderAdapt";//重新送数据
    public static final String DEFAULT_NOTIFY_TEMP_CAR_FEE_ORDER_PROTOCOL = "notifyTempCarFeeOrderAdapt";//重新送数据


    @Override
@@ -64,6 +67,18 @@

    }

    @Override
    public ResultVo getTempCarFeeOrder(@RequestBody TempCarPayOrderDto tempCarPayOrderDto) {
        IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_GET_TEMP_CAR_FEE_ORDER_PROTOCOL, IDatabusAdapt.class);
        return databusAdaptImpl.getTempCarFeeOrder(tempCarPayOrderDto);
    }

    @Override
    public ResultVo notifyTempCarFeeOrder(@RequestBody TempCarPayOrderDto tempCarPayOrderDto) {
        IDatabusAdapt databusAdaptImpl = ApplicationContextFactory.getBean(DEFAULT_NOTIFY_TEMP_CAR_FEE_ORDER_PROTOCOL, IDatabusAdapt.class);
        return databusAdaptImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
    }

    /**
     * 处理业务类
     *

 service-job/src/main/java/com/java110/job/task/inspection/GeneratorInspectionTaskTemplate.java

@@ -3,9 +3,9 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.inspectionPlan.InspectionPlanDto;
import com.java110.dto.inspectionPlanStaff.InspectionPlanStaffDto;
import com.java110.dto.inspectionRoute.InspectionRoutePointRelDto;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.dto.inspectionPlan.InspectionPlanStaffDto;
import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.dto.task.TaskDto;
import com.java110.intf.community.*;
import com.java110.job.quartz.TaskSystemQuartz;

 service-job/src/main/java/com/java110/job/task/ownerToMachine/ReTranslateOwnerPhotoMachineTemplate.java

@@ -9,7 +9,7 @@
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.communityLocation.CommunityLocationDto;
import com.java110.dto.community.CommunityLocationDto;
import com.java110.dto.machine.MachineDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.order.OrderDto;

 service-report/src/main/java/com/java110/report/dao/IReportAttendanceServiceDao.java

@@ -1,11 +1,5 @@
package com.java110.report.dao;

import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.report.ReportFeeDetailDto;
import com.java110.dto.report.ReportFeeDto;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;
import java.util.Map;


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

@@ -2,11 +2,9 @@


import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.attendanceClassesTask.AttendanceClassesTaskDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
import com.java110.intf.report.IReportAttendanceInnerServiceSMO;
import com.java110.report.dao.IReportAttendanceServiceDao;
import com.java110.report.dao.IReportFeeMonthStatisticsServiceDao;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;