station and user disable check Stationlogin first

Fancy

2025-01-09 e54a03e1c3fefef7ec84df6168ff5cf26e53f8cb

station and user disable check Stationlogin first

 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserSv.java

@@ -4,8 +4,10 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoBa.BaUserRoleMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoBa.BaUserRole;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
@@ -17,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -28,7 +31,8 @@
    private BaUserMapper dao;
    @Autowired
    private BaUserRoleMapper urDao;

    @Autowired
    private StaAssemblyWorkLastMapper assemblyWorkLastDao;
    /**
     * 生成指定位数随机数字密码
     *
@@ -134,6 +138,7 @@
     */
    @Transactional
    public int disabled(Long id,Boolean disabled) {
        checkStationLogin(id);
        BaUser user=new BaUser();
        user.id=id;
        user.disabled=disabled;
@@ -178,8 +183,21 @@
     */
    @Transactional
    public int delete(Long id) {
        checkStationLogin(id);
        return this.dao.deleteLogicById(id);
    }


    public void  checkStationLogin(Long id){
        //如果有工站登录信息,则提示先到触屏端登录页面logout
        Map<String, Object> params = new HashMap<>();
        params.put("userId", id);
        List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectSome(params);
        if (workLasts.size() > 0) {
            String stationStr = "(";
            for (StaAssemblyWorkLast workLast:workLasts) {
                stationStr += workLast.getStationName() +",";
            }
            throw new RuntimeException("该用户在"+ stationStr +")工站存在登录信息,请先到触屏端登录页面logout,或联系管理员删除");
        }
    }
}

 pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationSv.java

@@ -6,8 +6,10 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.daoPlt.PltProductionLineMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import lombok.extern.slf4j.Slf4j;
@@ -17,6 +19,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -26,6 +29,7 @@

    private PltStationMapper dao;
    private PltProductionLineMapper lineDao;
    private StaAssemblyWorkLastMapper assemblyWorkLastDao;
//    private static final String stationPrefix = "103" ;
    private static final String DEFAULT_CODE = "0001";
    private static final String CODE_FORMAT = "%04d";
@@ -37,6 +41,10 @@
    @Autowired
    public void setLineDao(PltProductionLineMapper lineDao) {
        this.lineDao = lineDao;
    }
    @Autowired
    public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
        this.assemblyWorkLastDao = assemblyWorkLastDao;
    }

    @Transactional
@@ -84,6 +92,7 @@
     */
    @Transactional
    public int delete(Long id) {
        checkStationLogin(id);
        return this.dao.deleteLogicById(id);
    }

@@ -142,6 +151,7 @@
                throw new RuntimeException("该工站所属生产线已禁用,请先启用该生产线");
            }
        }
        checkStationLogin(id);
        PltStation station = new PltStation();
        station.setId(id);
        station.setDisabled(disabled);
@@ -160,5 +170,18 @@
        });
        return child;
    }
    public void  checkStationLogin(Long id){
        //如果有工站登录信息,则提示先到触屏端登录页面logout
        Map<String, Object> params = new HashMap<>();
        params.put("stationId", id);
        List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectSome(params);
        if (workLasts.size() > 0) {
            String stationStr = "(";
            for (StaAssemblyWorkLast workLast:workLasts) {
                stationStr += workLast.getStationName() +",";
            }
            throw new RuntimeException("该"+ stationStr +")工站存在登录信息,请先到触屏端登录页面logout,或联系管理员删除");
        }
    }
}