From b932227695d1118a93b104df8b13987d78514710 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 16 十月 2024 09:43:12 +0800
Subject: [PATCH] 版本整合02
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 329 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 276 insertions(+), 53 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index e214749..83e7104 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -8,8 +8,8 @@
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
+import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.entity.request.IdentWornRequest;
@@ -19,10 +19,13 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.pp.entity.OptimizeDetail;
-import com.mes.pp.entity.OptimizeLayout;
+import com.mes.pp.entity.*;
import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.pp.mapper.OptimizeHeatDetailMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -54,7 +57,13 @@
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
+ EngineeringMapper engineeringMapper;
+
+ @Autowired
OptimizeDetailMapper optimizeDetailMapper;
+
+ @Autowired
+ OptimizeHeatDetailMapper optimizeHeatDetailMapper;
@Autowired
EdgStorageCageMapper edgStorageCageMapper;
@@ -65,11 +74,48 @@
TaskCacheService taskCacheService;
@Autowired
+ DamageMapper damageMapper;
+
+ @Autowired
DamageService damageService;
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
-
+//
+// @Override
+// public boolean identWorn(Map<String, Object> arguments) {
+// String glassId=arguments.get("glassId").toString();
+// int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
+// int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
+// String workingProcedure=arguments.get("workingProcedure").toString();
+// if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
+// log.info("鍓嶇浼犻�掓暟鎹笉鍏�:{}",arguments);
+// return false;
+// }
+// List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
+// .selectAll(GlassInfo.class)
+// .eq(GlassInfo::getGlassId, glassId));
+// if (GlassInfos.size() == 1) {
+// Damage damage =new Damage();
+// damage.setGlassId(glassId);
+// damage.setLine(line);
+// damage.setWorkingProcedure(workingProcedure);
+// damage.setRemark("");
+// damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
+// damageService.insertDamage(damage);
+// }else{
+// return false;
+// }
+// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+// .selectAll(EdgStorageCageDetails.class)
+// .eq(EdgStorageCageDetails::getGlassId, glassId));
+// if (edgStorageCageDetails.size() == 1) {
+// EdgStorageCageDetails item = edgStorageCageDetails.get(0);
+// item.setState(state);
+// baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
+// }
+// return true;
+// }
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
*
@@ -77,13 +123,67 @@
*/
@Override
public List<Map<String, Object>> selectCutTerritory() {
- List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
+ //鏌ヨEdgStorageCageDetails鏈�鍚庝竴寮犵幓鐠冩墍灞炵増鍥�
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
- .orderByDesc(UpPattenUsage::getState)
- .orderByDesc(UpPattenUsage::getId));
+ .distinct()
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
+ .eq(Engineering::getState,1)
+ .and(wrapper->wrapper.isNotNull(EdgStorageCageDetails::getId).or().isNotNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
+ );
if (!upPattenUsage.isEmpty()) {
+ //褰撳墠鐗�
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
- List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ //鏌ョ湅褰撳墠鐗堟槸鍚﹀瓨鍦ㄦ湭杩涚瀛愭垨鐮存崯鐨勭幓鐠�
+ List<UpPattenUsage> upPattenUsage2=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(GlassInfo.class, on -> on
+ .eq(GlassInfo::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(GlassInfo::getPatternSequence,UpPattenUsage::getLayoutSequence))
+ .leftJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(EdgStorageCageDetails::getGlassId,GlassInfo::getGlassId))
+ .leftJoin(Damage.class, on -> on
+ .eq(Damage::getEngineerId, UpPattenUsage::getEngineeringId)
+ .eq(Damage::getGlassId,GlassInfo::getGlassId))
+ .eq(UpPattenUsage::getEngineeringId,upPattenUsage.get(0).getEngineeringId())
+ .eq(UpPattenUsage::getLayoutSequence,upPattenUsage.get(0).getLayoutSequence())
+ .and(wrapper->wrapper.isNull(EdgStorageCageDetails::getId).or().isNull(Damage::getId))
+ .orderByDesc(UpPattenUsage::getLayoutSequence)
+ .orderByDesc(GlassInfo::getId)
+ );
+ //鏄剧ず涓嬩竴鐗� 鍚﹀垯鏄剧ず褰撳墠鐗堝浘
+ if(upPattenUsage2.isEmpty()){
+ //鍓╀綑鐗堝浘
+ List<UpPattenUsage> upPattenUsage3=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
+ .selectAll(UpPattenUsage.class)
+ .distinct()
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .eq(Engineering::getState,1)
+ .gt(UpPattenUsage::getLayoutSequence,upPattenUsage1.getLayoutSequence())
+ .orderByAsc(UpPattenUsage::getLayoutSequence)
+ );
+ if(!upPattenUsage3.isEmpty()){
+ //鍒囨崲鎴愪笅涓�鐗堝浘
+ upPattenUsage1=upPattenUsage3.get(0);
+ }
+ }
+
+ List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -93,29 +193,36 @@
.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
);
- List<Map<String, Object>> ResultcutTerritorys = new ArrayList<>();
- for (Map<String, Object> cutTerritory : cutTerritorys) {
- EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if (edgStorageCageDetails != null) {
- cutTerritory.put("glass_state", edgStorageCageDetails.getState());
- } else {
- cutTerritory.put("glass_state", 0);
- }
- ResultcutTerritorys.add(cutTerritory);
- }
- return ResultcutTerritorys;
+ Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
-// Sql鐗堟湰
-// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
-// .select("ol.width as olwidth","ol.height as olheight")
-// .leftJoin("optimize_layout ol on t.project_no=ol.project_no and t.stock_id=ol.stock_id")
-// .eq("t.project_no", upPattenUsage1.getEngineeringId())
-// .eq("t.stock_id",upPattenUsage1.getLayoutSequence())
-// );
+ Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ .selectAll(Damage.class)
+ .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
+ .and(wrapper->wrapper.eq(Damage::getType,8)
+ .or()
+ .eq(Damage::getType,9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ for (Map<String, Object> cutTerritory : cutTerritorys) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
+ return new ArrayList<>();
+ }else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
+ //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
+ cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getType());
+ }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
+ cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
+ }else{
+ cutTerritory.put("glass_state",0);
+ }
+ resultCutTerritory.add(cutTerritory);
+ }
+ return resultCutTerritory;
}
return null;
}
@@ -128,10 +235,19 @@
*/
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+
+ List<Engineering> engineering=engineeringMapper.selectJoinList(Engineering.class, new MPJLambdaWrapper<Engineering>()
+ .selectAll(Engineering.class)
+ .eq(Engineering::getEngineerId,current)
+ );
+ if(engineering.size()==0){
+ log.info("褰撳墠宸ョ▼鍙锋湭棰嗗彇杩�:{}",current);
+ return new ArrayList<>();
+ }
//缁撴灉
- List<Map<String, Object>> ResultcutTerritorys = new ArrayList<>();
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -141,32 +257,113 @@
.eq(OptimizeDetail::getProjectNo, current)
);
- Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getEngineerId, current)
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
- ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails));
- for (Map<String, Object> cutTerritory : cutTerritorys) {
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if (cutTerritory.get("glass_id") == null || "".equals(cutTerritory.get("glass_id"))) {
- log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}", cutTerritorys);
+ .eq(EdgStorageCageDetails::getEngineerId,current)
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));
+
+ Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ .selectAll(Damage.class)
+ .eq(Damage::getEngineerId,current)
+ .and(wrapper->wrapper.eq(Damage::getType,8)
+ .or()
+ .eq(Damage::getType,9))
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+
+ for (Map<String, Object> item : cutTerritory) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
return new ArrayList<>();
- } else if (edgMaps.get(cutTerritory.get("glass_id")) != null) {
- cutTerritory.put("glass_state", edgMaps.get(cutTerritory.get("glass_id")).getState());
- } else {
- cutTerritory.put("glass_state", 0);
}
- ResultcutTerritorys.add(cutTerritory);
+ if(damageMaps.get(item.get("glass_id"))!=null){
+ //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
+ item.put("glass_state",damageMaps.get(item.get("glass_id")).getType());
+ }else if(edgMaps.get(item.get("glass_id"))!=null){
+ item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
+ }else{
+ item.put("glass_state",0);
+ }
+ resultCutTerritory.add(item);
}
- Map<String, List<Map<String, Object>>> groupBy = ResultcutTerritorys.stream().collect(Collectors.groupingBy(item -> item.get("stock_id").toString()));
+ Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
- return new ArrayList<>(groupBy.values());
-//Sql鐗堟湰
-// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
-// .select("ol.width as olwidth","ol.height as olheight")
-// .leftJoin("optimize_layout ol on t.project_no=ol.project_no and t.stock_id=ol.stock_id")
-// .eq("t.project_no",current)
-// );
+ int count=1;
+ List<List<Map<String, Object>>> result=new ArrayList<>();
+ for (String item : groupBy.keySet()) {
+ String key=count+"";
+ if(key!=null){
+ result.add(groupBy.get(key));
+ }
+ count++;
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ *
+ * @param current
+ * @return
+ */
+ @Override
+ public List<List<Map<String, Object>>> selectTemperingTerritory(String current) {
+ //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
+ List<Map<String, Object>> resultCutTerritory=optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
+ .selectAll(OptimizeHeatDetail.class)
+ .selectAs(OptimizeProject::getLoadWidth, "olWidth")
+ .selectAs(OptimizeProject::getLoadLength, "olHeight")
+ .leftJoin(OptimizeHeatLayout.class, on -> on
+ .eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo)
+ .eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId))
+ .leftJoin(OptimizeProject.class, on -> on
+ .eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
+ .eq(OptimizeHeatDetail::getProjectNo, current)
+ );
+
+ Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
+// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
+ List<List<Map<String, Object>>> result = new ArrayList<>();
+ for (int i = 1; i <= groupBy.keySet().size(); i++) {
+ String key = i + "";
+ if (key != null) {
+ result.add(groupBy.get(key));
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ *
+ * @param current
+ * @return
+ */
+ @Override
+ public List<List<Map<String, Object>>> selectTemperingTerritory(String current) {
+ //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
+ List<Map<String, Object>> resultCutTerritory = optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
+ .selectAll(OptimizeHeatDetail.class)
+ .selectAs(OptimizeProject::getLoadWidth, "olWidth")
+ .selectAs(OptimizeProject::getLoadLength, "olHeight")
+ .leftJoin(OptimizeHeatLayout.class, on -> on
+ .eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo)
+ .eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId))
+ .leftJoin(OptimizeProject.class, on -> on
+ .eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
+ .eq(OptimizeHeatDetail::getProjectNo, current)
+ );
+
+ Map<String, List<Map<String, Object>>> groupBy = resultCutTerritory.stream().collect(Collectors.groupingBy(item -> item.get("layout_id").toString()));
+// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
+ List<List<Map<String, Object>>> result = new ArrayList<>();
+ for (int i = 1; i <= groupBy.keySet().size(); i++) {
+ String key = i + "";
+ if (key != null) {
+ result.add(groupBy.get(key));
+ }
+ }
+ return result;
}
/**
@@ -302,4 +499,30 @@
.set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
return "success";
}
+
+ /**
+ * 杩涚墖 鎵爜ID楠岃瘉閲嶅
+ *
+ * @param glassId
+ * @return
+ */
+ @Override
+ public boolean inToVerify(String glassId){
+ List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
+ );
+ if (listEdgStorageCageDetails.isEmpty()) {
+ //璇存槑姝ょ幓鐠冩病鏈夎繘杩囩悊鐗�
+ return true;
+ }else{
+ List<Damage> damage=damageMapper.selectList(new LambdaQueryWrapper<Damage>()
+ .eq(Damage::getGlassId, glassId)
+ .and(wrapper->wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
+ );
+ if(!damage.isEmpty()){
+ return true;
+ }
+ }
+ return false;
+ }
}
--
Gitblit v1.8.0