人员修改

zss

2024-12-23 0d930cdcf56bb92e67afabf45ec860689baf0282

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -1,6 +1,7 @@
package com.yuanchu.mom.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -53,6 +54,12 @@

    @Autowired
    private DataConfigService dataConfigService;

    @Override
    public List<User> selectUserList() {
        List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().like(User::getDepartLimsId, "1"));
        return users;
    }

    @Override
    public Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter) {
@@ -182,17 +189,12 @@
                .orderBy(false, false, DataConfig::getId));
            list1.addAll(list);
        });
        List<DataConfig> collect = list1.stream().distinct().collect(Collectors.toList());
        // 3、采集，取数据
        Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(list1, device.get(0), entrustCode, sampleCode, ip);
        Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(collect, device.get(0), entrustCode, sampleCode, ip);
        // 4、造循环次数，参与公式计算
        if (ObjectUtils.isNotEmpty(map)) {
            Object result;
            Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map);
//            if (ObjectUtils.isEmpty(device.get(0).getEntrustCode()) && ObjectUtils.isEmpty(device.get(0).getSampleCode())) {
//                result = formulaCalculation(frequency, true);
//            } else {
//                result = formulaCalculation(frequency, false);
//            }
            return Result.success(frequency);
        } else {
            return Result.success(null);