From a4c28679d108153476d6b7b9dff39527b26f098f Mon Sep 17 00:00:00 2001 From: Ziin Date: Fri, 13 Jun 2025 15:05:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E4=BF=A1=E6=81=AF=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=20userId=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=AE=B6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommonController.java | 34 +++++++ .../mapper/CountryInfoMapper.java | 21 ++++ .../model/entity/CountryInfo.java | 99 +++++++++++++++++++ .../springbootinit/model/entity/NewHosts.java | 5 + .../model/vo/country/CountryInfoVO.java | 67 +++++++++++++ .../service/CountryInfoService.java | 17 ++++ .../service/impl/CountryInfoServiceImpl.java | 30 ++++++ .../resources/mapper/CountryInfoMapper.xml | 42 ++++++++ src/main/resources/mapper/NewHostsMapper.xml | 11 ++- 9 files changed, 321 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/yupi/springbootinit/controller/CommonController.java create mode 100644 src/main/java/com/yupi/springbootinit/mapper/CountryInfoMapper.java create mode 100644 src/main/java/com/yupi/springbootinit/model/entity/CountryInfo.java create mode 100644 src/main/java/com/yupi/springbootinit/model/vo/country/CountryInfoVO.java create mode 100644 src/main/java/com/yupi/springbootinit/service/CountryInfoService.java create mode 100644 src/main/java/com/yupi/springbootinit/service/impl/CountryInfoServiceImpl.java create mode 100644 src/main/resources/mapper/CountryInfoMapper.xml diff --git a/src/main/java/com/yupi/springbootinit/controller/CommonController.java b/src/main/java/com/yupi/springbootinit/controller/CommonController.java new file mode 100644 index 0000000..11486e2 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/controller/CommonController.java @@ -0,0 +1,34 @@ +package com.yupi.springbootinit.controller; + +import com.yupi.springbootinit.common.BaseResponse; +import com.yupi.springbootinit.common.ResultUtils; +import com.yupi.springbootinit.model.vo.country.CountryInfoVO; +import com.yupi.springbootinit.service.CountryInfoService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/* + * @author: ziin + * @date: 2025/6/13 13:44 + */ +@RestController +@RequestMapping("/common") +@Slf4j +@CrossOrigin +public class CommonController { + + @Resource + private CountryInfoService countryInfoService; + + @PostMapping("country_info") + public BaseResponse> countryInfo() { + + return ResultUtils.success(countryInfoService.getCountryList()); + } +} diff --git a/src/main/java/com/yupi/springbootinit/mapper/CountryInfoMapper.java b/src/main/java/com/yupi/springbootinit/mapper/CountryInfoMapper.java new file mode 100644 index 0000000..82886b4 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/mapper/CountryInfoMapper.java @@ -0,0 +1,21 @@ +package com.yupi.springbootinit.mapper; +import com.yupi.springbootinit.model.vo.country.CountryInfoVO; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yupi.springbootinit.model.entity.CountryInfo; + +/* + * @author: ziin + * @date: 2025/6/13 13:58 + */ + +public interface CountryInfoMapper extends BaseMapper { + + List selectByCountryGroupName(); + + + + +} \ No newline at end of file diff --git a/src/main/java/com/yupi/springbootinit/model/entity/CountryInfo.java b/src/main/java/com/yupi/springbootinit/model/entity/CountryInfo.java new file mode 100644 index 0000000..0444dcb --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/model/entity/CountryInfo.java @@ -0,0 +1,99 @@ +package com.yupi.springbootinit.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/* +* @author: ziin +* @date: 2025/6/13 13:58 +*/ + +/** + * 国家与地区信息统计 + */ +@ApiModel(description = "国家与地区信息统计") +@Data +@TableName(value = "country_info") +public class CountryInfo { + /** + * 主键id，无业务含义 + */ + @ApiModelProperty(value = "主键id，无业务含义") + private Integer id; + + /** + * 国家id + */ + @TableId(value = "country_id", type = IdType.AUTO) + @ApiModelProperty(value = "国家id") + private String countryId; + + /** + * 业务区与地区码 + */ + @TableField(value = "country_group") + @ApiModelProperty(value = "业务区与地区码") + private String countryGroup; + + /** + * 业务区与地区名称 + */ + @TableField(value = "country_group_name") + @ApiModelProperty(value = "业务区与地区名称") + private String countryGroupName; + + /** + * 国家名称 + */ + @TableField(value = "country_name") + @ApiModelProperty(value = "国家名称") + private String countryName; + + /** + * 语言 + */ + @TableField(value = "`language`") + @ApiModelProperty(value = "语言") + private String language; + + /** + * 语言中文 + */ + @TableField(value = "language_name") + @ApiModelProperty(value = "语言中文") + private String languageName; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 创建人id + */ + @TableField(value = "creator") + @ApiModelProperty(value = "创建人id") + private String creator; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 更新人id + */ + @TableField(value = "updater") + @ApiModelProperty(value = "更新人id") + private String updater; +} \ No newline at end of file diff --git a/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java b/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java index 8536163..46810bd 100644 --- a/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java +++ b/src/main/java/com/yupi/springbootinit/model/entity/NewHosts.java @@ -72,6 +72,11 @@ public class NewHosts { */ private Long tenantId; + /** + * 用户 Id + */ + private Long userId; + /** * 入库人 */ diff --git a/src/main/java/com/yupi/springbootinit/model/vo/country/CountryInfoVO.java b/src/main/java/com/yupi/springbootinit/model/vo/country/CountryInfoVO.java new file mode 100644 index 0000000..b5d6c75 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/model/vo/country/CountryInfoVO.java @@ -0,0 +1,67 @@ +package com.yupi.springbootinit.model.vo.country; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/* +* @author: ziin +* @date: 2025/6/13 13:58 +*/ + +/** + * 国家与地区信息统计 + */ +@ApiModel(description = "国家与地区信息统计") +@Data +@TableName(value = "country_info") +public class CountryInfoVO { + /** + * 国家id + */ + @TableId(value = "country_id", type = IdType.AUTO) + @ApiModelProperty(value = "国家id") + private String countryId; + + /** + * 业务区与地区码 + */ + @TableField(value = "country_group") + @ApiModelProperty(value = "业务区与地区码") + private String countryGroup; + + /** + * 业务区与地区名称 + */ + @TableField(value = "country_group_name") + @ApiModelProperty(value = "业务区与地区名称") + private String countryGroupName; + + /** + * 国家名称 + */ + @TableField(value = "country_name") + @ApiModelProperty(value = "国家名称") + private String countryName; + + /** + * 语言 + */ + @TableField(value = "`language`") + @ApiModelProperty(value = "语言") + private String language; + + /** + * 语言中文 + */ + @TableField(value = "language_name") + @ApiModelProperty(value = "语言中文") + private String languageName; + +} \ No newline at end of file diff --git a/src/main/java/com/yupi/springbootinit/service/CountryInfoService.java b/src/main/java/com/yupi/springbootinit/service/CountryInfoService.java new file mode 100644 index 0000000..67f361d --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/service/CountryInfoService.java @@ -0,0 +1,17 @@ +package com.yupi.springbootinit.service; + + /* +* @author: ziin +* @date: 2025/6/13 13:57 +*/ + +import com.baomidou.mybatisplus.extension.service.IService; +import com.yupi.springbootinit.model.entity.CountryInfo; +import com.yupi.springbootinit.model.vo.country.CountryInfoVO; + +import java.util.List; + +public interface CountryInfoService extends IService { + + List getCountryList(); +} diff --git a/src/main/java/com/yupi/springbootinit/service/impl/CountryInfoServiceImpl.java b/src/main/java/com/yupi/springbootinit/service/impl/CountryInfoServiceImpl.java new file mode 100644 index 0000000..dd24e02 --- /dev/null +++ b/src/main/java/com/yupi/springbootinit/service/impl/CountryInfoServiceImpl.java @@ -0,0 +1,30 @@ +package com.yupi.springbootinit.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yupi.springbootinit.model.entity.CountryInfo; +import com.yupi.springbootinit.model.vo.country.CountryInfoVO; +import org.springframework.stereotype.Service; + +import org.springframework.beans.factory.annotation.Autowired; + +import com.yupi.springbootinit.mapper.CountryInfoMapper; +import com.yupi.springbootinit.service.CountryInfoService; + +import javax.annotation.Resource; +import java.util.List; +/* +* @author: ziin +* @date: 2025/6/13 13:57 +*/ + +@Service +public class CountryInfoServiceImpl extends ServiceImpl implements CountryInfoService{ + + @Resource + private CountryInfoMapper countryInfoMapper; + + @Override + public List getCountryList() { + return countryInfoMapper.selectByCountryGroupName(); + } +} diff --git a/src/main/resources/mapper/CountryInfoMapper.xml b/src/main/resources/mapper/CountryInfoMapper.xml new file mode 100644 index 0000000..1af4537 --- /dev/null +++ b/src/main/resources/mapper/CountryInfoMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, country_id, country_group, country_group_name, country_name, `language`, language_name, + create_time, creator, update_time, updater + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/NewHostsMapper.xml b/src/main/resources/mapper/NewHostsMapper.xml index cb6c83b..8ec0bd1 100644 --- a/src/main/resources/mapper/NewHostsMapper.xml +++ b/src/main/resources/mapper/NewHostsMapper.xml @@ -20,6 +20,7 @@ + @@ -42,7 +43,7 @@ id, hosts_id, hosts_level, hosts_coins, Invitation_type, fans, fllowernum, yesterday_coins, - country, hosts_kind, tenant_id, creator, create_time, updater, update_time + country, hosts_kind, tenant_id, creator, create_time, updater, update_time, user_id