Merge remote-tracking branch 'origin/master'

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingChildDayTask.java

文件已删除

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java

@@ -9,6 +9,8 @@
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -138,11 +140,15 @@
        Double value = null;
        switch (ProcessConfDataTypeEnum.getEumByCode(dataType)) {
            case DATAPOINT:
                List<String> points = new ArrayList<>();
                points.add(pointNo);
                Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
                if (pointsRealValue.containsKey(pointNo)) {
                    value = Double.valueOf(pointsRealValue.get(pointNo).toString());
                ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
                queryDTO.setPointNo(pointNo);
                Calendar calendar = Calendar.getInstance();
                queryDTO.setEnd(calendar.getTime());
                calendar.add(Calendar.DAY_OF_YEAR,-1);
                queryDTO.setStart(calendar.getTime());
                List<ApiPointValueDTO> values = dataPointApi.queryPointHistoryValue(queryDTO);
                if (!CollectionUtils.isEmpty(values)) {
                    value = values.get(values.size() - 1).getV();
                }
                break;
            case IND:

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java

@@ -197,11 +197,15 @@
        Double value = null;
        switch (ProcessConfDataTypeEnum.getEumByCode(conf.getDataType())) {
            case DATAPOINT:
                List<String> points = new ArrayList<>();
                points.add(conf.getPointNo());
                Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
                if (pointsRealValue.containsKey(conf.getPointNo())) {
                    value = Double.valueOf(pointsRealValue.get(conf.getPointNo()).toString());
                ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
                queryDTO.setPointNo(conf.getPointNo());
                Calendar calendar = Calendar.getInstance();
                queryDTO.setEnd(calendar.getTime());
                calendar.add(Calendar.DAY_OF_YEAR,-1);
                queryDTO.setStart(calendar.getTime());
                List<ApiPointValueDTO> values = dataPointApi.queryPointHistoryValue(queryDTO);
                if (!CollectionUtils.isEmpty(values)) {
                    value = values.get(values.size() - 1).getV();
                }
                break;
            case IND:

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java

@@ -11,6 +11,8 @@
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,10 +83,16 @@
                String value = "";
                switch (ProcessConfDataTypeEnum.getEumByCode(conf.getDataType())) {
                    case DATAPOINT:
                        List<String> points = new ArrayList<>();
                        points.add(conf.getPointNo());
                        Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
                        value = pointsRealValue.get(conf.getPointNo()).toString();
                        ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
                        queryDTO.setPointNo(conf.getPointNo());
                        Calendar calendar1 = Calendar.getInstance();
                        queryDTO.setEnd(calendar1.getTime());
                        calendar1.add(Calendar.DAY_OF_YEAR,-1);
                        queryDTO.setStart(calendar1.getTime());
                        List<ApiPointValueDTO> values = dataPointApi.queryPointHistoryValue(queryDTO);
                        if (!CollectionUtils.isEmpty(values)) {
                            value = String.valueOf(values.get(values.size() - 1).getV());
                        }
                        break;
                    case IND:
                        List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo());

 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdMonTask.java

文件已删除