处理产线权限用户划分功能

imcs-admin-boot/imcs-authority-entity/src/main/java/com/github/zuihou/authority/dto/auth/LoginParamDTO.java

@@ -60,4 +60,10 @@ public class LoginParamDTO {
      */
     @ApiModelProperty(value = "扫码登录选中的上下料站")
     private Long stationResourceId;
+
+    /**
+     * 登录用户绑定产线区间
+     */
+    @ApiModelProperty(value = "登录用户绑定产线区间")
+    private String zoneType;
 }

imcs-admin-boot/imcs-authority-server/src/main/java/com/github/zuihou/job/DashboardJob.java

@@ -207,6 +207,7 @@ public class DashboardJob {
 
     @Scheduled(cron="0 0/1 * * * ?")
     public void updateExceptionJob(){
+        BaseContextHandler.setTenant("0000");
         List<String> userIds = webSocketServer.getUserIds();
         if(userIds.size()>0) {
             userIds.forEach(item -> {

imcs-admin-boot/imcs-oauth-controller/src/main/java/com/github/zuihou/oauth/controller/OauthController.java

@@ -93,6 +93,14 @@ public class OauthController {
             u.setRoles(roles);
         }
 
+        //产线登录账号隔离处理
+        String zoneType = login.getZoneType();
+        if(!zoneType.equals("1")){
+            if((u.getRoles().indexOf("舱体")>=0 && zoneType.equals("3")) ||
+               (u.getRoles().indexOf("框体")>=0 && zoneType.equals("2"))){
+                return R.fail("该用户不存在，请确认产线或登录账号是否正确");
+            }
+        }
         // 账号密码登录绑定当前登录用户和上下料站的绑定关系
 //        stationLoginInfo(login, userInfo);
         return R.success(u);