mdc ok

yangys

2024-03-31 153d165114fb17722853629dfdc9c1d59b73e439

mdc ok

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.java

@@ -4,6 +4,9 @@
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.core.mp.support.BaseEntityWrapper;
import com.qianwen.core.tool.utils.SpringUtil;
import com.qianwen.smartman.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
@@ -13,7 +16,6 @@
import com.qianwen.smartman.modules.mdc.service.IWorkstationFeedbackService;
import com.qianwen.smartman.modules.mdc.vo.WorkstationFeedBackDetailVO;

/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.class */
public class WorkstationFeedBackDetailWrapper extends BaseEntityWrapper<WorkstationFeedbackDetail, WorkstationFeedBackDetailVO> {
    private static final IWorkstationFeedbackService feedbackService = (IWorkstationFeedbackService) SpringUtil.getBean(IWorkstationFeedbackService.class);
    private static final IEmployeeService employeeService = (IEmployeeService) SpringUtil.getBean(IEmployeeService.class);
@@ -33,6 +35,16 @@
        vo.setEndTime(detail.getEndTime());
        vo.setFeedbackTime(feedback.getFeedbackTime());
        vo.setFeedbackDesc(feedback.getRemark());
        
        Optional.<GlobalWcs>ofNullable(globalWcsService.getByCode(detail.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map(GlobalWcs::getName)
        .ifPresent(vo::setWcsDesc);
        Optional.<Long>ofNullable(feedback.getFeedUser()).map(employeeService::cachedById).map(Employee::getName).ifPresent(vo::setFeedUser);
        Optional.<Long>ofNullable(feedback.getEndFeedUser()).map(employeeService::cachedById).map(Employee::getName).ifPresent(vo::setEndFeedUser);
        Optional.<Workstation>ofNullable(workstationService.getById(feedback.getWorkstationId())).ifPresent(station -> vo.setWorkstationName(station.getName()));
        
        vo.setCanDelete(Boolean.valueOf((!feedback.getStatus().equals(FeedbackStatus.SYNCING) && !feedback.getStatus().equals(FeedbackStatus.WAIT_SYNC))));
      
        /*
        Optional map = Optional.ofNullable(globalWcsService.getByCode(detail.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map((v0) -> {
            return v0.getName();
        });
@@ -62,6 +74,7 @@
            vo.setWorkstationName(station.getName());
        });
        vo.setCanDelete(Boolean.valueOf((feedback.getStatus().equals(FeedbackStatus.SYNCING) || feedback.getStatus().equals(FeedbackStatus.WAIT_SYNC)) ? false : true));
        */
        return vo;
    }
}

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedbackWrapper.java

@@ -6,6 +6,9 @@
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.core.mp.support.BaseEntityWrapper;
import com.qianwen.core.tool.utils.SpringUtil;
import com.qianwen.smartman.modules.cps.entity.Employee;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
@@ -16,7 +19,6 @@
import com.qianwen.smartman.modules.mdc.vo.StatusRecordVO;
import com.qianwen.smartman.modules.mdc.vo.WorkstationFeedBackVO;

/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/wrapper/WorkstationFeedbackWrapper.class */
public class WorkstationFeedbackWrapper extends BaseEntityWrapper<WorkstationFeedback, WorkstationFeedBackVO> {
    private static final IGlobalWcsService globalWcsService = (IGlobalWcsService) SpringUtil.getBean(IGlobalWcsService.class);
    private static final IWorkstationService workstationService = (IWorkstationService) SpringUtil.getBean(IWorkstationService.class);
@@ -29,6 +31,20 @@

