Răsfoiți Sursa

逃跑路径添加

huangxingxing 7 luni în urmă
părinte
comite
40bcb534f7

+ 1 - 1
definitionsrc/returncode/returncode-business.properties

@@ -98,5 +98,5 @@ EB3100037 = doorid:{0}\u98CE\u95E8\u4E0D\u5B58\u5728\uFF01
 EB3100038 = aid:{0}\u4E8B\u6545\u4E0D\u5B58\u5728\uFF01
 EMB00001 = \u8BA1\u7B97\u672A\u5B8C\u6210\uFF01
 EMB00002 = \u8BA1\u7B97\u5931\u8D25\uFF01
-EMB00003 = \u4EBA\u5458\u4F4D\u7F6E\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u4F7F\u7528\u5982\u4E0B\u683C\u5F0F01
+EMB00003 = \u4EBA\u5458\u4F4D\u7F6E\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
 EMB00004 = \u6839\u636E\u5E73\u53F0\u8DEF\u5F84\u751F\u6210\u672C\u5730\u8DEF\u5F84\u5931\u8D25\uFF01

+ 1 - 1
definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -98,5 +98,5 @@ EB3100037 = doorid:{0}\u98CE\u95E8\u4E0D\u5B58\u5728\uFF01
 EB3100038 = aid:{0}\u4E8B\u6545\u4E0D\u5B58\u5728\uFF01
 EMB00001 = \u8BA1\u7B97\u672A\u5B8C\u6210\uFF01
 EMB00002 = \u8BA1\u7B97\u5931\u8D25\uFF01
-EMB00003 = \u4EBA\u5458\u4F4D\u7F6E\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u4F7F\u7528\u5982\u4E0B\u683C\u5F0F01
+EMB00003 = \u4EBA\u5458\u4F4D\u7F6E\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
 EMB00004 = \u6839\u636E\u5E73\u53F0\u8DEF\u5F84\u751F\u6210\u672C\u5730\u8DEF\u5F84\u5931\u8D25\uFF01

+ 24 - 9
src/main/java/com/miniframe/bisiness/system/M00002Service.java

@@ -27,13 +27,13 @@ public class M00002Service extends M00002BaseModel implements ExecProcessFlow {
 		String lname =this.getA_m00002().getLname();
 		String lnodes =this.getA_m00002().getLnodes();
 		String personsites=this.getA_m00002().getPersonsites();
-		String[] persons = personsites.split(";");
-		for (String p:persons) {
-			String[] st =p.split(",");
-			if(st.length!=3){
-				throw new BusinessException("EMB00003");
-			}
-		}
+//		String[] persons = personsites.split(";");
+//		for (String p:persons) {
+//			String[] st =p.split(",");
+//			if(st.length!=3){
+//				throw new BusinessException("EMB00003");
+//			}
+//		}
 		DMwayMapper wdao = UtilTools.getBean(DMwayMapper.class);
 		DAccidentMapper accDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccident da =accDao.selectByPrimaryKey(aid);
@@ -50,12 +50,12 @@ public class M00002Service extends M00002BaseModel implements ExecProcessFlow {
 			mway.setAid(aid);
 			mway.setLname(lname);
 			mway.setLnodes(lnodes);
-			mway.setPersonsites(personsites);
+//			mway.setPersonsites(personsites);
 			wdao.insertSelective(mway);
 		}else{
 			DMway mway =ways.get(0);
 			mway.setLnodes(lnodes);
-			mway.setPersonsites(personsites);
+//			mway.setPersonsites(personsites);
 			wdao.updateByPrimaryKey(mway);
 		}
 		List<DMway> ways2= wdao.selectByExample(wsb);
@@ -75,7 +75,11 @@ public class M00002Service extends M00002BaseModel implements ExecProcessFlow {
 		for (int i = 1; i < lnode_s.length-2; i++) {
 			lnode_sl.add(lnode_s[i]);
 		}
+
 		List<DPipe> pList = getdPipes(ptDao, ptsb, pDao, lnode_sl);
+		DPipe genp=pList.get(0);
+		updateWayPerson(way, genp);
+
 		AllPahtsDFS pathFinder = new AllPahtsDFS();
 		DPipeSQLBuilder.Criteria psc = psb.createCriteria();
 		DPipe genPipe = pList.get(0);
@@ -89,6 +93,17 @@ public class M00002Service extends M00002BaseModel implements ExecProcessFlow {
 
 	}
 
+	/**
+	 * 更新人员定位数据
+	 * @param way
+	 * @param genp
+	 */
+	private void updateWayPerson(DMway way, DPipe genp) {
+		DMwayMapper wdao = UtilTools.getBean(DMwayMapper.class);
+		way.setPersonsites(genp.getCode());
+		wdao.updateByPrimaryKey(way);
+	}
+
 	/**
 	 * 根据平台映射关系 获取 管道
 	 * @param ptDao

+ 1 - 1
系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -118,5 +118,5 @@
 
 4000001,EMB00001,计算未完成!,
 4000002,EMB00002,计算失败!,
-4000003,EMB00003,人员位置数据格式错误,请使用如下格式 01,pipes2,0.1;02,pipes2,0.1,
+4000003,EMB00003,人员位置数据格式错误,
 4000004,EMB00004,根据平台路径生成本地路径失败!