缺失资源接口优化

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.platform.common.tool.ServletRequestTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -88,6 +89,9 @@ public class WhiteController extends CoreBaseController {
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private ISysMenuService sysMenuService;
+
     @Resource(name=CommonConstWords.IMPP_REDIS_RES)
     private ImppRedis redisRes;
 
@@ -519,11 +523,19 @@ public class WhiteController extends CoreBaseController {
         }
     }
 
+    @AnnoIgnoreLog
     @PostMapping(value = "/miss-resource/get")
     @ApiOperation(value = "缺失资源", notes = "缺失资源")
-    public ResultBean getMissResourceByKey(String key,String soft){
+    public ResultBean getMissResourceByKey(String key,String menuCode){
         try {
-            LocaleUtils.saveMissResource(key, AuthUtil.getSessionLanguage().toString(), CommonEnumUtil.SOFT_TYPE.descOf(soft),
+            SysMenu sysMenu = sysMenuService.getSysMenuByCode(menuCode);
+            CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(sysMenu.getSoftType());
+            if(softType == null){
+                softType = CommonEnumUtil.SOFT_TYPE.IMPP;
+            }
+
+            LocaleUtils.saveMissResource(key, AuthUtil.getSessionLanguage().toString(),
+                    softType.getValue(),
                     CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(),
                     CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue());
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -182,12 +182,12 @@ public class SystemInitService implements ISystemInitService {
             } while (pager.hasNext());
 
             for (Map.Entry<String, Map<String, String>> entry : webLangMap.entrySet()) {
-                redisRes.putHashMap(entry.getKey(), entry.getValue());
+                redisRes.putHashMap(entry.getKey(), entry.getValue(),-1);
             }
             LOGGER.info("【加载WEB资源】WEB-语言 已分类缓存完毕");
 
             for (Map.Entry<String, Map<String, String>> entry : webLangSoftMap.entrySet()) {
-                redisRes.putHashMap(entry.getKey(), entry.getValue());
+                redisRes.putHashMap(entry.getKey(), entry.getValue(),-1);
             }
             LOGGER.info("【加载WEB资源】WEB-语言-模块 已分类缓存完毕");
 
@@ -241,7 +241,7 @@ public class SystemInitService implements ISystemInitService {
             } while (pager.hasNext());
 
             for (Map.Entry<String, Map<String, String>> entry : langSoftMap.entrySet()) {
-                redisRes.putHashMap(entry.getKey(), entry.getValue());
+                redisRes.putHashMap(entry.getKey(), entry.getValue(),-1);
             }
             LOGGER.info("【加载资源】模块资源 已分类缓存完毕");
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
@@ -11,8 +10,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
+import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@@ -24,7 +23,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -232,4 +230,11 @@ public class SysMenuService implements ISysMenuService {
         pager = PagerHelper.getPager(pager, sysMenuRDao.findByHqlWhereCount(packBean));
         return new ListPager(sysMenuRDao.findByHqlWherePage(packBean, pager), pager);
     }
+
+    @Override
+    public SysMenu getSysMenuByCode(String code) {
+        return sysMenuRDao.getByProperty(
+                new String[]{"code", "isDeleted", "isValid"},
+                new Object[]{code, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue()});
+    }
 }