|  | @@ -2,10 +2,7 @@ package com.miniframe.template;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import com.miniframe.core.ext.UtilTools;
 |  |  import com.miniframe.core.ext.UtilTools;
 | 
											
												
													
														|  |  import com.miniframe.model.system.*;
 |  |  import com.miniframe.model.system.*;
 | 
											
												
													
														|  | -import com.miniframe.model.system.dao.DBoundaryMapper;
 |  | 
 | 
											
												
													
														|  | -import com.miniframe.model.system.dao.DNodeValMapper;
 |  | 
 | 
											
												
													
														|  | -import com.miniframe.model.system.dao.DSourceMapper;
 |  | 
 | 
											
												
													
														|  | -import com.miniframe.model.system.dao.DSourceValMapper;
 |  | 
 | 
											
												
													
														|  | 
 |  | +import com.miniframe.model.system.dao.*;
 | 
											
												
													
														|  |  import com.miniframe.tools.XIFileUtils;
 |  |  import com.miniframe.tools.XIFileUtils;
 | 
											
												
													
														|  |  import com.miniframe.tools.XIIniFileUtils;
 |  |  import com.miniframe.tools.XIIniFileUtils;
 | 
											
												
													
														|  |  import freemarker.template.Configuration;
 |  |  import freemarker.template.Configuration;
 | 
											
										
											
												
													
														|  | @@ -164,7 +161,9 @@ public class TemplateGenerator {
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    public static void createFireControl(Integer aid,Integer jid,String totaltime,String dt,String dx,String reportstep,String interactionstep ) throws IOException, TemplateException {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public static void createFireControl(Integer aid,Integer jid,String totaltime,
 | 
											
												
													
														|  | 
 |  | +                                         String dt,String dx,String reportstep,String interactionstep,
 | 
											
												
													
														|  | 
 |  | +    String cocodes) throws IOException, TemplateException {
 | 
											
												
													
														|  |          Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
 |  |          Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
 | 
											
												
													
														|  |          // 设置模板所在目录
 |  |          // 设置模板所在目录
 | 
											
												
													
														|  |          cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
 |  |          cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
 | 
											
										
											
												
													
														|  | @@ -191,6 +190,8 @@ public class TemplateGenerator {
 | 
											
												
													
														|  |          dataModel.put("reportstep",reportstep);
 |  |          dataModel.put("reportstep",reportstep);
 | 
											
												
													
														|  |          dataModel.put("interactionstep",interactionstep);
 |  |          dataModel.put("interactionstep",interactionstep);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |          DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
 |  |          DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
 | 
											
												
													
														|  |          DSourceSQLBuilder dss= new DSourceSQLBuilder();
 |  |          DSourceSQLBuilder dss= new DSourceSQLBuilder();
 | 
											
												
													
														|  |          DSourceSQLBuilder.Criteria dssc = dss.createCriteria();
 |  |          DSourceSQLBuilder.Criteria dssc = dss.createCriteria();
 | 
											
										
											
												
													
														|  | @@ -207,10 +208,20 @@ public class TemplateGenerator {
 | 
											
												
													
														|  |          List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
 |  |          List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
 | 
											
												
													
														|  |          //边界数量
 |  |          //边界数量
 | 
											
												
													
														|  |          dataModel.put("boundarynum", boundaries.size());
 |  |          dataModel.put("boundarynum", boundaries.size());
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -        //TODO 物理量
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +        //物理量
 | 
											
												
													
														|  | 
 |  | +        String[] codes =cocodes.split(",");
 | 
											
												
													
														|  | 
 |  | +        List<String> concodeList =new ArrayList<>();
 | 
											
												
													
														|  | 
 |  | +        for (String concode:codes
 | 
											
												
													
														|  | 
 |  | +             ) {
 | 
											
												
													
														|  | 
 |  | +            concodeList.add(concode);
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  | 
 |  | +        DConMapper conMapper=UtilTools.getBean(DConMapper.class);
 | 
											
												
													
														|  | 
 |  | +        DConSQLBuilder consb =new DConSQLBuilder();
 | 
											
												
													
														|  | 
 |  | +        DConSQLBuilder.Criteria consc = consb.createCriteria();
 | 
											
												
													
														|  | 
 |  | +        consc.andCodeIn(concodeList);
 | 
											
												
													
														|  | 
 |  | +        List<DCon> cons =  conMapper.selectByExample(consb);
 | 
											
												
													
														|  | 
 |  | +        dataModel.put("conNum",cons.size());
 | 
											
												
													
														|  | 
 |  | +        dataModel.put("cons",cons);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          // 将数据模型传入模板进行处理
 |  |          // 将数据模型传入模板进行处理
 | 
											
												
													
														|  |          StringWriter writer = new StringWriter();
 |  |          StringWriter writer = new StringWriter();
 |