改包名
This commit is contained in:
@ -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";
|
||||
|
||||
|
||||
}
|
@ -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<Boolean> 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<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody DictProvincesCode dictProvincesCode){
|
||||
|
||||
return BaseResponse.success(idictProvincesCodeService.updateById(dictProvincesCode));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询数据
|
||||
* @param id 主键id
|
||||
* @return 返回结果
|
||||
*/
|
||||
@ApiOperation("查询数据")
|
||||
@GetMapping("/{id}")
|
||||
public BaseResponse<DictProvincesCode> 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<DictProvincesCode> getByProvincesNumber(@ApiParam(value = "主键id", required = true) @PathVariable String provincesNumber){
|
||||
|
||||
DictProvincesCode dictProvincesCode = idictProvincesCodeService.getByProvincesNumber(provincesNumber);
|
||||
|
||||
return BaseResponse.success(dictProvincesCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询所有数据
|
||||
*
|
||||
* @return 返回结果
|
||||
*/
|
||||
@ApiOperation("查询所有数据")
|
||||
@GetMapping("queryAll")
|
||||
public BaseResponse<List<DictProvincesCode>> queryAll(@RequestParam(value = "childCompany", required = false) Boolean childCompany) {
|
||||
LambdaQueryWrapper<DictProvincesCode> wrapper = Wrappers.lambdaQuery();
|
||||
wrapper.eq(childCompany != null, DictProvincesCode::getChildCompany, childCompany);
|
||||
return BaseResponse.success(idictProvincesCodeService.list(wrapper));
|
||||
}
|
||||
|
||||
}
|
@ -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<Boolean> 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<Boolean> update(@ApiParam(value = "对象数据", required = true) @RequestBody DictRegion dictRegion){
|
||||
|
||||
return BaseResponse.success(idictRegionService.updateById(dictRegion));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询数据
|
||||
*
|
||||
* @param id id值
|
||||
*
|
||||
* @return 返回结果
|
||||
*/
|
||||
@ApiOperation("查询数据")
|
||||
@GetMapping("/{id}")
|
||||
public BaseResponse<DictRegion> 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<List<DictRegion>> getChild(@ApiParam(value = "主键id", required = true) @RequestParam(name = "pId") String pId){
|
||||
|
||||
List<DictRegion> dictRegion = idictRegionService.getChild(pId);
|
||||
|
||||
return BaseResponse.success(dictRegion);
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -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<DictProject> {
|
||||
|
||||
|
||||
}
|
@ -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<DictProvincesCode> {
|
||||
|
||||
|
||||
}
|
@ -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<DictRegion> {
|
||||
|
||||
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.chinaunicom.mall.ebtp.project.dict.dao.DictProvincesCodeMapper">
|
||||
<resultMap id="BaseResultMap"
|
||||
type="com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode">
|
||||
<result column="id" jdbcType="INTEGER" property="id"/>
|
||||
<result column="provinces_number" jdbcType="VARCHAR" property="provincesNumber"/>
|
||||
<result column="provinces_name" jdbcType="VARCHAR" property="provincesName"/>
|
||||
<result column="provinces_code" jdbcType="VARCHAR" property="provincesCode"/>
|
||||
</resultMap>
|
||||
|
||||
<!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
|
||||
<update id="deleteOff" parameterType="java.lang.Long">
|
||||
update dict_provinces_code
|
||||
set
|
||||
delete_flag="deleted"
|
||||
where ID=#{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
</mapper>
|
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.chinaunicom.mall.ebtp.project.dict.dao.DictRegionMapper">
|
||||
<resultMap id="BaseResultMap"
|
||||
type="com.chinaunicom.mall.ebtp.project.dict.entity.DictRegion">
|
||||
<result column="id" jdbcType="VARCHAR" property="id"/>
|
||||
<result column="p_id" jdbcType="VARCHAR" property="pId"/>
|
||||
<result column="name" jdbcType="VARCHAR" property="name"/>
|
||||
<result column="level" jdbcType="VARCHAR" property="level"/>
|
||||
</resultMap>
|
||||
|
||||
<!--逻辑删除方法 此方法为代码生成器生成 不允许修改 如有特殊需求 请自行新建SQL语句-->
|
||||
<update id="deleteOff" parameterType="java.lang.String">
|
||||
update dict_region
|
||||
set
|
||||
delete_flag="deleted"
|
||||
where ID=#{id}
|
||||
</update>
|
||||
</mapper>
|
@ -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;
|
||||
|
||||
}
|
@ -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;
|
||||
|
||||
}
|
@ -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<DictProvincesCode>{
|
||||
|
||||
/**
|
||||
* 根据省分编号获取省分信息
|
||||
* @param provincesNumber 省分编码
|
||||
* @return 返回结果
|
||||
*/
|
||||
DictProvincesCode getByProvincesNumber(String provincesNumber);
|
||||
}
|
@ -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<DictRegion>{
|
||||
|
||||
|
||||
/**
|
||||
* 查询子元素
|
||||
* @param pId 父ID
|
||||
* @return
|
||||
*/
|
||||
List<DictRegion> getChild(String pId);
|
||||
}
|
@ -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<DictProvincesCodeMapper, DictProvincesCode> implements IDictProvincesCodeService {
|
||||
|
||||
|
||||
@Override
|
||||
public DictProvincesCode getByProvincesNumber(String provincesNumber) {
|
||||
QueryWrapper<DictProvincesCode> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq(DictProvincesCodeField.PROVINCES_NUMBER,provincesNumber);
|
||||
return this.getOne(queryWrapper);
|
||||
}
|
||||
}
|
@ -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<DictRegionMapper,DictRegion> implements IDictRegionService {
|
||||
|
||||
/**
|
||||
* 父类ID默认值
|
||||
*/
|
||||
private static final String P_ID = "0";
|
||||
|
||||
@Override
|
||||
public List<DictRegion> getChild(String pId) {
|
||||
|
||||
QueryWrapper<DictRegion> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("p_id", StringUtils.isNotBlank(pId)?pId : P_ID);
|
||||
queryWrapper.orderByAsc("id");
|
||||
return this.list(queryWrapper);
|
||||
}
|
||||
}
|
@ -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("启动成功!");
|
||||
}
|
||||
|
||||
/**
|
@ -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<Boolean> 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<List<DictProject>> selectDictList(DictProject dictProject){
|
||||
return BaseResponse.success(dictProjectService.selectDictList(dictProject));
|
||||
}
|
||||
|
||||
/**
|
||||
* 字典缓存查询数据
|
@ -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<DictProject> {
|
||||
|
||||
default LambdaQueryWrapper<DictProject> getCustomQueryWrapper(DictProject dictProject) {
|
||||
LambdaQueryWrapper<DictProject> 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;
|
||||
}
|
||||
}
|
@ -1,14 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.chinaunicom.mall.ebtp.project.dict.dao.DictProjectMapper">
|
||||
<mapper namespace="com.coscoshipping.ebtp.project.dict.dao.DictProjectMapper">
|
||||
<resultMap id="BaseResultMap"
|
||||
type="com.chinaunicom.mall.ebtp.project.dict.entity.DictProject">
|
||||
type="com.coscoshipping.ebtp.project.dict.entity.DictProject">
|
||||
<result column="id" jdbcType="INTEGER" property="id"/>
|
||||
<result column="code" jdbcType="VARCHAR" property="code"/>
|
||||
<result column="dic_name" jdbcType="VARCHAR" property="dicName"/>
|
||||
<result column="parent_code" jdbcType="VARCHAR" property="parentCode"/>
|
||||
<result column="parent_type" jdbcType="VARCHAR" property="parentType"/>
|
||||
<result column="dict_type_code" jdbcType="VARCHAR" property="dictTypeCode"/>
|
||||
<result column="dict_type_name" jdbcType="VARCHAR" property="dictTypeName"/>
|
||||
<result column="use_flag" jdbcType="VARCHAR" property="useFlag"/>
|
||||
<result column="default_flag" jdbcType="VARCHAR" property="defaultFlag"/>
|
||||
<result column="order_flag" jdbcType="INTEGER" property="orderFlag"/>
|
@ -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
|
||||
*/
|
@ -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<DictProject>{
|
||||
*/
|
||||
List<DictProject> getDictList(String parentCode, String toParentCode);
|
||||
|
||||
/**
|
||||
* 查询所有字典
|
||||
* @param dictProject
|
||||
* @return
|
||||
*/
|
||||
List<DictProject> selectDictList(DictProject dictProject);
|
||||
|
||||
/**
|
||||
* 查询字典数据
|
||||
* @param parentCode 字典父类code
|
@ -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<DictProjectMapper,DictProject> implements IDictProjectService {
|
||||
|
||||
|
||||
|
||||
@Resource DictProjectMapper mapper;
|
||||
|
||||
private static final String COMMON_STR = "=";
|
||||
|
||||
@ -62,6 +63,16 @@ public class DictProjectServiceImpl extends BaseServiceImpl<DictProjectMapper,Di
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询所有字典
|
||||
* @param dictProject
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<DictProject> 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) {
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user