优化代码

java110

2020-08-10 e565936a5b9e723529e8dbaa4e2e45316fa896c2

优化代码

 java110-db/src/main/resources/mapper/common/MachineRecordServiceDaoImplMapper.xml

@@ -269,4 +269,15 @@

    </select>

    <select id="getAssetsMachineRecords" parameterType="Map" resultType="Map">
        select DATE_FORMAT(t.create_time,'%m-%d') createTime, count(1) count
        from machine_record t
        where t.status_cd = '0'
        and t.community_id = #{communityId}
        group by DATE_FORMAT(t.create_time,'%Y-%m-%d')
        order by t.create_time desc
        limit 0,7
    </select>


</mapper>

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

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

import com.alibaba.fastjson.JSONArray;
import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.machine.MachineRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
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.RequestParam;

import java.util.List;

@@ -38,4 +40,7 @@
     */
    @RequestMapping(value = "/queryMachineRecordsCount", method = RequestMethod.POST)
    int queryMachineRecordsCount(@RequestBody MachineRecordDto machineRecordDto);

    @RequestMapping(value = "/getAssetsMachineRecords", method = RequestMethod.POST)
    JSONArray getAssetsMachineRecords(@RequestBody String communityId);
}

 service-common/src/main/java/com/java110/common/dao/IMachineRecordServiceDao.java

@@ -73,4 +73,6 @@
     */
    int queryMachineRecordsCount(Map info);

    List<Map> getAssetsMachineRecords(Map info);

}

 service-common/src/main/java/com/java110/common/dao/impl/MachineRecordServiceDaoImpl.java

@@ -130,5 +130,11 @@
        return Integer.parseInt(businessMachineRecordInfos.get(0).get("count").toString());
    }

    @Override
    public List<Map> getAssetsMachineRecords(Map info) {
        List<Map> machineRecordInfos = sqlSessionTemplate.selectList("machineRecordServiceDaoImpl.getAssetsMachineRecords", info);
        return machineRecordInfos;
    }


}

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

@@ -1,18 +1,21 @@
package com.java110.common.smo.impl;


import com.alibaba.fastjson.JSONArray;
import com.java110.common.dao.IMachineRecordServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.intf.common.IMachineRecordInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.intf.common.IMachineRecordInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
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.RestController;

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

/**
 * @ClassName FloorInnerServiceSMOImpl
@@ -54,6 +57,17 @@
        return machineRecordServiceDaoImpl.queryMachineRecordsCount(BeanConvertUtil.beanCovertMap(machineRecordDto));
    }

    @Override
    public JSONArray getAssetsMachineRecords(@RequestBody String communityId) {

        Map<String, Object> info = new HashMap<>();
        info.put("communityId", communityId);

        List<Map> records = machineRecordServiceDaoImpl.getAssetsMachineRecords(info);

        return JSONArray.parseArray(JSONArray.toJSONString(records));
    }

    public IMachineRecordServiceDao getMachineRecordServiceDaoImpl() {
        return machineRecordServiceDaoImpl;
    }

 service-community/src/main/java/com/java110/community/api/BigScreenApi.java

@@ -92,4 +92,17 @@
    public ResponseEntity<String> getAssetInspection(@RequestParam(value = "communityId") String communityId) {
        return queryAssetsInspectionBMOImpl.query(communityId);
    }

    /**
     * 开门
     *
     * @param communityId
     * @return
     * @Service /bigScreen/getAssetOpenDoor
     * @path /app/bigScreen/getAssetOpenDoor
     */
    @RequestMapping(value = "/getAssetOpenDoor", method = RequestMethod.GET)
    public ResponseEntity<String> getAssetOpenDoor(@RequestParam(value = "communityId") String communityId) {
        return queryAssetsInspectionBMOImpl.query(communityId);
    }
}

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

New file
@@ -0,0 +1,16 @@
package com.java110.community.bmo.assets;

import org.springframework.http.ResponseEntity;

/**
 * 资产查询接口类
 */
public interface IQueryAssetsOpenDoorBMO {

    /**
     * 查询资产信息
     * @param communityId
     * @return
     */
    ResponseEntity<String> query(String communityId);
}

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

@@ -41,7 +41,7 @@
        InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
        inspectionTaskDto.setCommunityId(communityId);
        Calendar calendar = Calendar.getInstance();
        calendar.add(Calendar.DATE, -1);
        calendar.add(Calendar.DATE, -2);

        inspectionTaskDto.setTodayPlanInsTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
        List<InspectionTaskDto> inspectionTaskDtos = inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto);

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

New file
@@ -0,0 +1,49 @@
package com.java110.community.bmo.assets.impl;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.community.bmo.assets.IQueryAssetsInspectionBMO;
import com.java110.community.bmo.assets.IQueryAssetsOpenDoorBMO;
import com.java110.dto.inspectionTask.InspectionTaskDto;
import com.java110.intf.common.IMachineRecordInnerServiceSMO;
import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

import java.util.Calendar;
import java.util.Date;
import java.util.List;

@Service
public class QueryAssetsOpenDoorBMOImpl implements IQueryAssetsOpenDoorBMO {
    protected final static Logger logger = LoggerFactory.getLogger(QueryAssetsOpenDoorBMOImpl.class);

    @Autowired
    private IMachineRecordInnerServiceSMO machineRecordInnerServiceSMOImpl;


    /**
     * @param communityId
     * @return {
     * data:{
     * floorCount:30,
     * roomCount:29,
     * parkingSpaceCount:12,
     * machineCount:12
     * }
     * }
     */
    @Override
    public ResponseEntity<String> query(String communityId) {
        JSONArray data = machineRecordInnerServiceSMOImpl.getAssetsMachineRecords(communityId);

        return ResultVo.createResponseEntity(data);
    }


}