瀏覽代碼

系统设置bug修改

wangzhengliang 3 年之前
父節點
當前提交
a2c6b023f3

+ 3 - 3
src/main/java/com/chuanghai/ihotel/aop/LoginCheckAspect.java

@@ -40,11 +40,11 @@ public class LoginCheckAspect {
     @Around("@annotation(com.chuanghai.ihotel.anno.AdminLoginCheck)")
     public Object adminLoginCheck(ProceedingJoinPoint point) throws Throwable {
         Claims claims = validateToken("admin_token");
-        Long adminId = Long.valueOf((String) claims.get("admin_id"));
-        if (adminId == null) {
+        Object adminIdStr = claims.get("admin_id");
+        if (adminIdStr == null) {
             throw new RRException(BizCodeEnume.TOKEN_INVALID);
         }
-
+        Long adminId = Long.valueOf((String) adminIdStr);
         LoginUserDTO loginUserVO = LoginUserDTO.builder().adminId(adminId).build();
 
         Object proceed;

+ 2 - 2
src/main/java/com/chuanghai/ihotel/controller/SystemSettingController.java

@@ -34,7 +34,7 @@ public class SystemSettingController {
      */
     @AdminLoginCheck
     @GetMapping("/info")
-    public CommonResult<SystemSettingEntity> list(@RequestHeader("admin_token")String adminToken){
+    public CommonResult<SystemSettingEntity> get(@RequestHeader("admin_token")String adminToken){
         SystemSettingEntity systemSettingEntity = systemSettingService.get();
 
         return CommonResult.ok().setResult(systemSettingEntity);
@@ -47,7 +47,7 @@ public class SystemSettingController {
     @ParamCheck
     @PutMapping("/update")
     public CommonResult<String> update(@RequestHeader("admin_token")String adminToken, @RequestBody SystemSettingEntity systemSetting){
-		boolean flag = systemSettingService.updateById(systemSetting);
+		boolean flag = systemSettingService.myUpdate(systemSetting);
 
 		if (flag) {
             return CommonResult.ok();

+ 2 - 0
src/main/java/com/chuanghai/ihotel/service/SystemSettingService.java

@@ -21,5 +21,7 @@ public interface SystemSettingService extends IService<SystemSettingEntity> {
      * @return
      */
     SystemSettingEntity get();
+
+    boolean myUpdate(SystemSettingEntity systemSetting);
 }
 

+ 7 - 2
src/main/java/com/chuanghai/ihotel/service/impl/SystemSettingServiceImpl.java

@@ -9,6 +9,7 @@ import com.chuanghai.ihotel.common.utils.PageUtils;
 import com.chuanghai.ihotel.dao.SystemSettingDao;
 import com.chuanghai.ihotel.entity.SystemSettingEntity;
 import com.chuanghai.ihotel.service.SystemSettingService;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -16,8 +17,6 @@ import org.springframework.stereotype.Service;
 @Service("systemSettingService")
 public class SystemSettingServiceImpl extends ServiceImpl<SystemSettingDao, SystemSettingEntity> implements SystemSettingService {
 
-
-
     @Override
     public PageUtils queryPage(PageParam pageParam) {
         IPage<SystemSettingEntity> page = this.page(
@@ -34,4 +33,10 @@ public class SystemSettingServiceImpl extends ServiceImpl<SystemSettingDao, Syst
         SystemSettingEntity systemSetting = this.getOne(null);
         return systemSetting;
     }
+
+    @CacheEvict(value = "systemSetting", allEntries = true)
+    @Override
+    public boolean myUpdate(SystemSettingEntity systemSetting) {
+        return this.updateById(systemSetting);
+    }
 }