Merge branch 'back' of https://github.com/java110/MicroCommunity into back

曾成

2020-03-28 983acc56b667c90804dbf5f46dae8f0161876380

Merge branch 'back' of https://github.com/java110/MicroCommunity into back

 Api/src/main/java/com/java110/api/bmo/ApiBaseBMO.java

@@ -51,6 +51,7 @@
     * @return
     */
    public ResponseEntity<String> callService(DataFlowContext context, String serviceCode,JSONArray businesses) {
        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
        JSONObject paramInObj = restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
        return callService(context,serviceCode,paramInObj);
    }
@@ -66,6 +67,7 @@

        //将 rest header 信息传递到下层服务中去
        HttpHeaders header = new HttpHeaders();

        freshHttpHeader(header, context.getRequestCurrentHeaders());

        ResponseEntity responseEntity = null;

 Api/src/main/java/com/java110/api/bmo/room/IRoomBMO.java

@@ -1,6 +1,10 @@
package com.java110.api.bmo.room;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.IApiBaseBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;

/**
 * @ClassName IRoomBMO
@@ -11,4 +15,13 @@
 * add by wuxw 2020/3/9
 **/
public interface IRoomBMO extends IApiBaseBMO {

    /**
     *  修改房屋
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
     JSONObject updateRoom(JSONObject paramInJson, DataFlowContext dataFlowContext);
}

 Api/src/main/java/com/java110/api/bmo/room/impl/RoomBMOImpl.java

@@ -1,8 +1,19 @@
package com.java110.api.bmo.room.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.room.IRoomBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
import com.java110.dto.RoomDto;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @ClassName RoomBMOImpl
@@ -15,4 +26,36 @@

@Service("roomBMOImpl")
public class RoomBMOImpl extends ApiBaseBMO implements IRoomBMO {

    @Autowired
    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;

    /**
     * 修改房屋
     *
     * @param paramInJson     接口调用放传入入参
     * @param dataFlowContext 数据上下文
     * @return 订单服务能够接受的报文
     */
    public JSONObject updateRoom(JSONObject paramInJson, DataFlowContext dataFlowContext) {

        RoomDto roomDto = new RoomDto();
        roomDto.setCommunityId(paramInJson.getString("communityId"));
        roomDto.setRoomId(paramInJson.getString("roomId"));
        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);

        Assert.listOnlyOne(roomDtos, "存在" + roomDtos.size() + "条房屋信息");

        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_ROOM_INFO);
        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
        JSONObject businessUnit = new JSONObject();
        businessUnit.putAll(BeanConvertUtil.beanCovertMap(roomDtos.get(0)));
        businessUnit.putAll(paramInJson);
        businessUnit.put("userId", dataFlowContext.getRequestCurrentHeaders().get(CommonConstant.HTTP_USER_ID));
        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessRoom", businessUnit);

        return business;
    }
}

 Api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java

@@ -78,6 +78,53 @@
    @Override
    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {

        if(reqJson.containsKey("relationship")){
            queryRelationship(event,context,reqJson);
        }else{
            queryCommon(event,context,reqJson);
        }

    }

    /**
     * 关系查询
     * @param event
     * @param context
     * @param reqJson
     */
    private void queryRelationship(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        InspectionDto inspectionPointDto = BeanConvertUtil.covertBean(reqJson, InspectionDto.class);

        int count = inspectionPointInnerServiceSMOImpl.queryInspectionsRelationShipCount(inspectionPointDto);

        List<ApiInspectionPointDataVo> inspectionPoints = null;

        if (count > 0) {
            inspectionPoints = BeanConvertUtil.covertBeanList(inspectionPointInnerServiceSMOImpl.getInspectionRelationShip(inspectionPointDto), ApiInspectionPointDataVo.class);
            // 刷新 位置信息
            refreshMachines(inspectionPoints);
        } else {
            inspectionPoints = new ArrayList<>();
        }

        ApiInspectionPointVo apiInspectionPointVo = new ApiInspectionPointVo();

        apiInspectionPointVo.setTotal(count);
        apiInspectionPointVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
        apiInspectionPointVo.setInspectionPoints(inspectionPoints);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK);

        context.setResponseEntity(responseEntity);
    }

    /**
     * 普通查询
     * @param event
     * @param context
     * @param reqJson
     */
    private void queryCommon(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
        InspectionDto inspectionPointDto = BeanConvertUtil.covertBean(reqJson, InspectionDto.class);

        int count = inspectionPointInnerServiceSMOImpl.queryInspectionsCount(inspectionPointDto);
@@ -101,7 +148,6 @@
        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiInspectionPointVo), HttpStatus.OK);

        context.setResponseEntity(responseEntity);

    }


