update login check API

Fancy

2024-06-24 d7c55e6c4d27a1640a8b8dd728aa3201be8c1e57

 pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java

@@ -1,8 +1,6 @@
package com.dy.pmsStation.workOrder;

import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.GlException;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
@@ -15,17 +13,21 @@
import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import com.dy.pmsGlobal.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@Slf4j
@Service
@@ -79,8 +81,6 @@
            throw new RuntimeException("员工编码:"+ userId +"不在系统中,请先维护员工信息");
        }else if(userInfo.getDisabled()){
            throw new RuntimeException("员工("+userInfo.getName()+")编码:"+ userId +"在系统已禁用,请先启用员工");
        }else if(userInfo.getDeleted()){
            throw new RuntimeException("员工("+userInfo.getName()+")编码:"+ userId +"在系统已删除,请先恢复员工信息");
        }
        return userInfo;
    }
@@ -96,66 +96,95 @@
        }else{
            stationId = Long.parseLong(id.toString());
        }
        PltStation record = new PltStation();
        record.setId(stationId);
        List<PltStation> stationInfo = pltStationDao.selectStationList(record);
        if(stationInfo.size() == 0){
        PltStation stationInfo = pltStationDao.selectByPrimaryKey(stationId);
        if(stationInfo == null){
            throw new RuntimeException("工站编码:"+ stationId +"不在系统中,请先维护工站信息");
        }else if(stationInfo.getDisabled()){
            throw new RuntimeException("工站("+stationInfo.getName()+")编码:"+ stationId +"在系统已禁用,请先启用工站");
        }
        return stationInfo;
    }
    public StaAssemblyWorkLast checkStationUsed(QueryVo last){
        StaAssemblyWorkLast result = new StaAssemblyWorkLast();
        PltStation stationInfo = null;
        BaUser userInfo = null;
        if(StringUtils.isBlank(last.getStationId()) || StringUtils.isBlank(last.getUserId())){
            throw new RuntimeException("工站编码或员工编码均不能为空,请检查");
        }
        //工站103
        if(last.getStationId().startsWith("103")){
            stationInfo = getStationInfo(last.getStationId());
        }else{
            userInfo = getUserInfo(last.getStationId());
        }
        if(last.getUserId().startsWith("103")){
            stationInfo = getStationInfo(last.getUserId());
        }else{
            userInfo = getUserInfo(last.getUserId());
        }
        if(userInfo == null && stationInfo == null){
            throw new RuntimeException("员工编码:"+ last.getUserId() + "和工站编码:" + last.getStationId() + "不正确,请检查");
        }else if(userInfo == null){
            throw new RuntimeException("员工编码:"+ last.getUserId() + "不正确,请检查");
        }else if(stationInfo == null){
            throw new RuntimeException("工站编码:" + last.getStationId() + "不正确,请检查");
        }
        //检查表中stationId是否已经存在
        StaAssemblyWorkLast param = new StaAssemblyWorkLast();
        param.setStationId(stationId);
        param.setStationId(stationInfo.getId());
        param.setStatus(1);
        List<StaAssemblyWorkLast> userStationList = assemblyWorkLastDao.selectList(param);
        if(userStationList.size() > 0){
            throw new RuntimeException("员工("+userStationList.get(0).getUserName()+")编码:"+ userStationList.get(0).getUserId() + "已经绑定该工站("+userStationList.get(0).getStationName()+")编码:" + userStationList.get(0).getStationId() + ".请先让其解绑");
        List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
        long userId = userInfo.getId();
        if(workLasts.size() > 0){
            List<StaAssemblyWorkLast>  userStationList =  workLasts.stream().filter(item->userId == item.getUserId()).collect(Collectors.toList());
            if(userStationList.size() == 0){
                throw new RuntimeException("员工("+workLasts.get(0).getUserName()+")编码:"+ workLasts.get(0).getUserId() + "已经绑定该工站("+workLasts.get(0).getStationName()+")编码:" + workLasts.get(0).getStationId() + ".请先让其解绑");
            }else{
                BeanUtils.copyProperties(userStationList.get(0),result);
            }
        }else{
            result.setStationId(stationInfo.getId());
            result.setStationName(stationInfo.getName());
            result.setLineId(stationInfo.getLineId());
        }
        return stationInfo.get(0);
        return result;
    }
    public String checkUserAndStation(QueryVo last){
        String message = "OK";
        Long userId = null;
        Long stationId = null;
        String userMsg ="";// checkUser(last.getUserId());
        String stationMsg = "";//checkStationUsed(last.getStationId());
        //工站103
        if(last.getUserId().startsWith("103")){
            stationId = getStationInfo(last.getUserId()).getId();
    @Transactional
    public int save(QueryVo last) {
        //先check
        StaAssemblyWorkLast checkResult = checkStationUsed(last);
        //校验planId processId nodeId
        PrAssemblyPlan params = new PrAssemblyPlan();
        params.setStatus(1);
        params.setId(last.getPlanId());
        params.setProcessId(last.getProcessId());
        List<PrAssemblyPlan> planList = selectAssyPlanList(params);
        planList.stream().forEach(process -> {
            process.nodes.stream().filter(node -> node.id == last.getNodeId());
        });
        last.setLineId(checkResult.getLineId());
        StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
        BeanUtils.copyProperties(last,staLast);
        staLast.setUserId(checkResult.getUserId());
        staLast.setStationId(checkResult.getStationId());
        int count = 0;
        if(checkResult.getId() == null){
            BeanUtils.copyProperties(last,staLast);
            staLast.setUserId(checkResult.getUserId());
            staLast.setStationId(checkResult.getStationId());
            staLast.setStatus(1);
            staLast.setStartTime(new Date());
            count = assemblyWorkLastDao.insertSelective(staLast);
        }else{
            userId = getUserInfo(last.getUserId()).getId();
            BeanUtils.copyProperties(checkResult,staLast);
            staLast.setPlanId(last.getPlanId());
            staLast.setProcessId(last.getProcessId());
            staLast.setNodeId(last.getNodeId());
            staLast.setStatus(1);
            staLast.setStartTime(new Date());
            count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
        }
        if(last.getStationId().startsWith("103")){
            stationId = getStationInfo(last.getStationId()).getId();
        }else{
            //userMsg = checkUser(last.getStationId());
        }

        if(userMsg.startsWith("FALSE") || stationMsg.startsWith("FALSE")){
            if(userMsg.startsWith("FALSE") && stationMsg.startsWith("FALSE")){
                message = userMsg +","+ stationMsg.split("\\^")[1];
            }else if(userMsg.startsWith("FALSE")){
                message = userMsg;
            }else if(stationMsg.startsWith("FALSE")){
                message = stationMsg;
            }
            return message;
        }else{//根据结果 找到对应的ID值
            if(userMsg.startsWith("USER")){
                userId =  Long.parseLong(userMsg.split("\\^")[1]);
            }else if(userMsg.startsWith("STATION")){
                stationId = Long.parseLong(userMsg.split("\\^")[1]);
            }
            if(stationMsg.startsWith("USER")){
                userId =  Long.parseLong(stationMsg.split("\\^")[1]);
            }else if(stationMsg.startsWith("STATION")){
                stationId = Long.parseLong(stationMsg.split("\\^")[1]);
            }
        }
        if(userId == null || stationId == null){
            message = "FALSE^员工编码:"+ last.getUserId() + "或工站编码:" + last.getStationId() + "不正确,请检查";
            return message;
        }
        return message;
        return count;
    }
    public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
        List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
@@ -182,4 +211,4 @@
        ins.extName = file.extName;
    }

}
}