From ecd71a54ca107cb9164e1d96beb9f54be3dfb1ef Mon Sep 17 00:00:00 2001 From: 32503 <325039231@qq.com> Date: Thu, 8 May 2025 16:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dict/column/DictProvincesCodeField.java | 35 ------- .../DictProvincesCodeController.java | 98 ------------------- .../dict/controller/DictRegionController.java | 92 ----------------- .../project/dict/dao/DictProjectMapper.java | 16 --- .../dict/dao/DictProvincesCodeMapper.java | 10 -- .../project/dict/dao/DictRegionMapper.java | 10 -- .../dao/mapper/DictProvincesCodeMapper.xml | 20 ---- .../dict/dao/mapper/DictRegionMapper.xml | 20 ---- .../dict/entity/DictProvincesCode.java | 69 ------------- .../ebtp/project/dict/entity/DictRegion.java | 54 ---------- .../service/IDictProvincesCodeService.java | 20 ---- .../dict/service/IDictRegionService.java | 24 ----- .../impl/DictProvincesCodeServiceImpl.java | 27 ----- .../service/impl/DictRegionServiceImpl.java | 35 ------- .../SysManagerEbtpProjectApplication.java | 7 +- .../controller/DictProjectController.java | 17 +++- .../project/dict/dao/DictProjectMapper.java | 33 +++++++ .../dict/dao/mapper/DictProjectMapper.xml | 6 +- .../ebtp/project/dict/entity/DictProject.java | 14 ++- .../dict/service/IDictProjectService.java | 11 ++- .../service/impl/DictProjectServiceImpl.java | 21 +++- src/main/resources/application-dev.yml | 4 +- src/main/resources/application-local.yml | 2 +- src/main/resources/application-master.yml | 8 +- src/main/resources/application-sim.yml | 4 +- src/main/resources/application-uat.yml | 4 +- .../swagger-configuration.properties | 2 +- 27 files changed, 104 insertions(+), 559 deletions(-) delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictRegionController.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProjectMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictRegionMapper.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictRegionService.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java delete mode 100644 src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictRegionServiceImpl.java rename src/main/java/com/{chinaunicom/mall => coscoshipping}/ebtp/project/SysManagerEbtpProjectApplication.java (88%) rename src/main/java/com/{chinaunicom/mall => coscoshipping}/ebtp/project/dict/controller/DictProjectController.java (83%) create mode 100644 src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java rename src/main/java/com/{chinaunicom/mall => coscoshipping}/ebtp/project/dict/dao/mapper/DictProjectMapper.xml (78%) rename src/main/java/com/{chinaunicom/mall => coscoshipping}/ebtp/project/dict/entity/DictProject.java (82%) rename src/main/java/com/{chinaunicom/mall => coscoshipping}/ebtp/project/dict/service/IDictProjectService.java (78%) rename src/main/java/com/{chinaunicom/mall => coscoshipping}/ebtp/project/dict/service/impl/DictProjectServiceImpl.java (76%) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java deleted file mode 100644 index 34235cc..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/column/DictProvincesCodeField.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.column; - -/** - * 字段常量 DictProvincesCode - * - * @author daixc - * @date 2021/04/06 - */ -public class DictProvincesCodeField { - - private DictProvincesCodeField(){ - - } - /** - * 编号 - */ - public static final String ID = "id"; - - /** - * 省份编码 - */ - public static final String PROVINCES_NUMBER = "provinces_number"; - - /** - * 省份名称 - */ - public static final String PROVINCES_NAME = "provinces_name"; - - /** - * 省份名称缩写 - */ - public static final String PROVINCES_CODE = "provinces_code"; - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java deleted file mode 100644 index b8a58ff..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProvincesCodeController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.controller; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; -import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -/** - * 省份对应缩写字典表 - * @author daixc - * @date 2021/ - */ -@RestController -@Api(tags = "省份对应缩写字典表") -@RequestMapping("/v1/dictprovincescode") -public class DictProvincesCodeController{ - - @Resource - private IDictProvincesCodeService idictProvincesCodeService; - - /** - * 插入新数据 - * @param dictProvincesCode 省分代码实体 - * @return 返回结果 - */ - @ApiOperation("插入新数据") - @PostMapping("") - public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictProvincesCode dictProvincesCode){ - - boolean save = idictProvincesCodeService.save(dictProvincesCode); - - return BaseResponse.success(save); - } - - /** - * 修改数据 - * @param dictProvincesCode 省分代码实体 - * @return 返回结果 - */ - @ApiOperation("修改数据") - @PostMapping("/update") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody DictProvincesCode dictProvincesCode){ - - return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode)); - } - - /** - * 查询数据 - * @param id 主键id - * @return 返回结果 - */ - @ApiOperation("查询数据") - @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable Integer id){ - - DictProvincesCode dictProvincesCode = idictProvincesCodeService.getById(id); - - return BaseResponse.success(dictProvincesCode); - } - - /** - * 根据省分编码查询数据 - * @param provincesNumber 省分编码 - * @return 返回结果 - */ - @ApiOperation("根据省分编码查询数据") - @GetMapping("getByProvincesNumber/{provincesNumber}") - public BaseResponse getByProvincesNumber(@ApiParam(value = "主键id", required = true) @PathVariable String provincesNumber){ - - DictProvincesCode dictProvincesCode = idictProvincesCodeService.getByProvincesNumber(provincesNumber); - - return BaseResponse.success(dictProvincesCode); - } - - /** - * 查询所有数据 - * - * @return 返回结果 - */ - @ApiOperation("查询所有数据") - @GetMapping("queryAll") - public BaseResponse> queryAll(@RequestParam(value = "childCompany", required = false) Boolean childCompany) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(childCompany != null, DictProvincesCode::getChildCompany, childCompany); - return BaseResponse.success(idictProvincesCodeService.list(wrapper)); - } - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictRegionController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictRegionController.java deleted file mode 100644 index 336f536..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictRegionController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.controller; - - -import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictRegion; -import com.chinaunicom.mall.ebtp.project.dict.service.IDictRegionService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -/** - * 全国行政区域信息 - * @author daixc - * @date 2020/10/29 - */ -@RestController -@Api(tags = "全国行政区划表") -@RequestMapping("/v1/dictRegion") -public class DictRegionController{ - - @Resource - private IDictRegionService idictRegionService; - - /** - * 插入新数据 - * - * @param dictRegion 字典信息 - * - * @return 返回结果 - */ - @ApiOperation("插入新数据") - @PostMapping("") - public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictRegion dictRegion){ - - boolean save = idictRegionService.save(dictRegion); - - return BaseResponse.success(save); - } - - /** - * 修改数据 - * - * @param dictRegion 字典信息 - * - * @return 返回结果 - */ - @ApiOperation("修改数据") - @PostMapping("/update") - public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody DictRegion dictRegion){ - - return BaseResponse.success(idictRegionService.updateById(dictRegion)); - } - - /** - * 查询数据 - * - * @param id id值 - * - * @return 返回结果 - */ - @ApiOperation("查询数据") - @GetMapping("/{id}") - public BaseResponse get(@ApiParam(value = "主键id", required = true) @PathVariable String id){ - - DictRegion dictRegion = idictRegionService.getById(id); - - return BaseResponse.success(dictRegion); - } - - /** - * 查询数据 - * - * @param pId 父类id值 - * - * @return 返回结果 - */ - @ApiOperation("查询数据") - @GetMapping("/getChild") - public BaseResponse> getChild(@ApiParam(value = "主键id", required = true) @RequestParam(name = "pId") String pId){ - - List dictRegion = idictRegionService.getChild(pId); - - return BaseResponse.success(dictRegion); - } - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProjectMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProjectMapper.java deleted file mode 100644 index 65d38be..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProjectMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.dao; - - -import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject; - - -/** - * 字典表mapper - * @author daixc - * @date 2020/11/03 - */ -public interface DictProjectMapper extends IBaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java deleted file mode 100644 index dc67dc4..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictProvincesCodeMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.dao; - - -import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; - -public interface DictProvincesCodeMapper extends IBaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictRegionMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictRegionMapper.java deleted file mode 100644 index 3578c3f..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/DictRegionMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.dao; - - -import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictRegion; - -public interface DictRegionMapper extends IBaseMapper { - - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml deleted file mode 100644 index baeb6fa..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProvincesCodeMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - update dict_provinces_code - set - delete_flag="deleted" - where ID=#{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml deleted file mode 100644 index 9fc807a..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictRegionMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - update dict_region - set - delete_flag="deleted" - where ID=#{id} - - \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java deleted file mode 100644 index 214b8a6..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProvincesCode.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 实体类 DictProvincesCode - * - * @author daixc - */ -@Data -@Accessors(chain = true) -@ApiModel -@TableName(value = "dict_provinces_code", autoResultMap = true) -public class DictProvincesCode implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 编号 - */ - @ApiModelProperty(value = "编号") - private Integer id; - - /** - * 省份编码 - */ - @ApiModelProperty(value = "省份编码") - private String provincesNumber; - - /** - * 省份名称 - */ - @ApiModelProperty(value = "省份名称") - private String provincesName; - - /** - * 省份名称缩写 - */ - @ApiModelProperty(value = "省份名称缩写") - private String provincesCode; - - /** - * 省份名称 - */ - @ApiModelProperty(value = "省份名称") - private String provincesRemark; - - - /** - * 省份地市编码 - */ - @ApiModelProperty(value = "省份地市编码") - private String provinces; -; - - - /** - * 公司级别 - */ - @ApiModelProperty(value = "公司级别") - private Integer childCompany; - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java deleted file mode 100644 index 546835f..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictRegion.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 全国行政区域实体类 DictRegion - * - * @author daixc - * @date 2020/10/29 - */ -@Data -@Accessors(chain = true) -@ApiModel("全国行政区域实体类") -@TableName(value = "dict_region", autoResultMap = true) -public class DictRegion implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * id - */ - @ApiModelProperty(value = "id") - private String id; - - /** - * 上级id - */ - @ApiModelProperty(value = "上级id") - private String pId; - - /** - * 名称 - */ - @ApiModelProperty(value = "名称") - private String name; - - /** - * 类型：0-省，1-市，2-县 - */ - @ApiModelProperty(value = "类型：0-省，1-市，2-县") - private String level; - /** - * 缩写 - */ - @ApiModelProperty(value = "缩写") - private String ab; - -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java deleted file mode 100644 index 42e078a..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProvincesCodeService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.service; - - -import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; - -/** - * 对数据表 dict_provinces_code 操作的 service - * @author Auto create - * - */ -public interface IDictProvincesCodeService extends IBaseService{ - - /** - * 根据省分编号获取省分信息 - * @param provincesNumber 省分编码 - * @return 返回结果 - */ - DictProvincesCode getByProvincesNumber(String provincesNumber); -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictRegionService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictRegionService.java deleted file mode 100644 index ddebe68..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictRegionService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.service; - - -import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictRegion; - - -import java.util.List; - -/** - * 对数据表 dict_region 操作的 service - * @author Auto create - * - */ -public interface IDictRegionService extends IBaseService{ - - - /** - * 查询子元素 - * @param pId 父ID - * @return - */ - List getChild(String pId); -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java deleted file mode 100644 index ceb48ed..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProvincesCodeServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.service.impl; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.project.dict.column.DictProvincesCodeField; -import com.chinaunicom.mall.ebtp.project.dict.dao.DictProvincesCodeMapper; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode; -import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService; -import org.springframework.stereotype.Service; - -/** - * 对数据表 dict_provinces_code 操作的 serviceImpl - * @author Auto create - * - */ -@Service -public class DictProvincesCodeServiceImpl extends BaseServiceImpl implements IDictProvincesCodeService { - - - @Override - public DictProvincesCode getByProvincesNumber(String provincesNumber) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DictProvincesCodeField.PROVINCES_NUMBER,provincesNumber); - return this.getOne(queryWrapper); - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictRegionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictRegionServiceImpl.java deleted file mode 100644 index 45c575c..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictRegionServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.dict.service.impl; - - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.project.dict.dao.DictRegionMapper; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictRegion; -import com.chinaunicom.mall.ebtp.project.dict.service.IDictRegionService; -import org.apache.commons.lang.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 对数据表 dict_region 操作的 serviceImpl - * @author Auto create - * - */ -@Service -public class DictRegionServiceImpl extends BaseServiceImpl implements IDictRegionService { - - /** - * 父类ID默认值 - */ - private static final String P_ID = "0"; - - @Override - public List getChild(String pId) { - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("p_id", StringUtils.isNotBlank(pId)?pId : P_ID); - queryWrapper.orderByAsc("id"); - return this.list(queryWrapper); - } -} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/SysManagerEbtpProjectApplication.java b/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java similarity index 88% rename from src/main/java/com/chinaunicom/mall/ebtp/project/SysManagerEbtpProjectApplication.java rename to src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java index 0561dcc..86ac129 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/SysManagerEbtpProjectApplication.java +++ b/src/main/java/com/coscoshipping/ebtp/project/SysManagerEbtpProjectApplication.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.project; +package com.coscoshipping.ebtp.project; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import io.micrometer.core.instrument.MeterRegistry; @@ -17,12 +17,13 @@ import org.springframework.context.annotation.ComponentScan; DruidDataSourceAutoConfigure.class }) @EnableFeignClients -@MapperScan({"com.chinaunicom.mall.ebtp.project.**.dao"}) -@ComponentScan("com.chinaunicom.mall.ebtp.*") +@MapperScan({"com.coscoshipping.ebtp.project.**.dao"}) +@ComponentScan("com.coscoshipping.ebtp.*") public class SysManagerEbtpProjectApplication { public static void main(String[] args) { SpringApplication.run(SysManagerEbtpProjectApplication.class, args); + System.out.println("启动成功！"); } /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProjectController.java b/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictProjectController.java similarity index 83% rename from src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProjectController.java rename to src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictProjectController.java index 47c48a4..6e8578a 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/controller/DictProjectController.java +++ b/src/main/java/com/coscoshipping/ebtp/project/dict/controller/DictProjectController.java @@ -1,9 +1,9 @@ -package com.chinaunicom.mall.ebtp.project.dict.controller; +package com.coscoshipping.ebtp.project.dict.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject; -import com.chinaunicom.mall.ebtp.project.dict.service.IDictProjectService; +import com.coscoshipping.ebtp.project.dict.entity.DictProject; +import com.coscoshipping.ebtp.project.dict.service.IDictProjectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -38,7 +38,6 @@ public class DictProjectController{ @ApiOperation("插入新数据") @PostMapping("") public BaseResponse insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid DictProject dictProject){ - boolean save = dictProjectService.save(dictProject); return BaseResponse.success(save); @@ -90,6 +89,16 @@ public class DictProjectController{ return BaseResponse.success(dictProjectService.getDictList(parentCode,toParentCode)); } + /** + * 查询所有字典 + * @param dictProject + * @return + */ + @ApiOperation("查询数据集合") + @GetMapping("/selectDictList") + public BaseResponse> selectDictList(DictProject dictProject){ + return BaseResponse.success(dictProjectService.selectDictList(dictProject)); + } /** * 字典缓存查询数据 diff --git a/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java b/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java new file mode 100644 index 0000000..1a78588 --- /dev/null +++ b/src/main/java/com/coscoshipping/ebtp/project/dict/dao/DictProjectMapper.java @@ -0,0 +1,33 @@ +package com.coscoshipping.ebtp.project.dict.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.coscoshipping.ebtp.project.dict.entity.DictProject; +import org.apache.commons.lang3.StringUtils; + + +/** + * 字典表mapper + * @author ll + * @date 2025/05/08 + */ +public interface DictProjectMapper extends IBaseMapper { + + default LambdaQueryWrapper getCustomQueryWrapper(DictProject dictProject) { + LambdaQueryWrapper w = new LambdaQueryWrapper<>(); + if (dictProject == null) { + return w; + } + + if (!StringUtils.isEmpty(dictProject.getDictTypeName())) { + w = w.and(i -> i.eq(DictProject::getDictTypeName, dictProject.getDictTypeName())); + } + + if (!StringUtils.isEmpty(dictProject.getDictTypeCode())) { + w = w.and(i -> i.eq(DictProject::getDictTypeCode, dictProject.getDictTypeCode())); + } + + return w; + } +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml b/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictProjectMapper.xml similarity index 78% rename from src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml rename to src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictProjectMapper.xml index 1141584..01f804e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/dao/mapper/DictProjectMapper.xml +++ b/src/main/java/com/coscoshipping/ebtp/project/dict/dao/mapper/DictProjectMapper.xml @@ -1,14 +1,16 @@ - + + type="com.coscoshipping.ebtp.project.dict.entity.DictProject"> + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProject.java b/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictProject.java similarity index 82% rename from src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProject.java rename to src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictProject.java index ac81012..4921a69 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/entity/DictProject.java +++ b/src/main/java/com/coscoshipping/ebtp/project/dict/entity/DictProject.java @@ -1,4 +1,4 @@ -package com.chinaunicom.mall.ebtp.project.dict.entity; +package com.coscoshipping.ebtp.project.dict.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -40,6 +40,18 @@ public class DictProject implements Serializable { @ApiModelProperty(value = "字典名称") private String dicName; + /** + * 分组编码dictTypeCode + */ + @ApiModelProperty(value = "分组编码") + private String dictTypeCode; + + /** + * 分组名称dictTypeName + */ + @ApiModelProperty(value = "分组名称") + private String dictTypeName; + /** * 父类code */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProjectService.java b/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictProjectService.java similarity index 78% rename from src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProjectService.java rename to src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictProjectService.java index bcd3df5..2d91e71 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/IDictProjectService.java +++ b/src/main/java/com/coscoshipping/ebtp/project/dict/service/IDictProjectService.java @@ -1,8 +1,8 @@ -package com.chinaunicom.mall.ebtp.project.dict.service; +package com.coscoshipping.ebtp.project.dict.service; import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject; +import com.coscoshipping.ebtp.project.dict.entity.DictProject; import java.util.List; import java.util.Map; @@ -29,6 +29,13 @@ public interface IDictProjectService extends IBaseService{ */ List getDictList(String parentCode, String toParentCode); + /** + * 查询所有字典 + * @param dictProject + * @return + */ + List selectDictList(DictProject dictProject); + /** * 查询字典数据 * @param parentCode 字典父类code diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProjectServiceImpl.java b/src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictProjectServiceImpl.java similarity index 76% rename from src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProjectServiceImpl.java rename to src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictProjectServiceImpl.java index 7c1eba9..8526973 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/dict/service/impl/DictProjectServiceImpl.java +++ b/src/main/java/com/coscoshipping/ebtp/project/dict/service/impl/DictProjectServiceImpl.java @@ -1,14 +1,15 @@ -package com.chinaunicom.mall.ebtp.project.dict.service.impl; +package com.coscoshipping.ebtp.project.dict.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; -import com.chinaunicom.mall.ebtp.project.dict.dao.DictProjectMapper; -import com.chinaunicom.mall.ebtp.project.dict.entity.DictProject; -import com.chinaunicom.mall.ebtp.project.dict.service.IDictProjectService; +import com.coscoshipping.ebtp.project.dict.dao.DictProjectMapper; +import com.coscoshipping.ebtp.project.dict.entity.DictProject; +import com.coscoshipping.ebtp.project.dict.service.IDictProjectService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -22,7 +23,7 @@ import java.util.stream.Collectors; public class DictProjectServiceImpl extends BaseServiceImpl implements IDictProjectService { - + @Resource DictProjectMapper mapper; private static final String COMMON_STR = "="; @@ -62,6 +63,16 @@ public class DictProjectServiceImpl extends BaseServiceImpl selectDictList(DictProject dictProject) { + return this.list(mapper.getCustomQueryWrapper(dictProject).orderByAsc(DictProject::getOrderFlag).orderByAsc(DictProject::getDictTypeCode)); + } + @Override public DictProject getDict(String code, String parentCode, String toParentCode) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3fb50e2..68ae6c5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -113,14 +113,14 @@ mybatis-plus: auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + mapper-locations: classpath*:com/coscoshipping/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 db-config: # logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 - type-aliases-package: com.chinaunicom.mall.ebtp.project + type-aliases-package: com.coscoshipping.ebtp.project hystrix: command: diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 139dd5f..dbd847b 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -106,7 +106,7 @@ mybatis-plus: auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + mapper-locations: classpath*:com/coscoshipping/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 db-config: diff --git a/src/main/resources/application-master.yml b/src/main/resources/application-master.yml index 060bb60..41e8dac 100644 --- a/src/main/resources/application-master.yml +++ b/src/main/resources/application-master.yml @@ -23,8 +23,8 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: root password: Unicom@2024 - jdbc-url: jdbc:mysql://59.110.10.99:53306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - url: jdbc:mysql://59.110.10.99:53306/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://59.110.10.99:53306/ebtp_sys_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://59.110.10.99:53306/ebtp_sys_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true filters: stat,wall,log4j maxActive: 20 initialSize: 1 @@ -87,13 +87,13 @@ mybatis-plus: auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + mapper-locations: classpath*:com/coscoshipping/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 db-config: logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 - type-aliases-package: com.chinaunicom.mall.ebtp.project + type-aliases-package: com.coscoshipping.ebtp.project hystrix: command: diff --git a/src/main/resources/application-sim.yml b/src/main/resources/application-sim.yml index f2337cc..939b5fe 100644 --- a/src/main/resources/application-sim.yml +++ b/src/main/resources/application-sim.yml @@ -113,13 +113,13 @@ mybatis-plus: auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + mapper-locations: classpath*:com/coscoshipping/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 db-config: logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 - type-aliases-package: com.chinaunicom.mall.ebtp.project + type-aliases-package: com.coscoshipping.ebtp.project hystrix: command: diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml index a850462..d6cd268 100644 --- a/src/main/resources/application-uat.yml +++ b/src/main/resources/application-uat.yml @@ -113,14 +113,14 @@ mybatis-plus: auto-mapping-behavior: full # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml + mapper-locations: classpath*:com/coscoshipping/ebtp/**/mapper/*Mapper.xml global-config: # 逻辑删除配置 db-config: # logic-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic logic-not-delete-value: normal # 逻辑删除标记：正常数据 logic-delete-value: deleted # 逻辑删除标记：已删除的数据 - type-aliases-package: com.chinaunicom.mall.ebtp.project + type-aliases-package: com.coscoshipping.ebtp.project hystrix: command: diff --git a/src/main/resources/swagger-configuration.properties b/src/main/resources/swagger-configuration.properties index 18fa96b..22a5fe4 100644 --- a/src/main/resources/swagger-configuration.properties +++ b/src/main/resources/swagger-configuration.properties @@ -1,4 +1,4 @@ -unifast.swagger.basePackage=com.chinaunicom.mall.ebtp.project +unifast.swagger.basePackage=com.coscoshipping.ebtp.project unifast.swagger.title=\u6D4B\u8BD5\u63A5\u53E3\u6587\u6863 unifast.swagger.contactName=\u5409\u6797\u9879\u76EE\u7EC4 unifast.swagger.contactUrl=http://chinaunicom.com