@@ -187,7 +233,6 @@

    /**
     * 获取批量单元
     *
     */
    private void refreshRooms(List<ApiInspectionPointDataVo> inspectionPoints) {
        List<String> roomIds = new ArrayList<String>();
@@ -210,7 +255,7 @@
        //根据 userId 查询用户信息
        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);

        for (ApiInspectionPointDataVo inspectionPointDataVo: tmpInspectionPoint) {
        for (ApiInspectionPointDataVo inspectionPointDataVo : tmpInspectionPoint) {
            for (RoomDto tmpRoomDto : roomDtos) {
                if (inspectionPointDataVo.getLocationObjId().equals(tmpRoomDto.getRoomId())) {
                    inspectionPointDataVo.setLocationObjName(tmpRoomDto.getFloorNum() + "栋" + tmpRoomDto.getUnitNum() + "单元" + tmpRoomDto.getRoomNum() + "室");

 Api/src/main/java/com/java110/api/listener/machineTranslate/MachineGetFreeParkingSpaceListener.java

@@ -103,7 +103,9 @@
        }
        OwnerCarDto ownerCarDto = new OwnerCarDto();
        ownerCarDto.setCommunityId(communityId);
        ownerCarDto.setCarNums(carNums.toArray(new String[carNums.size()]));
        if(!carNums.isEmpty()) {
            ownerCarDto.setCarNums(carNums.toArray(new String[carNums.size()]));
        }
        List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);

        List<String> psIds = new ArrayList<>();

 Api/src/main/java/com/java110/api/listener/room/ExitRoomListener.java

@@ -84,6 +84,9 @@
        //添加单元信息
        businesses.add(exitRoom(paramObj, dataFlowContext));

        paramObj.put("state","2002");
        //修改房屋状态
        businesses.add(roomBMOImpl.updateRoom(paramObj,dataFlowContext));

        //删除费用信息
        businesses.add(exitPropertyFee(paramObj, dataFlowContext));
@@ -127,6 +130,8 @@
        return business;
    }



    /**
     * 删除物业费用信息
     *

 CommunityService/src/main/java/com/java110/community/dao/IInspectionServiceDao.java

@@ -78,4 +78,18 @@
     */
    int queryInspectionsCount(Map info);

    /**
     * 查询巡检点数量
     * @param info 巡检点信息
     * @return 巡检点数量
     */
    public int queryInspectionsRelationShipCount(Map info);
    /**
     * 查询巡检点信息（instance）
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    public List<Map> getInspectionRelationShipInfo(Map info) throws DAOException ;

}

 CommunityService/src/main/java/com/java110/community/dao/impl/InspectionServiceDaoImpl.java

@@ -125,5 +125,37 @@
        return Integer.parseInt(businessInspectionInfos.get(0).get("count").toString());
    }

    /**
     * 查询巡检点数量
     * @param info 巡检点信息
     * @return 巡检点数量
     */
    @Override
    public int queryInspectionsRelationShipCount(Map info) {
        logger.debug("查询巡检点数据 入参 info : {}",info);

        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.queryInspectionsRelationShipCount", info);
        if (businessInspectionInfos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(businessInspectionInfos.get(0).get("count").toString());
    }

    /**
     * 查询巡检点信息（instance）
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getInspectionRelationShipInfo(Map info) throws DAOException {
        logger.debug("查询巡检点信息 入参 info : {}",info);

        List<Map> businessInspectionInfos = sqlSessionTemplate.selectList("inspectionServiceDaoImpl.getInspectionRelationShipInfo",info);

        return businessInspectionInfos;
    }


}

 CommunityService/src/main/java/com/java110/community/smo/impl/InspectionInnerServiceSMOImpl.java

@@ -54,6 +54,27 @@
    public int queryInspectionsCount(@RequestBody InspectionDto inspectionDto) {
        return inspectionServiceDaoImpl.queryInspectionsCount(BeanConvertUtil.beanCovertMap(inspectionDto));    }

    @Override
    public List<InspectionDto> getInspectionRelationShip(@RequestBody  InspectionDto inspectionDto) {

        //校验是否传了 分页信息

        int page = inspectionDto.getPage();

        if (page != PageDto.DEFAULT_PAGE) {
            inspectionDto.setPage((page - 1) * inspectionDto.getRow());
        }

        List<InspectionDto> inspections = BeanConvertUtil.covertBeanList(inspectionServiceDaoImpl.getInspectionRelationShipInfo(BeanConvertUtil.beanCovertMap(inspectionDto)), InspectionDto.class);

        return inspections;
    }


    @Override
    public int queryInspectionsRelationShipCount(@RequestBody InspectionDto inspectionDto) {
        return inspectionServiceDaoImpl.queryInspectionsRelationShipCount(BeanConvertUtil.beanCovertMap(inspectionDto));    }

    public IInspectionServiceDao getInspectionServiceDaoImpl() {
        return inspectionServiceDaoImpl;
    }

 FrontService/src/main/java/com/java110/front/components/fee/FeeSummaryComponent.java

File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/FeeSummaryComponent.java
@@ -1,10 +1,8 @@
package com.java110.report.components.fee;
package com.java110.front.components.fee;


import com.java110.core.context.IPageData;
import com.java110.report.smo.fee.IListFeeSummarySMO;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.report.smo.feeType.IFeeTypeSMO;
import com.java110.front.smo.fee.IListFeeSummarySMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;

 FrontService/src/main/java/com/java110/front/components/fee/PayFeeManageComponent.java

File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/PayFeeManageComponent.java
@@ -1,9 +1,9 @@
package com.java110.report.components.fee;
package com.java110.front.components.fee;


import com.java110.core.context.IPageData;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.report.smo.feeType.IFeeTypeSMO;
import com.java110.front.smo.fee.IListPayFeeSMO;
import com.java110.front.smo.feeType.IFeeTypeSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -27,10 +27,11 @@

    /**
     * 查询费用类型
     *
     * @param pd
     * @return
     */
    public ResponseEntity<String> listFeeType(IPageData pd){
    public ResponseEntity<String> listFeeType(IPageData pd) {
        return feeTypeSMOImpl.list(pd);
    }


 FrontService/src/main/java/com/java110/front/components/fee/StaffFeeManageComponent.java

File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/StaffFeeManageComponent.java
@@ -1,10 +1,8 @@
package com.java110.report.components.fee;
package com.java110.front.components.fee;


import com.java110.core.context.IPageData;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.report.smo.fee.IListStaffFeeSMO;
import com.java110.report.smo.feeType.IFeeTypeSMO;
import com.java110.front.smo.fee.IListStaffFeeSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;

 FrontService/src/main/java/com/java110/front/components/fee/TempCarInoutFeeManageComponent.java

File was renamed from ReportComponent/src/main/java/com/java110/report/components/fee/TempCarInoutFeeManageComponent.java
@@ -1,10 +1,9 @@
package com.java110.report.components.fee;
package com.java110.front.components.fee;


import com.java110.core.context.IPageData;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.report.smo.fee.IListTempCarInoutFeeSMO;
import com.java110.report.smo.feeType.IFeeTypeSMO;
import com.java110.front.smo.fee.IListTempCarInoutFeeSMO;
import com.java110.front.smo.feeType.IFeeTypeSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -28,10 +27,11 @@

    /**
     * 查询费用类型
     *
     * @param pd
     * @return
     */
    public ResponseEntity<String> listFeeType(IPageData pd){
    public ResponseEntity<String> listFeeType(IPageData pd) {
        return feeTypeSMOImpl.list(pd);
    }


 FrontService/src/main/java/com/java110/front/smo/fee/IListFeeSummarySMO.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListFeeSummarySMO.java
@@ -1,4 +1,4 @@
package com.java110.report.smo.fee;
package com.java110.front.smo.fee;

import com.java110.core.context.IPageData;
import org.springframework.http.ResponseEntity;

 FrontService/src/main/java/com/java110/front/smo/fee/IListPayFeeSMO.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListPayFeeSMO.java
@@ -1,4 +1,4 @@
package com.java110.report.smo.fee;
package com.java110.front.smo.fee;

import com.java110.core.context.IPageData;
import org.springframework.http.ResponseEntity;

 FrontService/src/main/java/com/java110/front/smo/fee/IListStaffFeeSMO.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListStaffFeeSMO.java
@@ -1,4 +1,4 @@
package com.java110.report.smo.fee;
package com.java110.front.smo.fee;

import com.java110.core.context.IPageData;
import org.springframework.http.ResponseEntity;

 FrontService/src/main/java/com/java110/front/smo/fee/IListTempCarInoutFeeSMO.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/IListTempCarInoutFeeSMO.java
@@ -1,4 +1,4 @@
package com.java110.report.smo.fee;
package com.java110.front.smo.fee;

import com.java110.core.context.IPageData;
import org.springframework.http.ResponseEntity;

 FrontService/src/main/java/com/java110/front/smo/fee/impl/ListFeeSummarySMOImpl.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListFeeSummarySMOImpl.java
@@ -1,11 +1,10 @@
package com.java110.report.smo.fee.impl;
package com.java110.front.smo.fee.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.report.smo.fee.IListFeeSummarySMO;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.front.smo.fee.IListFeeSummarySMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
@@ -47,12 +46,12 @@
        paramIn.put("page", (page - 1) * row);
        paramIn.put("row", page * row);

        if("1001".equals(paramIn.getString("feeSummaryType"))){//日
            paramIn.put("formatStr","%Y-%m-%d");
        }else if("1101".equals(paramIn.getString("feeSummaryType"))){
            paramIn.put("formatStr","%Y-%m");
        }else{
            paramIn.put("formatStr","%Y");
        if ("1001".equals(paramIn.getString("feeSummaryType"))) {//日
            paramIn.put("formatStr", "%Y-%m-%d");
        } else if ("1101".equals(paramIn.getString("feeSummaryType"))) {
            paramIn.put("formatStr", "%Y-%m");
        } else {
            paramIn.put("formatStr", "%Y");
        }

        String apiUrl = "";

 FrontService/src/main/java/com/java110/front/smo/fee/impl/ListPayFeeSMOImpl.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
@@ -1,23 +1,19 @@
package com.java110.report.smo.fee.impl;
package com.java110.front.smo.fee.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.front.smo.fee.IListPayFeeSMO;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;

import java.util.Map;

/**
 * 查询app服务类
@@ -59,7 +55,7 @@
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
        } else if ("6666".equals(paramIn.getString("payObjType"))) {
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
        }else{
        } else {
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
        }


 FrontService/src/main/java/com/java110/front/smo/fee/impl/ListStaffFeeSMOImpl.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListStaffFeeSMOImpl.java
@@ -1,11 +1,10 @@
package com.java110.report.smo.fee.impl;
package com.java110.front.smo.fee.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.report.smo.fee.IListStaffFeeSMO;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.front.smo.fee.IListStaffFeeSMO;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;

 FrontService/src/main/java/com/java110/front/smo/fee/impl/ListTempCarInoutFeeSMOImpl.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListTempCarInoutFeeSMOImpl.java
@@ -1,13 +1,10 @@
package com.java110.report.smo.fee.impl;
package com.java110.front.smo.fee.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.report.smo.fee.IListPayFeeSMO;
import com.java110.report.smo.fee.IListTempCarInoutFeeSMO;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.front.smo.fee.IListTempCarInoutFeeSMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;

 FrontService/src/main/java/com/java110/front/smo/feeType/IFeeTypeSMO.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/feeType/IFeeTypeSMO.java
@@ -1,4 +1,4 @@
package com.java110.report.smo.feeType;
package com.java110.front.smo.feeType;

import com.java110.core.context.IPageData;
import org.springframework.http.ResponseEntity;

 FrontService/src/main/java/com/java110/front/smo/feeType/impl/FeeTypeSMOImpl.java

File was renamed from ReportComponent/src/main/java/com/java110/report/smo/feeType/impl/FeeTypeSMOImpl.java
@@ -1,11 +1,10 @@
package com.java110.report.smo.feeType.impl;
package com.java110.front.smo.feeType.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.report.smo.feeType.IFeeTypeSMO;
import com.java110.front.smo.feeType.IFeeTypeSMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,6 @@
    private RestTemplate restTemplate;



    @Override
    public ResponseEntity<String> list(IPageData pd) {
        validate(pd);
@@ -39,8 +37,8 @@
        reqParam.put("name", "pay_fee");
        reqParam.put("type", "fee_type_cd");
        //拉取数据
        String url=ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam));
        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",url , HttpMethod.GET);
        String url = ServiceConstant.SERVICE_API_URL.concat("/api/dict.queryDict").concat(mapToUrlParam(reqParam));
        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
        return responseEntity;
    }


 ReportComponent/pom.xml

File was deleted

 ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html

File was deleted

 ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js

File was deleted

 ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.html

File was deleted

 ReportComponent/src/main/resources/components/feePackage/feeSummary/feeSummary.js

File was deleted

 ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.html

File was deleted

 ReportComponent/src/main/resources/components/feePackage/staffFeeManage/staffFeeManage.js

File was deleted

 ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.html

File was deleted

 ReportComponent/src/main/resources/components/feePackage/tempCarInoutfee-manage/tempCarInoutFeeManage.js

File was deleted

 ReportComponent/src/main/resources/views/feeSummaryFlow.html

File was deleted

 ReportComponent/src/main/resources/views/payFeeFlow.html

File was deleted

 ReportComponent/src/main/resources/views/staffFeeFlow.html

File was deleted

 ReportComponent/src/main/resources/views/tempCarInoutFeeFlow.html

File was deleted

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

@@ -27,6 +27,7 @@
    private String machineId;
    private String communityId;
    private String inspectionRouteId;
    private String relationship; //1 查询关联的巡检点 0 还未关联巡检点


    private Date createTime;
@@ -147,4 +148,12 @@
    public void setInspectionRouteId(String inspectionRouteId) {
        this.inspectionRouteId = inspectionRouteId;
    }

    public String getRelationship() {
        return relationship;
    }

    public void setRelationship(String relationship) {
        this.relationship = relationship;
    }
}

 java110-core/src/main/java/com/java110/core/smo/inspectionPoint/IInspectionInnerServiceSMO.java

@@ -1,7 +1,9 @@
package com.java110.core.smo.inspectionPoint;

import com.java110.core.feign.FeignConfiguration;
import com.java110.dto.PageDto;
import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,4 +41,10 @@
     */
    @RequestMapping(value = "/queryInspectionsCount", method = RequestMethod.POST)
    int queryInspectionsCount(@RequestBody InspectionDto inspectionDto);

    @RequestMapping(value = "/getInspectionRelationShip", method = RequestMethod.POST)
    public List<InspectionDto> getInspectionRelationShip(@RequestBody  InspectionDto inspectionDto);

    @RequestMapping(value = "/queryInspectionsRelationShipCount", method = RequestMethod.POST)
    public int queryInspectionsRelationShipCount(@RequestBody InspectionDto inspectionDto);
}

 java110-db/src/main/resources/mapper/community/CommunityServiceDaoImplMapper.xml

@@ -339,6 +339,7 @@
        <if test="communityName != null and communityName != '' and needCommunityInfo == true">
            and sc.name like concat('%',#{communityName},'%')
        </if>
        group by ms.community_id
        order by ms.create_time desc
        <if test="page != -1 and page != null">
            limit #{page},#{row}
@@ -366,7 +367,7 @@

    <!-- 查询小区成员  add by wuxw 2018-07-03 -->
    <select id="getCommunityMemberCount" parameterType="Map" resultType="Map">
        select count(1) count
        select ms.community_id,count(1) count
        from s_community_member ms
        <if test="needCommunityInfo == true">
            ,s_community sc,
@@ -424,6 +425,7 @@
        <if test="communityName != null and communityName != '' and needCommunityInfo == true">
            and sc.name like concat('%',#{communityName},'%')
        </if>
        group by ms.community_id
    </select>

    <!-- 查询小区信息 add by wuxw 2018-07-03 -->

 java110-db/src/main/resources/mapper/community/InspectionServiceDaoImplMapper.xml

@@ -7,10 +7,10 @@
    <!-- 保存巡检点信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessInspectionInfo" parameterType="Map">
        insert into business_inspection_point
                (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
            values
                (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
       </insert>
        (inspection_id,machine_id,operate,remark,inspection_name,community_id,b_id)
        values
        (#{inspectionId},#{machineId},#{operate},#{remark},#{inspectionName},#{communityId},#{bId})
    </insert>


    <!-- 查询巡检点信息（Business） add by wuxw 2018-07-03 -->
@@ -48,10 +48,10 @@
    <!-- 保存巡检点信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveInspectionInfoInstance" parameterType="Map">
        insert into
            inspection_point(
                inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
            ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
            business_inspection_point t where 1=1
        inspection_point(
        inspection_id,machine_id,remark,status_cd,inspection_name,community_id,b_id
        ) select t.inspection_id,t.machine_id,t.remark,'0',t.inspection_name,t.community_id,t.b_id from
        business_inspection_point t where 1=1
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
@@ -78,19 +78,20 @@
    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
    <select id="getInspectionInfo" parameterType="Map" resultType="Map">
        select
            t.inspection_id,t.inspection_id inspectionId,t.machine_id,
            t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
            t.inspection_name,t.inspection_name inspectionName,t.community_id,
            t.community_id communityId,t.b_id,t.b_id bId,
            m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id locationObjId,m.machine_id machineId,
            d.name locationTypeName
        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
        t.inspection_name,t.inspection_name inspectionName,t.community_id,
        t.community_id communityId,t.b_id,t.b_id bId,
        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
        locationObjId,m.machine_id machineId,
        d.name locationTypeName
        from inspection_point t
        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
        inner join t_dict d on d.status_cd = m.location_type_cd
        <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
            left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
            and t.status_cd = '0'
            and t.inspection_route_id is null
            and c.status_cd = '0'
            and c.inspection_route_id is null
        </if>
        where 1 =1
        <if test="inspectionId !=null and inspectionId != ''">
@@ -157,8 +158,8 @@
        from inspection_point t
        <if test="inspectionRouteId != null  and  inspectionRouteId != ''">
            left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
            and t.status_cd = '0'
            and t.inspection_route_id is null
            and c.status_cd = '0'
            and c.inspection_route_id is null
        </if>
        where 1 =1
        <if test="inspectionId !=null and inspectionId != ''">
@@ -186,4 +187,98 @@

    </select>


    <!-- 查询巡检点信息 add by wuxw 2018-07-03 -->
    <select id="getInspectionRelationShipInfo" parameterType="Map" resultType="Map">
        select
        t.inspection_id,t.inspection_id inspectionId,t.machine_id,
        t.machine_id machineId,t.remark,t.status_cd,t.status_cd statusCd,
        t.inspection_name,t.inspection_name inspectionName,t.community_id,
        t.community_id communityId,t.b_id,t.b_id bId,
        m.machine_code machineCode,m.machine_name machineName,location_type_cd locationTypeCd,location_obj_id
        locationObjId,m.machine_id machineId,
        d.name locationTypeName
        from inspection_point t
        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
        inner join t_dict d on d.status_cd = m.location_type_cd
        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
        where 1 =1
        <if test="relationship != null  and  relationship == '1'">
            and c.status_cd = '0'
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is not null
        </if>
        <if test="relationship != null  and  relationship == '0'">
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is null
        </if>
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
        <if test="machineCode !=null and machineCode != ''">
            and m.machine_code= #{machineCode}
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="inspectionName !=null and inspectionName != ''">
            and t.inspection_name like concat('%',#{inspectionName},'%')
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
        group by t.inspection_id
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
    </select>

    <!-- 查询巡检点数量 add by wuxw 2018-07-03 -->
    <select id="queryInspectionsRelationShipCount" parameterType="Map" resultType="Map">
        select count(1) count
        from inspection_point t
        inner join machine m on t.machine_id = m.machine_id and m.status_cd = 0
        inner join t_dict d on d.status_cd = m.location_type_cd
        left join inspection_route_point_rel c on t.inspection_id = c.inspection_id
        where 1 =1

        <if test="relationship != null  and  relationship == '1'">
            and c.status_cd = '0'
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is not null
        </if>
        <if test="relationship != null  and  relationship == '0'">
            and c.inspection_route_id = #{inspectionRouteId}
            and c.inspection_id is null
        </if>
        <if test="inspectionId !=null and inspectionId != ''">
            and t.inspection_id= #{inspectionId}
        </if>
        <if test="machineId !=null and machineId != ''">
            and t.machine_id= #{machineId}
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="inspectionName !=null and inspectionName != ''">
            and t.inspection_name= #{inspectionName}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
    </select>

</mapper>

 pom.xml

@@ -35,7 +35,6 @@
        <module>JobService</module>
        <module>CommonService</module>
        <module>ReportService</module>
        <module>ReportComponent</module>
        <module>HardwareAdapationService</module>
        <module>FrontService</module>
    </modules>