From 16b37165b10c0e47fd7ee0bb6cd7091775a35fbe Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 20 十月 2025 14:46:44 +0800
Subject: [PATCH] 修复堆垛机线程堆垛机号为空
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 320 ++++++++++------------------------------------------
1 files changed, 64 insertions(+), 256 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1892047..cfc018f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,11 +5,9 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
@@ -21,15 +19,16 @@
import com.zy.core.model.protocol.StaError1;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.entity.BasDevp;
-import com.zy.entity.WrkMast;
import com.zy.service.BasDevpService;
-import com.zy.service.WrkMastService;
import com.zy.utils.News;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -46,17 +45,14 @@
private short heartBeatVal = 1;
private StaError1 staError1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);
- add(104);add(105);add(106);add(107);
- add(200);add(201);add(202);add(203);add(210);
- add(300);add(301);add(302);add(303);add(304);add(305);
+ add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
}};
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(1); add(2);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
- add(101); add(103);
+ add(104); add(106);
}};
/**
@@ -73,11 +69,6 @@
* 4.鍑哄簱妯″紡
*/
public IoModeType ioModeOf101 = IoModeType.NONE;
- public IoModeType ioModeOf103 = IoModeType.NONE;
- public IoModeType ioModeOf305 = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
-// public IoModeType ioModeOf4F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -106,7 +97,7 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
- log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
+// log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
default:
break;
@@ -120,6 +111,7 @@
}
}
+
/**
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
@@ -145,6 +137,24 @@
staProtocol.setPakMk(true);
}
}
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ try {
+ List<BasDevp> basDevps = new ArrayList<>();
+ for (Integer siteId2 : staNos) {
+ StaProtocol staProtocol2 = station.get(siteId2);
+ basDevps.add(staProtocol2.toSqlModel());
+ }
+
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if(basDevps.size() > 0) {
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ }
+ }
+
+ } catch (Exception e){
+
+ }
}
@Override
@@ -170,15 +180,12 @@
/**
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
- private void read() throws InterruptedException {
-// // 鏇存柊鍏ュ嚭搴撴ā寮�
-// updateIoMode();
-// ArrayList<Integer> staNos = getStaNo();
-// int staNoSize = staNos.size();
- // 璇讳竴妤艰繛缁�8涓珯鐐�
+ private void read() {
+
+ // 绔欑偣淇℃伅
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (8*8));
if (result.IsSuccess) {
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -198,96 +205,25 @@
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
+ staProtocol.setLow(status[7]); // 涓簱浣�
+ staProtocol.setCenter(status[8]); // 浣庡簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
}
+ } else {
+ initSite();
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ News.error("SiemensCrn"+" - 4"+" - 璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ return;
}
- // 璇讳簩妤艰繛缁�4涓珯鐐�
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.800", (short) (4*8));
- if (result2.IsSuccess) {
- for (int i = 8; i < 12; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result2.Content, (i-8)*8)); // 宸ヤ綔鍙�
-
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result2.Content, (i-8)*8 + 4)); // 鐩爣绔�
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result2.Content, (i-8)*8 + 6, 2);
- staProtocol.setAutoing(status[0]); // 鑷姩
- staProtocol.setLoading(status[1]); // 鏈夌墿
- staProtocol.setInEnable(status[2]); // 鍙叆
- staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
- staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
-
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
- }
- }
- }
- // 璇讳簩妤�210
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.880", (short) (8));
- if (result3.IsSuccess) {
- Integer siteId = staNos.get(12); // 绔欑偣缂栧彿210
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result3.Content, 0)); // 宸ヤ綔鍙�
-
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result3.Content, 4)); // 鐩爣绔�
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 6, 2);
- staProtocol.setAutoing(status[0]); // 鑷姩
- staProtocol.setLoading(status[1]); // 鏈夌墿
- staProtocol.setInEnable(status[2]); // 鍙叆
- staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
- staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
-
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
- }
- }
-
-// BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
- //RGV灏忚溅1
-// Thread.sleep(100);
-// OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
-// if (result3.IsSuccess) {
-// BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
-// if (!Cools.isEmpty(basRgvMap)){
-// Integer siteId = 1;
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setAutoing(true);
-// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
-// }
-// }
// 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.1672", (short) ((BarcodeList.size()+1) * 8)); // 涓嶈繛缁�
+ OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.400", (short) (BarcodeList.size() * 10));
if (barcodeResult.IsSuccess) {
for (int i = 0; i < BarcodeList.size(); i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*16,8, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*10 + 2,8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, BarcodeList.get(i));
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
@@ -296,25 +232,29 @@
}
// 澶栧舰妫�娴�
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.1652", (short) ((staNosErrList.size()+1)*4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.430", (short) (staNosErrList.size() *4)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
if (resultErr.IsSuccess){
for (int i = 0;i<staNosErrList.size();i++){
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*9+2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4, 1);
StaProtocol staProtocol = station.get(staNosErrList.get(i));
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
staProtocol.setHighErr(status[2]);
staProtocol.setLeftErr(status[3]);
staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
+ staProtocol.setGroupSupportErr(status[5]);
staProtocol.setBarcodeErr(status[6]);
+ staProtocol.setWeightErr(status[7]);
+ short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4 + 2);
+ staProtocol.setGoodsHeight(goodsHeight);
}
}
- // 璇讳竴妤艰繛缁�8涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
- OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.3312", (short) (8*2));
+
+ // 鏁呴殰淇℃伅鍙嶉
+ OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.442", (short) (staNos.size() * 4));
if (resultErr2.IsSuccess) {
- for (int i = 0; i < 8; i++) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*2 + 1, 1);
+ for (int i = 0; i < staNos.size(); i++) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4 + 2, 1);
StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
staProtocol.setBreakerErr(status[0]);
staProtocol.setInfraredErr(status[1]);
@@ -327,112 +267,6 @@
}
}
- // 璇讳簩妤艰繛缁�4涓珯鐐癸紝鏁呴殰淇℃伅鍙嶉
- OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB101.3512", (short) (4*2));
- if (resultErr3.IsSuccess) {
- for (int i = 8; i < 12; i++) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, (i-8) * 2 + 1, 1);
- StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
- staProtocol.setBreakerErr(status[0]);
- staProtocol.setInfraredErr(status[1]);
- staProtocol.setOutTimeErr(status[2]);
- staProtocol.setSeizeSeatErr(status[3]);
- staProtocol.setWrkYgoodsN(status[4]);
- staProtocol.setInverterErr(status[5]);
- staProtocol.setContactErr(status[6]);
- staProtocol.setUpcontactErr(status[7]);
- }
- }
-
- // 涓�妤煎嚭鍏ュ簱妯″紡鍒囨崲
- OperateResultExOne<byte[]> ioModeResult = siemensS7Net.Read("DB101.3724", (short) 1);
- if (ioModeResult.IsSuccess) {
- boolean[] ioModelBooleans = siemensS7Net.getByteTransform().TransBool(ioModeResult.Content, 0, 1);
-// log.info("璇诲彇鍑哄叆搴撴ā寮忥細" + Arrays.toString(ioModelBooleans));
- WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
- if (ioModelBooleans[0]) { // 100鍒囧叆搴�
- if (ioModeOf101 == IoModeType.PAKOUT_MODE) {
- int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
- .eq("sta_no", 100).in("wrk_sts", 12, 13, 14));
- if (outCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[0]=true;
- ioModeOf101 = IoModeType.PAKIN_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("101鍒囨崲鍏ュ簱妯″紡鎴愬姛");
- }
- }
- }
- if (ioModelBooleans[1]) { // 100鍒囧嚭搴�
- if (ioModeOf101 == IoModeType.PAKIN_MODE) {
- int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
- .eq("sta_no", 101).in("wrk_sts", 2, 3, 4));
- if (inCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[0]=true;
- ioModeOf101 = IoModeType.PAKOUT_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("101鍒囨崲鍑哄簱妯″紡鎴愬姛");
- }
- }
- }
- if (ioModelBooleans[2]) { // 102鍒囧叆搴�
- if (ioModeOf103 == IoModeType.PAKOUT_MODE) {
- int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
- .eq("sta_no", 102).in("wrk_sts", 12, 13, 14));
- if (outCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[1]=true;
- ioModeOf103 = IoModeType.PAKIN_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("103鍒囨崲鍏ュ簱妯″紡鎴愬姛");
- }
- }
- }
- if (ioModelBooleans[3]) { // 102鍒囧嚭搴�
- if (ioModeOf103 == IoModeType.PAKIN_MODE) {
- int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
- .eq("sta_no", 103).in("wrk_sts", 2, 3, 4));
- if (inCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[1]=true;
- ioModeOf103 = IoModeType.PAKOUT_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("103鍒囨崲鍑哄簱妯″紡鎴愬姛");
- }
- }
- }
- }
-
-
-// OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
-// if (resultErr3.IsSuccess) {
-// if (staError1 == null){
-// staError1 = new StaError1();
-// }
-// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
-// staError1.setEMERGENCY_Stop_Core(status[0]);
-// staError1.setEMERGENCY_STOP1(status[1]);
-// staError1.setEMERGENCY_STOP2(status[2]);
-// staError1.setEMERGENCY_STOP3(status[3]);
-// staError1.setEMERGENCY_STOP4(status[4]);
-//
-// staError1.setDoor_EMERGENCY_STOP1(status[5]);
-// staError1.setDoor_EMERGENCY_STOP2(status[6]);
-// staError1.setDoor_EMERGENCY_STOP3(status[7]);
-// staError1.setDoor_EMERGENCY_STOP4(status[8]);
-// staError1.setDoor_EMERGENCY_STOP5(status[9]);
-// staError1.setDoor_EMERGENCY_STOP6(status[10]);
-//
-// staError1.setDoor_Open_Err1(status[11]);
-// staError1.setDoor_Open_Err1(status[12]);
-// staError1.setDoor_Open_Err1(status[13]);
-// staError1.setDoor_Open_Err1(status[14]);
-// staError1.setDoor_Open_Err1(status[15]);
-// staError1.setDoor_Open_Err1(status[16]);
-//
-// }
-
if (result.IsSuccess) {
@@ -471,40 +305,22 @@
return;
}
- int address = -1;
- switch (staProtocol.getSiteId()) {
- case 100: address = 0; break;
- case 101: address = 4; break;
- case 102: address = 8; break;
- case 103: address = 12; break;
- case 104: address = 16; break;
- case 105: address = 20; break;
- case 106: address = 24; break;
- case 107: address = 28; break;
- case 200: address = 400; break;
- case 201: address = 404; break;
- case 202: address = 408; break;
- case 203: address = 412; break;
- case 210: address = 440; break;
- default:
- }
- if(address == -1) {
- throw new CoolException("鍐欏叆绔欑偣寮傚父锛�" + staProtocol.getSiteId());
- }
+ int address = staNos.indexOf(staProtocol.getSiteId()) * 4;
+
OperateResult write;
OperateResult write1;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write1 = siemensS7Net.Write("DB100." + (address+2), staProtocol.getStaNo()); // 鐩爣绔�
write = siemensS7Net.Write("DB100." + address, staProtocol.getWorkNo().shortValue()); // 宸ヤ綔鍙�
+ write1 = siemensS7Net.Write("DB100." + (address + 2), staProtocol.getStaNo()); // 鐩爣绔�
Thread.sleep(200);
if(write.IsSuccess && write1.IsSuccess){
break;
}
else {
writeCount++;
- log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ News.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
}while (writeCount<5);
@@ -519,16 +335,7 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
}
- }
-
- // 鏇存柊鍏ュ嚭搴撴ā寮�
- private void updateIoMode() throws InterruptedException {
-// if (this.ioModeOf2F != IoModeType.NONE) {
-// if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-// OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-// News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
-// }
-// }
+ read();
}
/**
@@ -562,12 +369,13 @@
siemensS7Net.ConnectClose();
}
-// public static void main(String[] args) throws Exception {
-// DevpSlave slave = new DevpSlave();
-// slave.setIp("192.168.2.125");
-// SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-// devpThread.connect();
-// devpThread.read();
+ public static void main(String[] args) throws Exception {
+ DevpSlave slave = new DevpSlave();
+ slave.setIp("10.10.10.18");
+ SiemensDevpThread devpThread = new SiemensDevpThread(slave);
+ devpThread.connect();
+
+ devpThread.read();
// // 鍐�
// StaProtocol staProtocol = devpThread.getStation().get(1);
// staProtocol.setWorkNo((short) 232);
@@ -580,7 +388,7 @@
// // 璇�
// devpThread.read();
// System.out.println(JSON.toJSONString(devpThread.station));
-//
-// }
+
+ }
}
--
Gitblit v1.9.1