Merge branch 'dev_layer0731' into 'develop'

Dev layer0731

See merge request !304

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

@@ -10,38 +10,76 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
 public class BusinessLayerController {
 public class BusinessLayerController {
 
 
+
+	/**
+	 * 获取通用图层
+	 *
+	 * @return
+	 */
 	@GetMapping("/business/layer/universal")
 	@GetMapping("/business/layer/universal")
 	public Result<?> businessLayerUniversal() {
 	public Result<?> businessLayerUniversal() {
 		// 通用图层
 		// 通用图层
 		return null;
 		return null;
 	}
 	}
 
 
+	/**
+	 * 获取自定义图层列表
+	 *
+	 * @param levelType  组织层级类型
+	 * @param levelValue 组织层级值
+	 * @param page       分页-页数
+	 * @param size       分页-页大小
+	 * @return
+	 */
 	@GetMapping("/business/layer/custom/list")
 	@GetMapping("/business/layer/custom/list")
-	public Result<?> businessCustomLayers() {
+	public Result<?> businessCustomLayers(String levelType, String levelValue, long page, long size) {
 		// 自定义图层列表
 		// 自定义图层列表
 		return null;
 		return null;
 	}
 	}
 
 
+	/**
+	 * 获取自定义图层详情
+	 *
+	 * @param layerId 图层ID
+	 * @return
+	 */
 	@GetMapping("/business/layer/custom/detail")
 	@GetMapping("/business/layer/custom/detail")
-	public Result<?> businessCustomLayer() {
+	public Result<?> businessCustomLayer(String layerId) {
 		// 自定义图层详情
 		// 自定义图层详情
 		return null;
 		return null;
 	}
 	}
 
 
+	/**
+	 * 新增自定义图层
+	 *
+	 * @return
+	 */
 	@PostMapping("/business/layer/custom/add")
 	@PostMapping("/business/layer/custom/add")
 	public Result<?> businessCustomLayerAdd() {
 	public Result<?> businessCustomLayerAdd() {
 		// 自定义图层新增
 		// 自定义图层新增
 		return null;
 		return null;
 	}
 	}
 
 
+	/**
+	 * 修改自定义图层
+	 *
+	 * @param layerId 图层ID
+	 * @return
+	 */
 	@PostMapping("/business/layer/custom/update")
 	@PostMapping("/business/layer/custom/update")
-	public Result<?> businessCustomLayerUpdate() {
+	public Result<?> businessCustomLayerUpdate(String layerId) {
 		// 自定义图层修改
 		// 自定义图层修改
 		return null;
 		return null;
 	}
 	}
 
 
+	/**
+	 * 删除自定义图层
+	 *
+	 * @param layerId 图层ID
+	 * @return
+	 */
 	@PostMapping("/business/layer/custom/remove")
 	@PostMapping("/business/layer/custom/remove")
-	public Result<?> businessCustomLayerRemove() {
+	public Result<?> businessCustomLayerRemove(String layerId) {
 		// 自定义图层删除
 		// 自定义图层删除
 		return null;
 		return null;
 	}
 	}

project-order/src/main/java/com/dituhui/pea/order/dao/MapLayerCustomizeSkillMPDao.java

+package com.dituhui.pea.order.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dituhui.pea.order.entity.MapLayerCustomizeSkill;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MapLayerCustomizeSkillMPDao extends BaseMapper<MapLayerCustomizeSkill> {
+}

project-order/src/main/java/com/dituhui/pea/order/entity/MapLayerCustomize.java

@@ -11,7 +11,7 @@ public class MapLayerCustomize {
 	private String layerId;
 	private String layerId;
 	private String layer;
 	private String layer;
 	private String layerDescribe;
 	private String layerDescribe;
-	private String disabled;
+	private Integer status;
 	private String memo;
 	private String memo;
 	private LocalDateTime createTime;
 	private LocalDateTime createTime;
 	private LocalDateTime updateTime;
 	private LocalDateTime updateTime;

project-order/src/main/java/com/dituhui/pea/order/entity/MapLayerCustomizeSkill.java

+package com.dituhui.pea.order.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class MapLayerCustomizeSkill {
+	private Integer id;
+	private String layerId;
+	private String skillCode;
+	private String description;
+	private Integer status;
+	private String memo;
+	private LocalDateTime createTime;
+	private LocalDateTime updateTime;
+}