logout

Fancy

2024-06-24 d8a629a6f847acd2accbf150b5a341a9a1aed2ae

logout

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

@@ -81,13 +81,24 @@
        return BaseResponseUtils.buildSuccess(list);
    }*/
    /**
     * 查询全部执行中的组装任务清单
     * 保存登录信息
     * @param
     * @return
     */
    @PostMapping(path="save")
    public BaseResponse<Boolean> save(@RequestBody @Valid QueryVo last){
        int count = sv.save(last);
    public BaseResponse<StaAssemblyWorkLast> save(@RequestBody @Valid QueryVo last){
        StaAssemblyWorkLast result = sv.save(last);
        return BaseResponseUtils.buildSuccess(result);
    }

    /**
     * 保存登出信息
     * @param
     * @return
     */
    @PostMapping(path="logout")
    public BaseResponse<Boolean> logout(String id){
        int count = sv.logout(id);
        if (count <= 0) {
            return BaseResponseUtils.buildFail("数据库存储失败");
        } else {

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

@@ -1,10 +1,12 @@
package com.dy.pmsStation.workOrder;

import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkHistoryMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.dyFile.FileOperate;
import com.dy.pmsGlobal.dyFile.FileRestVo;
@@ -14,6 +16,7 @@
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -34,6 +37,7 @@
    private BaUserMapper baUserDao;
    private PltStationMapper pltStationDao;
    private StaAssemblyWorkLastMapper assemblyWorkLastDao;
    private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
    private FileOperate fileOperate;
    private OthFileMapper othFileMapper;
    @Value("${dy.webFile.fmUrl}")
@@ -49,6 +53,10 @@
    @Autowired
    private void setPltStationDao(PltStationMapper pltStationDao){
        this.pltStationDao = pltStationDao;
    }
    @Autowired
    private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao){
        this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
    }
    @Autowired
    private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
@@ -150,7 +158,7 @@
        return result;
    }
    @Transactional
    public int save(QueryVo last) {
    public StaAssemblyWorkLast save(QueryVo last) {
        //先check
        StaAssemblyWorkLast checkResult = checkStationUsed(last);
        //校验planId processId nodeId
@@ -179,6 +187,7 @@
            staLast.setStartTime(new Date());
            count = assemblyWorkLastDao.insertSelective(staLast);
        }else{
            //保存一条history?
            BeanUtils.copyProperties(checkResult,staLast);
            staLast.setPlanId(last.getPlanId());
            staLast.setProcessId(last.getProcessId());
@@ -187,6 +196,29 @@
            staLast.setStartTime(new Date());
            count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
        }
        if (count <= 0) {
            throw new RuntimeException("数据库存储失败");
        }
        StaAssemblyWorkLast result = assemblyWorkLastDao.selectList(staLast).get(0);
        return result;
    }
    @Transactional
    public int logout(String id) {
        //找到登录记录
        StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(id));
        if(workLast == null){
            throw new RuntimeException("系统中没有该条登录信息");
        }
        //更新登录记录
        workLast.setStatus(2);
        workLast.setEndTime(new Date());
        // 保存history
        StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
        BeanUtils.copyProperties(workLast,history);
        history.setId(null);
        int count = assemblyWorkHistoryDao.insertSelective(history);
        //删除last
        assemblyWorkLastDao.deleteByPrimaryKey(Long.parseLong(id));
        return count;
    }
    public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
@@ -213,5 +245,4 @@
        ins.orgName = file.orgName;
        ins.extName = file.extName;
    }

}