Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -129,6 +129,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
 
     private static final String selectCensusApplyTableKey = "selectCensusApplyTable";
 
+    private static final String resourceSelectTotalKey = "resourceSelectTotal";
+
     @Value("${system.startDay}")
     private String systemDay;
 
@@ -666,6 +668,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     }
 
     @Override
+    @Cacheable(value = resourceSelectTotalKey, key = "'totle'")
     public Object selectTotal() {
         HashMap<String, Object> resultMap = new HashMap<>();
         List<Map> re = resourceDao.selectTypeCount(null);
@@ -2313,7 +2316,8 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         x.put("deptType", ucsDept.get("type"));
                         x.put("district", ucsDept.get("district"));
                         x.replace("deptName", ucsDept.get("ucs_name"));
-                    } {
+                    }
+                    {
                         logger.error("未在ucs系统中找到浪潮{}单位对应部门", x.get("deptName").toString());
                         x.put("dept_id", "");
                         x.put("deptType", 2);

renren-admin/src/main/resources/ehcache.xml

@@ -110,4 +110,13 @@
            diskPersistent="true"
            memoryStoreEvictionPolicy="LRU"/>
 
+    <!-- selectTotal缓存 -->
+    <cache name="resourceSelectTotal"
+           maxElementsInMemory="1000"
+           eternal="false"
+           timeToIdleSeconds="15"
+           timeToLiveSeconds="60"
+           overflowToDisk="true"
+           diskPersistent="true"
+           memoryStoreEvictionPolicy="LRU"/>
 </ehcache>