fix：小程序添加流程状态变更

cjl

2023-11-08 0e4aa8d08a3bf8e8683d05081baefdbf96ce080f

 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;
@@ -90,29 +89,25 @@
            for (TimeForm timeForm : tables) {
                String start = timeForm.getStart();
                String end = timeForm.getEnd();
                List<Double> dust = historySecondCruiserMapper.getDust(start, end, mac);
                List<String> dust = historySecondCruiserMapper.getDust(start, end, mac);
                ArrayList<Double> rsDouble = new ArrayList<>();
                for (Double aDouble : dust) {
                    double v =0.0;
                for (String s : dust) {
                    double aDouble = Double.parseDouble(s);

                    if (aDouble>=0 && aDouble<40 ){
                        v = aDouble + 170;
                        aDouble = aDouble + 170;
                    }else if (aDouble>=40 && aDouble<60){
                        aDouble = aDouble + 130;
                    }else if (aDouble>=60 && aDouble<100 ){
                        aDouble = aDouble + 110;
                    }else if (aDouble>=100 && aDouble<150){
                        aDouble = aDouble + 70;
                    }else if (aDouble>=150 && aDouble<180){
                        aDouble = aDouble + 30;
                    }else {
                        aDouble= aDouble+0;
                    }
                    if (aDouble>=40 && aDouble<60 ){
                        v = aDouble + 130;
                    }
                    if (aDouble>=60 && aDouble<100 ){
                        v = aDouble + 110;
                    }
                    if (aDouble>=100 && aDouble<150 ){
                        v = aDouble + 70;
                    }
                    if (aDouble>=150 && aDouble<180 ){
                        v = aDouble + 30;
                    }
                    if (aDouble>=180){
                        v= aDouble;
                    }
                    rsDouble.add(v);
                    rsDouble.add(aDouble);
                }
                list.addAll(rsDouble);
            }
@@ -274,14 +269,21 @@
    private ManageCoordinateMapper manageCoordinateMapper;
    @Autowired
    private MaxRoadMapper maxRoadMapper;
    @Autowired
    private OrganizationMapper organizationMapper;

    @Override
    @Transactional
    public Map<String, Object> dailyDustlds(List<MultipartFile> file,Map<String, Object> params) {
    public Map<String, Object> dailyDustlds(Map<String, Object> params) {

        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);
@@ -290,7 +292,10 @@
        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;
        }
        Set<String> strings = collect.keySet();
        ArrayList<DustForm> list1 = new ArrayList<>();
        //所有的高值路段
@@ -385,14 +390,14 @@
                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);
                }
            }
        }
        rsMap.put("data",builder);
        rsMap.put("data",ObjectUtils.isEmpty(builder)?"暂无高值路段":builder);
        rsMap.put("list3",list3);
        rsMap.put("time",rsTime1+"-"+rsTime2);
        rsMap.put("date1",dateString3.substring(5,10));