更新UU互联和商务平台接口

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7280 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/mobile/dao/ClockAddressDao.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.mobile.dao;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -15,5 +17,5 @@ public interface ClockAddressDao extends JpaRepository<ClockAddress, Long>, JpaS
 	 * @param enuu
 	 * @return
 	 */
-	public ClockAddress getAddressByEnuu(Long enuu);
+	public List<ClockAddress> getAddressByEnuu(Long enuu);
 }

src/main/java/com/uas/platform/b2b/mobile/dao/ClockSetCenterDao.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2b.mobile.dao;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -19,6 +17,6 @@ public interface ClockSetCenterDao
 	 * @param enuu
 	 * @return
 	 */
-	public List<ClockSetCenter> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
+	public ClockSetCenter getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
 
 }

src/main/java/com/uas/platform/b2b/mobile/service/ClockSetCenterService.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2b.mobile.service;
 
-import java.util.List;
-
 import com.uas.platform.b2b.temporary.model.ClockSet;
 
 public interface ClockSetCenterService {
@@ -14,5 +12,5 @@ public interface ClockSetCenterService {
 	 * @param enuu
 	 * @return
 	 */
-	public List<ClockSet> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
+	public ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu);
 }

src/main/java/com/uas/platform/b2b/mobile/service/OutPlanService.java

@@ -17,4 +17,11 @@ public interface OutPlanService {
 	 * @return
 	 */
 	public ModelMap saveOutPlan(OutPlan outPlan, List<OutPlanDetail> outPlanDetails);
+
+	/**
+	 * 获取外勤计划
+	 * 
+	 * @return
+	 */
+	public ModelMap getOutPlan();
 }

src/main/java/com/uas/platform/b2b/mobile/service/OutSignService.java