    public WorkstationFeedBackVO entityVO(WorkstationFeedback feedback) {
        WorkstationFeedBackVO vo = WorkstationFeedBackConvert.INSTANCE.convert(feedback);
        
        Optional.<GlobalWcs>ofNullable(globalWcsService.getByCode(feedback.getWcs(), GlobalWcsTypeEnum.FEEDBACK))
        .map(GlobalWcs::getName).ifPresent(vo::setWcsDesc);
      Optional.<Workstation>ofNullable(workstationService.getById(feedback.getWorkstationId())).ifPresent(station -> {
            vo.setWorkstationName(station.getName());
            vo.setWorkstationCode(station.getCode());
            vo.setWorkstationAvatar(station.getAvatar());
          });
      Optional.<Employee>ofNullable(employeeService.cachedById(feedback.getFeedUser())).map(Employee::getName)
        .ifPresent(vo::setFeedUser);
      Optional.<GlobalWcs>ofNullable(globalWcsService.getByCode(feedback.getWcs(), GlobalWcsTypeEnum.FEEDBACK))
        .map(GlobalWcs::getName).ifPresent(vo::setWcsDesc);
      
        /*
        Optional map = Optional.ofNullable(globalWcsService.getByCode(feedback.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map((v0) -> {
            return v0.getName();
        });
@@ -48,7 +64,7 @@
            return v0.getName();
        });
        vo.getClass();
        map3.ifPresent(this::setWcsDesc);
        map3.ifPresent(this::setWcsDesc);*/
        vo.setPoint(vo.getEndTime() == null);
        vo.setFeedbackId(feedback.getId());
        return vo;
@@ -60,11 +76,15 @@
        vo.setStartTime(detail.getStartTime());
        vo.setEndTime(detail.getEndTime());
        vo.setWcs(detail.getWcs());
        
        Optional.<GlobalWcs>ofNullable(globalWcsService.getByCode(detail.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map(GlobalWcs::getName).ifPresent(vo::setWcsDesc);
        /*
        Optional map = Optional.ofNullable(globalWcsService.getByCode(detail.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map((v0) -> {
            return v0.getName();
        });
        vo.getClass();
        map.ifPresent(this::setWcsDesc);
        */
        vo.setFeedbackDesc(feedback.getRemark());
        Optional.ofNullable(workstationService.getById(detail.getWorkstationId())).ifPresent(station -> {
            vo.setWorkstationName(station.getName());
@@ -73,11 +93,14 @@
            vo.setWorkstationId(station.getId());
        });
        vo.setFeedbackTime(feedback.getFeedbackTime());
        /*
        Optional map2 = Optional.ofNullable(employeeService.cachedById(feedback.getFeedUser())).map((v0) -> {
            return v0.getName();
        });
        vo.getClass();
        map2.ifPresent(this::setFeedUser);
        map2.ifPresent(this::setFeedUser);*/
        
        Optional.<Employee>ofNullable(employeeService.cachedById(feedback.getFeedUser())).map(Employee::getName).ifPresent(vo::setFeedUser);
        vo.setPoint(feedback.getEndTime() == null);
        return vo;
    }
@@ -106,6 +129,11 @@
    private static void wrapper(final StatusRecordVO vo, final WorkstationFeedback feedback) {
        vo.setFeedbackTime(new Timestamp(feedback.getFeedbackTime().getTime()));
        vo.setWcs(Integer.valueOf(Integer.parseInt(feedback.getWcs())));
        
        Optional.<GlobalWcs>ofNullable(globalWcsService.getByCode(feedback.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map(GlobalWcs::getName).ifPresent(vo::setWcsDesc);
        Optional.<Employee>ofNullable(employeeService.cachedById(feedback.getFeedUser())).map(Employee::getName).map(vo::setFeedUser);
      
        /*
        Optional map = Optional.ofNullable(globalWcsService.getByCode(feedback.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map((v0) -> {
            return v0.getName();
        });
@@ -115,8 +143,8 @@
            return v0.getName();
        });
        vo.getClass();
        map2.map(this::setFeedUser);
        vo.setFeedUserId((Long) Optional.ofNullable(feedback.getEndFeedUser()).orElse(feedback.getFeedUser()));
        map2.map(this::setFeedUser);*/
        vo.setFeedUserId(Optional.ofNullable(feedback.getEndFeedUser()).orElse(feedback.getFeedUser()));
        vo.setHumanFeedback(true);
        vo.setFeedbackId(feedback.getId());
        vo.setFeedbackDesc(feedback.getRemark());