Merge branch 'fix/attendance_distinct' into 'develop'

缓存修改——考勤

See merge request o2oa/o2oa!1626

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/CacheUtil.java

@@ -2,6 +2,7 @@ package com.x.attendance.assemble.control;
 
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 
 /**
  * 缓存管理帮助类
@@ -10,7 +11,7 @@ import com.x.base.core.project.cache.ApplicationCache;
 public class CacheUtil {
 	
 	public static <T extends JpaObject> void notify( Class<T> clz ) throws Exception {
-		ApplicationCache.notify( clz );
+		CacheManager.notify( clz );
 	}
 	
 }

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionDelete.java

@@ -6,6 +6,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -30,7 +31,7 @@ public class ActionDelete extends BaseAction {
 				emc.remove(attendanceStatisticalCycle, CheckRemoveType.all);
 				emc.commit();
 
-				ApplicationCache.notify( AttendanceStatisticalCycle.class );
+				CacheManager.notify( AttendanceStatisticalCycle.class );
 
 				result.setData(new Wo(id));
 			}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionSave.java

@@ -15,6 +15,7 @@ import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -82,7 +83,7 @@ public class ActionSave extends BaseAction {
 				}
 				emc.commit();
 
-				ApplicationCache.notify( AttendanceStatisticalCycle.class );
+				CacheManager.notify( AttendanceStatisticalCycle.class );
 
 				result.setData(new Wo(attendanceStatisticalCycle.getId()));
 			} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionDelete.java

@@ -8,6 +8,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -33,7 +34,7 @@ public class ActionDelete extends BaseAction {
 				emc.remove(attendanceWorkDayConfig, CheckRemoveType.all);
 				emc.commit();
 
-				ApplicationCache.notify( AttendanceWorkDayConfig.class );
+				CacheManager.notify( AttendanceWorkDayConfig.class );
 
 				result.setData(new Wo(id));
 			}

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceworkdayconfig/ActionSave.java

@@ -15,6 +15,7 @@ import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -97,7 +98,7 @@ public class ActionSave extends BaseAction {
 							emc.persist(attendanceWorkDayConfig, CheckPersistType.all);
 							emc.commit();
 
-							ApplicationCache.notify( AttendanceWorkDayConfig.class );
+							CacheManager.notify( AttendanceWorkDayConfig.class );
 
 							result.setData(new Wo(attendanceWorkDayConfig.getId()));
 						} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDelete.java

@@ -12,6 +12,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -39,7 +40,7 @@ public class ActionDelete extends BaseAction {
 				emc.commit();
 
 				//清除缓存
-				ApplicationCache.notify( AttendanceSelfHoliday.class );
+				CacheManager.notify( AttendanceSelfHoliday.class );
 
 				result.setData( new Wo(id) );
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDeleteByWfDocId.java

@@ -11,6 +11,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -46,7 +47,7 @@ public class ActionDeleteByWfDocId extends BaseAction {
 						emc.commit();
 
 						//清除缓存
-						ApplicationCache.notify( AttendanceSelfHoliday.class );
+						CacheManager.notify( AttendanceSelfHoliday.class );
 
 						logger.debug( effectivePerson, ">>>>>>>>>>System delete attendanceSelfHoliday success......");
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionSave.java

@@ -14,6 +14,7 @@ import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.cache.ApplicationCache;
+import com.x.base.core.project.cache.CacheManager;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -162,7 +163,8 @@ public class ActionSave extends BaseAction {
 						result.setData( new Wo( attendanceSelfHoliday.getId() ) );
 
 						//清除缓存
-						ApplicationCache.notify( AttendanceSelfHoliday.class );
+						//ApplicationCache.notify( AttendanceSelfHoliday.class );
+						CacheManager.notify(AttendanceSelfHoliday.class);
 
 						//根据员工休假数据来记录与这条数据相关的统计需求记录
 						//new AttendanceDetailAnalyseService().recordStatisticRequireLog( attendanceSelfHoliday );

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceSelfHolidayService.java

@@ -41,7 +41,7 @@ public class AttendanceSelfHolidayService {
 	public List<AttendanceSelfHoliday> listWithPersonFromCache( EntityManagerContainer emc, String person, boolean debugger) throws Exception {
 		//String cacheKey = ApplicationCache.concreteCacheKey( "list#" + person );
 		//Element element = cache_AttendanceSelfHoliday.get(cacheKey);
-		CacheKey cacheKey = new CacheKey("list#" + person);
+		CacheKey cacheKey = new CacheKey(this.getClass(),"list" , person);
 		Optional<?> optional = CacheManager.get(cache_AttendanceSelfHoliday, cacheKey);
 		
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceStatisticalCycleService.java

@@ -37,7 +37,7 @@ public class AttendanceStatisticalCycleService {
 	 * @throws Exception
 	 */
 	public Map<String, Map<String, List<AttendanceStatisticalCycle>>> getAllStatisticalCycleMapWithCache(Boolean debugger) throws Exception {
-		CacheKey cacheKey = new CacheKey("map#all");
+		CacheKey cacheKey = new CacheKey(this.getClass(),"map","all");
 		
 		Map<String, Map<String, List<AttendanceStatisticalCycle>>> statisticalCycleMap = null;
 		Optional<?> optional = CacheManager.get(cache_AttendanceStatisticalCycle, cacheKey);