add -sap

wujian

2024-10-25 9906e6b188bf2c36dddc0d5adadbf02e69ea3e4b

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java

@@ -1,10 +1,20 @@
package com.jcdm.main.da.paramCollection.controller;

import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.jcdm.common.core.domain.R;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
import com.jcdm.main.da.collectionParamConf.vo.ChartVO;
import com.jcdm.main.da.collectionParamConf.vo.Options;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +47,9 @@
    @Autowired
    private IDaParamCollectionService daParamCollectionService;

    @Resource
    private IDaCollectionParamConfService daCollectionParamConfService;

    /**
     * 查询设备产品过程参数采集列表
     */
@@ -57,6 +70,80 @@
        return getDataTable(list);
    }


    @GetMapping("/queryChart")
    public R queryChart(DaParamCollection daParamCollection)
    {
        if(daParamCollection.getDateConditions()!=null){
            String[] conditions = daParamCollection.getDateConditions();
            daParamCollection.setStartTime(conditions[0]);
            daParamCollection.setEndTime(conditions[1]);
        } else {
            return R.fail("请选择日期范围");
        }
        if (StrUtil.isBlank(daParamCollection.getLocationCode())){
            return R.fail("请输入工位编号");
        }
        if (StrUtil.isBlank(daParamCollection.getParamName())){
            return R.fail("请选择数据类型");
        }
        if (StrUtil.isBlank(daParamCollection.getParamCode())){
            return R.fail("请选择螺栓");
        }
        List<DaParamCollection> list = daParamCollectionService.queryDaParamCollectionListForSearch(daParamCollection);
        String[] array = list.stream().map(DaParamCollection::getParamValue).toArray(String[]::new);
        return R.ok(array);
    }


    @GetMapping("/getSelectOption")
    public R getSelectOption(DaParamCollection daParamCollection){
        ChartVO chartVO = new ChartVO();
        List<Options> locationList = new ArrayList<>();
        List<Options> paramCodeList = new ArrayList<>();
        DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
        if (StrUtil.isBlank(daParamCollection.getLocationCode())){
            List<DaCollectionParamConf> selectOption = daCollectionParamConfService.getSelectOption(daCollectionParamConf);
            List<String> collect = selectOption.stream().map(DaCollectionParamConf::getProcessesCode).distinct().collect(Collectors.toList());
            if (CollUtil.isNotEmpty(collect)){
                for (String s : collect) {
                    Options options = new Options();
                    options.setLabel(s);
                    options.setValue(s);
                    locationList.add(options);
                }
            }
        } else {
            List<DaCollectionParamConf> selectOption2 = daCollectionParamConfService.getSelectOption(daCollectionParamConf);
            List<String> collect = selectOption2.stream().map(DaCollectionParamConf::getProcessesCode).distinct().collect(Collectors.toList());
            if (CollUtil.isNotEmpty(collect)){
                for (String s : collect) {
                    Options options = new Options();
                    options.setLabel(s);
                    options.setValue(s);
                    locationList.add(options);
                }
            }

            daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
            if (StrUtil.isNotBlank(daParamCollection.getParamName())){
                daCollectionParamConf.setCollectParameterName(daParamCollection.getParamName());
                List<DaCollectionParamConf> selectOption = daCollectionParamConfService.getSelectOption(daCollectionParamConf);
                if (CollUtil.isNotEmpty(selectOption)){
                    for (DaCollectionParamConf collectionParamConf : selectOption) {
                        Options options = new Options();
                        options.setLabel(collectionParamConf.getParameterSetName());
                        options.setValue(collectionParamConf.getParameterSetCode());
                        paramCodeList.add(options);
                    }
                }
            }
        }
        chartVO.setLocationList(locationList);
        chartVO.setParamCodeList(paramCodeList);
        return R.ok(chartVO);
    }

    /**
     * 导出设备产品过程参数采集列表
     */