From 416cc38ad5a18e2e852e3ebbf7f01d7521dd850a Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 20 Oct 2021 00:41:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E8=A1=A8=E5=AD=97=E6=AE=B5=E3=80=81=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/grid/GridController.java | 102 +++++++ .../api/grid/GridGroupController.java | 111 ++++++++ .../route/grid/GridGroupRouteController.java | 37 +++ .../wgink/module/map/dao/grid/IGridDao.java | 30 +- .../module/map/dao/grid/IGridGroupDao.java | 84 ++++++ .../module/map/dao/grid/IGridPointDao.java | 2 +- .../module/map/dao/grid/IGridRelationDao.java | 2 +- .../module/map/pojo/dto/grid/GridDTO.java | 83 ------ .../module/map/pojo/dtos/grid/GridDTO.java | 185 +++++++++++++ .../map/pojo/dtos/grid/GridGroupDTO.java | 78 ++++++ .../pojo/{dto => dtos}/grid/GridPointDTO.java | 30 +- .../{dto => dtos}/grid/GridRelationDTO.java | 14 +- .../module/map/pojo/pos/grid/GridGroupPO.java | 114 ++++++++ .../module/map/pojo/pos/grid/GridPO.java | 158 +++++++++++ .../module/map/pojo/vos/grid/GridGroupVO.java | 58 ++++ .../pojo/{vo => vos}/grid/GridPointVO.java | 30 +- .../map/pojo/{vo => vos}/grid/GridVO.java | 2 +- .../map/service/grid/IGridGroupService.java | 117 ++++++++ .../map/service/grid/IGridPointService.java | 4 +- .../service/grid/IGridRelationService.java | 2 +- .../module/map/service/grid/IGridService.java | 51 +++- .../grid/impl/GridGroupServiceImpl.java | 123 +++++++++ .../grid/impl/GridPointServiceImpl.java | 8 +- .../grid/impl/GridRelationServiceImpl.java | 2 +- .../service/grid/impl/GridServiceImpl.java | 51 +++- .../mybatis/mapper/grid/grid-group-mapper.xml | 199 ++++++++++++++ .../mybatis/mapper/grid/grid-mapper.xml | 147 +++++++++- .../mybatis/mapper/grid/grid-point-mapper.xml | 23 +- .../mapper/grid/grid-relation-mapper.xml | 19 +- .../templates/grid/grid-group/list.html | 258 ++++++++++++++++++ .../templates/grid/grid-group/save.html | 119 ++++++++ .../templates/grid/grid-group/update.html | 130 +++++++++ 32 files changed, 2205 insertions(+), 168 deletions(-) create mode 100644 module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridGroupController.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/controller/route/grid/GridGroupRouteController.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridGroupDao.java delete mode 100644 module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridDTO.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridDTO.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridGroupDTO.java rename module-map/src/main/java/ink/wgink/module/map/pojo/{dto => dtos}/grid/GridPointDTO.java (62%) rename module-map/src/main/java/ink/wgink/module/map/pojo/{dto => dtos}/grid/GridRelationDTO.java (76%) create mode 100644 module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridGroupPO.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridPO.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridGroupVO.java rename module-map/src/main/java/ink/wgink/module/map/pojo/{vo => vos}/grid/GridPointVO.java (60%) rename module-map/src/main/java/ink/wgink/module/map/pojo/{vo => vos}/grid/GridVO.java (98%) create mode 100644 module-map/src/main/java/ink/wgink/module/map/service/grid/IGridGroupService.java create mode 100644 module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridGroupServiceImpl.java create mode 100644 module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml create mode 100644 module-map/src/main/resources/templates/grid/grid-group/list.html create mode 100644 module-map/src/main/resources/templates/grid/grid-group/save.html create mode 100644 module-map/src/main/resources/templates/grid/grid-group/update.html diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java b/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java new file mode 100644 index 00000000..7f5a6b5b --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java @@ -0,0 +1,102 @@ +package ink.wgink.module.map.controller.api.grid; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.map.pojo.dtos.grid.GridDTO; +import ink.wgink.module.map.pojo.vos.grid.GridVO; +import ink.wgink.module.map.service.grid.IGridService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultList; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: GridControler + * @Description: 网格管理 + * @Author: wanggeng + * @Date: 2021/10/19 10:21 下午 + * @Version: 1.0 + */ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "网格接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/grid") +public class GridController extends DefaultBaseController { + + @Autowired + private IGridService gridService; + + @ApiOperation(value = "新增网格", notes = "新增网格接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody GridVO gridVO) throws Exception { + gridService.save(gridVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除网格", notes = "删除网格接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@PathVariable("ids") String ids) { + gridService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改网格", notes = "修改网格接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "gridIdId", value = "网格ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{gridId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("gridId") String gridId, @RequestBody GridVO gridVO) throws Exception { + gridService.update(gridId, gridVO); + return new SuccessResult(); + } + + @ApiOperation(value = "网格详情", notes = "网格详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "gridIdId", value = "网格ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{gridId}") + public GridDTO get(@PathVariable("gridId") String gridId) { + return gridService.get(gridId); + } + + @ApiOperation(value = "网格列表", notes = "网格列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return gridService.list(params); + } + + @ApiOperation(value = "网格分页列表", notes = "网格分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return gridService.listPage(page); + } + +} diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridGroupController.java b/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridGroupController.java new file mode 100644 index 00000000..ab0466fc --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridGroupController.java @@ -0,0 +1,111 @@ +package ink.wgink.module.map.controller.api.grid; + +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.exceptions.ParamsException; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.map.pojo.dtos.grid.GridGroupDTO; +import ink.wgink.module.map.pojo.vos.grid.GridGroupVO; +import ink.wgink.module.map.service.grid.IGridGroupService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.RegexUtil; +import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @ClassName: GridGroupController + * @Description: 网格组管理 + * @Author: wanggeng + * @Date: 2021/10/19 10:21 下午 + * @Version: 1.0 + */ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "网格组接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/grid-group") +public class GridGroupController extends DefaultBaseController { + + @Autowired + private IGridGroupService gridGroupService; + + @ApiOperation(value = "新增网格组", notes = "新增网格组接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save") + @CheckRequestBodyAnnotation + public SuccessResult save(@RequestBody GridGroupVO gridGroupVO) throws Exception { + if (StringUtils.isBlank(gridGroupVO.getGridGroupCode())) { + throw new ParamsException("编码不能为空"); + } + if (!RegexUtil.isLetter(gridGroupVO.getGridGroupCode())) { + throw new ParamsException("编码只能是字母"); + } + gridGroupService.save(gridGroupVO); + return new SuccessResult(); + } + + @ApiOperation(value = "删除网格组", notes = "删除网格组接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "ids", value = "ID列表，用下划线分隔", paramType = "path", example = "1_2_3") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove/{ids}") + public SuccessResult remove(@PathVariable("ids") String ids) { + gridGroupService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); + } + + @ApiOperation(value = "修改网格组", notes = "修改网格组接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "gridGroupIdId", value = "网格组ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update/{gridGroupId}") + @CheckRequestBodyAnnotation + public SuccessResult update(@PathVariable("gridGroupId") String gridGroupId, @RequestBody GridGroupVO gridGroupVO) throws Exception { + gridGroupService.update(gridGroupId, gridGroupVO); + return new SuccessResult(); + } + + @ApiOperation(value = "网格组详情", notes = "网格组详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "gridGroupIdId", value = "网格组ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{gridGroupId}") + public GridGroupDTO get(@PathVariable("gridGroupId") String gridGroupId) { + return gridGroupService.get(gridGroupId); + } + + @ApiOperation(value = "网格组列表", notes = "网格组列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return gridGroupService.list(params); + } + + @ApiOperation(value = "网格组分页列表", notes = "网格组分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return gridGroupService.listPage(page); + } + +} diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/route/grid/GridGroupRouteController.java b/module-map/src/main/java/ink/wgink/module/map/controller/route/grid/GridGroupRouteController.java new file mode 100644 index 00000000..32702d7d --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/controller/route/grid/GridGroupRouteController.java @@ -0,0 +1,37 @@ +package ink.wgink.module.map.controller.route.grid; + +import ink.wgink.interfaces.consts.ISystemConstant; +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +/** + * @ClassName: GridGroupRouteController + * @Description: 网格组路由 + * @Author: wanggeng + * @Date: 2021/10/19 11:54 下午 + * @Version: 1.0 + */ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "网格组接口") +@Controller +@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/grid-group") +public class GridGroupRouteController { + + @GetMapping("list") + public ModelAndView list() { + return new ModelAndView("grid/grid-group/list"); + } + + @GetMapping("save") + public ModelAndView save() { + return new ModelAndView("grid/grid-group/save"); + } + + @GetMapping("update") + public ModelAndView update() { + return new ModelAndView("grid/grid-group/update"); + } + +} diff --git a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridDao.java b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridDao.java index 82ddc573..a7f0401a 100644 --- a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridDao.java +++ b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridDao.java @@ -5,7 +5,8 @@ import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.interfaces.init.IInitBaseTable; -import ink.wgink.module.map.pojo.dto.grid.GridDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridDTO; +import ink.wgink.module.map.pojo.pos.grid.GridPO; import org.springframework.stereotype.Repository; import java.util.List; @@ -31,6 +32,14 @@ public interface IGridDao extends IInitBaseTable { */ void save(Map params) throws SaveException; + /** + * 删除网格 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + /** * 删除网格 * @@ -47,6 +56,24 @@ public interface IGridDao extends IInitBaseTable { */ void update(Map params) throws UpdateException; + /** + * 网格详情 + * + * @param params + * @return + * @throws SearchException + */ + GridDTO get(Map params) throws SearchException; + + /** + * 网格详情 + * + * @param params + * @return + * @throws SearchException + */ + GridPO getPO(Map params) throws SearchException; + /** * 获取网格列表 * @@ -65,4 +92,5 @@ public interface IGridDao extends IInitBaseTable { */ List listGroup(Map params) throws SearchException; + } diff --git a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridGroupDao.java b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridGroupDao.java new file mode 100644 index 00000000..d2fcecf8 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridGroupDao.java @@ -0,0 +1,84 @@ +package ink.wgink.module.map.dao.grid; + +import ink.wgink.exceptions.RemoveException; +import ink.wgink.exceptions.SaveException; +import ink.wgink.exceptions.SearchException; +import ink.wgink.exceptions.UpdateException; +import ink.wgink.interfaces.init.IInitBaseTable; +import ink.wgink.module.map.pojo.dtos.grid.GridGroupDTO; +import ink.wgink.module.map.pojo.pos.grid.GridGroupPO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IGridGroupDao + * @Description: 网格组 + * @Author: wanggeng + * @Date: 2021/10/19 10:26 下午 + * @Version: 1.0 + */ +@Repository +public interface IGridGroupDao extends IInitBaseTable { + + /** + * 新增网格组 + * + * @param params + * @throws SaveException + */ + void save(Map params) throws SaveException; + + /** + * 删除网格组 + * + * @param params + * @throws RemoveException + */ + void remove(Map params) throws RemoveException; + + /** + * 修改网格组 + * + * @param params + * @throws UpdateException + */ + void update(Map params) throws UpdateException; + + /** + * 网格组详情 + * + * @param params + * @return + * @throws SearchException + */ + GridGroupDTO get(Map params) throws SearchException; + + /** + * 网格组详情 + * + * @param params + * @return + * @throws SearchException + */ + GridGroupPO getPO(Map params) throws SearchException; + + /** + * 网格组列表 + * + * @param params + * @return + * @throws SearchException + */ + List list(Map params) throws SearchException; + + /** + * 网格组列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; +} diff --git a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridPointDao.java b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridPointDao.java index 721fe29d..b578adef 100644 --- a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridPointDao.java +++ b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridPointDao.java @@ -4,7 +4,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.init.IInitBaseTable; -import ink.wgink.module.map.pojo.dto.grid.GridPointDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridPointDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridRelationDao.java b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridRelationDao.java index f9acf8be..0d816317 100644 --- a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridRelationDao.java +++ b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridRelationDao.java @@ -4,7 +4,7 @@ import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.init.IInitBaseTable; -import ink.wgink.module.map.pojo.dto.grid.GridRelationDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridDTO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridDTO.java deleted file mode 100644 index 8afa36b4..00000000 --- a/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridDTO.java +++ /dev/null @@ -1,83 +0,0 @@ -package ink.wgink.module.map.pojo.dto.grid; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -import java.util.ArrayList; -import java.util.List; - -/** - * When you feel like quitting. Think about why you started - * 当你想要放弃的时候，想想当初你为何开始 - * - * @ClassName: GridDTO - * @Description: 网格 - * @Author: WangGeng - * @Date: 2020/10/21 17:01 - * @Version: 1.0 - **/ -@ApiModel -public class GridDTO extends GridRelationDTO { - - @ApiModelProperty(name = "fillColor", value = "填充颜色") - private String fillColor; - @ApiModelProperty(name = "gridName", value = "网格名称") - private String gridName; - @ApiModelProperty(name = "relationIdArray", value = "关联ID列表") - private List relationIdArray; - @ApiModelProperty(name = "pointArray", value = "网格点列表") - private List pointArray; - - public String getFillColor() { - return fillColor == null ? "" : fillColor.trim(); - } - - public void setFillColor(String fillColor) { - this.fillColor = fillColor; - } - - public String getGridName() { - return gridName == null ? "" : gridName.trim(); - } - - public void setGridName(String gridName) { - this.gridName = gridName; - } - - public List getRelationIdArray() { - if (relationIdArray == null) { - return new ArrayList<>(); - } - return relationIdArray; - } - - public void setRelationIdArray(List relationIdArray) { - this.relationIdArray = relationIdArray; - } - - public List getPointArray() { - if (pointArray == null) { - return new ArrayList<>(); - } - return pointArray; - } - - public void setPointArray(List pointArray) { - this.pointArray = pointArray; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("{"); - sb.append("\"fillColor\":\"") - .append(fillColor).append('\"'); - sb.append(",\"gridName\":\"") - .append(gridName).append('\"'); - sb.append(",\"relationIdArray\":") - .append(relationIdArray); - sb.append(",\"pointArray\":") - .append(pointArray); - sb.append('}'); - return sb.toString(); - } -} diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridDTO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridDTO.java new file mode 100644 index 00000000..96c58fc6 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridDTO.java @@ -0,0 +1,185 @@ +package ink.wgink.module.map.pojo.dtos.grid; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: GridDTO + * @Description: 网格 + * @Author: WangGeng + * @Date: 2020/10/21 17:01 + * @Version: 1.0 + **/ +@ApiModel +public class GridDTO implements Serializable { + + private static final long serialVersionUID = 8205867660055311853L; + @ApiModelProperty(name = "gridId", value = "主键") + private String gridId; + @ApiModelProperty(name = "gridName", value = "网格名称") + private String gridName; + @ApiModelProperty(name = "gridSummary", value = "网格描述") + private String gridSummary; + @ApiModelProperty(name = "gridGroupId", value = "网格组ID") + private String gridGroupId; + @ApiModelProperty(name = "gridDuty", value = "网格职责") + private String gridDuty; + @ApiModelProperty(name = "gridCode", value = "网格编码") + private String gridCode; + @ApiModelProperty(name = "gridSquare", value = "网格面积") + private Double gridSquare; + @ApiModelProperty(name = "areaCode", value = "区域编码") + private String areaCode; + @ApiModelProperty(name = "areaName", value = "区域名称") + private String areaName; + @ApiModelProperty(name = "fillColor", value = "填充颜色") + private String fillColor; + @ApiModelProperty(name = "relationId", value = "关联ID") + private String relationId; + @ApiModelProperty(name = "gmtCreate", value = "添加时间") + private String gmtCreate; + @ApiModelProperty(name = "relationIdArray", value = "关联ID列表") + private List relationIdArray; + @ApiModelProperty(name = "pointArray", value = "网格点列表") + private List pointArray; + + public String getGridId() { + return gridId == null ? "" : gridId.trim(); + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getGridName() { + return gridName == null ? "" : gridName.trim(); + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public String getGridSummary() { + return gridSummary == null ? "" : gridSummary.trim(); + } + + public void setGridSummary(String gridSummary) { + this.gridSummary = gridSummary; + } + + public String getGridGroupId() { + return gridGroupId == null ? "" : gridGroupId.trim(); + } + + public void setGridGroupId(String gridGroupId) { + this.gridGroupId = gridGroupId; + } + + public String getGridDuty() { + return gridDuty == null ? "" : gridDuty.trim(); + } + + public void setGridDuty(String gridDuty) { + this.gridDuty = gridDuty; + } + + public String getGridCode() { + return gridCode == null ? "" : gridCode.trim(); + } + + public void setGridCode(String gridCode) { + this.gridCode = gridCode; + } + + public Double getGridSquare() { + return gridSquare == null ? 0 : gridSquare; + } + + public void setGridSquare(Double gridSquare) { + this.gridSquare = gridSquare; + } + + public String getAreaCode() { + return areaCode == null ? "" : areaCode.trim(); + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaName() { + return areaName == null ? "" : areaName.trim(); + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public String getFillColor() { + return fillColor == null ? "" : fillColor.trim(); + } + + public void setFillColor(String fillColor) { + this.fillColor = fillColor; + } + + public String getRelationId() { + return relationId == null ? "" : relationId.trim(); + } + + public void setRelationId(String relationId) { + this.relationId = relationId; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public List getRelationIdArray() { + if (relationIdArray == null) { + return new ArrayList<>(); + } + return relationIdArray; + } + + public void setRelationIdArray(List relationIdArray) { + this.relationIdArray = relationIdArray; + } + + public List getPointArray() { + if (pointArray == null) { + return new ArrayList<>(); + } + return pointArray; + } + + public void setPointArray(List pointArray) { + this.pointArray = pointArray; + } + + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"fillColor\":\"") + .append(fillColor).append('\"'); + sb.append(",\"gridName\":\"") + .append(gridName).append('\"'); + sb.append(",\"relationIdArray\":") + .append(relationIdArray); + sb.append(",\"pointArray\":") + .append(pointArray); + sb.append('}'); + return sb.toString(); + } +} diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridGroupDTO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridGroupDTO.java new file mode 100644 index 00000000..b64597ed --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridGroupDTO.java @@ -0,0 +1,78 @@ +package ink.wgink.module.map.pojo.dtos.grid; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.io.Serializable; + +/** + * @ClassName: GridGroupDTO + * @Description: 网格组 + * @Author: wanggeng + * @Date: 2021/10/19 10:29 下午 + * @Version: 1.0 + */ +@ApiModel +public class GridGroupDTO implements Serializable { + + @ApiModelProperty(name = "gridGroupId", value = "主键") + private String gridGroupId; + @ApiModelProperty(name = "gridGroupName", value = "名称") + private String gridGroupName; + @ApiModelProperty(name = "gridGroupCode", value = "编码") + private String gridGroupCode; + @ApiModelProperty(name = "gridGroupSummary", value = "描述") + private String gridGroupSummary; + @ApiModelProperty(name = "gridGroupDuty", value = "职责") + private String gridGroupDuty; + @ApiModelProperty(name = "gmtCreate", value = "创建时间") + private String gmtCreate; + + public String getGridGroupId() { + return gridGroupId == null ? "" : gridGroupId.trim(); + } + + public void setGridGroupId(String gridGroupId) { + this.gridGroupId = gridGroupId; + } + + public String getGridGroupName() { + return gridGroupName == null ? "" : gridGroupName.trim(); + } + + public void setGridGroupName(String gridGroupName) { + this.gridGroupName = gridGroupName; + } + + public String getGridGroupCode() { + return gridGroupCode == null ? "" : gridGroupCode.trim(); + } + + public void setGridGroupCode(String gridGroupCode) { + this.gridGroupCode = gridGroupCode; + } + + public String getGridGroupSummary() { + return gridGroupSummary == null ? "" : gridGroupSummary.trim(); + } + + public void setGridGroupSummary(String gridGroupSummary) { + this.gridGroupSummary = gridGroupSummary; + } + + public String getGridGroupDuty() { + return gridGroupDuty == null ? "" : gridGroupDuty.trim(); + } + + public void setGridGroupDuty(String gridGroupDuty) { + this.gridGroupDuty = gridGroupDuty; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } +} diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridPointDTO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridPointDTO.java similarity index 62% rename from module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridPointDTO.java rename to module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridPointDTO.java index 1863b53f..629d0875 100644 --- a/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridPointDTO.java +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridPointDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.map.pojo.dto.grid; +package ink.wgink.module.map.pojo.dtos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,10 +21,10 @@ public class GridPointDTO implements Serializable { private static final long serialVersionUID = -2367199018377785048L; @ApiModelProperty(name = "gridId", value = "网格ID") private String gridId; - @ApiModelProperty(name = "lng", value = "经度") - private String lng; - @ApiModelProperty(name = "lat", value = "纬度") - private String lat; + @ApiModelProperty(name = "pointLng", value = "点经度") + private String pointLng; + @ApiModelProperty(name = "pointLat", value = "点纬度") + private String pointLat; public String getGridId() { return gridId == null ? "" : gridId.trim(); @@ -34,20 +34,20 @@ public class GridPointDTO implements Serializable { this.gridId = gridId; } - public String getLng() { - return lng == null ? "" : lng.trim(); + public String getPointLng() { + return pointLng == null ? "" : pointLng.trim(); } - public void setLng(String lng) { - this.lng = lng; + public void setPointLng(String pointLng) { + this.pointLng = pointLng; } - public String getLat() { - return lat == null ? "" : lat.trim(); + public String getPointLat() { + return pointLat == null ? "" : pointLat.trim(); } - public void setLat(String lat) { - this.lat = lat; + public void setPointLat(String pointLat) { + this.pointLat = pointLat; } @Override @@ -56,9 +56,9 @@ public class GridPointDTO implements Serializable { sb.append("\"gridId\":\"") .append(gridId).append('\"'); sb.append(",\"lng\":\"") - .append(lng).append('\"'); + .append(pointLng).append('\"'); sb.append(",\"lat\":\"") - .append(lat).append('\"'); + .append(pointLat).append('\"'); sb.append('}'); return sb.toString(); } diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridRelationDTO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridRelationDTO.java similarity index 76% rename from module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridRelationDTO.java rename to module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridRelationDTO.java index 7a7c4fcf..cc9153e1 100644 --- a/module-map/src/main/java/ink/wgink/module/map/pojo/dto/grid/GridRelationDTO.java +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/dtos/grid/GridRelationDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.map.pojo.dto.grid; +package ink.wgink.module.map.pojo.dtos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -23,6 +23,8 @@ public class GridRelationDTO implements Serializable { private String gridId; @ApiModelProperty(name = "relationId", value = "关联ID") private String relationId; + @ApiModelProperty(name = "gmtCreate", value = "添加时间") + private String gmtCreate; public String getGridId() { return gridId == null ? "" : gridId.trim(); @@ -40,6 +42,14 @@ public class GridRelationDTO implements Serializable { this.relationId = relationId; } + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + @Override public String toString() { final StringBuilder sb = new StringBuilder("{"); @@ -47,6 +57,8 @@ public class GridRelationDTO implements Serializable { .append(gridId).append('\"'); sb.append(",\"relationId\":\"") .append(relationId).append('\"'); + sb.append(",\"gmtCreate\":\"") + .append(gmtCreate).append('\"'); sb.append('}'); return sb.toString(); } diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridGroupPO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridGroupPO.java new file mode 100644 index 00000000..77653af9 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridGroupPO.java @@ -0,0 +1,114 @@ +package ink.wgink.module.map.pojo.pos.grid; + +import java.io.Serializable; + +/** + * @ClassName: GridGroupVO + * @Description: 网格组 + * @Author: wanggeng + * @Date: 2021/10/19 10:34 下午 + * @Version: 1.0 + */ +public class GridGroupPO implements Serializable { + + private static final long serialVersionUID = -3846496038237663121L; + private Long id; + private String gridGroupId; + private String gridGroupName; + private String gridGroupCode; + private String gridGroupSummary; + private String gridGroupDuty; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private Integer isDelete; + + public Long getId() { + return id == null ? 0 : id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getGridGroupId() { + return gridGroupId == null ? "" : gridGroupId.trim(); + } + + public void setGridGroupId(String gridGroupId) { + this.gridGroupId = gridGroupId; + } + + public String getGridGroupName() { + return gridGroupName == null ? "" : gridGroupName.trim(); + } + + public void setGridGroupName(String gridGroupName) { + this.gridGroupName = gridGroupName; + } + + public String getGridGroupCode() { + return gridGroupCode == null ? "" : gridGroupCode.trim(); + } + + public void setGridGroupCode(String gridGroupCode) { + this.gridGroupCode = gridGroupCode; + } + + public String getGridGroupSummary() { + return gridGroupSummary == null ? "" : gridGroupSummary.trim(); + } + + public void setGridGroupSummary(String gridGroupSummary) { + this.gridGroupSummary = gridGroupSummary; + } + + public String getGridGroupDuty() { + return gridGroupDuty == null ? "" : gridGroupDuty.trim(); + } + + public void setGridGroupDuty(String gridGroupDuty) { + this.gridGroupDuty = gridGroupDuty; + } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } +} diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridPO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridPO.java new file mode 100644 index 00000000..40a1067e --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/pos/grid/GridPO.java @@ -0,0 +1,158 @@ +package ink.wgink.module.map.pojo.pos.grid; + +import java.io.Serializable; + +/** + * @ClassName: GridPO + * @Description: 网格 + * @Author: wanggeng + * @Date: 2021/10/19 11:33 下午 + * @Version: 1.0 + */ +public class GridPO implements Serializable { + private static final long serialVersionUID = -5995673062067526517L; + private Long id; + private String gridId; + private String gridName; + private String gridSummary; + private String gridGroupId; + private String gridDuty; + private String gridCode; + private Double gridSquare; + private String areaCode; + private String areaName; + private String fillColor; + private String creator; + private String gmtCreate; + private String modifier; + private String gmtModified; + private Integer isDelete; + + public Long getId() { + return id == null ? 0 : id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getGridId() { + return gridId == null ? "" : gridId.trim(); + } + + public void setGridId(String gridId) { + this.gridId = gridId; + } + + public String getGridName() { + return gridName == null ? "" : gridName.trim(); + } + + public void setGridName(String gridName) { + this.gridName = gridName; + } + + public String getGridSummary() { + return gridSummary == null ? "" : gridSummary.trim(); + } + + public void setGridSummary(String gridSummary) { + this.gridSummary = gridSummary; + } + + public String getGridGroupId() { + return gridGroupId == null ? "" : gridGroupId.trim(); + } + + public void setGridGroupId(String gridGroupId) { + this.gridGroupId = gridGroupId; + } + + public String getGridDuty() { + return gridDuty == null ? "" : gridDuty.trim(); + } + + public void setGridDuty(String gridDuty) { + this.gridDuty = gridDuty; + } + + public String getGridCode() { + return gridCode == null ? "" : gridCode.trim(); + } + + public void setGridCode(String gridCode) { + this.gridCode = gridCode; + } + + public Double getGridSquare() { + return gridSquare == null ? 0 : gridSquare; + } + + public void setGridSquare(Double gridSquare) { + this.gridSquare = gridSquare; + } + + public String getAreaCode() { + return areaCode == null ? "" : areaCode.trim(); + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } + + public String getAreaName() { + return areaName == null ? "" : areaName.trim(); + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public String getFillColor() { + return fillColor == null ? "" : fillColor.trim(); + } + + public void setFillColor(String fillColor) { + this.fillColor = fillColor; + } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtCreate() { + return gmtCreate == null ? "" : gmtCreate.trim(); + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } +} diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridGroupVO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridGroupVO.java new file mode 100644 index 00000000..0e383e75 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridGroupVO.java @@ -0,0 +1,58 @@ +package ink.wgink.module.map.pojo.vos.grid; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: GridGroupVO + * @Description: 网格组 + * @Author: wanggeng + * @Date: 2021/10/19 10:34 下午 + * @Version: 1.0 + */ +@ApiModel +public class GridGroupVO { + + @ApiModelProperty(name = "gridGroupName", value = "名称") + @CheckEmptyAnnotation(name = "名称") + private String gridGroupName; + @ApiModelProperty(name = "gridGroupCode", value = "编码") + private String gridGroupCode; + @ApiModelProperty(name = "gridGroupSummary", value = "描述") + private String gridGroupSummary; + @ApiModelProperty(name = "gridGroupDuty", value = "职责") + private String gridGroupDuty; + + public String getGridGroupName() { + return gridGroupName == null ? "" : gridGroupName.trim(); + } + + public void setGridGroupName(String gridGroupName) { + this.gridGroupName = gridGroupName; + } + + public String getGridGroupCode() { + return gridGroupCode == null ? "" : gridGroupCode.trim(); + } + + public void setGridGroupCode(String gridGroupCode) { + this.gridGroupCode = gridGroupCode; + } + + public String getGridGroupSummary() { + return gridGroupSummary == null ? "" : gridGroupSummary.trim(); + } + + public void setGridGroupSummary(String gridGroupSummary) { + this.gridGroupSummary = gridGroupSummary; + } + + public String getGridGroupDuty() { + return gridGroupDuty == null ? "" : gridGroupDuty.trim(); + } + + public void setGridGroupDuty(String gridGroupDuty) { + this.gridGroupDuty = gridGroupDuty; + } +} diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/vo/grid/GridPointVO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridPointVO.java similarity index 60% rename from module-map/src/main/java/ink/wgink/module/map/pojo/vo/grid/GridPointVO.java rename to module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridPointVO.java index 282f93ec..17580c7b 100644 --- a/module-map/src/main/java/ink/wgink/module/map/pojo/vo/grid/GridPointVO.java +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridPointVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.map.pojo.vo.grid; +package ink.wgink.module.map.pojo.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -18,10 +18,10 @@ public class GridPointVO { @ApiModelProperty(name = "gridId", value = "网格ID") private String gridId; - @ApiModelProperty(name = "lng", value = "经度") - private String lng; - @ApiModelProperty(name = "lat", value = "纬度") - private String lat; + @ApiModelProperty(name = "pointLng", value = "经度") + private String pointLng; + @ApiModelProperty(name = "pointLat", value = "纬度") + private String pointLat; public String getGridId() { return gridId == null ? "" : gridId.trim(); @@ -31,20 +31,20 @@ public class GridPointVO { this.gridId = gridId; } - public String getLng() { - return lng == null ? "" : lng.trim(); + public String getPointLng() { + return pointLng == null ? "" : pointLng.trim(); } - public void setLng(String lng) { - this.lng = lng; + public void setPointLng(String pointLng) { + this.pointLng = pointLng; } - public String getLat() { - return lat == null ? "" : lat.trim(); + public String getPointLat() { + return pointLat == null ? "" : pointLat.trim(); } - public void setLat(String lat) { - this.lat = lat; + public void setPointLat(String pointLat) { + this.pointLat = pointLat; } @Override @@ -53,9 +53,9 @@ public class GridPointVO { sb.append("\"gridId\":\"") .append(gridId).append('\"'); sb.append(",\"lng\":\"") - .append(lng).append('\"'); + .append(pointLng).append('\"'); sb.append(",\"lat\":\"") - .append(lat).append('\"'); + .append(pointLat).append('\"'); sb.append('}'); return sb.toString(); } diff --git a/module-map/src/main/java/ink/wgink/module/map/pojo/vo/grid/GridVO.java b/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridVO.java similarity index 98% rename from module-map/src/main/java/ink/wgink/module/map/pojo/vo/grid/GridVO.java rename to module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridVO.java index 25285ced..26542a54 100644 --- a/module-map/src/main/java/ink/wgink/module/map/pojo/vo/grid/GridVO.java +++ b/module-map/src/main/java/ink/wgink/module/map/pojo/vos/grid/GridVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.map.pojo.vo.grid; +package ink.wgink.module.map.pojo.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridGroupService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridGroupService.java new file mode 100644 index 00000000..16256796 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridGroupService.java @@ -0,0 +1,117 @@ +package ink.wgink.module.map.service.grid; + +import ink.wgink.module.map.pojo.dtos.grid.GridGroupDTO; +import ink.wgink.module.map.pojo.pos.grid.GridGroupPO; +import ink.wgink.module.map.pojo.vos.grid.GridGroupVO; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: IGridGroupService + * @Description: 网格组 + * @Author: wanggeng + * @Date: 2021/10/19 10:25 下午 + * @Version: 1.0 + */ +public interface IGridGroupService { + + /** + * 新增网格组 + * + * @param gridGroupVO + * @throws Exception + */ + void save(GridGroupVO gridGroupVO) throws Exception; + + /** + * 新增网格组 + * + * @param gridGroupVO + * @return 网格组ID + * @throws Exception + */ + String saveAndReturnId(GridGroupVO gridGroupVO) throws Exception; + + /** + * 删除网格组 + * + * @param asList + */ + void remove(List ids); + + /** + * 修改网格组 + * + * @param gridGroupId + * @param gridGroupVO + * @throws Exception + */ + void update(String gridGroupId, GridGroupVO gridGroupVO) throws Exception; + + /** + * 网格组详情 + * + * @param params + * @return + */ + GridGroupDTO get(Map params); + + /** + * 网格组详情 + * + * @param gridGroupId 网格组ID + * @return + */ + GridGroupDTO get(String gridGroupId); + + /** + * 网格组详情 + * + * @param gridGroupCode + * @return + */ + GridGroupDTO getByCode(String gridGroupCode); + + /** + * 网格组详情 + * + * @param params + * @return + */ + GridGroupPO getPO(Map params); + + /** + * 网格组详情 + * + * @param gridGroupId + * @return + */ + GridGroupPO getPO(String gridGroupId); + + /** + * 网格组详情 + * + * @param gridGroupCode + * @return + */ + GridGroupPO getPOByCode(String gridGroupCode); + + /** + * 网格组列表 + * + * @param params + * @return + */ + List list(Map params); + + /** + * 网格组分页列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); +} diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridPointService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridPointService.java index 1f55ee4e..e8a2be79 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridPointService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridPointService.java @@ -1,8 +1,8 @@ package ink.wgink.module.map.service.grid; import ink.wgink.exceptions.RemoveException; -import ink.wgink.module.map.pojo.dto.grid.GridPointDTO; -import ink.wgink.module.map.pojo.vo.grid.GridPointVO; +import ink.wgink.module.map.pojo.dtos.grid.GridPointDTO; +import ink.wgink.module.map.pojo.vos.grid.GridPointVO; import java.util.List; import java.util.Map; diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java index 455907c8..61623ee0 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java @@ -1,6 +1,6 @@ package ink.wgink.module.map.service.grid; -import ink.wgink.module.map.pojo.dto.grid.GridRelationDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; import java.util.List; import java.util.Map; diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java index 5991ef84..492c5a3f 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java @@ -1,8 +1,9 @@ package ink.wgink.module.map.service.grid; import ink.wgink.exceptions.SearchException; -import ink.wgink.module.map.pojo.dto.grid.GridDTO; -import ink.wgink.module.map.pojo.vo.grid.GridVO; +import ink.wgink.module.map.pojo.dtos.grid.GridDTO; +import ink.wgink.module.map.pojo.pos.grid.GridPO; +import ink.wgink.module.map.pojo.vos.grid.GridVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; @@ -39,6 +40,12 @@ public interface IGridService { */ String saveAndReturnId(GridVO gridVO) throws Exception; + /** + * 删除网格 + * + * @param ids + */ + void remove(List ids); /** * 删除网格 @@ -70,6 +77,38 @@ public interface IGridService { */ void update(String gridId, GridVO gridVO) throws Exception; + /** + * 网格详情 + * + * @param params + * @return + */ + GridDTO get(Map params); + + /** + * 网格详情 + * + * @param gridId + * @return + */ + GridDTO get(String gridId); + + /** + * 网格详情 + * + * @param params + * @return + */ + GridPO gridPO(Map params); + + /** + * 网格详情 + * + * @param gridId + * @return + */ + GridPO gridPO(String gridId); + /** * 网格列表 * @@ -119,5 +158,11 @@ public interface IGridService { */ SuccessResultList> listPageByRelationIds(ListPage page, List relationIds); - + /** + * 网格列表 + * + * @param page + * @return + */ + SuccessResultList> listPage(ListPage page); } diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridGroupServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridGroupServiceImpl.java new file mode 100644 index 00000000..8d595b9e --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridGroupServiceImpl.java @@ -0,0 +1,123 @@ +package ink.wgink.module.map.service.grid.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.exceptions.SearchException; +import ink.wgink.module.map.dao.grid.IGridGroupDao; +import ink.wgink.module.map.pojo.dtos.grid.GridGroupDTO; +import ink.wgink.module.map.pojo.pos.grid.GridGroupPO; +import ink.wgink.module.map.pojo.vos.grid.GridGroupVO; +import ink.wgink.module.map.service.grid.IGridGroupService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.UUIDUtil; +import ink.wgink.util.map.HashMapUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: GridGroupServiceImpl + * @Description: 网格组业务 + * @Author: wanggeng + * @Date: 2021/10/19 10:25 下午 + * @Version: 1.0 + */ +@Service +public class GridGroupServiceImpl extends DefaultBaseService implements IGridGroupService { + + @Autowired + private IGridGroupDao gridGroupDao; + + @Override + public void save(GridGroupVO gridGroupVO) throws Exception { + saveAndReturnId(gridGroupVO); + } + + @Override + public String saveAndReturnId(GridGroupVO gridGroupVO) throws Exception { + GridGroupPO gridGroupPO = getPOByCode(gridGroupVO.getGridGroupCode()); + if (gridGroupPO != null) { + throw new SearchException("网格组编码存在"); + } + String gridGroupId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(gridGroupVO); + params.put("gridGroupId", gridGroupId); + setSaveInfo(params); + gridGroupDao.save(params); + return gridGroupId; + } + + @Override + public void remove(List ids) { + if (ids.isEmpty()) { + return; + } + Map params = getHashMap(2); + params.put("gridGroupIds", ids); + setUpdateInfo(params); + gridGroupDao.remove(params); + } + + @Override + public void update(String gridGroupId, GridGroupVO gridGroupVO) throws Exception { + Map params = HashMapUtil.beanToMap(gridGroupVO); + params.put("gridGroupId", gridGroupId); + setUpdateInfo(params); + gridGroupDao.update(params); + } + + @Override + public GridGroupDTO get(Map params) { + return gridGroupDao.get(params); + } + + @Override + public GridGroupDTO get(String gridGroupId) { + Map params = getHashMap(2); + params.put("gridGroupId", gridGroupId); + return get(params); + } + + @Override + public GridGroupDTO getByCode(String gridGroupCode) { + Map params = getHashMap(2); + params.put("gridGroupCode", gridGroupCode); + return get(params); + } + + @Override + public GridGroupPO getPO(Map params) { + return gridGroupDao.getPO(params); + } + + @Override + public GridGroupPO getPO(String gridGroupId) { + Map params = getHashMap(2); + params.put("gridGroupId", gridGroupId); + return getPO(params); + } + + @Override + public GridGroupPO getPOByCode(String gridGroupCode) { + Map params = getHashMap(2); + params.put("gridGroupCode", gridGroupCode); + return getPO(params); + } + + @Override + public List list(Map params) { + return gridGroupDao.list(params); + } + + @Override + public SuccessResultList> listPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List gridGroupDTOs = list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(gridGroupDTOs); + return new SuccessResultList<>(gridGroupDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } +} diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridPointServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridPointServiceImpl.java index 3d035e26..803ee85e 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridPointServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridPointServiceImpl.java @@ -3,8 +3,8 @@ package ink.wgink.module.map.service.grid.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.RemoveException; import ink.wgink.module.map.dao.grid.IGridPointDao; -import ink.wgink.module.map.pojo.dto.grid.GridPointDTO; -import ink.wgink.module.map.pojo.vo.grid.GridPointVO; +import ink.wgink.module.map.pojo.dtos.grid.GridPointDTO; +import ink.wgink.module.map.pojo.vos.grid.GridPointVO; import ink.wgink.module.map.service.grid.IGridPointService; import ink.wgink.util.map.HashMapUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +35,8 @@ public class GridPointServiceImpl extends DefaultBaseService implements IGridPoi Map params = getHashMap(4); params.put("gridId", gridId); for (GridPointVO gridPointVO : pointArray) { - params.put("lng", gridPointVO.getLng()); - params.put("lat", gridPointVO.getLat()); + params.put("lng", gridPointVO.getPointLng()); + params.put("lat", gridPointVO.getPointLat()); gridPointDao.save(params); } } diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java index fe72d073..729f20b9 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridRelationServiceImpl.java @@ -3,7 +3,7 @@ package ink.wgink.module.map.service.grid.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.RemoveException; import ink.wgink.module.map.dao.grid.IGridRelationDao; -import ink.wgink.module.map.pojo.dto.grid.GridRelationDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; import ink.wgink.module.map.service.grid.IGridRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java index cdd77f58..1fc08354 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java @@ -5,11 +5,12 @@ import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; import ink.wgink.module.map.dao.grid.IGridDao; -import ink.wgink.module.map.pojo.dto.grid.GridDTO; -import ink.wgink.module.map.pojo.dto.grid.GridPointDTO; -import ink.wgink.module.map.pojo.dto.grid.GridRelationDTO; -import ink.wgink.module.map.pojo.vo.grid.GridPointVO; -import ink.wgink.module.map.pojo.vo.grid.GridVO; +import ink.wgink.module.map.pojo.dtos.grid.GridDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridPointDTO; +import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; +import ink.wgink.module.map.pojo.pos.grid.GridPO; +import ink.wgink.module.map.pojo.vos.grid.GridPointVO; +import ink.wgink.module.map.pojo.vos.grid.GridVO; import ink.wgink.module.map.service.grid.IGridPointService; import ink.wgink.module.map.service.grid.IGridRelationService; import ink.wgink.module.map.service.grid.IGridService; @@ -67,6 +68,14 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService return gridId; } + @Override + public void remove(List ids) { + Map params = getHashMap(2); + params.put("gridIds", ids); + setUpdateInfo(params); + gridDao.remove(params); + } + @Override public void deleteByRelationId(String relationId) { List gridIds = gridRelationService.listGridId(relationId); @@ -130,6 +139,30 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService gridDao.update(params); } + @Override + public GridDTO get(Map params) { + return gridDao.get(params); + } + + @Override + public GridDTO get(String gridId) { + Map params = getHashMap(2); + params.put("gridId", gridId); + return get(params); + } + + @Override + public GridPO gridPO(Map params) { + return gridDao.getPO(params); + } + + @Override + public GridPO gridPO(String gridId) { + Map params = getHashMap(2); + params.put("gridId", gridId); + return gridPO(params); + } + @Override public List list(Map params) { List gridDTOs = gridDao.list(params); @@ -230,6 +263,14 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService return new SuccessResultList<>(gridDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + public SuccessResultList> listPage(ListPage page) { + PageHelper.startPage(page.getPage(), page.getRows()); + List gridDTOs = gridDao.list(page.getParams()); + PageInfo pageInfo = new PageInfo<>(gridDTOs); + return new SuccessResultList<>(gridDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); + } + /** * 设置网格点 diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml new file mode 100644 index 00000000..41f054ed --- /dev/null +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CREATE TABLE IF NOT EXISTS `map_grid_group` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `grid_group_id` char(36) DEFAULT NULL COMMENT '主键', + `grid_group_name` varchar(255) DEFAULT NULL COMMENT '名称', + `grid_group_code` varchar(255) DEFAULT NULL COMMENT '编码', + `grid_group_summary` varchar(255) DEFAULT NULL COMMENT '描述', + `grid_group_duty` varchar(255) DEFAULT NULL COMMENT '网格组责任', + `creator` char(36) DEFAULT NULL COMMENT '创建人', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + `modifier` char(36) DEFAULT NULL COMMENT '修改人', + `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间', + `is_delete` int(1) DEFAULT '0' COMMENT '是否删除', + PRIMARY KEY (`id`), + UNIQUE KEY `grid_type_id` (`grid_group_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网格组'; + + + + + INSERT INTO map_grid_group( + grid_group_id, + grid_group_name, + grid_group_code, + grid_group_summary, + grid_group_duty, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete + ) VALUES( + #{gridGroupId}, + #{gridGroupName}, + #{gridGroupCode}, + #{gridGroupSummary}, + #{gridGroupDuty}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) + + + + + UPDATE + map_grid_group + SET + is_delete = 1, + modifier = #{modifier}, + gmt_modified = #{gmtModified} + WHERE + grid_group_id = #{gridGroupId} + + + + + UPDATE + map_grid_group + SET + + grid_group_name = #{gridGroupName}, + + + grid_group_summary = #{gridGroupSummary}, + + + grid_group_duty = #{gridGroupDuty}, + + gmt_modified = #{gmtModified}, + modifier = #{modifier} + WHERE + grid_group_id = #{gridGroupId} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml index 009128c7..3f752a3b 100644 --- a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml @@ -4,28 +4,63 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CREATE TABLE IF NOT EXISTS `map_grid` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `grid_id` char(36) NOT NULL, - `grid_name` varchar(255) NOT NULL, - `fill_color` varchar(7) NOT NULL DEFAULT '#000000' COMMENT '颜色', - `gmt_create` datetime DEFAULT NULL, - `creator` char(36) DEFAULT NULL, - `gmt_modified` datetime DEFAULT NULL, - `modifier` char(36) DEFAULT NULL, - `is_delete` int(1) DEFAULT '0', + `id` bigint(36) unsigned NOT NULL AUTO_INCREMENT, + `grid_id` char(36) DEFAULT NULL COMMENT '主键', + `grid_name` varchar(255) DEFAULT NULL COMMENT '网格名称', + `grid_summary` varchar(255) DEFAULT NULL COMMENT '网格描述', + `grid_group_id` char(36) DEFAULT NULL COMMENT '网格组ID', + `grid_duty` varchar(255) DEFAULT NULL COMMENT '网格责任', + `grid_code` varchar(255) DEFAULT NULL COMMENT '网格编码', + `grid_square` double(11,2) DEFAULT NULL COMMENT '网格面积', + `area_code` varchar(255) DEFAULT NULL COMMENT '区域编码', + `area_name` varchar(255) DEFAULT NULL COMMENT '区域名称', + `fill_color` varchar(7) DEFAULT NULL COMMENT '填充颜色', + `creator` char(36) DEFAULT NULL COMMENT '创建人', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + `modifier` char(36) DEFAULT NULL COMMENT '修改人', + `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间', + `is_delete` int(1) DEFAULT '0' COMMENT '是否删除', PRIMARY KEY (`id`), - UNIQUE KEY `grid_id` (`grid_id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网格'; + UNIQUE KEY `grid_id` (`grid_id`) USING BTREE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网格表'; @@ -33,6 +68,13 @@ INSERT INTO map_grid( grid_id, grid_name, + grid_summary, + grid_group_id, + grid_duty, + grid_code, + grid_square, + area_code, + area_name, fill_color, gmt_create, creator, @@ -42,6 +84,13 @@ ) VALUES( #{gridId}, #{gridName}, + #{gridSummary}, + #{gridGroupId}, + #{gridDuty}, + #{gridCode}, + #{gridSquare}, + #{areaCode}, + #{areaName}, #{fillColor}, #{gmtCreate}, #{creator}, @@ -51,6 +100,18 @@ ) + + + UPDATE + map_grid + SET + is_delete = 1, + modifier = #{modifier}, + gmt_modified = #{gmtModified} + WHERE + grid_id = #{gridId} + + DELETE FROM @@ -84,12 +145,70 @@ grid_id = #{gridId} + + + + + + SELECT grid_id, - lng, - lat + point_lng, + point_lat FROM map_grid_point diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-relation-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-relation-mapper.xml index 2f9b24d0..2d083ce2 100644 --- a/module-map/src/main/resources/mybatis/mapper/grid/grid-relation-mapper.xml +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-relation-mapper.xml @@ -4,31 +4,33 @@ - + + CREATE TABLE IF NOT EXISTS `map_grid_relation` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `relation_id` char(36) NOT NULL COMMENT '关联ID', - `grid_id` char(36) NOT NULL COMMENT '网格ID', - PRIMARY KEY (`id`,`relation_id`), - KEY `relation_id` (`relation_id`) USING BTREE, - KEY `grid_id` (`grid_id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网格与关联'; + `grid_id` char(36) DEFAULT NULL COMMENT '网格ID', + `relation_id` char(36) DEFAULT NULL COMMENT '关联ID', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网格关联表'; INSERT INTO map_grid_relation( grid_id, - relation_id + relation_id, + gmt_create ) VALUES( #{gridId}, #{relationId} + #{gmtCreate} ) @@ -58,6 +60,7 @@ + + + +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/module-map/src/main/resources/templates/grid/grid-group/save.html b/module-map/src/main/resources/templates/grid/grid-group/save.html new file mode 100644 index 00000000..5b08d129 --- /dev/null +++ b/module-map/src/main/resources/templates/grid/grid-group/save.html @@ -0,0 +1,119 @@ + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 新增内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/module-map/src/main/resources/templates/grid/grid-group/update.html b/module-map/src/main/resources/templates/grid/grid-group/update.html new file mode 100644 index 00000000..640c6f70 --- /dev/null +++ b/module-map/src/main/resources/templates/grid/grid-group/update.html @@ -0,0 +1,130 @@ + + + + + + + + + + + + + +
+
+
+ + 上级列表/ + 编辑内容 + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + + \ No newline at end of file