| 
					
				 | 
			
			
				@@ -6,7 +6,7 @@ var JV = require('../rpt_component/Jpc_ValueDefine'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 var Template = require('../models/rpt_template'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 var TemplateData = require('../models/rpt_temp_data'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 var JpcEx = require('../rpt_component/JpcEx'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-var cacheController = require('./cacheController'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+var cache = require('../../../public/cache/cacheUtil'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //统一回调函数 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 var callback = function(req, res, err, data){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -18,7 +18,7 @@ var callback = function(req, res, err, data){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         //res.send({success: true, data: data}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         res.json({success:true, data: data}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 module.exports = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     getReportAllPages: function(req, res){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -31,9 +31,9 @@ module.exports = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (tplData) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         var printCom = JpcEx.createNew(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        var dftControls = cacheController.getCache("common_ctrls"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        var dftFonts = cacheController.getCache("common_fonts"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        var dftStyles = cacheController.getCache("common_styles"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        var dftControls = cache.getCache("common_ctrls"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        var dftFonts = cache.getCache("common_fonts"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        var dftStyles = cache.getCache("common_styles"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         var defProperties = {ctrls: dftControls, fonts: dftFonts, styles: dftStyles}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         printCom.initialize(rptTpl); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         printCom.analyzeData(rptTpl, tplData, defProperties); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -56,5 +56,4 @@ module.exports = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     remove: function(req, res){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+}; 
			 |