From c86ed59bbb89f1a83425a380735a2c788e45d054 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 26 八月 2022 10:47:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 216 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 154 insertions(+), 62 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index c8d8983..62c577e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -1,16 +1,13 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.core.util.PageUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.C3mRedisConfig;
-import com.sandu.ximon.admin.controller.C3mChargingChargeController;
import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
@@ -24,20 +21,15 @@
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.utils.ListPagingUtils;
-import com.sandu.ximon.admin.utils.LogUtils;
-import com.sandu.ximon.admin.utils.RedisUtils;
-import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.utils.*;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.C3ChargingBo;
-import com.sandu.ximon.dao.domain.C3mCharging;
-import com.sandu.ximon.dao.domain.C3mChargingCharge;
-import com.sandu.ximon.dao.domain.C3mOrder;
-import com.sandu.ximon.dao.domain.PoleBinding;
-import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.OrderByEnums;
+import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -78,10 +70,11 @@
}
/**
- * 淇濆瓨涓婃姤C3鍏呯數璁惧蹇冭烦鏁版嵁
+ * 淇濆瓨涓婃姤C3鍏呯數璁惧
*
* @return 鏄惁鎴愬姛
*/
+ @SneakyThrows
public boolean saveReporEquipment(String deviceName, String mcuUdid, String c3Mac) {
C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
boolean flag;
@@ -98,60 +91,55 @@
one.setC3Mac(c3Mac);
flag = updateById(one);
}
+
+ //鍚屾鏃堕棿鎴�
+ System.out.println("鍚屾鏃堕棿鎴冲紑濮�");
+ String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+ String s = SetCalendar(c3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+ Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
+ Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
+ if (!"鎿嶄綔鎴愬姛".equals(s)) {
+ LogUtils.error("鍙戦�佽缃瓹3鏃堕棿鍚屾澶辫触!");
+ return false;
+ }
+ System.out.println("鍚屾鏃堕棿鎴崇粨鏉�");
+
+ Thread.sleep(1000);
+
//璁剧疆璐圭巼
+ System.out.println("璁剧疆璐圭巼寮�濮�");
C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
-// /**
-// * 娣诲姞缁戝畾鍏崇郴寮�濮�
-// */
-// Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
-// if (pole == null) {
-// Pole pole1 = new Pole();
-// pole1.setDeviceCode(deviceName);
-// pole1.setPoleName(deviceName);
-// pole1.setPoleCode(poleService.generatePoleCode());
-// poleService.save(pole1);
-// }
-//
-// Long poleId = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName)).getId();
-// PoleBindingParam poleBindingParam = new PoleBindingParam();
-// poleBindingParam.setDeviceType(2);
-// poleBindingParam.setDeviceCode(mcuUdid);
-// bindingService.bindPole(poleId, poleBindingParam);
+ String rateState = setRate(c3Mac, list, true);
+ System.out.println("璁剧疆璐圭巼缁撴灉锛�" + rateState);
+ System.out.println("璁剧疆璐圭巼缁撴潫");
- /**
- * 娣诲姞缁戝畾鍏崇郴缁撴潫
- */
+ Thread.sleep(1000);
- //鍚屾鏃堕棿鎴�
- String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
- String s = SetCalendar(c3Mac, Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
- Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
- Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)));
- if (!"鎿嶄綔鎴愬姛".equals(s)) {
- LogUtils.error("鍙戦�佽缃瓹3鏃堕棿鍚屾澶辫触!");
- return false;
- }
/** 璺冲寘鏃堕棿鍚屾
* 璁剧疆鏃堕棿瑙勫垯锛氬厖鐢垫椂涓�1鍊嶏紝闈炲厖鐢电姸鎬佷负1.5鍊嶆椂闂�
*/
+ System.out.println("璁剧疆蹇冭烦鍖呴棿闅旀椂闂村紑濮�");
Set<String> keys = RedisUtils.getBean().keys(C3mRedisConstant.C3_STATUS.getCode() + "*");
C3mRedisConfig.reFlushTime(keys.size());
- String time1 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false);
+ String time1 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME) * 2, false, true);
LogUtils.error("C3绌洪棽蹇冭烦鍖呮椂闂村悓姝ュ搷搴旂粨鏋滐細" + time1);
- String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true);
+ String time2 = SetHeartbeatPacketTimeCharging(c3Mac, C3mRedisConfig.parseInt(C3mRedisConfig.HEART_BEAT_TIME), true, true);
LogUtils.error("C3鍏呯數鏃跺績璺冲寘鏃堕棿鍚屾鍝嶅簲缁撴灉锛�" + time2);
+ System.out.println("璁剧疆蹇冭烦鍖呴棿闅旀椂闂寸粨鏉�");
+ Thread.sleep(1000);
/**
* 鑾峰彇蹇冭烦鍖咃紝鍒ゆ柇鍦ㄧ嚎
*/
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
+ System.out.println("鑾峰彇蹇冭烦鍖呭紑濮�");
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac, true);
if (aPackage == null) {
LogUtils.error("璇诲彇蹇冭烦鍖呬负绌�");
return false;
@@ -162,15 +150,20 @@
JSON.toJSONString(aPackage),
C3mRedisConfig.OUTLINE_TIME
);
+ System.out.println("鑾峰彇蹇冭烦鍖呯粨鏉�");
+ Thread.sleep(1000);
/**
* finally銆佸悓姝ョ粨鏉�
*/
- String end = EndOfTheSynchronization(c3Mac);
+ System.out.println("鍚屾缁撴潫 寮�濮�");
+ String end = EndOfTheSynchronization(c3Mac, true);
if (!"鎿嶄綔鎴愬姛".equals(end)) {
LogUtils.error("C3鍚屾缁撴潫鍝嶅簲缁撴灉" + end);
return false;
}
+ System.out.println("鍚屾缁撴潫 缁撴潫");
+
return flag;
}
@@ -179,7 +172,7 @@
*
* @return
*/
- public Map getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam) {
+ public Map getC3ChargingListByKeyword(BaseConditionVO baseConditionVO, C3ChargingParam c3ChargingParam, Integer order, Integer seq) {
if (c3ChargingParam == null) {
c3ChargingParam = new C3ChargingParam();
}
@@ -188,12 +181,38 @@
if (c3ChargingParam.getKeyword() != null) {
c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
}
+ //鎺掑簭瀛楁
+ String orderByResult = "t1.c3_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.CHARGE_POLE_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
List<C3ChargingBo> c3ChargingBoList;
if (SecurityUtils.getClientId() == null) {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null);
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), null, orderBy);
} else {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId());
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword(), SecurityUtils.getUserId(), orderBy);
}
//鍦ㄧ嚎鏁伴噺
int onlineNumber = 0;
@@ -203,6 +222,8 @@
int faultNumber = 0;
//绛夊緟鎺ュ叆鏁伴噺
int waitConnectNumber = 0;
+ //鍏呯數涓暟閲�
+ int chargingNumber = 0;
for (C3ChargingBo one : c3ChargingBoList) {
String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
@@ -217,6 +238,7 @@
break;
//2.鍏呯數涓�
case 2:
+ chargingNumber++;
onlineNumber = onlineNumber + 1;
break;
//3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭
@@ -258,6 +280,7 @@
map.put("offlineNumber", offlineNumber);
map.put("faultNumber", faultNumber);
map.put("waitConnectNumber", waitConnectNumber);
+ map.put("chargingNumber", chargingNumber);
return map;
}
@@ -271,9 +294,9 @@
List<C3ChargingBo> c3ChargingBoList;
if (SecurityUtils.getClientId() == null) {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, null);
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, null, "c3_id ASC");
} else {
- c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId());
+ c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId(), "c3_id ASC");
}
return c3ChargingBoList;
}
@@ -300,13 +323,13 @@
if (one == null) {
throw new BusinessException("鍏呯數妗╀俊鎭笉瀛樺湪锛�");
}
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac());
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = ReadTheHeartbeatPackage(one.getC3Mac(), false);
if (beatDataPackage != null) {
//鍏呯數妗㊣D
chargingDto.setC3Id(one.getC3Id());
//C3Mac
chargingDto.setC3Mac(one.getC3Mac());
- //鍦ㄧ嚎鐘舵��
+ //鍦ㄧ嚎鐘舵�� 1.绌洪棽 2.鍏呯數涓� 3.鍏呯數涓柇锛岀瓑寰呮湇鍔″櫒纭 4.鍏呯數缁撴潫锛岀瓑寰呮湇鍔″櫒纭 5.鏈夋晠闅� 6.涓庡厖鐢垫々瀵规帴涓�
chargingDto.setStatusBit(Integer.valueOf(beatDataPackage.getStatusBit()));
//鐢靛帇
chargingDto.setGridVoltage(beatDataPackage.getGridVoltage());
@@ -318,6 +341,10 @@
chargingDto.setPoleId(pole.getId());
//璐圭巼
BigDecimal bigDecimal = SpringContextHolder.getBean(C3mChargingChargeService.class).getchargeDecimalByC3id(one.getC3Id());
+ //宸插厖鐢甸噺
+ chargingDto.setChargedCapacity(beatDataPackage.getChargedCapacity());
+ //鍏呯數鏃堕暱
+ chargingDto.setAlreadyChargingTime(beatDataPackage.getAlreadyChargingTime());
chargingDto.setRate(bigDecimal);
}
@@ -431,7 +458,7 @@
if (order == null) {
throw new BusinessException("鍏呯數妗╂病鏈夎繘琛屼腑鐨勮鍗�");
}
- if (!openId.equals(order.getOrderId())) {
+ if (!openId.equals(order.getUserCode())) {
throw new BusinessException("涓嶈兘鎿嶄綔涓嶅睘浜庢偍鐨勮鍗�");
}
@@ -480,8 +507,9 @@
* 鍚屾缁撴潫
*
* @param c3Mac
+ * @param resendFlag 閲嶅彂鏍囧織
*/
- public String EndOfTheSynchronization(String c3Mac) {
+ public String EndOfTheSynchronization(String c3Mac, boolean resendFlag) {
C3EndOfTheSynchronizationReqInnerFrame c3EndOfTheSynchronizationReqInnerFrame =
new C3EndOfTheSynchronizationReqInnerFrame(c3Mac);
@@ -492,7 +520,12 @@
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ }
StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-鍚屾缁撴潫", a5Frame, commonFrame);
@@ -695,8 +728,9 @@
* 璇诲績璺冲寘
*
* @param c3Mac
+ * @param resendFlag 閲嶅彂鏍囧織
*/
- public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(String c3Mac) {
+ public A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage ReadTheHeartbeatPackage(String c3Mac, boolean resendFlag) {
C3ReadTheHeartbeatPackageReqInnerFrame readTheHeartbeatPackageReqInnerFrame =
new C3ReadTheHeartbeatPackageReqInnerFrame(c3Mac);
@@ -707,7 +741,12 @@
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ }
StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璇诲彇蹇冭烦鍖�", a5Frame, commonFrame);
@@ -726,9 +765,10 @@
*
* @param c3Mac
* @param setTime
+ * @param resndFlag 閲嶅彂鏍囧織
* @return
*/
- public String SetHeartbeatPacketTimeCharging(String c3Mac, int setTime, boolean flag) {
+ public String SetHeartbeatPacketTimeCharging(String c3Mac, int setTime, boolean flag, boolean resndFlag) {
if (setTime <= 0) {
throw new BusinessException("璁剧疆鐨勫績璺冲寘闂撮殧鏃堕棿閿欒锛�");
}
@@ -742,7 +782,12 @@
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ CommonFrame commonFrame;
+ if (resndFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ }
StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆蹇冭烦鍖呴棿闅旀椂闂�", a5Frame, commonFrame);
@@ -842,9 +887,10 @@
* 璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
*
* @param c3Mac
+ * @param resendFlag 鏄惁闇�瑕侀噸鍙戞爣蹇�
* @return
*/
- public String SetCalendar(String c3Mac, int year, int month, int day, int hour, int min, int sec) {
+ public String SetCalendar(String c3Mac, int year, int month, int day, int hour, int min, int sec, boolean resendFlag) {
C3SetCalendarReqInnerFrame setCalendarReqInnerFrame =
@@ -857,7 +903,14 @@
if (c3mCharging == null) {
throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
}
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ //闇�瑕侀噸鍙�
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ //涓嶉渶瑕侀噸鍙�
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ }
StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆鏃ュ巻", a5Frame, commonFrame);
System.out.println(commonFrame + " -----commonFrame");
@@ -871,6 +924,45 @@
}
/**
+ * 璁剧疆璐圭巼
+ *
+ * @param c3Mac
+ * @param list
+ * @return
+ */
+ public String setRate(String c3Mac, List<C3mChargingCharge> list, boolean resendFlag) {
+ if (StringUtil.strIsNullOrEmpty(c3Mac)) {
+ throw new BusinessException("C3Mac鍦板潃涓嶈兘涓虹┖锛�");
+ }
+ if (list.isEmpty()) {
+ throw new BusinessException("璐圭巼鏁版嵁涓嶈兘涓虹┖锛�");
+ }
+ C3SetRateReqInnerFrame c3SetRateReqInnerFrame = new C3SetRateReqInnerFrame(c3Mac, list);
+
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), c3SetRateReqInnerFrame);
+ System.out.println(a5Frame + " -----a5Frame");
+ C3mCharging c3mCharging = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
+ if (c3mCharging == null) {
+ throw new BusinessException("C3鍏呯數妗╃‖浠秏cu_udid涓嶅瓨鍦�");
+ }
+ CommonFrame commonFrame;
+ if (resendFlag) {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame, true);
+ } else {
+ commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(c3mCharging.getPoleDevicesCode(), a5Frame);
+ }
+ StoreOperationRecordsUtils.storeInnerFrameData(c3Mac, "C3甯�-璁剧疆璐圭巼", a5Frame, commonFrame);
+ System.out.println(commonFrame + " -----commonFrame");
+
+ A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(commonFrame.getPayload());
+ if (operationReportInnerFrame.isValidate()) {
+ return operationReportInnerFrame.getState();
+ } else {
+ throw new BusinessException("鏁版嵁鏍￠獙閿欒锛岃閲嶆柊璇锋眰");
+ }
+ }
+
+ /**
* 鏁呴殰鐮佷笂鎶ユ竻闄�
*
* @param c3Mac
--
Gitblit v1.9.3