diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java index d0a7e8547..fbb55d8c0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java @@ -1,11 +1,11 @@ -/** +/** * @Project: emis * @Title: EmisContinent.java * @author linfso - * @date 2023-11-16 16:18:39 + * @date 2023-12-12 06:35:06 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 - * @Description:

地球洲 实体类

+ * @version v1.0 + * @Description:

全球大区 实体类

*/ package com.xdadan.erp.emis.domain; @@ -23,11 +23,11 @@ import lombok.Data; /** * @ClassName EmisContinent - * @Description 地球洲 + * @Description 全球大区 * @author linfso - * @date 2023-11-16 16:18:39 + * @date 2023-12-12 06:35:06 */ - @Data +@Data public class EmisContinent extends BaseEntity { private static final long serialVersionUID = 1L; @@ -38,6 +38,8 @@ public class EmisContinent extends BaseEntity private String name; /* 英文名称 */ private String nameEn; + /* 父ID */ + private Integer parentId; /* 洲代码(段码使用) */ private String code; /* 二字码 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java index be80789b1..5b355986e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisCountry.java * @author linfso - * @date 2023-11-16 16:18:40 + * @date 2023-12-12 06:35:32 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

国家 实体类

*/ @@ -25,9 +25,9 @@ import lombok.Data; * @ClassName EmisCountry * @Description 国家 * @author linfso - * @date 2023-11-16 16:18:40 + * @date 2023-12-12 06:35:32 */ - @Data +@Data public class EmisCountry extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java b/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java deleted file mode 100644 index de4042f28..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisContinentController.java +++ /dev/null @@ -1,118 +0,0 @@ - -/** - * @Project: emis - * @Title: EmisContinentController.java - * @author linfso - * @date 2023-11-16 16:18:40 - * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 - * @Description:

地球洲 控制器

- */ - -package com.xdadan.erp.web.emis; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.xdadan.erp.common.annotation.Log; -import com.xdadan.erp.common.core.controller.BaseController; -import com.xdadan.erp.common.core.domain.AjaxResult; -import com.xdadan.erp.common.core.page.TableDataInfo; -import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.common.utils.StringUtils; -import com.xdadan.erp.common.utils.poi.ExcelUtil; - -import com.xdadan.erp.emis.domain.EmisContinent; -import com.xdadan.erp.emis.service.IEmisContinentService; - -/** - * 地球洲Controller - * - * @author linfso - * @date 2023-11-16 16:18:40 - */ -@RestController -@RequestMapping("/emis/emisContinent") -public class EmisContinentController extends BaseController -{ - @Autowired - private IEmisContinentService emisContinentService; - - /** - * 查询地球洲列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisContinent:list')") - @GetMapping("/list") - public TableDataInfo list(EmisContinent emisContinent) - { - startPage(); - List list = emisContinentService.selectEmisContinentList(emisContinent); - return getDataTable(list); - } - - /** - * 导出地球洲列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisContinent:export')") - @Log(title = "地球洲", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EmisContinent emisContinent) - { - List list = emisContinentService.selectEmisContinentList(emisContinent); - ExcelUtil util = new ExcelUtil(EmisContinent.class); - util.exportExcel(response, list, "地球洲数据"); - } - - /** - * 获取地球洲详细信息 - */ - @PreAuthorize("@ss.hasPermi('emis:emisContinent:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Integer id) - { - return AjaxResult.success(emisContinentService.selectEmisContinentById(id)); - } - - /** - * 新增地球洲 - */ - @PreAuthorize("@ss.hasPermi('emis:emisContinent:add')") - @Log(title = "地球洲", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EmisContinent emisContinent) - { - return toAjax(emisContinentService.insertEmisContinent(emisContinent)); - } - - /** - * 修改地球洲 - */ - @PreAuthorize("@ss.hasPermi('emis:emisContinent:edit')") - @Log(title = "地球洲", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EmisContinent emisContinent) - { - return toAjax(emisContinentService.updateEmisContinent(emisContinent)); - } - - /** - * 删除地球洲 - */ - @PreAuthorize("@ss.hasPermi('emis:emisContinent:remove')") - @Log(title = "地球洲", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Integer[] ids) - { - return toAjax(emisContinentService.deleteEmisContinentByIds(ids)); - } -} diff --git a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java b/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java deleted file mode 100644 index 52a0d2a55..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisCountryAreaController.java +++ /dev/null @@ -1,118 +0,0 @@ - -/** - * @Project: emis - * @Title: EmisCountryAreaController.java - * @author linfso - * @date 2023-11-16 16:18:40 - * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 - * @Description:

国家大区表 控制器

- */ - -package com.xdadan.erp.web.emis; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.xdadan.erp.common.annotation.Log; -import com.xdadan.erp.common.core.controller.BaseController; -import com.xdadan.erp.common.core.domain.AjaxResult; -import com.xdadan.erp.common.core.page.TableDataInfo; -import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.common.utils.StringUtils; -import com.xdadan.erp.common.utils.poi.ExcelUtil; - -import com.xdadan.erp.emis.domain.EmisCountryArea; -import com.xdadan.erp.emis.service.IEmisCountryAreaService; - -/** - * 国家大区表Controller - * - * @author linfso - * @date 2023-11-16 16:18:40 - */ -@RestController -@RequestMapping("/emis/emisCountryArea") -public class EmisCountryAreaController extends BaseController -{ - @Autowired - private IEmisCountryAreaService emisCountryAreaService; - - /** - * 查询国家大区表列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountryArea:list')") - @GetMapping("/list") - public TableDataInfo list(EmisCountryArea emisCountryArea) - { - startPage(); - List list = emisCountryAreaService.selectEmisCountryAreaList(emisCountryArea); - return getDataTable(list); - } - - /** - * 导出国家大区表列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountryArea:export')") - @Log(title = "国家大区表", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EmisCountryArea emisCountryArea) - { - List list = emisCountryAreaService.selectEmisCountryAreaList(emisCountryArea); - ExcelUtil util = new ExcelUtil(EmisCountryArea.class); - util.exportExcel(response, list, "国家大区表数据"); - } - - /** - * 获取国家大区表详细信息 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountryArea:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(emisCountryAreaService.selectEmisCountryAreaById(id)); - } - - /** - * 新增国家大区表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountryArea:add')") - @Log(title = "国家大区表", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EmisCountryArea emisCountryArea) - { - return toAjax(emisCountryAreaService.insertEmisCountryArea(emisCountryArea)); - } - - /** - * 修改国家大区表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountryArea:edit')") - @Log(title = "国家大区表", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EmisCountryArea emisCountryArea) - { - return toAjax(emisCountryAreaService.updateEmisCountryArea(emisCountryArea)); - } - - /** - * 删除国家大区表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountryArea:remove')") - @Log(title = "国家大区表", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(emisCountryAreaService.deleteEmisCountryAreaByIds(ids)); - } -} diff --git a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java b/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java deleted file mode 100644 index 36c32315e..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java +++ /dev/null @@ -1,118 +0,0 @@ - -/** - * @Project: emis - * @Title: EmisCountryController.java - * @author linfso - * @date 2023-11-16 16:18:40 - * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 - * @Description:

国家 控制器

- */ - -package com.xdadan.erp.web.emis; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.xdadan.erp.common.annotation.Log; -import com.xdadan.erp.common.core.controller.BaseController; -import com.xdadan.erp.common.core.domain.AjaxResult; -import com.xdadan.erp.common.core.page.TableDataInfo; -import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.common.utils.StringUtils; -import com.xdadan.erp.common.utils.poi.ExcelUtil; - -import com.xdadan.erp.emis.domain.EmisCountry; -import com.xdadan.erp.emis.service.IEmisCountryService; - -/** - * 国家Controller - * - * @author linfso - * @date 2023-11-16 16:18:40 - */ -@RestController -@RequestMapping("/emis/emisCountry") -public class EmisCountryController extends BaseController -{ - @Autowired - private IEmisCountryService emisCountryService; - - /** - * 查询国家列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountry:list')") - @GetMapping("/list") - public TableDataInfo list(EmisCountry emisCountry) - { - startPage(); - List list = emisCountryService.selectEmisCountryList(emisCountry); - return getDataTable(list); - } - - /** - * 导出国家列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountry:export')") - @Log(title = "国家", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EmisCountry emisCountry) - { - List list = emisCountryService.selectEmisCountryList(emisCountry); - ExcelUtil util = new ExcelUtil(EmisCountry.class); - util.exportExcel(response, list, "国家数据"); - } - - /** - * 获取国家详细信息 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountry:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Integer id) - { - return AjaxResult.success(emisCountryService.selectEmisCountryById(id)); - } - - /** - * 新增国家 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountry:add')") - @Log(title = "国家", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EmisCountry emisCountry) - { - return toAjax(emisCountryService.insertEmisCountry(emisCountry)); - } - - /** - * 修改国家 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountry:edit')") - @Log(title = "国家", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EmisCountry emisCountry) - { - return toAjax(emisCountryService.updateEmisCountry(emisCountry)); - } - - /** - * 删除国家 - */ - @PreAuthorize("@ss.hasPermi('emis:emisCountry:remove')") - @Log(title = "国家", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Integer[] ids) - { - return toAjax(emisCountryService.deleteEmisCountryByIds(ids)); - } -} diff --git a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java b/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java deleted file mode 100644 index f00b41ffc..000000000 --- a/emis-biz/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java +++ /dev/null @@ -1,118 +0,0 @@ - -/** - * @Project: emis - * @Title: EmisRegionController.java - * @author linfso - * @date 2023-11-16 16:18:40 - * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 - * @Description:

四级省市区镇表 控制器

- */ - -package com.xdadan.erp.web.emis; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.xdadan.erp.common.annotation.Log; -import com.xdadan.erp.common.core.controller.BaseController; -import com.xdadan.erp.common.core.domain.AjaxResult; -import com.xdadan.erp.common.core.page.TableDataInfo; -import com.xdadan.erp.common.enums.BusinessType; -import com.xdadan.erp.common.utils.StringUtils; -import com.xdadan.erp.common.utils.poi.ExcelUtil; - -import com.xdadan.erp.emis.domain.EmisRegion; -import com.xdadan.erp.emis.service.IEmisRegionService; - -/** - * 四级省市区镇表Controller - * - * @author linfso - * @date 2023-11-16 16:18:40 - */ -@RestController -@RequestMapping("/emis/emisRegion") -public class EmisRegionController extends BaseController -{ - @Autowired - private IEmisRegionService emisRegionService; - - /** - * 查询四级省市区镇表列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')") - @GetMapping("/list") - public TableDataInfo list(EmisRegion emisRegion) - { - startPage(); - List list = emisRegionService.selectEmisRegionList(emisRegion); - return getDataTable(list); - } - - /** - * 导出四级省市区镇表列表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisRegion:export')") - @Log(title = "四级省市区镇表", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, EmisRegion emisRegion) - { - List list = emisRegionService.selectEmisRegionList(emisRegion); - ExcelUtil util = new ExcelUtil(EmisRegion.class); - util.exportExcel(response, list, "四级省市区镇表数据"); - } - - /** - * 获取四级省市区镇表详细信息 - */ - @PreAuthorize("@ss.hasPermi('emis:emisRegion:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Integer id) - { - return AjaxResult.success(emisRegionService.selectEmisRegionById(id)); - } - - /** - * 新增四级省市区镇表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisRegion:add')") - @Log(title = "四级省市区镇表", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody EmisRegion emisRegion) - { - return toAjax(emisRegionService.insertEmisRegion(emisRegion)); - } - - /** - * 修改四级省市区镇表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisRegion:edit')") - @Log(title = "四级省市区镇表", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody EmisRegion emisRegion) - { - return toAjax(emisRegionService.updateEmisRegion(emisRegion)); - } - - /** - * 删除四级省市区镇表 - */ - @PreAuthorize("@ss.hasPermi('emis:emisRegion:remove')") - @Log(title = "四级省市区镇表", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Integer[] ids) - { - return toAjax(emisRegionService.deleteEmisRegionByIds(ids)); - } -} diff --git a/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml b/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml index 23d4d9ea3..530f5daaf 100644 --- a/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisContinentMapper.xml @@ -1,13 +1,14 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + @@ -21,15 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, name, name_en, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_continent + select id, name, name_en, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_continent - + - + insert into emis_continent id, name, name_en, + parent_id, code, two_code, three_code, @@ -66,11 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{id}, #{name}, #{nameEn}, + #{parentId}, #{code}, #{twoCode}, #{threeCode}, @@ -81,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + @@ -89,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" name = #{name}, name_en = #{nameEn}, + parent_id = #{parentId}, code = #{code}, two_code = #{twoCode}, three_code = #{threeCode}, @@ -108,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_continent where id in + delete from emis_continent where id in #{id} diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml index d3df57ca2..335b1f10d 100644 --- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into emis_country @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{id}, #{name}, @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_country where id in + delete from emis_country where id in #{id}