@@ -13,4 +13,5 @@ public interface OutSignService {
 	 * @return
 	 */
 	public ModelMap saveOutSign(OutSign outSign);
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/WorkDailyService.java

@@ -40,4 +40,12 @@ public interface WorkDailyService {
 	 * @return
 	 */
 	public ModelMap deleteById(Long id);
+
+	/**
+	 * 通过id看详情
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public WorkDaily getById(Long id);
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/ClockAddressServiceImpl.java

@@ -28,7 +28,7 @@ public class ClockAddressServiceImpl implements ClockAddressService {
 	@Override
 	public ModelMap saveSignCardAddress(ClockAddress address) {
 		ModelMap map = new ModelMap();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMHHss");
 		address.setCs_code(sdf.format(new Date()));
 		address.setCs_recorder(SystemSession.getUser().getUserName());
 		address.setEnuu(SystemSession.getUser().getEnterprise().getUu());

src/main/java/com/uas/platform/b2b/mobile/service/impl/ClockSetCenterServiceImpl.java

@@ -1,13 +1,13 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.uas.platform.b2b.mobile.dao.ClockAddressDao;
 import com.uas.platform.b2b.mobile.dao.ClockSetCenterDao;
+import com.uas.platform.b2b.mobile.model.ClockAddress;
 import com.uas.platform.b2b.mobile.model.ClockSetCenter;
 import com.uas.platform.b2b.mobile.service.ClockSetCenterService;
 import com.uas.platform.b2b.temporary.model.ClassObject;
@@ -19,17 +19,19 @@ public class ClockSetCenterServiceImpl implements ClockSetCenterService {
 	@Autowired
 	private ClockSetCenterDao clockSetCenterDao;
 
+	@Autowired
+	private ClockAddressDao clockAddressDao;
+
 	@Override
-	public List<ClockSet> getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
-		List<ClockSetCenter> clocks = clockSetCenterDao.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
-		List<ClockSet> sets = new ArrayList<ClockSet>();
-		if (!CollectionUtils.isEmpty(clocks)) {
-			for (ClockSetCenter clock : clocks) {
-				ClockSet set = new ClockSet();
+	public ClockSet getSignCardInfoByEmcodeAndEnuu(Long emcode, Long enuu) {
+		ClockSetCenter clock = clockSetCenterDao.getSignCardInfoByEmcodeAndEnuu(emcode, enuu);
+		ClockSet set = new ClockSet();
+		if (clock != null) {
+				List<ClockAddress> address = clockAddressDao.getAddressByEnuu(enuu);
+				set.setComAddressdata(address);
 				ClassObject obj1 = new ClassObject();
 				ClassObject obj2 = new ClassObject();
 				ClassObject obj3 = new ClassObject();
-				set.setAddress(clock.getAddress());
 				obj1.setWd_onbeg(clock.getWd_onbegOne());
 				obj1.setWd_onduty(clock.getWd_ondutyOne());
 				obj1.setWd_offduty(clock.getWd_offdutyOne());
@@ -61,10 +63,8 @@ public class ClockSetCenterServiceImpl implements ClockSetCenterService {
 				set.setWd_degree(clock.getWd_degree());
 				set.setWd_earlytime(clock.getWd_earlytime());
 				set.setWd_pcount(clock.getWd_pcount());
-				sets.add(set);
-			}
 		}
-		return sets;
+		return set;
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/FeePleaseServiceImpl.java

@@ -26,6 +26,7 @@ import com.uas.platform.b2b.mobile.model.FeePleaseDetail;
 import com.uas.platform.b2b.mobile.service.FeePleaseService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 @Service
 public class FeePleaseServiceImpl implements FeePleaseService {
@@ -50,10 +51,11 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 		Set<FeePleaseDetail> feeDetails = new HashSet<FeePleaseDetail>();
 		if (!CollectionUtils.isEmpty(feePleaseDetails)) {
 			for (FeePleaseDetail feePleaseDetail : feePleaseDetails) {
+				feePleaseDetail.setFeePlease(feePlease);
 				feeDetails.add(feePleaseDetail);
-				feePlease.setFeePleaseDetails(feeDetails);
 			}
 		}
+		feePlease.setFeePleaseDetails(feeDetails);
 		feePleaseDetails = feePleaseDetailDao.save(feeDetails);
 		if (feePleaseDetails.get(0).getFpd_id() != null) {
 			map.put("success", true);
@@ -66,9 +68,10 @@ public class FeePleaseServiceImpl implements FeePleaseService {
 	@Override
 	public ModelMap getFeePlease(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
-		final PageInfo pageInfo = new PageInfo();
-		pageInfo.setPageNumber(pageNumber);
-		pageInfo.setPageNumber(pageNumber);
+		PageParams params = new PageParams();
+		params.setCount(pageSize);
+		params.setPage(pageNumber);
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<FeePlease> feePleases = feePleaseDao.findAll(new Specification<FeePlease>() {

src/main/java/com/uas/platform/b2b/mobile/service/impl/OutPlanServiceImpl.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -9,10 +11,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 
+import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.mobile.dao.OutPlanDetailDao;
+import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
 import com.uas.platform.b2b.mobile.model.OutPlan;
 import com.uas.platform.b2b.mobile.model.OutPlanDetail;
 import com.uas.platform.b2b.mobile.service.OutPlanService;
+import com.uas.platform.b2b.support.SystemSession;
 
 @Service
 public class OutPlanServiceImpl implements OutPlanService {
@@ -20,12 +25,27 @@ public class OutPlanServiceImpl implements OutPlanService {
 	@Autowired
 	private OutPlanDetailDao outPlanDetailDao;
 
+	@Autowired
+	private CommonDao commonDao;
+
 	@Override
 	public ModelMap saveOutPlan(OutPlan outPlan, List<OutPlanDetail> outPlanDetails) {
 		ModelMap map = new ModelMap();
+		outPlan.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMhhss");
+		outPlan.setMp_code("OU" + sdf.format(new Date()));
+		outPlan.setMp_recorder(SystemSession.getUser().getUserName());
+		outPlan.setRecorderCode(SystemSession.getUser().getUserUU());
 		Set<OutPlanDetail> outDetail = new HashSet<OutPlanDetail>();
 		if (CollectionUtils.isEmpty(outPlanDetails)) {
 			for (OutPlanDetail outPlanDetail : outPlanDetails) {
+				outPlanDetail.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+				outPlanDetail.setMpd_code("OUT" + sdf.format(new Date()));
+				outPlanDetail.setMpd_recorddate(new Date());
+				outPlanDetail.setMpd_status(MobileStatus.ENTERING.getPhrase());
+				outPlanDetail.setMpd_statuscode(MobileStatus.ENTERING.name());
+				outPlanDetail.setRecorderCode(SystemSession.getUser().getUserUU());
+				outPlanDetail.setMpd_recorder(SystemSession.getUser().getUserName());
 				outDetail.add(outPlanDetail);
 				outPlan.setOutPlanDetail(outDetail);
 				
@@ -40,4 +60,28 @@ public class OutPlanServiceImpl implements OutPlanService {
 		return map;
 	}
 
+	@Override
+	public ModelMap getOutPlan() {
+		ModelMap map = new ModelMap();
+		Long enuu = SystemSession.getUser().getEnterprise().getUu();
+		Long emcode = SystemSession.getUser().getUserUU();
+		String sql = "select p.op_id mp_id,p.op_recorder mp_recorder,p.op_recordercode recorderCode,p.op_code mp_code,p.op_address mp_address,"
+				+ "p.op_visittime mp_visittime,p.op_enuu enuu from mobile$outplan p where op_enuu = " + enuu
+				+ " and op_recordercode = " + emcode + " order by op_id desc";
+		List<OutPlan> outPlans = commonDao.query(sql, OutPlan.class);
+		for (OutPlan outPlan : outPlans) {
+			String detailSql = "select p.opd_id mpd_id, p.opd_code mpd_code, p.opd_recordercode mpd_recordercode, p.opd_recorder mpd_recorder, p.opd_address mpd_address,"
+					+ "p.opd_kind mpd_kind, p.opd_detno mpd_detno, p.opd_remark mpd_remark, p.opd_location mpd_location, p.opd_enuu mpd_enuu, p.opd_arrivedate mpd_arrivedate,"
+					+ "p.opd_actdate mpd_actdate, p.opd_outdate mpd_outdate, p.opd_recorddate mpd_recorddate, p.opd_status mpd_status, p.opd_statuscode mpd_statuscode from mobile$outplandetail p where opd_opid = ?"
+					+ " and opd_arrivedate>=to_char(sysdate) and opd_arrivedate<to_char(sysdate+1) order by opd_id desc";
+			List<OutPlanDetail> details = commonDao.query(detailSql, OutPlanDetail.class, outPlan.getMp_id());
+			Set<OutPlanDetail> planDetails = new HashSet<OutPlanDetail>();
+			planDetails.addAll(details);
+			outPlan.setOutPlanDetail(planDetails);
+		}
+		map.put("data", outPlans);
+		map.put("success", true);
+		return map;
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/SignCardLogServiceImpl.java

@@ -7,7 +7,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -19,6 +18,7 @@ import com.uas.platform.b2b.mobile.model.SignCard;
 import com.uas.platform.b2b.mobile.service.SignCardLogService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 @Service
 public class SignCardLogServiceImpl implements SignCardLogService {
@@ -29,9 +29,10 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 	@Override
 	public ModelMap getListData(Long emcode, Long enuu, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
-		final PageInfo pageInfo = new PageInfo();
-		pageInfo.setPageNumber(pageNumber);
-		pageInfo.setPageNumber(pageNumber);
+		PageParams params = new PageParams();
+		params.setCount(pageSize);
+		params.setPage(pageNumber);
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<SignCard> sigLogs = signCardDao.findAll(new Specification<SignCard>() {
@@ -39,12 +40,8 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		if (!CollectionUtils.isEmpty(sigLogs.getContent())) {
-			map.put("listdata", sigLogs.getContent());
-			map.put("success", true);
-		} else {
-			map.put("success", false);
-		}
+		map.put("listdata", sigLogs.getContent());
+		map.put("success", true);
 		return map;
 	}
 
@@ -61,7 +58,7 @@ public class SignCardLogServiceImpl implements SignCardLogService {
 		} else {
 			map.put("success", false);
 		}
-		return null;
+		return map;
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/VacationServiceImpl.java

@@ -20,6 +20,7 @@ import com.uas.platform.b2b.mobile.model.Vacation;
 import com.uas.platform.b2b.mobile.service.VacationService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 @Service
 public class VacationServiceImpl implements VacationService {
@@ -30,9 +31,10 @@ public class VacationServiceImpl implements VacationService {
 	@Override
 	public ModelMap getAllVacation(Long emcode, Integer pageNumber, Integer pageSize, Long enuu) {
 		ModelMap map = new ModelMap();
-		final PageInfo pageInfo = new PageInfo();
-		pageInfo.setPageNumber(pageNumber);
-		pageInfo.setPageNumber(pageNumber);
+		PageParams params = new PageParams();
+		params.setCount(pageSize);
+		params.setPage(pageNumber);
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
 		Page<Vacation> vacations = vacationDao.findAll(new Specification<Vacation>() {

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDailyServiceImpl.java

@@ -1,5 +1,8 @@
 package com.uas.platform.b2b.mobile.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
@@ -12,9 +15,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.mobile.dao.WorkDailyDao;
+import com.uas.platform.b2b.mobile.enumeration.MobileStatus;
 import com.uas.platform.b2b.mobile.model.WorkDaily;
 import com.uas.platform.b2b.mobile.service.WorkDailyService;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 @Service
 public class WorkDailyServiceImpl implements WorkDailyService {
@@ -25,6 +31,13 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 	@Override
 	public ModelMap saveWorkDaily(WorkDaily workDaily) {
 		ModelMap map = new ModelMap();
+		workDaily.setEmcode(SystemSession.getUser().getUserUU());
+		workDaily.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+		workDaily.setWd_date(new Date());
+		workDaily.setWd_status(MobileStatus.ENTERING.getPhrase());
+		workDaily.setWd_statuscode(MobileStatus.ENTERING.name());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyMMHHss");
+		workDaily.setWd_code("WD" + sdf.format(new Date()));
 		map.put("data", workDailyDao.save(workDaily));
 		return map;
 	}
@@ -32,9 +45,10 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 	@Override
 	public ModelMap getWorkDaily(Long emcode, Integer pageNumber, Integer pageSize, Long enuu) {
 		ModelMap map = new ModelMap();
-		final PageInfo pageInfo = new PageInfo();
-		pageInfo.setPageNumber(pageNumber);
-		pageInfo.setPageNumber(pageNumber);
+		PageParams params = new PageParams();
+		params.setCount(pageSize);
+		params.setPage(pageNumber);
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enuu", enuu);
 		pageInfo.filter("emcode", emcode);
 		Page<WorkDaily> workDaily = workDailyDao.findAll(new Specification<WorkDaily>() {
@@ -54,6 +68,7 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 		oldDaily.setWd_comment(workDaily.getWd_comment());
 		oldDaily.setWd_experience(workDaily.getWd_experience());
 		oldDaily.setWd_plan(workDaily.getWd_plan());
+		oldDaily.setWd_date(new Date());
 		workDailyDao.save(oldDaily);
 		map.put("success", true);
 		return map;
@@ -73,4 +88,9 @@ public class WorkDailyServiceImpl implements WorkDailyService {
 		return map;
 	}
 
+	@Override
+	public WorkDaily getById(Long id) {
+		return workDailyDao.findOne(id);
+	}
+
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkDataServiceImpl.java

@@ -42,9 +42,13 @@ public class WorkDataServiceImpl implements WorkDataService {
 	public ModelMap saveWorkData(WorkData workData) {
 		ModelMap map = new ModelMap();
 		workData = workDataDao.save(workData);
-		map.put("id", workData.getWd_id());
-		map.put("success", true);
-		return null;
+		if (workData.getWd_id() != null) {
+			map.put("id", workData.getWd_id());
+			map.put("success", true);
+		} else {
+			map.put("success", false);
+		}
+		return map;
 	}
 
 }

src/main/java/com/uas/platform/b2b/mobile/service/impl/WorkOvertimeServiceImpl.java

@@ -26,6 +26,7 @@ import com.uas.platform.b2b.mobile.model.WorkOvertimeDet;
 import com.uas.platform.b2b.mobile.service.WorkOvertimeService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.PageParams;
 
 @Service
 public class WorkOvertimeServiceImpl implements WorkOvertimeService {
@@ -46,14 +47,17 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 		workOvertime.setWo_status(MobileStatus.ENTERING.getPhrase());
 		workOvertime.setWo_statuscode(MobileStatus.ENTERING.name());
 		workOvertime.setWo_recorder(SystemSession.getUser().getUserName());
-		Set<WorkOvertimeDet> workOvertimeDetail = new HashSet<WorkOvertimeDet>();
+		workOvertime.setWo_date(new Date());
+		Set<WorkOvertimeDet> workOvertimeDetails = new HashSet<WorkOvertimeDet>();
 		if (!CollectionUtils.isEmpty(workOvertimeDets)) {
 			for (WorkOvertimeDet workOvertimeDet : workOvertimeDets) {
-				workOvertimeDetail.add(workOvertimeDet);
-				workOvertime.setWorkovertimedet(workOvertimeDetail);
+				workOvertimeDet.setEmpcode(SystemSession.getUser().getUserUU());
+				workOvertimeDet.setWod_empname(SystemSession.getUser().getUserName());
+				workOvertimeDet.setWorkOvertime(workOvertime);
+				workOvertimeDetails.add(workOvertimeDet);
 			}
 		}
-		workOvertimeDets = workOvertimeDetDao.save(workOvertimeDetail);
+		workOvertimeDets = workOvertimeDetDao.save(workOvertimeDetails);
 		if (!CollectionUtils.isEmpty(workOvertimeDets)) {
 			map.put("success", true);
 		} else {
@@ -65,17 +69,18 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
 	@Override
 	public ModelMap getWorkOvertime(Long enuu, Long emcode, Integer pageNumber, Integer pageSize) {
 		ModelMap map = new ModelMap();
-		final PageInfo pageInfo = new PageInfo();
-		pageInfo.setPageNumber(pageNumber);
-		pageInfo.setPageNumber(pageNumber);
+		PageParams params = new PageParams();
+		params.setCount(pageSize);
+		params.setPage(pageNumber);
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("emcode", emcode);
 		pageInfo.filter("enuu", enuu);
-		Page<WorkOvertime> workOvertimeDets = workOvertimeDao.findAll(new Specification<WorkOvertime>() {
+		Page<WorkOvertime> workOvertime = workOvertimeDao.findAll(new Specification<WorkOvertime>() {
 			public Predicate toPredicate(Root<WorkOvertime> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		map.put("listdata", workOvertimeDets.getContent());
+		map.put("listdata", workOvertime.getContent());
 		return map;
 	}
 }