登录

securitycontrol-api/securitycontrol-api-system/src/main/java/com/securitycontrol/system/api/domain/SysUser.java

@@ -95,7 +95,7 @@ public class SysUser extends BaseEntity {
     /**
      * 登录类型
      */
-    private int loginType;
+    private String loginType;
     /**
      * 部门
      */
@@ -131,11 +131,11 @@ public class SysUser extends BaseEntity {
         this.userType = userType;
     }
 
-    public int getLoginType() {
+    public String getLoginType() {
         return loginType;
     }
 
-    public void setLoginType(int loginType) {
+    public void setLoginType(String loginType) {
         this.loginType = loginType;
     }
 

securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysLoginService.java

@@ -72,6 +72,18 @@ public class SysLoginService
             recordLogService.recordLogininfor(username,null,"用户登录","对不起，您的账号：" + username + " 已锁定",1);
             throw new ServiceException("对不起，您的账号：" + username + " 已锁定",201);
         }
+        if(StringUtils.isEmpty(loginType) && !user.getLoginType().contains(Constant.BACK_LOGIN)){
+            throw new ServiceException("对不起，您的账号：" + username + " 无登录后台权限",201);
+        }
+        if(StringUtils.isNotEmpty(loginType) && !user.getLoginType().contains(Constant.SC_SCREEN)){
+            throw new ServiceException("对不起，您的账号：" + username + " 无登录省侧大屏权限",201);
+        }
+        if(StringUtils.isEmpty(loginType) && !user.getLoginType().contains(Constant.SG_SCREEN)){
+            throw new ServiceException("对不起，您的账号：" + username + " 无登录施工大屏权限",201);
+        }
+        if(StringUtils.isEmpty(loginType) && !user.getLoginType().contains(Constant.APP_LOGIN)){
+            throw new ServiceException("对不起，您的账号：" + username + " 无登录APP权限",201);
+        }
         passwordService.validate(user, password);
         Result<List<SysMenu>> menu = remoteUserService.getAllMenuList(user.getUserId()+"", SecurityConstants.INNER);
         list = handleMenuList(menu.getData(),loginType);

securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/constant/Constant.java

@@ -38,6 +38,8 @@ public class Constant {
     public final static String SG_SCREEN = "2";
     public final static String SG_SCREEN_NAME = "施工大屏";
     public final static String SC_SCREEN = "1";
+    public final static String APP_LOGIN = "3";
+    public final static String BACK_LOGIN = "4";
     public final static String SC_SCREEN_NAME = "省侧大屏";
     public final static String ADMINISTRATORS = "administrators";
     public final static String MANAGER = "manager";

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java

@@ -5,6 +5,7 @@ import com.securitycontrol.background.mapper.IDeviceOfBdMapper;
 import com.securitycontrol.background.service.IDeviceOfBdService;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.common.security.utils.ValidatorsUtils;
@@ -64,7 +65,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
                 return AjaxResult.error("边带编码不能重复");
             }
             if (StringUtils.isEmpty(vo.getId())) {
-                String bdId = UUID.randomUUID().toString().replace("-", "");
+                String bdId = IdUtils.getUUId();
                 vo.setId(bdId);
                 vo.setType(1);
                 vo.setCreateTime(DateTimeHelper.getNowTime());
@@ -138,7 +139,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
                 return AjaxResult.error("设备编码不能重复");
             }
             if (StringUtils.isEmpty(vo.getDeviceId())) {
-                String deviceId = UUID.randomUUID().toString().replace("-", "");
+                String deviceId = IdUtils.getUUId();
                 vo.setDeviceId(deviceId);
                 vo.setType(1);
                 vo.setCreateTime(DateTimeHelper.getNowTime());

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/HumanServiceImpl.java

@@ -10,6 +10,7 @@ import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.AesCbcUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.ValidatorsUtils;
 import com.securitycontrol.entity.background.dto.ParamDto;
@@ -65,7 +66,7 @@ public class HumanServiceImpl implements HumanService {
             if (StringUtils.isNotBlank(validResult)) {
                 return AjaxResult.error(validResult);
             }
-            String userId = UUID.randomUUID().toString().replace("-", "");
+            String userId = IdUtils.getUUId();
             List<Map<String, String>> list = mapper.userIsExist(vo);
             if (CollectionUtils.isNotEmpty(list)) {
                 Boolean result = userIsExist(list,vo.getIdNumber());
@@ -101,7 +102,7 @@ public class HumanServiceImpl implements HumanService {
                     delFileId = item.getString("fileId");
                     if (item != null) {
                         ResourceFileVo fileVo = new ResourceFileVo();
-                        String resourceId = UUID.randomUUID().toString().replace("-", "");
+                        String resourceId = IdUtils.getUUId();
                         fileVo.setResourceId(resourceId);
                         fileVo.setFileType(1);
                         fileVo.setFileId(item.getString("fileId"));

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/TeamServiceImpl.java

@@ -4,6 +4,7 @@ import com.securitycontrol.background.mapper.TeamManageMapper;
 import com.securitycontrol.background.service.TeamService;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.AesCbcUtils;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.ValidatorsUtils;
 import com.securitycontrol.entity.background.dto.ParamDto;
@@ -63,7 +64,7 @@ public class TeamServiceImpl implements TeamService {
                 }
             }
             if (StringUtils.isEmpty(vo.getTeamId())) {
-                String teamId = UUID.randomUUID().toString().replace("-", "");
+                String teamId = IdUtils.getUUId();
                 vo.setTeamId(teamId);
                 vo.setType(1);
             } else {

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/VehicleServiceImpl.java

@@ -3,6 +3,7 @@ package com.securitycontrol.background.service.impl;
 
 import com.securitycontrol.background.mapper.VehicleMapper;
 import com.securitycontrol.background.service.VehicleService;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.entity.background.dto.VehicleDto;
 import com.securitycontrol.entity.background.vo.VehicleVo;
 
@@ -55,7 +56,7 @@ public class VehicleServiceImpl implements VehicleService {
     public AjaxResult addOrUpdateVehicle(VehicleVo vo) {
         try {
             if (StringUtils.isEmpty(vo.getId())) {
-                String ids = UUID.randomUUID().toString().replace("-", "");
+                String ids = IdUtils.getUUId();
                 vo.setId(ids);
                 vo.setType(1);
             } else {

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java

@@ -3,6 +3,7 @@ package com.securitycontrol.system.base.service.impl;
 import com.securitycontrol.common.core.constant.Constant;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.ValidatorsUtils;
 import com.securitycontrol.entity.system.base.dto.GxPlanDto;
@@ -117,7 +118,7 @@ public class ProScheduleServiceImpl implements IProScheduleService {
             }
             // 填报工序计划
             vo.setCreateTime(DateTimeHelper.getNowDate());
-            String progressId = UUID.randomUUID().toString().replace("-", "");
+            String progressId = IdUtils.getUUId();
             vo.setProgressId(progressId);
             mapper.addGxPlanProgress(vo);
             // 工程为线路时 更新杆塔当前工序

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java

@@ -10,6 +10,7 @@ import com.securitycontrol.common.core.domain.Result;
 import com.securitycontrol.common.core.utils.ImportExcelUtils;
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.ValidatorsUtils;
 import com.securitycontrol.entity.system.base.dto.GxPlanDto;
@@ -89,7 +90,7 @@ public class ProServiceImpl implements IProService {
             if (StringUtils.isNotBlank(validResult)) {
                 return AjaxResult.error(validResult);
             }
-            String proId = UUID.randomUUID().toString().replace("-", "");
+            String proId = IdUtils.getUUId();
             int result = mapper.proIsExist(vo);
             if (result > 0) {
                 return AjaxResult.error("标段编码已存在");
@@ -124,7 +125,7 @@ public class ProServiceImpl implements IProService {
                         if (item != null) {
                             uploadFiles.add(item.getString("fileId"));
                             ResourceFileVo fileVo = new ResourceFileVo();
-                            String resourceId = UUID.randomUUID().toString().replace("-", "");
+                            String resourceId = IdUtils.getUUId();
                             fileVo.setResourceId(resourceId);
                             fileVo.setFileType(1);
                             fileVo.setFileId(item.getString("fileId"));
@@ -436,7 +437,7 @@ public class ProServiceImpl implements IProService {
     }
 
     public ProImportVo setProData(ProImportVo vo, JSONObject obj) {
-        String proId = UUID.randomUUID().toString().replace("-", "");
+        String proId = IdUtils.getUUId();
         vo.setProId(proId);
         vo.setOrg(getBuildCode(obj.getString("org")));
         vo.setBidCode(obj.getString("bidCode"));
@@ -482,7 +483,7 @@ public class ProServiceImpl implements IProService {
 
     public ResourceFileVo setResourceData(JSONObject item, String proId, int type) {
         ResourceFileVo fileVo = new ResourceFileVo();
-        String resourceId = UUID.randomUUID().toString().replace("-", "");
+        String resourceId = IdUtils.getUUId();
         fileVo.setResourceId(resourceId);
         fileVo.setFileType(1);
         fileVo.setFileId(item.getString("fileId"));
@@ -547,7 +548,7 @@ public class ProServiceImpl implements IProService {
                 }
             }
             if (StringUtils.isEmpty(vo.getPlanId())) {
-                String gxPlanId = UUID.randomUUID().toString().replace("-", "");
+                String gxPlanId = IdUtils.getUUId();
                 vo.setPlanId(gxPlanId);
                 vo.setType(1);
             } else {

securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/TeamQuEvalServiceImpl.java

@@ -2,6 +2,7 @@ package com.securitycontrol.system.base.service.impl;
 
 import com.securitycontrol.common.core.utils.StringUtils;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
+import com.securitycontrol.common.core.utils.uuid.IdUtils;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.entity.system.base.dto.TeamQuEvalDto;
@@ -50,7 +51,7 @@ public class TeamQuEvalServiceImpl implements ITeamQuEvalService {
                 vo.setEvaluator(SecurityUtils.getLoginUser().getSysUser().getUserName());
             }
             if (StringUtils.isEmpty(vo.getEvalId())) {
-                String evalId = UUID.randomUUID().toString().replace("-", "");
+                String evalId = IdUtils.getUUId();
                 vo.setEvalId(evalId);
                 vo.setType(1);
                 vo.setEvalTime(DateTimeHelper.getNowTime());