旧代码合并,页面报错修改
This commit is contained in:
parent
e458b4e3cf
commit
fa509f09c8
pom.xml
service/src/main/java/com/hzya/frame
sys
appApi/entity
integrationtask/living/service/impl
sysnew
menuConfig/service/impl
testCaching/service
user/service/impl
6
pom.xml
6
pom.xml
|
@ -319,6 +319,12 @@
|
|||
<artifactId>dom4j</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 缓存-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cache</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
@ -519,7 +519,7 @@
|
|||
a.api_name,
|
||||
a.api_code,
|
||||
a.create_user_id,
|
||||
c.view_name as create_user,
|
||||
c.login_code as create_user,
|
||||
a.create_time
|
||||
from
|
||||
sys_app_api a
|
||||
|
|
|
@ -173,7 +173,7 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
WhereCriterion passwordCondition = new WhereCriterion("", "id", ConditionType.等于.getValue(), StpUtil.getLoginIdAsString(), "", ConnectType.AND);
|
||||
whereList.add(passwordCondition);
|
||||
HashMap<String, Object> userMap = baseDaoUtilImpl.selectOne("sys_user", whereList);
|
||||
integrationTaskLivingDetailsEntity.setProcessor_name(userMap.get("view_name").toString());
|
||||
integrationTaskLivingDetailsEntity.setProcessor_name(userMap.get("login_code").toString());
|
||||
integrationTaskLivingDetailsEntity.setProcessing_time(new Date());
|
||||
integrationTaskLivingDetailsEntity.setNew_state("H");
|
||||
integrationtasklivingdetailsDao.entity_updatebyid(integrationTaskLivingDetailsEntity);
|
||||
|
|
|
@ -69,7 +69,7 @@ public class SysMenuConfigServiceImpl extends BaseService<SysMenuConfigEntity, S
|
|||
|
||||
SysMenuConfigEntity sysMenuConfigEntity = new SysMenuConfigEntity();
|
||||
sysMenuConfigEntity.setUserId(entity.getId());
|
||||
sysMenuConfigEntity.setVisibles("0");
|
||||
//sysMenuConfigEntity.setVisibles("0");
|
||||
List<SysMenuConfigEntity> sysMenuConfigEntities = sysMenuConfigDao.queryUserMenu(sysMenuConfigEntity);
|
||||
|
||||
List<ModuleVo> moduleVos = new ArrayList<>();
|
||||
|
@ -96,11 +96,16 @@ public class SysMenuConfigServiceImpl extends BaseService<SysMenuConfigEntity, S
|
|||
ModuleVo moduleVo = new ModuleVo();
|
||||
moduleVo.setId(sysMenuConfigEntity.getId());
|
||||
moduleVo.setPath(sysMenuConfigEntity.getRoute());
|
||||
moduleVo.setName(sysMenuConfigEntity.getMenuName());
|
||||
moduleVo.setName(sysMenuConfigEntity.getMenuEnglishName());
|
||||
moduleVo.setComponent(sysMenuConfigEntity.getMenuPage());
|
||||
JSONObject meta = new JSONObject();
|
||||
meta.put("title", sysMenuConfigEntity.getMenuName());
|
||||
meta.put("icon", sysMenuConfigEntity.getMenuIcon());
|
||||
if("0".equals(sysMenuConfigEntity.getVisibles())){
|
||||
meta.put("hidden", false);
|
||||
}else {
|
||||
meta.put("hidden", true);
|
||||
}
|
||||
moduleVo.setMeta(meta);
|
||||
List<ModuleVo> children = new ArrayList<>();
|
||||
for (int i = 0; i < sysMenuConfigEntities.size(); i++) {
|
||||
|
|
|
@ -0,0 +1,17 @@
|
|||
package com.hzya.frame.sysnew.testCaching.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hzya.frame.basedao.service.IBaseService;
|
||||
import com.hzya.frame.sysnew.sysInterface.entity.SysInterfaceEntity;
|
||||
import com.hzya.frame.sysnew.user.entity.SysUserEntity;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
|
||||
/**
|
||||
* 系统接口表(SysInterface)表服务接口
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-04-09 08:53:28
|
||||
*/
|
||||
public interface ITestCachingService {
|
||||
SysUserEntity getEntity(String id);
|
||||
}
|
|
@ -0,0 +1,34 @@
|
|||
package com.hzya.frame.sysnew.testCaching.service.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.hzya.frame.sysnew.testCaching.service.ITestCachingService;
|
||||
import com.hzya.frame.sysnew.user.dao.ISysUserDao;
|
||||
import com.hzya.frame.sysnew.user.entity.SysUserEntity;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class TestCachingServiceImpl implements ITestCachingService {
|
||||
|
||||
@Resource
|
||||
private ISysUserDao sysUserDao;
|
||||
|
||||
/**
|
||||
|
||||
@Cacheable注解说明:
|
||||
@Cacheable声明 当前方法的返回值 放入缓存中,其中要指定缓存的存储位置,以及缓存中保存当前方法返回值对应的名称。
|
||||
上例中value属性描述缓存的存储位置,cacheSpace可以理解为是一个存储空间名
|
||||
key属性描述了缓存中 保存数据的名称,使用#id读取形参中的id值作为缓存名称。
|
||||
使用@Cacheable注解后,执行当前操作,如果发现对应名称在缓存中没有数据,就正常读取数据,然后放入缓存;如果对应名称在缓存中有数据,就终止当前业务方法执行,直接返回缓存中的数据。
|
||||
https://blog.csdn.net/guorui_java/article/details/132592760 不会的可以看看这篇博客
|
||||
**/
|
||||
@Override
|
||||
@Cacheable(value="sysUser",key="#id")
|
||||
public SysUserEntity getEntity(String id) {
|
||||
SysUserEntity sysUserEntity = sysUserDao.get(id);
|
||||
return sysUserEntity;
|
||||
}
|
||||
}
|
|
@ -21,6 +21,7 @@ import com.hzya.frame.sysnew.popedomOperate.dao.ISysPopedomOperateDao;
|
|||
import com.hzya.frame.sysnew.popedomOperate.entity.SysPopedomOperateEntity;
|
||||
import com.hzya.frame.sysnew.sysInterface.dao.ISysInterfaceDao;
|
||||
import com.hzya.frame.sysnew.sysInterface.entity.SysInterfaceEntity;
|
||||
import com.hzya.frame.sysnew.testCaching.service.ITestCachingService;
|
||||
import com.hzya.frame.sysnew.user.entity.JurisdictionDto;
|
||||
import com.hzya.frame.sysnew.user.entity.JurisdictionVo;
|
||||
import com.hzya.frame.sysnew.user.entity.MenuVo;
|
||||
|
@ -57,6 +58,8 @@ public class SysUserServiceImpl extends BaseService<SysUserEntity, String> imple
|
|||
@Resource
|
||||
private ISysUserCompanyDao sysUserCompanyDao;
|
||||
@Resource
|
||||
private ITestCachingService testCachingService;
|
||||
@Resource
|
||||
private ISysUserRolesDao sysUserRolesDao;
|
||||
@Resource
|
||||
private ISysMenuConfigDao sysMenuConfigDao;
|
||||
|
@ -206,6 +209,7 @@ public class SysUserServiceImpl extends BaseService<SysUserEntity, String> imple
|
|||
return BaseResult.getFailureMessageEntity("系统错误");
|
||||
}
|
||||
entity = sysUserDao.get(entity.getId());
|
||||
//entity = testCachingService.getEntity(entity.getId());
|
||||
if (entity == null) {
|
||||
return BaseResult.getFailureMessageEntity("获取用户失败");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue