Browse Source

纯净版

caizm 1 month ago
parent
commit
2e4437f242
35 changed files with 1 additions and 2523 deletions
  1. 1 1
      profiles/dev/application-dev.properties
  2. 0 73
      src/main/java/com/miniframe/bisiness/es/BES001Service.java
  3. 0 98
      src/main/java/com/miniframe/bisiness/es/ES0001Service.java
  4. 0 146
      src/main/java/com/miniframe/bisiness/es/ES0002Service.java
  5. 0 62
      src/main/java/com/miniframe/bisiness/es/ES0003Service.java
  6. 0 114
      src/main/java/com/miniframe/bisiness/es/ES0004Service.java
  7. 0 80
      src/main/java/com/miniframe/bisiness/es/ES0005Service.java
  8. 0 115
      src/main/java/com/miniframe/bisiness/es/ES0006Service.java
  9. 0 78
      src/main/java/com/miniframe/bisiness/es/ES0007Service.java
  10. 0 67
      src/main/java/com/miniframe/bisiness/es/ES0008Service.java
  11. 0 89
      src/main/java/com/miniframe/bisiness/es/ES0009Service.java
  12. 0 115
      src/main/java/com/miniframe/bisiness/es/ES0010Service.java
  13. 0 111
      src/main/java/com/miniframe/bisiness/es/ES0011Service.java
  14. 0 84
      src/main/java/com/miniframe/bisiness/es/ES0012Service.java
  15. 0 248
      src/main/java/com/miniframe/bisiness/es/ES0013Service.java
  16. 0 84
      src/main/java/com/miniframe/bisiness/es/ES0014Service.java
  17. 0 109
      src/main/java/com/miniframe/bisiness/es/ES0015Service.java
  18. 0 59
      src/main/java/com/miniframe/bisiness/es/ES0016Service.java
  19. 0 62
      src/main/java/com/miniframe/bisiness/es/ES0017Service.java
  20. 0 126
      src/main/java/com/miniframe/bisiness/es/ES0018Service.java
  21. 0 96
      src/main/java/com/miniframe/bisiness/es/ES1001Service.java
  22. 0 23
      src/main/java/com/miniframe/dbtransfer/EsAttDbTransfer.java
  23. 0 23
      src/main/java/com/miniframe/dbtransfer/EsComDbTransfer.java
  24. 0 23
      src/main/java/com/miniframe/dbtransfer/EsDataAttDbTransfer.java
  25. 0 23
      src/main/java/com/miniframe/dbtransfer/EsDataDbTransfer.java
  26. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProComAttDataDbTransfer.java
  27. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProComAttDbTransfer.java
  28. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProComConDbTransfer.java
  29. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProComDbTransfer.java
  30. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProDbTransfer.java
  31. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProJobDbTransfer.java
  32. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProResultKeyDbTransfer.java
  33. 0 23
      src/main/java/com/miniframe/dbtransfer/EsProResultValueDbTransfer.java
  34. 0 196
      src/main/java/com/miniframe/mappers/es/dao/EsMapper.java
  35. 0 34
      src/main/java/com/miniframe/mappers/es/model/ProComAttDto.java

+ 1 - 1
profiles/dev/application-dev.properties

@@ -31,7 +31,7 @@ eureka.instance.health-check-url-path=/monitor/health
 
 #=======================datasource\u914D\u7F6E================================
 spring.datasource.druid.driver-class-name=org.postgresql.Driver
-spring.datasource.druid.url=jdbc:postgresql://192.168.0.131:5432/es
+spring.datasource.druid.url=jdbc:postgresql://192.168.0.131:5432/aircraft-server
 spring.datasource.druid.username=postgres
 spring.datasource.druid.password=postgres
 

+ 0 - 73
src/main/java/com/miniframe/bisiness/es/BES001Service.java

@@ -1,73 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.BES001BaseModel;
-import com.miniframe.generate.comm.es.D_BES001_ROWS_RECODE;
-import com.miniframe.model.system.SysAppcode;
-import com.miniframe.model.system.SysAppcodeSQLBuilder;
-import com.miniframe.model.system.dao.SysAppcodeMapper;
-
-/**
- * 无锡发动机,“基础字典查询”逻辑处理(重新生成不覆盖)。
- */
-public class BES001Service extends BES001BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“基础字典查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String type = this.getA_bes001().getType();
-		SysAppcodeMapper codedao = UtilTools.getBean(SysAppcodeMapper.class);
-		SysAppcodeSQLBuilder csb = new SysAppcodeSQLBuilder();
-		SysAppcodeSQLBuilder.Criteria csc = csb.createCriteria();
-		csc.andCodeTypeEqualTo(type);
-		csb.setOrderByClause("code_order asc");
-		List<SysAppcode> clist = codedao.selectByExample(csb);
-		List<D_BES001_ROWS_RECODE> rows = new ArrayList<>();
-		for (SysAppcode c:clist) {
-			D_BES001_ROWS_RECODE row =new D_BES001_ROWS_RECODE();
-			row.setTag(c.getCodeDesc());
-			row.setVal(c.getCodeValue());
-			row.setType(c.getCodeType());
-			rows.add(row);
-		}
-		this.getD_bes001().setRows(rows);
-
-
-	
-	}
-	
-	/**
-	 * 无锡发动机,“基础字典查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“基础字典查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“基础字典查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 98
src/main/java/com/miniframe/bisiness/es/ES0001Service.java

@@ -1,98 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0001BaseModel;
-import com.miniframe.generate.comm.es.D_ES0001_ROWS_RECODE;
-import com.miniframe.model.es.EsPro;
-import com.miniframe.model.es.dao.EsProMapper;
-import com.miniframe.model.system.SysUser;
-import com.miniframe.model.system.dao.SysUserMapper;
-import com.miniframe.tools.XIDataUtils;
-import com.miniframe.tools.XIDateTimeUtils;
-import com.miniframe.tools.XIUtils;
-import org.apache.commons.lang3.StringUtils;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-/**
- * 无锡发动机,“项目查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES0001Service extends ES0001BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		Integer count =this.getA_es0001().getCount();
-		Integer page =this.getA_es0001().getPage();
-		String searchtag =this.getA_es0001().getSearchtag();
-		String uid = this.getA_eshead().getUserId();
-//		SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
-//		SysUser user = udao.selectByPrimaryKey(uid);
-		EsProMapper proMapper = UtilTools.getBean(EsProMapper.class);
-		Weekend<EsPro> weekend = new Weekend<>(EsPro.class);
-		WeekendCriteria<EsPro, Object> keywordCriteria = weekend.weekendCriteria();
-		if (StringUtils.isNotEmpty(searchtag)) {
-			searchtag ="%"+searchtag+"%";
-			keywordCriteria.orLike(EsPro::getName, searchtag)
-					.orLike(EsPro::getRemark, searchtag);
-		}
-		keywordCriteria.andEqualTo(EsPro::getUid,uid);
-		weekend.orderBy("createTime").desc();
-		int total = proMapper.selectCountByExample(weekend);
-		XIUtils.pageSet(page, count);
-		List<EsPro>  eList = proMapper.selectByExample(weekend);
-		List<D_ES0001_ROWS_RECODE> rows = new ArrayList<>();
-		for (EsPro p :eList) {
-			D_ES0001_ROWS_RECODE row = new D_ES0001_ROWS_RECODE();
-			row.setUid(p.getUid());
-			row.setPid(p.getPid());
-			row.setCreateTime(XIDateTimeUtils.getStrFromDate(p.getCreateTime()));
-			row.setUpdateTime(XIDateTimeUtils.getStrFromDate(p.getUpdateTime()));
-			row.setUname(p.getUname());
-			row.setFlow(p.getFlow());
-			row.setName(p.getName());
-			row.setRemark(p.getRemark());
-			row.setDirsize(p.getSize());
-			row.setKeywords(p.getKeywords());
-			rows.add(row);
-		}
-		this.getD_es0001().setRows(rows);
-		this.getD_es0001().setTotal(total);
-
-	}
-	
-	/**
-	 * 无锡发动机,“项目查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 146
src/main/java/com/miniframe/bisiness/es/ES0002Service.java

@@ -1,146 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0002BaseModel;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.model.es.*;
-import com.miniframe.model.es.dao.*;
-import com.miniframe.model.system.SysUser;
-import com.miniframe.model.system.dao.SysUserMapper;
-import com.miniframe.tools.XIFileUtils;
-import io.netty.util.internal.StringUtil;
-
-/**
- * 无锡发动机,“项目新增修改”逻辑处理(重新生成不覆盖)。
- */
-public class ES0002Service extends ES0002BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目新增修改”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid = this.getA_es0002().getPid();
-		String uid =this.getA_eshead().getUserId();
-		String name =this.getA_es0002().getName();
-		String remark =this.getA_es0002().getRemark();
-		String flow =this.getA_es0002().getFlow();
-		String keywords =this.getA_es0002().getKeywords();
-		SysUserMapper udao = UtilTools.getBean(SysUserMapper.class);
-		SysUser user = udao.selectByPrimaryKey(uid);
-		EsProMapper pdao = UtilTools.getBean(EsProMapper.class);
-		EsPro p;
-		if(StringUtil.isNullOrEmpty(pid)){//新增
-			p =new EsPro();
-			p.setPid(UtilTools.getUUid());
-			p.setCreateTime(new Date());
-			p.setUpdateTime(new Date());
-			p.setUid(uid);
-			p.setUname(user.getNickname());
-			p.setFlow(flow);
-			p.setRemark(remark);
-			p.setName(name);
-			p.setKeywords(keywords);
-			pdao.insert(p);
-			//创建文件路径
-			XIFileUtils.mkdir(XIFileUtils.getRootPathStr());
-			XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es");
-			XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+p.getPid());
-			XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+p.getPid()+"/Calculate");
-			XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+p.getPid()+"/Calculate/Geometry");//几何路径
-
-			//添加模拟数据组件
-			pid = p.getPid();
-			EsComMapper cdao = UtilTools.getBean(EsComMapper.class);
-			EsCom c = cdao.selectByPrimaryKey("-1");//模拟数据组件
-			EsProCom pc =savePc(pid, c, uid);
-			savePca(pid, uid, pc);
-		}else{
-			p = pdao.selectByPrimaryKey(pid);
-			if(p!=null){
-				p.setUpdateTime(new Date());
-				p.setUid(uid);
-				p.setUname(user.getNickname());
-				p.setFlow(flow);
-				p.setRemark(remark);
-				p.setName(name);
-				p.setKeywords(keywords);
-				pdao.updateByPrimaryKey(p);
-			}
-		}
-		this.getD_es0002().setPid(p.getPid());
-	}
-	private void savePca(String pid, String uid, EsProCom pc) {
-		EsProComAttMapper pcadao = UtilTools.getBean(EsProComAttMapper.class);
-		EsAttMapper adao = UtilTools.getBean(EsAttMapper.class);
-		EsAttSQLBuilder asb =new EsAttSQLBuilder();
-		EsAttSQLBuilder.Criteria asc = asb.createCriteria();
-		asc.andComIdEqualTo(pc.getComId());
-		List<EsAtt> atts = adao.selectByExample(asb);
-		for (EsAtt a :atts) {
-			EsProComAtt pca = new EsProComAtt();
-			pca.setPcaId(UtilTools.getUUid());
-			pca.setPid(pid);
-			pca.setPcId(pc.getPcId());
-			pca.setComId(pc.getComId());
-			pca.setAttId(a.getAttId());
-			pca.setUid(uid);
-			Date now = new Date();
-			pca.setUpdateTime(now);
-			pca.setCreateTime(now);
-			pcadao.insert(pca);
-		}
-	}
-
-	private EsProCom savePc(String pid, EsCom c, String uid) {
-		Date now = new Date();
-		EsProCom pc =new EsProCom();
-		pc.setPcId(UtilTools.getUUid());
-		pc.setComId(c.getComId());
-		pc.setUid(uid);
-		pc.setCreateTime(now);
-		pc.setUpdateTime(now);
-		pc.setPid(pid);
-		EsMapper edao = UtilTools.getBean(EsMapper.class);
-		Integer maxser =edao.getProComSer(pid, c.getIdCode());
-		maxser=maxser==null?0:maxser;
-		pc.setSer(maxser+1);
-		pc.setIdCode(c.getIdCode());
-		EsProComMapper pcdao = UtilTools.getBean(EsProComMapper.class);
-		pcdao.insert(pc);
-		return pc;
-	}
-
-	/**
-	 * 无锡发动机,“项目新增修改”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目新增修改”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目新增修改”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 62
src/main/java/com/miniframe/bisiness/es/ES0003Service.java

@@ -1,62 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.nio.file.Paths;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0003BaseModel;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.model.es.dao.EsComMapper;
-import com.miniframe.model.es.dao.EsProMapper;
-import com.miniframe.tools.XIFileUtils;
-
-/**
- * 无锡发动机,“项目删除”逻辑处理(重新生成不覆盖)。
- */
-public class ES0003Service extends ES0003BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目删除”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid = this.getA_es0003().getPid();
-		EsMapper esdao = UtilTools.getBean(EsMapper.class);
-		esdao.deleteEsProComAttData(pid);
-		esdao.deleteEsProComAtt(pid);
-		esdao.deleteEsProComCon(pid);
-		esdao.deletEsProCom(pid);
-		EsProMapper pdao = UtilTools.getBean(EsProMapper.class);
-		XIFileUtils.deleteFolder(Paths.get(XIFileUtils.getRootPathStr()+"/"+pid));
-		pdao.deleteByPrimaryKey(pid);
-	}
-	
-	/**
-	 * 无锡发动机,“项目删除”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目删除”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目删除”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 114
src/main/java/com/miniframe/bisiness/es/ES0004Service.java

@@ -1,114 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.exception.BusinessException;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0004BaseModel;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.model.es.*;
-import com.miniframe.model.es.dao.*;
-import com.miniframe.tools.XIDateTimeUtils;
-import com.miniframe.tools.ali.Data;
-
-import javax.rmi.CORBA.Util;
-
-/**
- * 无锡发动机,“项目添加组件”逻辑处理(重新生成不覆盖)。
- */
-public class ES0004Service extends ES0004BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目添加组件”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid = this.getA_es0004().getPid();
-		String comId = this.getA_es0004().getComId();
-		EsProMapper  pdao = UtilTools.getBean(EsProMapper.class);
-		EsPro p = pdao.selectByPrimaryKey(pid);
-		if(p==null){
-			throw  new BusinessException("ES000005");
-		}
-		EsComMapper cdao = UtilTools.getBean(EsComMapper.class);
-		EsCom c = cdao.selectByPrimaryKey(comId);
-		String uid =this.getA_eshead().getUserId();
-		EsProCom pc =savePc(pid, c, uid);
-		savePca(pid, uid, pc);
-		this.getD_es0004().setPcId(pc.getPcId());
-		this.getD_es0004().setSer(pc.getSer());
-		this.getD_es0004().setIdCode(pc.getIdCode());
-	}
-
-	private void savePca(String pid, String uid, EsProCom pc) {
-		EsProComAttMapper pcadao = UtilTools.getBean(EsProComAttMapper.class);
-		EsAttMapper adao = UtilTools.getBean(EsAttMapper.class);
-		EsAttSQLBuilder asb =new EsAttSQLBuilder();
-		EsAttSQLBuilder.Criteria asc = asb.createCriteria();
-		asc.andComIdEqualTo(pc.getComId());
-		List<EsAtt> atts = adao.selectByExample(asb);
-		for (EsAtt a :atts) {
-			EsProComAtt pca = new EsProComAtt();
-			pca.setPcaId(UtilTools.getUUid());
-			pca.setPid(pid);
-			pca.setPcId(pc.getPcId());
-			pca.setComId(pc.getComId());
-			pca.setAttId(a.getAttId());
-			pca.setUid(uid);
-			Date now = new Date();
-			pca.setUpdateTime(now);
-			pca.setCreateTime(now);
-			pcadao.insert(pca);
-		}
-	}
-
-	private EsProCom savePc(String pid, EsCom c, String uid) {
-		Date now = new Date();
-		EsProCom pc =new EsProCom();
-		pc.setPcId(UtilTools.getUUid());
-		pc.setComId(c.getComId());
-		pc.setUid(uid);
-		pc.setCreateTime(now);
-		pc.setUpdateTime(now);
-		pc.setPid(pid);
-		EsMapper edao = UtilTools.getBean(EsMapper.class);
-		Integer maxser =edao.getProComSer(pid, c.getIdCode());
-		maxser=maxser==null?0:maxser;
-		pc.setSer(maxser+1);
-		pc.setIdCode(c.getIdCode());
-		EsProComMapper pcdao = UtilTools.getBean(EsProComMapper.class);
-		pcdao.insert(pc);
-		return pc;
-	}
-
-	/**
-	 * 无锡发动机,“项目添加组件”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目添加组件”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目添加组件”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 80
src/main/java/com/miniframe/bisiness/es/ES0005Service.java

@@ -1,80 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0005BaseModel;
-import com.miniframe.model.es.*;
-import com.miniframe.model.es.dao.EsProComAttDataMapper;
-import com.miniframe.model.es.dao.EsProComAttMapper;
-import com.miniframe.model.es.dao.EsProComConMapper;
-import com.miniframe.model.es.dao.EsProComMapper;
-
-/**
- * 无锡发动机,“项目删除组件”逻辑处理(重新生成不覆盖)。
- */
-public class ES0005Service extends ES0005BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目删除组件”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pcId = this.getA_es0005().getPcId();
-
-		//删除项目组件属性数值
-		EsProComAttDataMapper pcaddao = UtilTools.getBean(EsProComAttDataMapper.class);
-		EsProComAttDataSQLBuilder pcadsb = new EsProComAttDataSQLBuilder();
-		EsProComAttDataSQLBuilder.Criteria pcadsc = pcadsb.createCriteria();
-		pcadsc.andPcIdEqualTo(pcId);
-		pcaddao.deleteByExample(pcadsb);
-
-		//删除项目组件属性
-		EsProComAttMapper adao = UtilTools.getBean(EsProComAttMapper.class);
-		EsProComAttSQLBuilder asb = new EsProComAttSQLBuilder();
-		EsProComAttSQLBuilder.Criteria asc = asb.createCriteria();
-		asc.andPcIdEqualTo(pcId);
-		adao.deleteByExample(asb);
-
-		//删除链接
-		EsProComConMapper condao = UtilTools.getBean(EsProComConMapper.class);
-		EsProComConSQLBuilder consb = new EsProComConSQLBuilder();
-		EsProComConSQLBuilder.Criteria consc =consb.createCriteria();
-		consc.andPcIdEqualTo(pcId);
-		condao.deleteByExample(consb);
-
-		//删除项目组件
-		EsProComMapper cdao = UtilTools.getBean(EsProComMapper.class);
-		cdao.deleteByPrimaryKey(pcId);
-
-	}
-	
-	/**
-	 * 无锡发动机,“项目删除组件”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目删除组件”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目删除组件”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 115
src/main/java/com/miniframe/bisiness/es/ES0006Service.java

@@ -1,115 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.exception.BusinessException;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0006BaseModel;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProComCon;
-import com.miniframe.model.es.EsProComConSQLBuilder;
-import com.miniframe.model.es.EsProComSQLBuilder;
-import com.miniframe.model.es.dao.EsProComConMapper;
-import com.miniframe.model.es.dao.EsProComMapper;
-import io.netty.util.internal.StringUtil;
-
-/**
- * 无锡发动机,“项目组件连线”逻辑处理(重新生成不覆盖)。
- */
-public class ES0006Service extends ES0006BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目组件连线”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid =this.getA_es0006().getPid();
-		String npcId = this.getA_es0006().getNpcId();
-		String pcId1 = this.getA_es0006().getPcId1();
-		String pcId2 = this.getA_es0006().getPcId2();
-		Integer type =this.getA_es0006().getType();
-		String uid = this.getA_eshead().getUserId();
-		EsProCom  nProcom = findEsProCom(npcId);
-		EsProCom  proCom1 = findEsProCom(pcId1);
-		EsProCom  proCom2 = findEsProCom(pcId2);
-		if(nProcom==null){
-			throw  new BusinessException("ES000006");//节点不存在
-		}
-		if(!nProcom.getComId().equals("3")){//节点不存在
-			throw  new BusinessException("ES000006");
-		}
-		if(proCom1==null){
-			throw  new BusinessException("ES000007");//组件不存在
-		}
-		String pccId1 = savePcc(pid,npcId, uid, pcId1,type);
-		this.getD_es0006().setPccId1(pccId1);
-		if(proCom2!=null){
-			String pccId2 = savePcc(pid,npcId, uid, pcId2,type);
-			this.getD_es0006().setPccId2(pccId2);
-		}
-	}
-
-	private String  savePcc(String pid,String npcId, String uid, String pcId,Integer type) {
-		EsProComConMapper condao = UtilTools.getBean(EsProComConMapper.class);
-		EsProComConSQLBuilder consb = new EsProComConSQLBuilder();
-		EsProComConSQLBuilder.Criteria consc = consb.createCriteria();
-		consc.andPcIdEqualTo(pcId);
-		consc.andNpcIdEqualTo(npcId);
-		consc.andTypeEqualTo(Short.valueOf(type.toString()));
-		List<EsProComCon> comCons = condao.selectByExample(consb);
-		if(comCons==null||comCons.isEmpty()){
-			EsProComCon comCon = new EsProComCon();
-			comCon.setPccId(UtilTools.getUUid());
-			comCon.setNpcId(npcId);
-			comCon.setPcId(pcId);
-			comCon.setUid(uid);
-			comCon.setCreateTime(new Date());
-			comCon.setUpdateTime(new Date());
-			comCon.setType(Short.valueOf(type.toString()));
-			comCon.setPid(pid);
-			condao.insert(comCon);
-			return comCon.getPccId();
-		}else{
-			return comCons.get(0).getPccId();
-		}
-	}
-
-	public EsProCom findEsProCom(String pcid){
-		if(StringUtil.isNullOrEmpty(pcid)){
-			return  null;
-		}
-		EsProComMapper cdao = UtilTools.getBean(EsProComMapper.class);
-		return cdao.selectByPrimaryKey(pcid);
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件连线”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件连线”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件连线”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 78
src/main/java/com/miniframe/bisiness/es/ES0007Service.java

@@ -1,78 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.exception.BusinessException;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0007BaseModel;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProComCon;
-import com.miniframe.model.es.EsProComConSQLBuilder;
-import com.miniframe.model.es.EsProComSQLBuilder;
-import com.miniframe.model.es.dao.EsProComConMapper;
-import com.miniframe.model.es.dao.EsProComMapper;
-
-/**
- * 无锡发动机,“项目组件删除连线”逻辑处理(重新生成不覆盖)。
- */
-public class ES0007Service extends ES0007BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目组件删除连线”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String npcId = this.getA_es0007().getNpcId();
-		String pcId = this.getA_es0007().getPcId();
-		Integer type = this.getA_es0007().getType();
-
-		EsProComMapper cdao = UtilTools.getBean(EsProComMapper.class);
-		EsProCom proCom= cdao.selectByPrimaryKey(pcId);
-		EsProCom nProCom =cdao.selectByPrimaryKey(npcId);
-		if(nProCom==null){
-			throw new BusinessException("");
-		}
-		if(nProCom.getComId()!="3"){
-			throw new BusinessException("");
-		}
-		if(proCom==null){
-			throw new BusinessException("");
-		}
-		EsProComConMapper pccdao =UtilTools.getBean(EsProComConMapper.class);
-		EsProComConSQLBuilder pccsb = new EsProComConSQLBuilder();
-		EsProComConSQLBuilder.Criteria pccsc = pccsb.createCriteria();
-		pccsc.andNpcIdEqualTo(npcId);
-		pccsc.andPcIdEqualTo(pcId);
-		pccsc.andTypeEqualTo(Short.valueOf(type.toString()));
-		pccdao.deleteByExample(pccsb);
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件删除连线”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件删除连线”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件删除连线”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 67
src/main/java/com/miniframe/bisiness/es/ES0008Service.java

@@ -1,67 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Date;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0008BaseModel;
-import com.miniframe.model.es.EsProComAtt;
-import com.miniframe.model.es.dao.EsProComAttMapper;
-
-/**
- * 无锡发动机,“项目组件属性修改”逻辑处理(重新生成不覆盖)。
- */
-public class ES0008Service extends ES0008BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目组件属性修改”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pcavals= this.getA_es0008().getPcavals();
-		EsProComAttMapper cadao = UtilTools.getBean(EsProComAttMapper.class);
-		String[] pcavalobjs = pcavals.split(";");
-		for (String pcavalobj:pcavalobjs) {
-			String[] obj = pcavalobj.split(",");
-			String pcaId=obj[0];
-			String value=obj[1];
-			String unit=obj[2];
-			EsProComAtt ca = cadao.selectByPrimaryKey(pcaId);
-			if(ca!=null){
-				ca.setValue(value);
-				ca.setUnit(unit);
-				ca.setUpdateTime(new Date());
-				cadao.updateByPrimaryKey(ca);
-			}
-		}
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性修改”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性修改”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性修改”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 89
src/main/java/com/miniframe/bisiness/es/ES0009Service.java

@@ -1,89 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.exception.BusinessException;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0009BaseModel;
-import com.miniframe.generate.comm.es.D_ES0009_ROWS_RECODE;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.mappers.es.model.ProComAttDto;
-import com.miniframe.model.es.EsCom;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProComAtt;
-import com.miniframe.model.es.EsProComAttSQLBuilder;
-import com.miniframe.model.es.dao.EsComMapper;
-import com.miniframe.model.es.dao.EsProComAttMapper;
-import com.miniframe.model.es.dao.EsProComMapper;
-
-/**
- * 无锡发动机,“项目组件属性查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES0009Service extends ES0009BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目组件属性查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pcId = this.getA_es0009().getPcId();
-		EsMapper esdao = UtilTools.getBean(EsMapper.class);
-		List<ProComAttDto> dtos = esdao.selectPrComAttList(pcId);
-		List<D_ES0009_ROWS_RECODE> rows = new ArrayList<>();
-		for (ProComAttDto dto:dtos) {
-			D_ES0009_ROWS_RECODE row = new D_ES0009_ROWS_RECODE();
-			row.setPcaId(dto.getPcaId());
-			row.setValue(dto.getValue());
-			row.setUnit(dto.getUnit());
-			row.setUnitType(dto.getUnitType());
-			row.setName(dto.getName());
-			row.setCode(dto.getCode());
-			row.setValueType(dto.getValueType());
-			row.setValueDef(dto.getValueDef());
-			row.setDataType(dto.getDataType()==null?-1: dto.getDataType());
-			rows.add(row);
-		}
-		EsProComMapper pcdao =UtilTools.getBean(EsProComMapper.class);
-		EsProCom pc = pcdao.selectByPrimaryKey(pcId);
-		EsComMapper cdao =UtilTools.getBean(EsComMapper.class);
-		EsCom c = cdao.selectByPrimaryKey(pc.getComId());
-		this.getD_es0009().setComId(c.getComId());
-		this.getD_es0009().setName(c.getName());
-		this.getD_es0009().setPcId(pcId);
-		this.getD_es0009().setSer(pc.getSer());
-		this.getD_es0009().setIdCode(pc.getIdCode());
-
-		this.getD_es0009().setRows(rows);
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 115
src/main/java/com/miniframe/bisiness/es/ES0010Service.java

@@ -1,115 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.*;
-
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.exception.BusinessException;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.appcode.AttValueType;
-import com.miniframe.generate.business.es.model.ES0010BaseModel;
-import com.miniframe.generate.comm.es.D_ES0010_DATAS_RECODE;
-import com.miniframe.generate.comm.es.D_ES0010_DATAS_VALS_RECODE;
-import com.miniframe.generate.comm.es.D_ES0010_HEADERS_RECODE;
-import com.miniframe.model.es.*;
-import com.miniframe.model.es.dao.*;
-import org.apache.tika.io.EndianUtils;
-
-/**
- * 无锡发动机,“项目组件属性值数据查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES0010Service extends ES0010BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目组件属性值数据查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pcaId = this.getA_es0010().getPcaId();
-		EsProComAttMapper pcadao =UtilTools.getBean(EsProComAttMapper.class);
-		EsProComAtt pca = pcadao.selectByPrimaryKey(pcaId);
-		if(pca==null){
-			throw  new BusinessException("ES000001");//项目组件属性不存在
-		}
-		EsAttMapper attdao =UtilTools.getBean(EsAttMapper.class);
-		EsAtt att = attdao.selectByPrimaryKey(pca.getAttId());
-		if(att==null){
-			throw  new BusinessException("ES000002");//组件属性数据不存在
-		}
-		if(att.getValueType()!=Short.valueOf(AttValueType.v3.getIndex())){
-			throw new BusinessException("ES000003");//该组件属性数据类型不是数列
-		}
-		EsDataMapper dataDao = UtilTools.getBean(EsDataMapper.class);
-		EsData data = dataDao.selectByPrimaryKey(att.getValueDef());
-		if(data==null){
-			throw  new BusinessException("ES000004");//数据定义错误
-		}
-		EsDataAttMapper dataAttDao = UtilTools.getBean(EsDataAttMapper.class);
-		EsDataAttSQLBuilder dataAttSb = new EsDataAttSQLBuilder();
-		EsDataAttSQLBuilder.Criteria dataAttSc = dataAttSb.createCriteria();
-		dataAttSc.andCdIdEqualTo(data.getCdId());
-		dataAttSb.setOrderByClause("ser asc");
-		List<EsDataAtt> dataAtts = dataAttDao.selectByExample(dataAttSb);
-		List<D_ES0010_HEADERS_RECODE> hrs = new ArrayList<>();
-		for (EsDataAtt datt:dataAtts) {
-			D_ES0010_HEADERS_RECODE  hr  =new D_ES0010_HEADERS_RECODE();
-			hr.setCdvId(datt.getCdvId());
-			hr.setCdId(datt.getCdId());
-			hr.setName(datt.getName());
-			hr.setCode(datt.getCode());
-			hr.setDataType(data.getType());
-			hr.setValueDef(datt.getValueDef());
-			hr.setValueType(datt.getValueType());
-			hr.setUnitType(datt.getUnitType());
-			hrs.add(hr);
-		}
-		this.getD_es0010().setHeaders(hrs);
-
-		EsProComAttDataMapper pcaddao = UtilTools.getBean(EsProComAttDataMapper.class);
-		EsProComAttDataSQLBuilder pcadsb = new EsProComAttDataSQLBuilder();
-		EsProComAttDataSQLBuilder.Criteria pcadsc = pcadsb.createCriteria();
-		pcadsc.andPcaIdEqualTo(pcaId);
-		pcadsb.setOrderByClause("ser asc");
-		List<EsProComAttData> pcads =pcaddao.selectByExample(pcadsb);
-		List<D_ES0010_DATAS_RECODE> das = new ArrayList<>();
-		for (EsProComAttData pcad :pcads) {
-			D_ES0010_DATAS_RECODE da =new D_ES0010_DATAS_RECODE();
-			da.setPcadgId(pcad.getPcadgId());
-			da.setPcadId(pcad.getPcadId());
-			da.setValue(pcad.getValue());
-			da.setUnit(pcad.getUnit());
-			da.setCdvId(pcad.getCdvId());
-			das.add(da);
-		}
-		this.getD_es0010().setDatas(das);
-		this.getD_es0010().setPcaId(pcaId);
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性值数据查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性值数据查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性值数据查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 111
src/main/java/com/miniframe/bisiness/es/ES0011Service.java

@@ -1,111 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Date;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0011BaseModel;
-import com.miniframe.model.es.EsDataAtt;
-import com.miniframe.model.es.EsProComAtt;
-import com.miniframe.model.es.EsProComAttData;
-import com.miniframe.model.es.dao.EsDataAttMapper;
-import com.miniframe.model.es.dao.EsProComAttDataMapper;
-import com.miniframe.model.es.dao.EsProComAttMapper;
-import io.netty.util.internal.StringUtil;
-
-/**
- * 无锡发动机,“项目组件属性值数据添加修改”逻辑处理(重新生成不覆盖)。
- */
-public class ES0011Service extends ES0011BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目组件属性值数据添加修改”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		//cdvId-pcadgId-pcadId-value-unit 字段已逗号分隔数据已分号分隔
-		String pcaId = this.getA_es0011().getPcaId();
-		EsProComAttMapper pcadao = UtilTools.getBean(EsProComAttMapper.class);
-		EsProComAtt pca = pcadao.selectByPrimaryKey(pcaId);
-		String pcadvals = this.getA_es0011().getPcadvals();
-		String[] pcads= pcadvals.split(";");
-		for (String pcad: pcads){
-			String[] pcadts = pcad.split(",");
-			String cdvId= pcadts[0];
-			String pcadgId= pcadts[1];
-			String pcadId= pcadts[2];
-			String value= pcadts[3];
-			String unit= pcadts[4];
-			EsDataAttMapper dattdao =UtilTools.getBean(EsDataAttMapper.class);
-			EsDataAtt datt = dattdao.selectByPrimaryKey(cdvId);
-			EsProComAttDataMapper pcaddao = UtilTools.getBean(EsProComAttDataMapper.class);
-			EsProComAttData d;
-			if(StringUtil.isNullOrEmpty(pcadId)){//新增
-				d=new EsProComAttData();
-				d.setPcadId(UtilTools.getUUid());
-				d.setPcadgId(Integer.valueOf(pcadgId));
-				d.setPid(pca.getPid());
-				d.setPcId(pca.getPcId());
-				d.setComId(pca.getComId());
-				d.setAttId(pca.getAttId());
-				d.setPcaId(pca.getPcaId());
-				d.setCdId(datt.getCdId());
-				d.setCdvId(cdvId);
-				d.setValue(value);
-				d.setUnit(unit);
-				d.setUid(this.getA_eshead().getUserId());
-				d.setCreateTime(new Date());
-				d.setUpdateTime(new Date());
-				d.setSer(datt.getSer());
-				pcaddao.insert(d);
-			}else{//修改
-				d =pcaddao.selectByPrimaryKey(pcadId);
-				if(d!=null){
-					d.setPcadgId(Integer.valueOf(pcadgId));
-					d.setPid(pca.getPid());
-					d.setPcId(pca.getPcId());
-					d.setComId(pca.getComId());
-					d.setAttId(pca.getAttId());
-					d.setPcaId(pca.getPcaId());
-					d.setCdId(datt.getCdId());
-					d.setCdvId(cdvId);
-					d.setValue(value);
-					d.setUnit(unit);
-					d.setUid(this.getA_eshead().getUserId());
-					d.setUpdateTime(new Date());
-					d.setSer(datt.getSer());
-					pcaddao.updateByPrimaryKey(d);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性值数据添加修改”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性值数据添加修改”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目组件属性值数据添加修改”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 84
src/main/java/com/miniframe/bisiness/es/ES0012Service.java

@@ -1,84 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0012BaseModel;
-import com.miniframe.generate.comm.es.D_ES0009_ROWS_RECODE;
-import com.miniframe.generate.comm.es.D_ES0012_ROWS_RECODE;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.mappers.es.model.ProComAttDto;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProComSQLBuilder;
-import com.miniframe.model.es.dao.EsProComMapper;
-
-/**
- * 无锡发动机,“项目模拟数据组件属性查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES0012Service extends ES0012BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid = this.getA_es0012().getPid();
-		EsProComMapper pcdao = UtilTools.getBean(EsProComMapper.class);
-		EsProComSQLBuilder pcsb = new EsProComSQLBuilder();
-		EsProComSQLBuilder.Criteria pcsc = pcsb.createCriteria();
-		pcsc.andPidEqualTo(pid);
-		pcsc.andComIdEqualTo("-1");//模拟数据
-		List<EsProCom> proComs = pcdao.selectByExample(pcsb);
-		if(proComs!=null&&!proComs.isEmpty()){
-			EsProCom pc= proComs.get(0);
-			EsMapper esdao = UtilTools.getBean(EsMapper.class);
-			List<ProComAttDto> dtos = esdao.selectPrComAttList(pc.getPcId());
-			List<D_ES0012_ROWS_RECODE> rows = new ArrayList<>();
-			for (ProComAttDto dto:dtos) {
-				D_ES0012_ROWS_RECODE row = new D_ES0012_ROWS_RECODE();
-				row.setPcaId(dto.getPcaId());
-				row.setValue(dto.getValue());
-				row.setUnit(dto.getUnit());
-				row.setUnitType(dto.getUnitType());
-				row.setName(dto.getName());
-				row.setCode(dto.getCode());
-				row.setValueType(dto.getValueType());
-				row.setValueDef(dto.getValueDef());
-				row.setDataType(dto.getDataType()==null?-1: dto.getDataType());
-				rows.add(row);
-			}
-			this.getD_es0012().setRows(rows);
-		}
-	}
-	
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 248
src/main/java/com/miniframe/bisiness/es/ES0013Service.java

@@ -1,248 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.Frame;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0013BaseModel;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.model.es.*;
-import com.miniframe.model.es.dao.*;
-import com.miniframe.tools.XIFileUtils;
-import com.miniframe.tools.docker.DockerExe;
-import es.service.LogService;
-import es.template.TemplateGenerator;
-
-/**
- * 无锡发动机,“项目求解”逻辑处理(重新生成不覆盖)。
- */
-public class ES0013Service extends ES0013BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目求解”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid = this.getA_es0013().getPid();
-		XIFileUtils.mkdir(XIFileUtils.getRootPathStr());
-		XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es");
-		XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid);
-		XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate");
-		XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate/Geometry");//几何路径
-		TemplateGenerator.createPipenetXml(pid);
-		EsMapper esMapper = UtilTools.getBean(EsMapper.class);
-		Integer maxser =esMapper.getProJobSer(pid);
-		maxser=maxser==null?0:maxser;
-		String jobId = insertJob(pid,maxser);
-		run(pid,jobId,maxser+1);
-	}
-	private String updateJob(String jobId) {
-		EsProJobMapper epjDao = UtilTools.getBean(EsProJobMapper.class);
-		EsProJob esjob =epjDao.selectByPrimaryKey(jobId);
-		esjob.setEndTime(new Date());
-		epjDao.updateByPrimaryKey(esjob);
-		return jobId;
-	}
-	private String insertJob(String pid,Integer maxser) {
-		EsProJobMapper epjDao = UtilTools.getBean(EsProJobMapper.class);
-		EsProJob esjob = new EsProJob();
-		String jobId = UtilTools.getUUid();
-		esjob.setJobId(jobId);
-		esjob.setPid(pid);
-		esjob.setStartTime(new Date());
-		esjob.setEndTime(new Date());
-
-		esjob.setSer(maxser+1);
-		esjob.setUid(this.getA_eshead().getUserId());
-		esjob.setCreateTime(new Date());
-		esjob.setUpdateTime(new Date());
-		epjDao.insert(esjob);
-		return jobId;
-	}
-
-	private void run(String pid,String jobId,Integer maxser) throws Exception {
-		LogService.clearLog(pid);
-		LogService.addLog(pid,"求解——————————————————开始");
-		DockerExe.stopDocker(pid);
-		DockerExe.run(pid);
-		final int[] con = {0};
-		final String[] line = {""};
-		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()-> {try {
-			DockerExe.getDockerLogs(pid,new ResultCallback.Adapter<Frame>() {
-				@Override
-				public void onNext(Frame frame) {
-					if(con[0] <100){
-						line[0]+=new String(frame.getPayload());
-						con[0]++;
-					}else{
-						LogService.addLog(pid, line[0]);
-						line[0]="";
-						con[0] =0;
-					}
-//					LogService.addLog(pid, new String(frame.getPayload()));
-					System.out.print(new String(frame.getPayload()));
-					super.onNext(frame);
-				}
-				@Override
-				public void onError(Throwable throwable) {
-					System.err.println("日志获取失败");
-					LogService.addLog(pid, line[0]);
-					throwable.printStackTrace();
-					DockerExe.stopDocker(pid);
-					super.onError(throwable);
-				}
-				@Override
-				public void onComplete() {
-					System.out.println("日志获取完成");
-					LogService.addLog(pid, line[0]);
-					DockerExe.stopDocker(pid);
-					super.onComplete();
-				}
-			});
-			LogService.addLog(pid,"求解——————————————————成功");
-			readFileSaveTb(pid,jobId);
-			mvFiles(pid, maxser);
-
-
-			updateJob(jobId);
-		} catch (Exception e) {
-			LogService.addLog(pid,"求解——————————————————失败");
-			e.printStackTrace();
-		}
-			return null;
-		});
-	}
-
-	private void mvFiles(String pid, Integer maxser) {
-		//文件移动
-		XIFileUtils.mkdir(XIFileUtils.getRootPathStr()+"/es/"+ pid +"/Calculate/"+ maxser);
-		Path directory = Paths.get(XIFileUtils.getRootPathStr()+"/es/"+ pid +"/Calculate"); // 替换为你的目录路径
-		try (Stream<Path> stream = Files.list(directory)) {
-			stream.forEach(path -> {
-				if (Files.isRegularFile(path)) { // 确保是普通文件
-					XIFileUtils.fileCopy(path.toString(),
-							XIFileUtils.getRootPathStr()+"/es/"+ pid +"/Calculate/"+ maxser +"/"+path.getFileName());
-					System.out.println("File: " + path.getFileName());
-				}
-			});
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void readFileSaveTb(String pid,String jobId) throws Exception{
-		EsProComMapper pcdao = UtilTools.getBean(EsProComMapper.class);
-		EsProComSQLBuilder pcsb = new EsProComSQLBuilder();
-		EsProComSQLBuilder.Criteria pcsc = pcsb.createCriteria();
-		pcsc.andPidEqualTo(pid);
-		pcsc.andComIdNotEqualTo("-1");//排除模拟数据
-		List<EsProCom> epcList = pcdao.selectByExample(pcsb);
-		for(int i=0;i<epcList.size();i++){
-			int step = 0;
-			String fileName = epcList.get(i).getIdCode();
-			if(fileName.isEmpty()) continue;
-			fileName = fileName + epcList.get(i).getSer().toString();
-			String comId = epcList.get(i).getComId();
-			String pcId = epcList.get(i).getPcId();
-			List<String> lines = Files.readAllLines(Paths.get(XIFileUtils.getRootPathStr()+"/es/"+pid+"/Calculate/"+fileName));
-			List<List<String>> data = lines.stream()
-					.filter(line -> !line.trim().isEmpty()) // 跳过空行
-					.map(line -> {
-						return Arrays.stream(line.split(",")) // 分割逗号
-								.map(String::trim)           // 去除空格
-								.collect(Collectors.toList());
-					})
-					.collect(Collectors.toList());
-			List<String> keyList = new ArrayList<>();
-			for(int j=0;j<data.size();j++){
-				for(int k=0;k<data.get(j).size();k++){
-					if(j==1){
-						String pcrId = insertIntoTbKey(data.get(j-1).get(k),data.get(j).get(k),jobId,comId,pcId);
-						keyList.add(pcrId);
-					}else if(j>1){
-                        if(k==0)++step;
-						insertIntoTbValue(data.get(j).get(k),jobId,Integer.valueOf(step),comId,keyList.get(k),pcId);
-
-					}
-				}
-			}
-		}
-	}
-
-
-	private void insertIntoTbValue(String value,String job_id,Integer step,String comId,String pcrId,String pcId) throws Exception{
-		EsProResultValueMapper eprvMapper = UtilTools.getBean(EsProResultValueMapper.class);
-		EsProResultValue eprv = new EsProResultValue();
-		eprv.setPcrvId(UtilTools.getUUid());
-		eprv.setPcrId(pcrId);
-		eprv.setPid(this.getA_es0013().getPid());
-		eprv.setComId(comId);
-		eprv.setPcId(pcId);
-		eprv.setJobId(job_id);
-		eprv.setValue(value);
-		eprv.setUid(this.getA_eshead().getUserId());
-		eprv.setCreateTime(new Date());
-		eprv.setUpdateTime(new Date());
-		eprv.setRemark("");
-		eprv.setStep(step);
-		eprvMapper.insert(eprv);
-	}
-
-	private String insertIntoTbKey(String key_en,String key_zh,String jobId,String comId,String pcId) throws Exception{
-		EsProResultKeyMapper eprkMapper = UtilTools.getBean(EsProResultKeyMapper.class);
-		EsProResultKey eprk = new EsProResultKey();
-		String pcrId = UtilTools.getUUid();
-		eprk.setPcrId(pcrId);
-		eprk.setPid(this.getA_es0013().getPid());
-		eprk.setComId(comId);
-		eprk.setPcId(pcId);
-		eprk.setJobId(jobId);
-		eprk.setKeyEn(key_en);
-		eprk.setKeyZh(key_zh);
-		eprk.setUid(this.getA_eshead().getUserId());
-		eprk.setCreateTime(new Date());
-		eprk.setUpdateTime(new Date());
-		eprk.setRemark("");
-		eprkMapper.insert(eprk);
-		return pcrId;
-	}
-
-	/**
-	 * 无锡发动机,“项目求解”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目求解”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目求解”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 84
src/main/java/com/miniframe/bisiness/es/ES0014Service.java

@@ -1,84 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0014BaseModel;
-import com.miniframe.generate.comm.es.D_ES0009_ROWS_RECODE;
-import com.miniframe.generate.comm.es.D_ES0014_ROWS_RECODE;
-import com.miniframe.mappers.es.dao.EsMapper;
-import com.miniframe.model.es.EsProComAttDataSQLBuilder;
-import com.miniframe.model.es.EsProJob;
-import com.miniframe.model.es.EsProJobSQLBuilder;
-import com.miniframe.model.es.dao.EsProJobMapper;
-import com.miniframe.tools.XIDateTimeUtils;
-
-/**
- * 无锡发动机,“任务查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES0014Service extends ES0014BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“任务查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid = this.getA_es0014().getPid();
-		/*
-		EsMapper epjmapper = UtilTools.getBean(EsMapper.class);
-		List<EsProJob> jobList = epjmapper.selectEsProJobList(pid);*/
-
-		EsProJobSQLBuilder builder = new EsProJobSQLBuilder();
-		EsProJobSQLBuilder.Criteria epjsbc = builder.createCriteria();
-		epjsbc.andPidEqualTo(pid);
-		builder.setOrderByClause("ser asc");
-		EsProJobMapper mapper = UtilTools.getBean(EsProJobMapper.class);
-		List<EsProJob> jobList = mapper.selectByExample(builder);
-
-		List<D_ES0014_ROWS_RECODE> rows = new ArrayList<>();
-		for(EsProJob job:jobList){
-			D_ES0014_ROWS_RECODE row = new D_ES0014_ROWS_RECODE();
-			row.setJobId(job.getJobId());
-			row.setStartTime(XIDateTimeUtils.getStrFromDate(job.getStartTime()));
-			row.setEndTime(XIDateTimeUtils.getStrFromDate(job.getEndTime()));
-			row.setSer(job.getSer());
-			row.setUid(job.getUid());
-			row.setCreateTime(XIDateTimeUtils.getStrFromDate(job.getCreateTime()));
-			row.setUpdateTime(XIDateTimeUtils.getStrFromDate(job.getUpdateTime()));
-			row.setRemark(job.getRemark());
-			rows.add(row);
-		}
-		this.getD_es0014().setRows(rows);
-	}
-	
-	/**
-	 * 无锡发动机,“任务查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“任务查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“任务查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 109
src/main/java/com/miniframe/bisiness/es/ES0015Service.java

@@ -1,109 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0015BaseModel;
-import com.miniframe.generate.comm.es.D_ES0015_ROWS_COMS_RECODE;
-import com.miniframe.generate.comm.es.D_ES0015_ROWS_RECODE;
-import com.miniframe.model.es.EsProResultKey;
-import com.miniframe.model.es.EsProResultKeySQLBuilder;
-import com.miniframe.model.es.EsProResultValue;
-import com.miniframe.model.es.EsProResultValueSQLBuilder;
-import com.miniframe.model.es.dao.EsProResultKeyMapper;
-import com.miniframe.model.es.dao.EsProResultValueMapper;
-import com.miniframe.tools.XIDateTimeUtils;
-
-/**
- * 无锡发动机,“结果属性值查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES0015Service extends ES0015BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“结果属性值查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pcId = this.getA_es0015().getPcId();
-		String jobId = this.getA_es0015().getJobId();
-		EsProResultKeySQLBuilder builder = new EsProResultKeySQLBuilder();
-		EsProResultKeySQLBuilder.Criteria eprkbc = builder.createCriteria();
-		eprkbc.andJobIdEqualTo(jobId);
-		eprkbc.andPcIdEqualTo(pcId);
-		EsProResultKeyMapper mapper = UtilTools.getBean(EsProResultKeyMapper.class);
-		List<EsProResultKey> eprkList = mapper.selectByExample(builder);
-		List<D_ES0015_ROWS_RECODE> rowList = new ArrayList<D_ES0015_ROWS_RECODE>();
-		for(EsProResultKey eprk : eprkList){
-			D_ES0015_ROWS_RECODE dr = new D_ES0015_ROWS_RECODE();
-			String pcrId = eprk.getPcrId();
-			dr.setPcrId(pcrId);
-			dr.setPId(eprk.getPid());
-			dr.setComId(eprk.getComId());
-			dr.setPcId(eprk.getPcId());
-			dr.setJobId(eprk.getJobId());
-			dr.setKeyEn(eprk.getKeyEn());
-			dr.setKeyZh(eprk.getKeyZh());
-			dr.setUid(eprk.getUid());
-			dr.setCreateTime(XIDateTimeUtils.getStrFromDate(eprk.getCreateTime()));
-			dr.setUpdateTime(XIDateTimeUtils.getStrFromDate(eprk.getUpdateTime()));
-			dr.setRemark(eprk.getRemark());
-
-			EsProResultValueSQLBuilder valuebuilder = new EsProResultValueSQLBuilder();
-			EsProResultValueSQLBuilder.Criteria valueCriteria = valuebuilder.createCriteria();
-			valueCriteria.andPcrIdEqualTo(pcrId);
-			EsProResultValueMapper valueMapper = UtilTools.getBean(EsProResultValueMapper.class);
-			List<EsProResultValue> valueList = valueMapper.selectByExample(valuebuilder);
-			List<D_ES0015_ROWS_COMS_RECODE> comsRecodeList = new ArrayList<D_ES0015_ROWS_COMS_RECODE>();
-			for (EsProResultValue value : valueList) {
-				D_ES0015_ROWS_COMS_RECODE comsRecode = new D_ES0015_ROWS_COMS_RECODE();
-				comsRecode.setPcrvId(value.getPcrvId());
-				comsRecode.setPcrId(value.getPcrId());
-				comsRecode.setPId(value.getPid());
-				comsRecode.setComId(value.getComId());
-				comsRecode.setPcId(value.getPcId());
-				comsRecode.setJobId(value.getJobId());
-				comsRecode.setValue(value.getValue());
-				comsRecode.setUid(value.getUid());
-				comsRecode.setCreateTime(XIDateTimeUtils.getStrFromDate(value.getCreateTime()));
-				comsRecode.setUpdateTime(XIDateTimeUtils.getStrFromDate(value.getUpdateTime()));
-				comsRecode.setRemark(value.getRemark());
-				comsRecode.setStep(value.getStep());
-				comsRecodeList.add(comsRecode);
-			}
-			dr.setComs(comsRecodeList);
-			rowList.add(dr);
-		}
-		this.getD_es0015().setRows(rowList);
-	}
-	
-	/**
-	 * 无锡发动机,“结果属性值查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“结果属性值查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“结果属性值查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 59
src/main/java/com/miniframe/bisiness/es/ES0016Service.java

@@ -1,59 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0016BaseModel;
-import com.miniframe.model.es.EsPro;
-import com.miniframe.model.es.EsProComAttDataSQLBuilder;
-import com.miniframe.model.es.dao.EsProComAttDataMapper;
-
-/**
- * 无锡发动机,“项目模拟数据组件属性删除”逻辑处理(重新生成不覆盖)。
- */
-public class ES0016Service extends ES0016BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性删除”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pcaId=this.getA_es0016().getPcaId();
-		Integer pcadgId= this.getA_es0016().getPcadgId();
-		EsProComAttDataMapper attdatadao = UtilTools.getBean(EsProComAttDataMapper.class);
-		EsProComAttDataSQLBuilder sb = new EsProComAttDataSQLBuilder();
-		EsProComAttDataSQLBuilder.Criteria sc = sb.createCriteria();
-		sc.andPcaIdEqualTo(pcaId);
-		sc.andPcadgIdEqualTo(pcadgId);
-		attdatadao.deleteByExample(sb);
-	}
-	
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性删除”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性删除”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“项目模拟数据组件属性删除”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 62
src/main/java/com/miniframe/bisiness/es/ES0017Service.java

@@ -1,62 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.generate.business.es.model.ES0017BaseModel;
-import com.miniframe.tools.XIFileUtils;
-import es.service.LogService;
-
-/**
- * 无锡发动机,“求解日志获取”逻辑处理(重新生成不覆盖)。
- */
-public class ES0017Service extends ES0017BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“求解日志获取”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		String pid =this.getA_es0017().getPid();
-		String filePath = LogService.BPATH+"/"+pid+"/log.txt";
-
-		Path path = Paths.get(filePath);
-		if (Files.notExists(path)) {
-			this.getD_es0017().setLogs("");
-		}else{
-			String logs = XIFileUtils.readFileAsString(filePath);
-			this.getD_es0017().setLogs(logs);
-		}
-	}
-	
-	/**
-	 * 无锡发动机,“求解日志获取”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“求解日志获取”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“求解日志获取”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 126
src/main/java/com/miniframe/bisiness/es/ES0018Service.java

@@ -1,126 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.business.es.model.ES0018BaseModel;
-import com.miniframe.httpserver.HttpServerTransFile;
-import com.miniframe.tools.XIFileUtils;
-
-/**
- * 无锡发动机,“文件打包下载”逻辑处理(重新生成不覆盖)。
- */
-public class ES0018Service extends ES0018BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“文件打包下载”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		// 验证路径是否有效
-		String pid = this.getA_es0018().getPid();
-		String basePath = XIFileUtils.getRootPathStr()+"/es/"+pid;
-		Path directoryPath = Paths.get(basePath);
-		if (!Files.exists(directoryPath)) {
-			throw new IllegalArgumentException("指定的目录不存在: " + basePath);
-		}
-
-		if (!Files.isDirectory(directoryPath)) {
-			throw new IllegalArgumentException("指定的路径不是目录: " + basePath);
-		}
-
-		// 创建临时ZIP文件
-		Path tempZip = createTempZipFile();
-
-		try {
-			// 压缩目录内容
-			zipDirectory(directoryPath, tempZip);
-
-			// 准备文件传输对象
-			String zipFileName = directoryPath.getFileName() + ".zip";
-			String mimeType = "application/zip";
-
-			HttpServerTransFile transFile = new HttpServerTransFile(
-					zipFileName,
-					mimeType,
-					tempZip,
-					true // 设置自动删除标志
-			);
-
-			// 设置当前请求的文件传输对象
-			UtilTools.setHttpServerTransFile(transFile);
-		} catch (Exception e) {
-			// 发生异常时删除临时文件
-			Files.deleteIfExists(tempZip);
-			throw e;
-		}
-	}
-
-	private Path createTempZipFile() throws IOException {
-		return Files.createTempFile("download-", ".zip");
-	}
-
-	private void zipDirectory(Path sourceDir, Path zipPath) throws IOException {
-		try (OutputStream fos = Files.newOutputStream(zipPath);
-			 BufferedOutputStream bos = new BufferedOutputStream(fos);
-			 ZipOutputStream zos = new ZipOutputStream(bos)) {
-
-			Files.walk(sourceDir)
-					.filter(path -> !Files.isDirectory(path))
-					.forEach(path -> {
-						try {
-							// 获取相对路径并修正分隔符
-							String relativePath = sourceDir.relativize(path).toString()
-									.replace(File.separatorChar, '/');
-
-							// 创建ZIP条目
-							ZipEntry zipEntry = new ZipEntry(relativePath);
-							zos.putNextEntry(zipEntry);
-
-							// 复制文件内容
-							Files.copy(path, zos);
-							zos.closeEntry();
-						} catch (IOException e) {
-							throw new UncheckedIOException(e);
-						}
-					});
-
-			zos.finish();
-		}
-	}
-	/**
-	 * 无锡发动机,“文件打包下载”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“文件打包下载”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“文件打包下载”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 96
src/main/java/com/miniframe/bisiness/es/ES1001Service.java

@@ -1,96 +0,0 @@
-package com.miniframe.bisiness.es;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.miniframe.core.ExecProcessFlow;
-import com.miniframe.core.ext.UtilTools;
-import com.miniframe.generate.appcode.Booltype;
-import com.miniframe.generate.appcode.ComFType;
-import com.miniframe.generate.business.es.model.ES1001BaseModel;
-import com.miniframe.generate.comm.es.D_ES0001_ROWS_RECODE;
-import com.miniframe.generate.comm.es.D_ES1001_ROWS_COMS_RECODE;
-import com.miniframe.generate.comm.es.D_ES1001_ROWS_RECODE;
-import com.miniframe.model.es.EsCom;
-import com.miniframe.model.es.EsComSQLBuilder;
-import com.miniframe.model.es.dao.EsComMapper;
-import com.miniframe.tools.XIDateTimeUtils;
-
-/**
- * 无锡发动机,“组件查询”逻辑处理(重新生成不覆盖)。
- */
-public class ES1001Service extends ES1001BaseModel implements ExecProcessFlow {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-		
-	/**
-	 * 无锡发动机,“组件查询”业务核心处理
- 	 */
-	public void transExecute() throws Exception {
-		ComFType[] types =ComFType.values();
-		EsComMapper comDao = UtilTools.getBean(EsComMapper.class);
-		EsComSQLBuilder comSb = new EsComSQLBuilder();
-		EsComSQLBuilder.Criteria comSc = comSb.createCriteria();
-		comSc.andFlagEqualTo(Short.valueOf(Booltype.yes.getIndex()));
-		List<EsCom> coms = comDao.selectByExample(comSb);
-		List<D_ES1001_ROWS_RECODE> rows = new ArrayList<>();
-		for (ComFType type:types) {
-			D_ES1001_ROWS_RECODE row  =new D_ES1001_ROWS_RECODE();
-			row.setFtypecode(Integer.valueOf(type.getIndex()));
-			row.setFtypedesc(type.getDesc());
-			List<D_ES1001_ROWS_COMS_RECODE> comrs = new ArrayList<>();
-			List<EsCom> tcoms = coms.stream().filter(v ->
-					v.getFtype().toString().equals(type.getIndex())).collect(Collectors.toList());
-			if(tcoms!=null){
-				for (EsCom c:tcoms) {
-					D_ES1001_ROWS_COMS_RECODE cr = new D_ES1001_ROWS_COMS_RECODE();
-					cr.setComId(c.getComId());
-					cr.setName(c.getName());
-					cr.setFtype(c.getFtype());
-					cr.setImage(c.getImage());
-					cr.setUid(c.getUid());
-					cr.setCreateTime(XIDateTimeUtils.getStrFromDate(c.getCreateTime()));
-					cr.setUpdateTime(XIDateTimeUtils.getStrFromDate(c.getCreateTime()));
-					cr.setFlag(c.getFlag());
-					cr.setIdCode(c.getIdCode());
-					cr.setType(c.getType());
-					cr.setCode(c.getCode());
-					comrs.add(cr);
-				}
-			}
-			row.setComs(comrs);
-			rows.add(row);
-		}
-		this.getD_es1001().setRows(rows);
-	}
-	
-	/**
-	 * 无锡发动机,“组件查询”业务前处理
- 	 */
-	public void preTransFlow() throws Exception {
-		this.validater();
-	}
-	
-	/**
-	 * 无锡发动机,“组件查询”业务后处理
- 	 */
-	public void afterTransFlow() throws Exception {
-	
-	}
-	
-	/**
-	 * 无锡发动机,“组件查询”逻辑入口处理方法
- 	 */
- 	@SuppressWarnings("rawtypes")
-	@Override
-	public Map execute(Map vars) throws Exception {
-		this.setTransMap(vars);
-		preTransFlow();// 执行业务开始的规则检查和校验
-		transExecute();// 执行核心业务段
-		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
-		return this.getTransMap();
-	}
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsAttDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsAtt;
-
-/**
- * 实体列表,“ES_ATT”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsAttDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsAtt> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsComDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsCom;
-
-/**
- * 实体列表,“ES_COM”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsComDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsCom> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsDataAttDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsDataAtt;
-
-/**
- * 实体列表,“ES_DATA_ATT”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsDataAttDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsDataAtt> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsDataDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsData;
-
-/**
- * 实体列表,“ES_DATA”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsDataDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsData> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProComAttDataDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProComAttData;
-
-/**
- * 实体列表,“ES_PRO_COM_ATT_DATA”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProComAttDataDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProComAttData> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProComAttDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProComAtt;
-
-/**
- * 实体列表,“ES_PRO_COM_ATT”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProComAttDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProComAtt> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProComConDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProComCon;
-
-/**
- * 实体列表,“ES_PRO_COM_CON”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProComConDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProComCon> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProComDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProCom;
-
-/**
- * 实体列表,“ES_PRO_COM”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProComDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProCom> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsPro;
-
-/**
- * 实体列表,“ES_PRO”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsPro> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProJobDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProJob;
-
-/**
- * 实体列表,“ES_PRO_JOB”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProJobDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProJob> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProResultKeyDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProResultKey;
-
-/**
- * 实体列表,“ES_PRO_RESULT_KEY”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProResultKeyDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProResultKey> list=l;
-		return list;
-	};
-
-}

+ 0 - 23
src/main/java/com/miniframe/dbtransfer/EsProResultValueDbTransfer.java

@@ -1,23 +0,0 @@
-package com.miniframe.dbtransfer;
-
-import com.miniframe.core.DbTransfer;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.miniframe.model.es.EsProResultValue;
-
-/**
- * 实体列表,“ES_PRO_RESULT_VALUE”数据库数据转化逻辑处理(重新生成不覆盖)。
- */
-public class EsProResultValueDbTransfer extends DbTransfer implements Serializable {
-	
-	private static final long serialVersionUID = -7051358269847459502L;
-
-	@Override
-	public List transfer(final List l,Map map) throws Exception{
-		List<EsProResultValue> list=l;
-		return list;
-	};
-
-}

+ 0 - 196
src/main/java/com/miniframe/mappers/es/dao/EsMapper.java

@@ -1,196 +0,0 @@
-package com.miniframe.mappers.es.dao;
-
-import com.miniframe.mappers.es.model.ProComAttDto;
-import com.miniframe.model.es.EsDataAtt;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProJob;
-import com.miniframe.model.system.SysUser;
-import com.miniframe.system.MiniserviceBaseDao;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-public interface EsMapper extends MiniserviceBaseDao {
-    /**
-     * 删除 连线
-     * @param pid
-     * @return
-     */
-    @Delete("delete  from es_pro_com_con where pid =#{pid}")
-    void deleteEsProComCon(String pid);
-    /**
-     * 删除 组件属性值
-     * @param pid
-     * @return
-     */
-    @Delete("delete  from es_pro_com_att_data where pid =#{pid}")
-    Integer deleteEsProComAttData(String pid);
-    /**
-     * 删除 组件属性
-     * @param pid
-     * @return
-     */
-    @Delete("delete  from es_pro_com_att where pid =#{pid}")
-    Integer deleteEsProComAtt(String pid);
-
-    /**
-     * 删除 组件
-     * @param pid
-     * @return
-     */
-    @Delete("delete  from es_pro_com where pid =#{pid}")
-    Integer deletEsProCom(String pid);
-
-
-    /**
-     * 项目组件 获取最大编号
-     * @param pid
-     * @param idCode
-     * @return
-     */
-    @Select("select max(ser) from es_pro_com where pid =#{pid} and id_code=#{idCode}")
-    Integer getProComSer(String pid,String idCode);
-
-    /**
-     * 项目任务 获取最大编号
-     * @param pid
-     * @return
-     */
-    @Select("select max(ser) from es_pro_job where pid =#{pid}")
-    Integer getProJobSer(String pid);
-
-    /**
-     * 返回结构化DTO对象列表
-     * @param pid 产品ID
-     * @return 组件信息DTO列表
-     */
-    @Select("SELECT a.pc_id as pcId," +
-            "a.com_id as comId," +
-            "a.uid as uid," +
-            "a.remark as remark," +
-            "a.create_time as createTime," +
-            "a.update_time as updateTime," +
-            "a.pid as pid," +
-            "a.ser as ser," +
-            "a.id_code as idCode " +
-            "FROM es_pro_com a " +
-            "WHERE pid = #{pid} " +
-            "AND com_id != '-1'")
-            //"WHERE pid = #{pid} " +
-            //"  AND com_id != \"-1\"")
-    List<EsProCom> selectEsProComListByPid(@Param("pid") String pid);
-
-
-    @Select("SELECT a.job_id as jobId," +
-            "a.pid as pid," +
-            "a.start_time as startTime," +
-            "a.end_time as endTime," +
-            "a.ser as ser," +
-            "a.uid as uid," +
-            "a.create_time as createTime," +
-            "a.update_time as updateTime," +
-            "a.remark as remark " +
-            "FROM es_pro_job a " +
-            "WHERE pid = #{pid}")
-    List<EsProJob> selectEsProJobList(String pid);
-
-    /**
-     *  项目组件属性值数据
-     * @param pcId
-     * @return
-     */
-    @Select("select a.pca_id as pcaId," +
-            "a.value as value," +
-            "a.unit as unit," +
-            "b.unit_type as unitType," +
-            "b.name as name," +
-            "b.code as code," +
-            "b.value_def as valueDef," +
-            "b.value_type as valueType, " +
-            "(select max(c.type) from es_data as c where c.cd_id = b.value_def) as dataType " +
-            "from es_pro_com_att a,es_att b where a.att_id=b.att_id and pc_id=#{pcId} ORDER BY ser asc;")
-    List<ProComAttDto> selectPrComAttList(String pcId);
-
-
-
-    /**
-     *  项目组件属性值数据 排除数列数据
-     * @param pcId
-     * @return
-     */
-    @Select("select a.pca_id as pcaId," +
-            "a.value as value," +
-            "a.unit as unit," +
-            "b.unit_type as unitType," +
-            "b.name as name," +
-            "b.code as code," +
-            "b.value_def as valueDef," +
-            "b.value_type as valueType, " +
-            "(select max(c.type) from es_data as c where c.cd_id = b.value_def) as dataType " +
-            "from es_pro_com_att a,es_att b " +
-            "where a.att_id=b.att_id " +
-            "and value_type in(0,1,2) " +
-            "and pc_id=#{pcId} " +
-            "ORDER BY b.ser asc;")
-    List<ProComAttDto> selectPrComAttListNoData(String pcId);
-
-    /**
-     * 项目组件属性值数据查询
-     * @param pcId 项目组件ID
-     * @return
-     */
-    @Select("select DISTINCT cd_id from es_pro_com_att_data where pc_id = #{pcId} order by cd_id asc")
-    List<String> selectAttDataCdIds(String pcId);
-
-
-    /**
-     *  项目组件属性值数据查询
-     * @param pcId
-     * @return
-     */
-    @Select("select  a.value as value, " +
-            "a.unit as unit, " +
-            "b.unit_type as unitType, " +
-            "b.name as name, " +
-            "b.code as code, " +
-            "b.value_def as valueDef, " +
-            "b.value_type as valueType,0 as dataType  " +
-            "from es_pro_com_att_data a,es_data_att b " +
-            "where a.cdv_id = b.cdv_id and a.pc_id= #{pcId} " +
-            "and a.cd_id=#{cdId}  " +
-            "ORDER BY b.ser asc;")
-    List<ProComAttDto> selectPrComAttDataList(String pcId,String cdId);
-
-
-    /**
-     *  获取组件连接的节点IdCode+Ser 如:N1 N2
-     * @param pcId
-     * @return
-     */
-    @Select("select DISTINCT concat(a.id_code,a.ser) from es_pro_com a ,es_pro_com_con b where a.pc_id = b.npc_id and b.pc_id =#{pcId}")
-    List<String> selectComconNodeIdcodeSer(String pcId);
-
-    /**
-     *  模拟属性查询
-     * @param pcId
-     * @return
-     */
-    @Select("select a.pca_id as pcaId," +
-            "a.value as value," +
-            "a.unit as unit," +
-            "b.unit_type as unitType," +
-            "b.name as name," +
-            "b.code as code," +
-            "b.value_def as valueDef," +
-            "b.value_type as valueType, " +
-            "0 as dataType " +
-            "from es_pro_com_att a,es_att b " +
-            "where a.att_id=b.att_id " +
-            "and a.com_id='-1' " +
-            "and pid=#{pcId} ORDER BY ser asc;")
-    List<ProComAttDto> selectSimulationsPrComAttDataList(String pcId);
-
-
-}

+ 0 - 34
src/main/java/com/miniframe/mappers/es/model/ProComAttDto.java

@@ -1,34 +0,0 @@
-package com.miniframe.mappers.es.model;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class ProComAttDto {
-
-    private String pcaId;
-    private String value;
-    private String unit;
-    private String unitType;
-    private String name;
-    private String code;
-    private Integer valueType;
-    private String valueDef;
-    private Integer dataType;
-
-    @Override
-    public String toString() {
-        return "ProComAttDto{" +
-                "pcaId='" + pcaId + '\'' +
-                ", value='" + value + '\'' +
-                ", unit='" + unit + '\'' +
-                ", unitType='" + unitType + '\'' +
-                ", name='" + name + '\'' +
-                ", code='" + code + '\'' +
-                ", valueType=" + valueType +
-                ", valueDef='" + valueDef + '\'' +
-                ", dataType=" + dataType +
-                '}';
-    }
-}