过程参数，图形展示修改为使用数据点的paramChartType属性来判断

yangys

2024-10-25 f112d1263921940234671e5788f6cf2655dbc353

过程参数，图形展示修改为使用数据点的paramChartType属性来判断

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/cps/service/impl/CalendarServiceImpl.java

@@ -293,7 +293,7 @@
        while (true) {
            long i = j;
            if (i <= difference) {
                LocalDate needHandleDate = year.equals(currentYear) ? LocalDate.now().plus(difference - i, (TemporalUnit) ChronoUnit.DAYS) : LocalDate.of(year.intValue(), 1, 1).plus(difference - i, (TemporalUnit) ChronoUnit.DAYS);
                LocalDate needHandleDate = year.equals(currentYear) ? LocalDate.now().plus(difference - i, ChronoUnit.DAYS) : LocalDate.of(year.intValue(), 1, 1).plus(difference - i, ChronoUnit.DAYS);// (TemporalUnit) ChronoUnit.DAYS
                LocalDate nextNeedHandleDate = needHandleDate.plus(1L, (TemporalUnit) ChronoUnit.DAYS);
                buildCurrentDayTime(dateDTOList, calendarId, year, dateList, offDay, productionCalendarDaytimeList, productionCalendarDayList, shiftDetailMap, snowflake, curProductionCalendarDayTimeList, needHandleDate);
                handleConflietDayTime(calenadar, year, productionCalendarDaytimeList, todayDateTimeList, curProductionCalendarDayTimeList, difference, i, needHandleDate, nextNeedHandleDate);

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/controller/ProcessParameterController.java

@@ -17,6 +17,7 @@
import com.qianwen.core.tool.api.R;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
import com.qianwen.smartman.modules.mdc.service.IProcessParameterService;
import com.qianwen.smartman.modules.mdc.vo.AllShiftTimeDetail;
@@ -78,9 +79,18 @@
    @GetResource({"/param"})
    @ApiOperation("参数选择")
    @PreAuth
    //TODO è°ƒè¯•æ–°è¿‡ç¨‹å‚数展示后删除
    public R<List<WorkstationWcsDmpDTO>> processParam(@RequestParam("workstationId") String workstationId) {
        return R.data(this.processParameterService.processParam(workstationId));
    }
    
    @ApiOperationSupport(order = RegionCache.VILLAGE_LEVEL)
    @GetResource({"/params"})
    @ApiOperation("展示数据点列表")
    @PreAuth
    public R<List<DatapointDTO>> params(@RequestParam("workstationId") String workstationId) {
        return R.data(this.processParameterService.processParams(workstationId));
    }

    @ApiOperationSupport(order = 6)
    @PostResource({"/excel/export"})

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/dto/DatapointDTO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.qianwen.smartman.modules.mdc.dto;

import java.io.Serializable;
/**
 * æ•°æ®ç‚¹ï¼Œç”¨äºŽèŽ·å–过程参数展示项
 */
public class DatapointDTO implements Serializable {
    private static final long serialVersionUID = -27216320873573146L;

    private String dpLabel;
    private String dpName;
    private Boolean isProcessParam;
    /**
     * å±•ç¤ºå›¾è¡¨ç±»åž‹.”曲线图“（值line）和”分布图“（值distribute）
     */
    private String paramChartType;
    public String getDpLabel() {
        return dpLabel;
    }
    public void setDpLabel(String dpLabel) {
        this.dpLabel = dpLabel;
    }
	
    public String getDpName() {
        return dpName;
    }
    public void setDpName(String dpName) {
        this.dpName = dpName;
    }
    public String getParamChartType() {
        return paramChartType;
    }
    public void setParamChartType(String paramChartType) {
        this.paramChartType = paramChartType;
    }
    public Boolean getIsProcessParam() {
        return isProcessParam;
    }
    public void setIsProcessParam(Boolean isProcessParam) {
        this.isProcessParam = isProcessParam;
    }
    
    
}

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/IProcessParameterService.java

@@ -6,6 +6,7 @@
import com.qianwen.core.oss.model.BladeFile;
import com.qianwen.smartman.modules.cps.dto.WorkstationWcsDmpDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterRealVO;
import com.qianwen.smartman.modules.mdc.dto.ProcessParameterVO;
import com.qianwen.smartman.modules.mdc.entity.WorkstationCollectData;
@@ -28,7 +29,7 @@
    IPage<ProcessParameterRealVO> pageProcessParameter(Query query, ProcessParameterItemSearchVO vo);

    /**
     * èŽ·å–工位的所有采集参数列表
     * èŽ·å–工位的所有采集参数列表,调试完成后需要删除
     * @param workstationId
     * @return
     */
@@ -62,6 +63,13 @@
     * @return
     */
    List<WorkstationCollectData> queryLastParameter(long workstationId);

    /**
     * èŽ·å–工位的所有数据点参数(允许过程参数展示的)
     * @param workstationId å·¥ä½id
     * @return
     */
    List<DatapointDTO> processParams(String workstationId);
    
   
}

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java

@@ -55,6 +55,7 @@
import com.qianwen.smartman.modules.cps.utils.ThrowFun;
import com.qianwen.smartman.modules.cps.vo.ShiftTimeDetailVO;
import com.qianwen.smartman.modules.cps.vo.WorkstationDatapointsVO;
import com.qianwen.smartman.modules.mdc.dto.DatapointDTO;
import com.qianwen.smartman.modules.mdc.dto.GroupWorkDTO;
import com.qianwen.smartman.modules.mdc.dto.NewParamDTO;
import com.qianwen.smartman.modules.mdc.dto.ParamDTO;
@@ -219,6 +220,24 @@
        }
        return dps;
    }
    
    @Override
    public List<DatapointDTO> processParams(String workstationId) {
        //获取展示在过程参数中的变量
        if(ObjectUtil.isEmpty(workstationId)) {
            return Collections.emptyList(); 
        }
        WorkstationDatapointsVO dpVo = dpService.getDatapoints(Long.parseLong(workstationId));
        if(ObjectUtil.isEmpty(dpVo.getDpConfig())) {
            return Collections.emptyList();
        }
        
        //JSONArray dpArrJson = JSONArray.parseArray(dpVo.getDpConfig());
        List<DatapointDTO> list = JSONObject.parseArray(dpVo.getDpConfig(),DatapointDTO.class);
        
        return list.stream().filter(dp -> dp.getIsProcessParam()!=null && dp.getIsProcessParam()).collect(Collectors.toList());
        
    }

    @Override
    public ProParamSheetVO queryProcessParameterSheet(ProcessParameterSearchVO vo, Boolean isFilterProcessParameter) {

 smart-man-boot/src/main/resources/application-dev.yml

@@ -71,7 +71,7 @@
      addresses: http://localhost:8080/xxl-job-admin
    ### xxl-job executor address
    executor:
      appname: phoenix
      appname: smartman
      ip:
      # éƒ¨ç½²39，临时调整 7079ori
      port: 7089