修改登录时候校验接口是否授权，修改任务的缓存方法

service/src/main/java/com/hzya/frame/sysnew/integtationTask/service/impl/IntegrationTaskCacheableServiceImpl.java

@@ -40,7 +40,7 @@ public class IntegrationTaskCacheableServiceImpl implements IIntegrationTaskCach
 	}
 
 	@Override
-	@CachePut(cacheNames="IntegrationTask",key = "#entity.id",unless = "#result == null")
+	@CacheEvict(cacheNames="IntegrationTask",key = "#entity.id")
 	public IntegrationTaskEntity updateIntegrationTaskEntity(IntegrationTaskEntity entity) {
 		if(entity.getId() != null && !"".equals(entity.getId())){
 			integrationTaskDao.update(entity);
@@ -65,7 +65,7 @@ public class IntegrationTaskCacheableServiceImpl implements IIntegrationTaskCach
 	}
 
 	@Override
-	@CachePut(cacheNames="IntegrationTaskLiving",key = "#entity.id",unless = "#result == null")
+	@CacheEvict(cacheNames="IntegrationTaskLiving",key = "#entity.id")
 	public IntegrationTaskLivingEntity updateIntegrationTaskLivingEntity(IntegrationTaskLivingEntity entity) {
 		if(entity.getId() != null && !"".equals(entity.getId())){
 			iIntegrationTaskLivingDao.update(entity);
@@ -90,7 +90,7 @@ public class IntegrationTaskCacheableServiceImpl implements IIntegrationTaskCach
 	}
 
 	@Override
-	@CachePut(cacheNames="sysApplicationPlugin",key = "#entity.id",unless = "#result == null")
+	@CacheEvict(cacheNames="sysApplicationPlugin",key = "#entity.id")
 	public SysApplicationPluginEntity updateSysApplicationPluginEntity(SysApplicationPluginEntity entity) {
 		if(entity.getId() != null && !"".equals(entity.getId())){
 			iSysApplicationPluginDao.update(entity);

service/src/main/java/com/hzya/frame/sysnew/login/impl/LoginServiceImpl.java

@@ -6,10 +6,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.sysnew.login.ILoginService;
 import com.hzya.frame.sysnew.organ.dao.ISysOrganDao;
 import com.hzya.frame.sysnew.organ.entity.SysOrganEntity;
+import com.hzya.frame.sysnew.popedomInterface.entity.SysPopedomInterfaceEntity;
+import com.hzya.frame.sysnew.popedomInterface.service.impl.InterfaceCache;
+import com.hzya.frame.sysnew.sysInterface.entity.SysInterfaceEntity;
 import com.hzya.frame.sysnew.user.dao.ISysUserDao;
 import com.hzya.frame.sysnew.user.entity.SysUserEntity;
 import com.hzya.frame.sysnew.userCompany.dao.ISysUserCompanyDao;
 import com.hzya.frame.sysnew.userCompany.entity.SysUserCompanyEntity;
+import com.hzya.frame.sysnew.userRoles.entity.SysUserRolesEntity;
 import com.hzya.frame.util.AESUtil;
 import com.hzya.frame.web.entity.BaseResult;
 import com.hzya.frame.web.entity.JsonResultEntity;
@@ -33,6 +37,8 @@ public class LoginServiceImpl implements ILoginService {
     @Resource
     private ISysOrganDao sysOrganDao;
 
+    @Resource
+    private InterfaceCache interfaceCache;
     /**
      * 登录
      *
@@ -57,6 +63,40 @@ public class LoginServiceImpl implements ILoginService {
         if (sysUserEntity.getId() == null || "".equals(sysUserEntity.getId())) {
             return BaseResult.getFailureMessageEntity("用户名或密码错误");
         }
+        if (sysUserEntity.getState() == null || !"0".equals(sysUserEntity.getState())) {
+            return BaseResult.getFailureMessageEntity("当前用户已停用，请先启用");
+        }
+        //校验当前登陆人是否有权限
+        boolean flag = false;
+        SysInterfaceEntity sysInterfaceEntity = (SysInterfaceEntity) interfaceCache.get("6","beanNameloginServiceinterfacNamedoLogin");
+        if(sysInterfaceEntity == null || sysInterfaceEntity.getId() == null){
+            return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员");
+        }
+        //查询用户权限
+        if(!flag){
+            SysPopedomInterfaceEntity userPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("4","userId"+sysUserEntity.getId()+"interfaceId"+sysInterfaceEntity.getId());
+            if(userPopedomInterfaceEntity != null && userPopedomInterfaceEntity.getId() != null ){
+                flag = true;
+            }
+        }
+        //查询用户角色的权限
+        if(!flag){
+            List<SysUserRolesEntity> userRoleMap = (List<SysUserRolesEntity>) interfaceCache.get("3",null);
+            if(userRoleMap != null && userRoleMap.size() > 0){
+                for (SysUserRolesEntity sysUserRolesEntity : userRoleMap) {
+                    if(sysUserRolesEntity.getUserId().equals(sysUserEntity.getId())){
+                        SysPopedomInterfaceEntity sysPopedomInterfaceEntity = (SysPopedomInterfaceEntity) interfaceCache.get("5","roleId"+sysUserRolesEntity.getRoleId()+"interfaceId"+sysInterfaceEntity.getId());
+                        if(sysPopedomInterfaceEntity != null && sysPopedomInterfaceEntity.getId() != null ){
+                            flag = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if(!flag){
+            return BaseResult.getFailureMessageEntity("用户无访问权限，请联系管理员");
+        }
         //登录
         StpUtil.login(sysUserEntity.getId());
         //获取token