Merge remote-tracking branch 'origin/develop' into develop

project-interface/src/main/java/com/dituhui/pea/pojo/RegionDTO.java

+package com.dituhui.pea.pojo;
+
+import lombok.Data;
+
+@Data
+public class RegionDTO {
+
+	/**
+	 * 点集
+	 */
+	private PointBase[] points = null;
+	/**
+	 * 面的parts
+	 */
+	private Integer[] parts;
+
+}

project-order/src/main/java/com/dituhui/pea/order/controller/MapController.java

+package com.dituhui.pea.order.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.dituhui.pea.common.BusinessException;
+import com.dituhui.pea.common.Result;
+import com.dituhui.pea.order.service.IMapService;
+import com.dituhui.pea.pojo.RegionDTO;
+
+/**
+ * 地图相关接口
+ * 
+ */
+@RestController
+@RequestMapping("/pea-order/map")
+public class MapController {
+
+	@Autowired
+	private IMapService mapService;
+
+	/**
+	 * 更新小队区块
+	 * 
+	 * @param blockId
+	 * @param area
+	 * @param region
+	 * @return
+	 */
+	@PostMapping("/updateBlock")
+	public Result<Boolean> updateBlock(@RequestParam String blockId, @RequestParam Long area,
+			@RequestParam RegionDTO region) {
+		Result<Boolean> res = null;
+		try {
+			res = mapService.updateBlock(blockId, area, region);
+		} catch (BusinessException e) {
+			return Result.failure(e.getMessage());
+		}
+		return res;
+	}
+
+}

project-order/src/main/java/com/dituhui/pea/order/service/IMapService.java

+package com.dituhui.pea.order.service;
+
+import com.dituhui.pea.common.Result;
+import com.dituhui.pea.pojo.RegionDTO;
+
+public interface IMapService {
+
+	public Result<Boolean> updateBlock(String blockId, Long area, RegionDTO region);
+
+}

project-order/src/main/java/com/dituhui/pea/order/service/impl/MapServiceImpl.java

+package com.dituhui.pea.order.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.dituhui.pea.common.Result;
+import com.dituhui.pea.order.dao.MapLayerDao;
+import com.dituhui.pea.order.service.IMapService;
+import com.dituhui.pea.pojo.RegionDTO;
+
+@Service
+public class MapServiceImpl implements IMapService {
+
+	@Autowired
+	private MapLayerDao mapLayerDao;
+
+	@Override
+	public Result<Boolean> updateBlock(String blockId, Long area, RegionDTO region) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}