blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2023-11-13 471f693ac87a6ed6a2b00e93472b025266c0271f 
 screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java


@@ -1,7 +1,10 @@


package com.moral.api.service.impl;






import com.moral.api.exception.BusinessException;


import com.moral.api.mapper.*;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.collections4.CollectionUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.system.ApplicationHome;


import org.springframework.stereotype.Service;


@@ -36,10 +39,6 @@


import com.moral.api.entity.Dustld;


import com.moral.api.entity.ManageCoordinate;


import com.moral.api.entity.MaxRoad;


import com.moral.api.mapper.DustldMapper;


import com.moral.api.mapper.HistorySecondCruiserMapper;


import com.moral.api.mapper.ManageCoordinateMapper;


import com.moral.api.mapper.MaxRoadMapper;


import com.moral.api.pojo.dto.historySecondCruiser.DustldDTO;


import com.moral.api.pojo.dust.DustForm;


import com.moral.api.pojo.dust.TimeForm;


@@ -270,6 +269,8 @@


    private ManageCoordinateMapper manageCoordinateMapper;


    @Autowired


    private MaxRoadMapper maxRoadMapper;


    @Autowired


    private OrganizationMapper organizationMapper;




    @Override


    @Transactional


@@ -278,6 +279,11 @@


        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();


        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");


        Integer orgId = (Integer) orgInfo.get("id");


        String mac = params.get("mac").toString();


        List<Integer> orgList = organizationMapper.orgIdSpecialDevList(orgId,mac);


        if(CollectionUtils.isEmpty(orgList)){


            throw new BusinessException("该设备没有路段组织信息！");


        }


        String time1 = params.get("startTime").toString();


        String dateString1 = DateUtils.stringToDateString(time1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);


        String rsTime1 = dateString1.substring(5, 14);


@@ -286,7 +292,7 @@


        String rsTime2 = dateString2.substring(5, 14);


        HashMap<String, Object> rsMap = new HashMap<>();


        List<Map<String, Object>> dusts = historySecondCruiserMapper.getDusts(params);


        Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgId).stream().collect(Collectors.groupingBy(o -> o.getName()));


        Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgList.get(0)).stream().collect(Collectors.groupingBy(o -> o.getName()));


        if (ObjectUtils.isEmpty(dusts) || ObjectUtils.isEmpty(collect)){


            return null;


        }


@@ -384,9 +390,9 @@


                if (road.getName().equals(dustForm.getRoad())){


                    HashMap<String, Object> map = new HashMap<>();


                    map.put("road",road.getName());


                    map.put("value1",road.getData());


                    map.put("value2",dustForm.getValue());


                    map.put("value3",road.getData()-dustForm.getValue());


                    map.put("value1",String.format("%.2f",road.getData()));


                    map.put("value2",String.format("%.2f",dustForm.getValue()));


                    map.put("value3",String.format("%.2f",road.getData()-dustForm.getValue()));


                    list3.add(map);


                }


            }