From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 232 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 164 insertions(+), 68 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index e84ac6a..24935b5 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -7,11 +7,15 @@
import cn.hutool.db.Db;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.common.utils.SecurityUtils;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.bs.formula.service.IBsFormulaInfoService;
import com.jcdm.main.bs.formula.service.impl.BsFormulaInfoServiceImpl;
@@ -30,6 +34,8 @@
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
+import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.restful.qingYan.doman.ChildVO;
@@ -94,6 +100,12 @@
@Autowired
private IDaParamCollectionTempService daParamCollectionTempService;
+
+ @Autowired
+ private IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
+ @Autowired
+ private IDaPassingStationCollectionService daPassingStationCollectionService;
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -254,12 +266,13 @@
@Override
public void saveCampaignTimeParameters(DaParamCollection daParamCollection) {
- List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
- .eq(BsFormulaChildInfo::getProcessesCode, daParamCollection.getLocationCode())
- .eq(BsFormulaChildInfo::getSpareField4, "1")
- );
- if(StringUtils.isNotBlank(list.get(0).getResults())){
- if(!list.get(0).getResults().equals("OK")){
+// List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+// .eq(BsFormulaChildInfo::getProcessesCode, daParamCollection.getLocationCode())
+// .eq(BsFormulaChildInfo::getSpareField4, "1")
+// );
+ BsFormulaChildInfo childInfo = daParamCollection.getFormulaChildEntity();
+ if(StringUtils.isNotBlank(childInfo.getResults())){
+ if(!childInfo.getResults().equals("OK")){
try {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
} catch (Exception e) {
@@ -275,45 +288,80 @@
}
return;
}
- BsFormulaChildInfo bsFormulaChildInfo = new BsFormulaChildInfo();
- bsFormulaChildInfo.setProcessesCode(daParamCollection.getLocationCode());
- bsFormulaChildInfo.setProductCode(daParamCollection.getProductCode());
- bsFormulaChildInfo.setSpareField4("1");
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
- String result = bsFormulaChildInfos.get(0).getResults();
+// BsFormulaChildInfo bsFormulaChildInfo = new BsFormulaChildInfo();
+// bsFormulaChildInfo.setProcessesCode(daParamCollection.getLocationCode());
+// bsFormulaChildInfo.setProductCode(daParamCollection.getProductCode());
+// bsFormulaChildInfo.setSpareField4("1");
+// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+ String result = childInfo.getResults();
if(result != null && !result.isEmpty()){
try {
- //杩囩珯鍙傛暟閲囬泦璁板綍鍑虹珯鏃堕棿
- DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
- daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
- daCollectionParamConf.setCollectParameterId("OUTT");
- List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
- DaParamCollection saveData = new DaParamCollection();
- saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
- saveData.setProductCode(daParamCollection.getProductCode());
- saveData.setLocationCode(daParamCollection.getLocationCode());
- saveData.setSfcCode(daParamCollection.getProductBarcode());
- saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
- saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
- saveData.setCollectionTime(new Date());
- saveData.setParamValue(DateUtil.formatDateTime(new Date()));
- daParamCollectionMapper.insertDaParamCollection(saveData);
+// //鏇存柊鍙傛暟閲囬泦閰嶇疆琛�
+// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+// daCollectionParamConf.setCollectParameterId("OUTT");
+// List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
+// DaParamCollection saveData = new DaParamCollection();
+// saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+// saveData.setProductCode(daParamCollection.getProductCode());
+// saveData.setLocationCode(daParamCollection.getLocationCode());
+// saveData.setSfcCode(daParamCollection.getProductBarcode());
+// saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+// saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+// saveData.setCollectionTime(new Date());
+// saveData.setParamValue(DateUtil.formatDateTime(new Date()));
+// daParamCollectionMapper.insertDaParamCollection(saveData);
- //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+ //澧炲姞杩囩珯璁板綍
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ daPassingStationCollection.setSfcCode(daParamCollection.getProductBarcode());
+ daPassingStationCollection.setProductCode(daParamCollection.getProductCode());
daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode());
- List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
- daPassingStationCollections.get(0).setOutboundTime(new Date());
- int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+ daPassingStationCollection.setInboundTime(daParamCollection.getInboundTime());
+ daPassingStationCollection.setOutboundTime(new Date());
+ daPassingStationCollection.setCreateTime(new Date());
+ daPassingStationCollection.setOutRsSign("1");
+ boolean save = daPassingStationCollectionService.save(daPassingStationCollection);
+
+ //娣诲姞鍩虹鍙傛暟
+ this.manualWorkstationsAddBasicParameters(daParamCollection);
+
+// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+// daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+// daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode());
+// List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+// daPassingStationCollections.get(0).setOutboundTime(new Date());
+// int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
// OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode());
//缁檕pc鍙�21
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
if(daParamCollection.getLocationCode().equals("OP240")){
- RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
+ try{
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ logger.info("OP230鎶ュ伐寮�濮�-宸ュ巶MES寮傛鏂规硶");
+ String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "POP230", format.format(new Date()));
+ JSONObject jsonObject = new JSONObject(reportResult);
+ String code = jsonObject.getStr("code");
+ if("success".equals(code)){
+ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂�
+ omProductionOrdeInfoService.updateOrderByProductNum("1",daParamCollection.getProductBarcode(),"POP230");
+ }else{
+ //瑙ｆ瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂�
+ omProductionOrdeInfoService.updateOrderByProductNum("2",daParamCollection.getProductBarcode(),"POP230");
+ }
+ logger.info("OP230鎶ュ伐缁撴潫-宸ュ巶MES寮傛鏂规硶{}"+reportResult);
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+// RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
}
+
+
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -376,36 +424,26 @@
@Override
public void jrmSaveCampaignTimeParameters(DaParamCollection daParamCollection) {
- DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
- daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
- daCollectionParamConf.setCollectParameterId("OUTT");
- List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
- DaParamCollection saveData = new DaParamCollection();
- saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
- saveData.setProductCode(daParamCollection.getProductCode());
- saveData.setLocationCode(daParamCollection.getLocationCode());
- saveData.setSfcCode(daParamCollection.getProductBarcode());
- saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
- saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
- saveData.setCollectionTime(new Date());
- saveData.setParamValue(DateUtil.formatDateTime(new Date()));
- daParamCollectionMapper.insertDaParamCollection(saveData);
-
- //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+ //澧炲姞杩囩珯璁板綍
DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ daPassingStationCollection.setSfcCode(daParamCollection.getProductBarcode());
+ daPassingStationCollection.setProductCode(daParamCollection.getProductCode());
daPassingStationCollection.setLocationCode(daParamCollection.getLocationCode());
- List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
- daPassingStationCollections.get(0).setOutboundTime(new Date());
- int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+ daPassingStationCollection.setInboundTime(daParamCollection.getInboundTime());
+ daPassingStationCollection.setOutboundTime(new Date());
+ daPassingStationCollection.setCreateTime(new Date());
+ daPassingStationCollection.setOutRsSign("1");
+ boolean save = daPassingStationCollectionService.save(daPassingStationCollection);
-// OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode());
+ //娣诲姞鍩虹鍙傛暟
+ this.manualWorkstationsAddBasicParameters(daParamCollection);
//缁檕pc鍙�21
try {
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
- String strA = daParamCollection.getLocationCode();
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build());
+ String str = daParamCollection.getLocationCode();
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+str+".RecordDataDone").value(21).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -466,8 +504,8 @@
public void pushGeelycvMesFeedback(String packID, String stationCode) {
logger.info("杩涘叆浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
- String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
String totalResult = "0";
List<DaParamCollectionTemp> paramList = daParamCollectionTempService.list(new LambdaQueryWrapper<DaParamCollectionTemp>().eq(DaParamCollectionTemp::getSfcCode, packID).eq(DaParamCollectionTemp::getLocationCode, stationCode));
if(paramList.size() > 0){
@@ -524,19 +562,23 @@
logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
logger.info("寮傛鏂规硶鎵ц缁撴潫");
- logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
- List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
- Long[] array = idsList.toArray(new Long[0]);
- int i = daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
+ logger.info("鎵嬪姩宸ヤ綅{}浼犲伐鍘傚叆鍙俈O{}" + stationCode,new Gson().toJson(parentVO));
+ logger.info("鎵嬪姩宸ヤ綅{}浼犲伐鍘侻ES寮傛鏂规硶{}"+stationCode,execute.body());
+
+ DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();
+ daParamCollectionTemp.setSfcCode(packID);
+ daParamCollectionTemp.setLocationCode(stationCode);
+ int i = daParamCollectionTempService.deleteDaParamCollectionTempBySfcCodeAndLocationCode(daParamCollectionTemp);
logger.info("鍒犻櫎涓存椂琛ㄦ暟鎹潯鏁皗}-宸ヤ綅{}-pack鐮亄}",i,stationCode,packID);
+// List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
+// Long[] array = idsList.toArray(new Long[0]);
+// int i = daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
+// logger.info("鍒犻櫎涓存椂琛ㄦ暟鎹潯鏁皗}-宸ヤ綅{}-pack鐮亄}",i,stationCode,packID);
});
}catch (Exception e){
System.out.println(e.getMessage());
}
// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
-
-// System.out.println(execute.body());
- System.out.println("-----------------------"+totalResult);
logger.info("缁撴潫浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
}
@@ -604,16 +646,15 @@
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
- System.out.println(execute.body());
logger.info("寮傛鏂规硶鎵ц缁撴潫");
- logger.info("鑷姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
+ logger.info("鑷姩宸ヤ綅{}浼犲伐鍘傚叆鍙俈O{}" + stationCode,new Gson().toJson(parentVO));
+ logger.info("鑷姩宸ヤ綅{}浼犲伐鍘侻ES寮傛鏂规硶杩斿洖{}"+stationCode,execute.body());
});
}catch (Exception e){
System.out.println(e.getMessage());
}
// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
logger.info("缁撴潫宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉旽ttpResponseSend",stationCode);
- System.out.println("-----------------------"+totalResult);
}
logger.info("缁撴潫宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉昦utomaticWorkstationPushGeelycvMesFeedback",stationCode);
}
@@ -657,7 +698,7 @@
childVOList.add(childVO);
parentVO.setSiteCode("3983");
parentVO.setRecordId(""+timestampMillis);
- parentVO.setStationCode("OP500");
+ parentVO.setStationCode("POP430");
parentVO.setProductNum(daParamCollection.getSfcCode());
parentVO.setTotalResult("1");
parentVO.setCheckList(childVOList);
@@ -673,7 +714,62 @@
// }catch (Exception e){
// System.out.println(e.getMessage());
// }
- RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"OP500",format.format(new Date()));
+ RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"POP430",format.format(new Date()));
+ }
+
+ @Override
+ public void manualWorkstationsAddBasicParameters(DaParamCollection daParamCollection) {
+ // 鍋囪杩欐槸浠庢暟鎹簱鎴栧叾浠栧湴鏂硅幏鍙栫殑鍙傛暟鏁版嵁
+ Map<String, String> map = new HashMap<>();
+ map.put("GC", "鍗楁禂宸ュ巶");
+ map.put("CXBH", "Pack绾�");
+ map.put("SBBH", "璁惧001");
+ map.put("YGBH", SecurityUtils.getUsername());
+ map.put("GDBH", daParamCollection.getWorkOrderNo());
+ map.put("CPXH", daParamCollection.getProductCode());
+ map.put("INT", format.format(daParamCollection.getInboundTime()));
+ map.put("OUTT",format.format(new Date()));
+
+ map.forEach((key, value) -> {
+ DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+ daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+ daCollectionParamConf.setCollectParameterId(key);
+ List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ saveData.setProductCode(daParamCollection.getProductCode());
+ saveData.setLocationCode(daParamCollection.getLocationCode());
+ saveData.setSfcCode(daParamCollection.getProductBarcode());
+ saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+ saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+ saveData.setCollectionTime(new Date());
+ saveData.setParamValue(value);
+ daParamCollectionMapper.insertDaParamCollection(saveData);
+ });
+ }
+
+ @Override
+ public void preInstallOut(DaParamCollection daParamCollection) {
+ String locationCode = daParamCollection.getLocationCode();
+ //澧炲姞杩囩珯璁板綍
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ daPassingStationCollection.setSfcCode(daParamCollection.getProductBarcode());
+ daPassingStationCollection.setLocationCode(locationCode);
+ daPassingStationCollection.setInboundTime(daParamCollection.getInboundTime());
+ daPassingStationCollection.setOutboundTime(new Date());
+ daPassingStationCollection.setCreateTime(new Date());
+ daPassingStationCollection.setOutRsSign("1");
+ boolean save = daPassingStationCollectionService.save(daPassingStationCollection);
+ //娣诲姞鍩虹鍙傛暟
+ this.manualWorkstationsAddBasicParameters(daParamCollection);
+
+ try {
+ String str = "PACK."+locationCode+".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(21).build());
+ logger.info("棰勮宸ヤ綅鍐欏叆OPC鎴愬姛锛屽伐浣嶏細{}锛屽�納}",str,21);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
}
--
Gitblit v1.9.3