优化代码

wuxw

2023-10-31 9ae66b76fa28b1c9106e5da8f8df18fa0610e3e4

优化代码

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

@@ -338,4 +338,21 @@
        </if>
    </select>

    <select id="getCommunityFeeDetailCount" parameterType="Map" resultType="Map">
        select * from (
        select t.community_id communityId,count(1) count,SUM(t.received_amount) receivedAmount from pay_fee_detail t
        where t.status_cd = '0'
        and t.state in ('1000','1400','1200')
        <if test="communityIds !=null ">
            and t.community_id in
            <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        and t.create_time &gt;= #{startTime}
        and t.create_time &lt;= #{endTime}
        group by t.community_id
        ) a order by a.count desc limit 10
    </select>

</mapper>

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

@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.RequestMethod;

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

/**
 * @ClassName IReportFeeStatisticsInnerServiceSMO
@@ -61,4 +62,7 @@

    @RequestMapping(value = "/getOweRoomInfo", method = RequestMethod.POST)
    List<RoomDto> getOweRoomInfo(@RequestBody RoomDto roomDto);

    @RequestMapping(value = "/getCommunityFeeDetailCount", method = RequestMethod.POST)
    List<Map> getCommunityFeeDetailCount(@RequestBody  Map info);
}

 service-report/src/main/java/com/java110/report/cmd/admin/QueryCommunityFeeAndRepairCmd.java

New file
@@ -0,0 +1,124 @@
package com.java110.report.cmd.admin;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.store.StoreDto;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Java110Cmd(serviceCode = "admin.queryCommunityFeeAndRepair")
public class QueryCommunityFeeAndRepairCmd extends Cmd {

    @Autowired
    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;

    @Autowired
    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;

    @Autowired
    private IBaseDataStatistics baseDataStatisticsImpl;

    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {

        String storeId = CmdContextUtils.getStoreId(context);

        StoreDto storeDto = new StoreDto();
        storeDto.setStoreId(storeId);
        storeDto.setStoreTypeCd(StoreDto.STORE_TYPE_ADMIN);
        int count = storeInnerServiceSMOImpl.getStoreCount(storeDto);
        if (count < 1) {
            throw new CmdException("非法操作，请用系统管理员账户操作");
        }

        if (!reqJson.containsKey("startTime")) {
            String startTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B);
            String endTime = startTime + " 23:59:59";
            reqJson.put("startTime", startTime);
            reqJson.put("endTime", endTime);
        }

        String startTime = reqJson.getString("startTime");
        if (StringUtil.isEmpty(startTime)) {
            startTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B);
            String endTime = startTime + " 23:59:59";
            reqJson.put("startTime", startTime);
            reqJson.put("endTime", endTime);
        }
    }

    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {

        CommunityDto communityDto = new CommunityDto();
        communityDto.setPage(1);
        communityDto.setRow(100);
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
        List<Map> datas = null;
        if (communityDtos == null || communityDtos.isEmpty()) {
            datas = new ArrayList<>();
            Map data = new HashMap();
            data.put("communityId", "-1");
            data.put("communityName", "未添加小区");
            data.put("count", 0);
            data.put("receivedAmount", 0);

            datas.add(data);
            context.setResponseEntity(ResultVo.createResponseEntity(datas));
            return;
        }

        List<String> communityIds = new ArrayList<>();
        for (CommunityDto tmpCommunityDto : communityDtos) {
            communityIds.add(tmpCommunityDto.getCommunityId());
        }

        reqJson.put("communityIds", communityIds.toArray(new String[communityIds.size()]));
        datas = baseDataStatisticsImpl.getCommunityFeeDetailCount(reqJson);

        if (datas == null || datas.isEmpty()) {
            datas = new ArrayList<>();
            for (int communityIndex = 0; communityIndex < communityDtos.size(); communityIndex++) {
                if (communityIndex > 9) {
                    continue;
                }
                Map data = new HashMap();
                data.put("communityId", communityDtos.get(communityIndex).getCommunityId());
                data.put("communityName", communityDtos.get(communityIndex).getName());
                data.put("count", 0);
                data.put("receivedAmount", 0);
                datas = new ArrayList<>();
                datas.add(data);
            }
            context.setResponseEntity(ResultVo.createResponseEntity(datas));
            return;
        }

        for (Map data : datas) {
            for (CommunityDto tmpCommunityDto : communityDtos) {
                if (data.get("communityId").equals(tmpCommunityDto.getCommunityId())) {
                    data.put("communityName", tmpCommunityDto.getName());
                }
            }
        }

        context.setResponseEntity(ResultVo.createResponseEntity(datas));
    }
}

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

@@ -49,4 +49,6 @@
     * @return
     */
    List<Map> getOweRoomInfo(Map info);

    List<Map> getCommunityFeeDetailCount(Map info);
}

 service-report/src/main/java/com/java110/report/dao/impl/BaseDataStatisticsServiceDaoImpl.java

@@ -74,4 +74,10 @@
        List<Map> infos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getOweRoomInfo", info);
        return infos;
    }

    @Override
    public List<Map> getCommunityFeeDetailCount(Map info) {
        List<Map> infos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getCommunityFeeDetailCount", info);
        return infos;
    }
}

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

@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

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

@@ -95,4 +96,10 @@
        List<Map> info = baseDataStatisticsServiceDaoImpl.getOweRoomInfo(BeanConvertUtil.beanCovertMap(roomDto));
        return BeanConvertUtil.covertBeanList(info, RoomDto.class);
    }

    @Override
    public List<Map> getCommunityFeeDetailCount(Map info) {
        List<Map> infos = baseDataStatisticsServiceDaoImpl.getCommunityFeeDetailCount(info);
        return infos;
    }
}

 service-report/src/main/java/com/java110/report/statistics/IBaseDataStatistics.java

@@ -7,6 +7,7 @@
import com.java110.dto.report.QueryStatisticsDto;

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

/**
 * 基础数据统计
@@ -89,4 +90,11 @@
    long getOweRoomCount(QueryStatisticsDto queryStatisticsDto);

    List<RoomDto> getOweRoomInfo(QueryStatisticsDto queryStatisticsDto);

    /**
     * 查询小区缴费订单数
     * @param info
     * @return
     */
    List<Map> getCommunityFeeDetailCount(Map info);
}

 service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;

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

/**
 * 基础数据统计类
@@ -222,6 +223,13 @@
        return ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
    }

    @Override
    public List<Map> getCommunityFeeDetailCount(Map info) {

       return baseDataStatisticsInnerServiceSMOImpl.getCommunityFeeDetailCount(info);
    }