语言接口添加，匹配模糊搜索。

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/dto/ParametersDto.java

@@ -1,16 +1,19 @@
 package edu.travel.remote.dto;
 
+import edu.travel.po.PagePO;
 import lombok.Data;
 
 @Data
-public class ParametersDto {
+public class ParametersDto extends PagePO {
 
-    /**国家Id*/
+    /**
+     * 国家Id
+     */
     private String countryId;
-
-    private Integer currentPage = 1;
-
-    private Integer pageSize = 10;
+    /**
+     * 参数名称
+     */
+    private String parametersName;
     /**
      * 是否必填参数  0 是 1 否
      */

edu-travel-remote/edu-travel-remote-commodity/src/main/java/edu/travel/remote/vo/ShopParametersVo.java

@@ -42,5 +42,5 @@ public class ShopParametersVo extends BaseEntity {
     /**
      * ProductParametersMap
      */
-    private List<Map<String,Object>> productParametersMap;
+    private Map<String,Object> productParametersMap;
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/BaseCountryServeCurrencyDto.java

@@ -68,6 +68,10 @@ public class BaseCountryServeCurrencyDto extends PagePO {
      */
     private Long currencyId;
     /**
+     * 语言表id
+     */
+    private Long languageId;
+    /**
      * 创建时间
      */
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/ShopLanguageDto.java

@@ -16,7 +16,7 @@ public class ShopLanguageDto extends PagePO {
      * id
      */
 
-    private Long id;
+    private String id;
 
     /**
      * 中文语言名

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/dto/ShopLanguageWebAppupdateDto.java

@@ -0,0 +1,35 @@
+package edu.travel.dto;
+
+import edu.travel.entity.BaseEntity;
+import edu.travel.po.PagePO;
+import lombok.Data;
+
+
+/**
+ * 语言表
+ */
+@Data
+public class ShopLanguageWebAppupdateDto extends PagePO {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * web前端状态 0未完成 1完成
+     */
+    private Integer webStatus;
+
+    /**
+     * 移动端状态 0未完成 1完成
+     */
+    private Integer mobileStatus;
+
+    /**
+     * web后端状态 0未完成 1完成
+     */
+    private Integer webBackendStatus;
+    /**
+     * 项目标识
+     */
+    private String project;
+}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/BaseCountryServeCurrencyVo.java

@@ -67,7 +67,11 @@ public class BaseCountryServeCurrencyVo extends BaseEntity {
     /**
      * 货币表id
      */
-    private Long currencyId;
+    private String currencyId;
+    /**
+     * 语言表id
+     */
+    private String languageId;
     /**
      * 创建时间
      */

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/ShopCurrencyVo.java

@@ -20,41 +20,35 @@ public class ShopCurrencyVo extends BaseEntity {
     /**
      * ID
      */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 货币名称_en
      */
-    @TableField(value = "currency_name_en")
     private String currencyNameEn;
 
     /**
      * 货币名称_zh
      */
-    @TableField(value = "currency_name_zh")
     private String currencyNameZh;
 
     /**
      * 货币代码
      */
-    @TableField(value = "currency_code")
     private String currencyCode;
 
     /**
      * 货币符号
      * */
-    @TableField(value = "currency_symbol")
     private String currencySymbol;
     /**
      * 货币单位
      * */
-    @TableField(value = "currency_unit")
     private String currencyUnit;
 
     /**
      * 状态 -0启用  -1禁用
      * */
-    @TableField(value = "status")
+
     private String status;
 }

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/ShopLanguageVo.java

@@ -12,7 +12,7 @@ public class ShopLanguageVo extends BaseEntity {
     /**
      * id
      */
-    private Long id;
+    private String id;
 
     /**
      * 中文语言名

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/vo/ShopLanguageWebAppupdateVo.java

@@ -0,0 +1,34 @@
+package edu.travel.vo;
+
+import edu.travel.entity.BaseEntity;
+import lombok.Data;
+
+
+/**
+ * 语言表
+ */
+@Data
+public class ShopLanguageWebAppupdateVo extends BaseEntity {
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * web前端状态 0未完成 1完成
+     */
+    private Integer webStatus;
+
+    /**
+     * 移动端状态 0未完成 1完成
+     */
+    private Integer mobileStatus;
+
+    /**
+     * web后端状态 0未完成 1完成
+     */
+    private Integer webBackendStatus;
+    /**
+     * 项目标识
+     */
+    private String project;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopParameters.java

@@ -51,6 +51,6 @@ public class ShopParameters extends BaseEntity {
      * 连表shopProductParameters表
      */
     @TableField(exist = false)
-    @LinkMany(linkField = "id",linkMapper = ShopProductParametersMapper.class,linkPrimaryField = "parameters_id")
-    private List<Map<String,Object>> productParametersMap;
+    @LinkOne(linkField = "id",linkMapper = ShopProductParametersMapper.class,linkPrimaryField = "parameters_id")
+    private Map<String,Object> productParametersMap;
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopParametersMapper.java

@@ -2,6 +2,12 @@ package edu.travel.commodity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import edu.travel.commodity.entity.ShopParameters;
+import edu.travel.remote.dto.ParametersDto;
+import edu.travel.remote.vo.ShopParametersVo;
+
+import java.util.List;
 
 public interface ShopParametersMapper extends BaseMapper<ShopParameters> {
+    List<ShopParametersVo> selectParametersWithCountry(ParametersDto parametersDto);
+    int selectParametersCount(ParametersDto parametersDto);
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopParametersService.java

@@ -1,5 +1,6 @@
 package edu.travel.commodity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.commodity.entity.ShopParameters;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -7,6 +8,7 @@ import edu.travel.remote.dto.ParametersDto;
 import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.remote.vo.ParametersVo;
 import edu.travel.remote.vo.ShopParametersVo;
+import edu.travel.rpc.RPCBaseResponse;
 
 import java.util.List;
 
@@ -18,4 +20,6 @@ public interface ShopParametersService extends IService<ShopParameters>{
     Page<ParametersVo> getAllParameters(ParametersDto param);
 
     List<ShopParameters> getAllList();
+
+    RPCBaseResponse<Page<ShopParameters>> getAllParametersPage(ParametersDto param);
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopParametersServiceImpl.java

@@ -2,9 +2,10 @@ package edu.travel.commodity.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.adapter.service.country.CountryAdapter;
 import edu.travel.commodity.entity.ShopParameters;
 import edu.travel.commodity.entity.ShopProductParameters;
 import edu.travel.commodity.mapper.ShopParametersMapper;
@@ -15,20 +16,23 @@ import edu.travel.remote.dto.ParametersDto;
 import edu.travel.remote.dto.ProductSpecDto;
 import edu.travel.remote.vo.ParametersVo;
 import edu.travel.remote.vo.ShopParametersVo;
+import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.service.SysServiceImpl;
+import edu.travel.vo.BaseCountryServeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class ShopParametersServiceImpl extends SysServiceImpl<ShopParametersMapper, ShopParameters> implements ShopParametersService {
     @Autowired
     private ShopProductParametersService shopProductParametersService;
+    @Autowired
+    private ShopParametersMapper shopParametersMapper;
+    @Autowired
+    private CountryAdapter countryAdapter;
 
     @Override
     public Page<ShopParametersVo> getShopParameters(ProductSpecDto param) {
@@ -76,5 +80,77 @@ public class ShopParametersServiceImpl extends SysServiceImpl<ShopParametersMapp
         return getListLink(null);
     }
 
+    @Override
+    public RPCBaseResponse<Page<ShopParameters>> getAllParametersPage(ParametersDto parametersDto) {
+        // 查询参数数据，确保并计算总记录数
+        List<ShopParametersVo> shopParametersVoList = shopParametersMapper.selectParametersWithCountry(parametersDto);
+        int total = shopParametersMapper.selectParametersCount(parametersDto);
+
+        // 将 ShopParametersVo 转换为 ShopParameters
+        List<ShopParameters> shopParametersList = shopParametersVoList.stream()
+                .map(this::convertVoToEntity) // 使用转换方法
+                .collect(Collectors.toList());
+
+        // 提取国家服务ID
+        Set<Long> countryServeIds = shopParametersList.stream()
+                .map(ShopParameters::getCountryId)
+                .collect(Collectors.toSet());
+
+        // 查询国家信息
+        Map<String, BaseCountryServeVo> countryMap = fetchCountryData(countryServeIds);
+
+        // 将国家信息放入参数列表中
+        for (ShopParameters shopParameters : shopParametersList) {
+            if (shopParameters.getProductParametersMap() == null) {
+                shopParameters.setProductParametersMap(new HashMap<>());
+            }
+            if (countryMap.containsKey(shopParameters.getCountryId())) {
+                shopParameters.getProductParametersMap().put("country", countryMap.get(shopParameters.getCountryId()));
+            }
+        }
+
+        // 封装返回结果
+        Page<ShopParameters> shopParametersPage = new Page<>();
+        shopParametersPage.setRecords(shopParametersList);
+        shopParametersPage.setTotal(total);
+        shopParametersPage.setCurrent(parametersDto.getCurrentPage());
+        shopParametersPage.setSize(parametersDto.getPageSize());
+        return new RPCBaseResponse<>(200, "SUCCESS", shopParametersPage);
+    }
+
+    /**
+     * 将 ShopParametersVo 转换为 ShopParameters
+     */
+    private ShopParameters convertVoToEntity(ShopParametersVo parametersVo) {
+        ShopParameters parameters = new ShopParameters();
+        // 复制各个属性
+        parameters.setId(Long.valueOf(parametersVo.getId()));
+        parameters.setParametersName(parametersVo.getParametersName());
+        parameters.setIsNecessary(parametersVo.getIsNecessary());
+        parameters.setProject(parametersVo.getProject());
+        parameters.setCreateTime(parametersVo.getCreateTime());
+        parameters.setCreateUserId(parametersVo.getCreateUserId());
+        parameters.setUpdateTime(parametersVo.getUpdateTime());
+        parameters.setUpdateUserId(parametersVo.getUpdateUserId());
+        parameters.setDeleteFlag(parametersVo.getDeleteFlag());
+        parameters.setCountryId(parametersVo.getCountryId());
+        return parameters;
+    }
+
+    /**
+     * 提取国家数据
+     */
+    private Map<String, BaseCountryServeVo> fetchCountryData(Set<Long> countryServeIds) {
+        Map<String, BaseCountryServeVo> countryMap = new HashMap<>();
+        if (!countryServeIds.isEmpty()) {
+            for (Long countryServeId : countryServeIds) {
+                RPCBaseResponse<BaseCountryServeVo> response = countryAdapter.getFormId(String.valueOf(countryServeId));
+                if (response != null && response.getData() != null) {
+                    countryMap.put(String.valueOf(countryServeId), response.getData());
+                }
+            }
+        }
+        return countryMap;
+    }
 
 }

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopParametersController.java

@@ -1,6 +1,7 @@
 package edu.travel.commodity.web;
 
 import com.alibaba.nacos.shaded.com.google.common.base.Objects;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import edu.travel.adapter.service.country.CountryAdapter;
 import edu.travel.commodity.constant.BaseConstant;
@@ -63,10 +64,13 @@ public class ShopParametersController extends BaseController<ShopParameters> imp
     public RPCBaseResponse<Page<ParametersVo>> getAllParameters(ParametersDto param){
         return success(shopParametersService.getAllParameters(param));
     }
-
-
-
-
+    /**
+     * 连表分页
+     */
+    @GetMapping("/getAllParametersPage")
+    public RPCBaseResponse<Page<ShopParameters>> getAllParametersPage(ParametersDto param) {
+        return shopParametersService.getAllParametersPage(param);
+    }
     /**
      * 通过id获取商品参数(连表-服务国家）
      * @param id
@@ -156,9 +160,8 @@ public class ShopParametersController extends BaseController<ShopParameters> imp
     @Override
     @GetMapping("/getAllForm")
     public RPCBaseResponse<List<ShopParametersVo>> getAllForm() {
-        List<ShopParameters> shopParametersList = shopParametersService.getAllList();
         // Step 1: 获取所有 ShopParameters 数据
-
+        List<ShopParameters> shopParametersList = shopParametersService.getAllList();
         // Step 2: 创建一个用于存储每个 ShopParametersVo 的映射
         Map<Long, ShopParametersVo> parametersMap = new HashMap<>();
         List<ShopParametersVo> result = new ArrayList<>();

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopParametersMapper.xml

@@ -20,4 +20,48 @@
     id, parameters_name, is_necessary, project, create_time, create_user_id,
     update_time, update_user_id, delete_flag,country_id
   </sql>
+  <select id="selectParametersWithCountry" resultType="edu.travel.remote.vo.ShopParametersVo">
+    SELECT
+    sp.id,
+    sp.parameters_name,
+    sp.is_necessary,
+    sp.project,
+    sp.create_time,
+    sp.create_user_id,
+    sp.update_time,
+    sp.update_user_id,
+    sp.delete_flag,
+    sp.country_id
+    FROM
+    shop_parameters sp
+    <where>
+      <if test="countryId != null and countryId != ''">
+        AND sp.country_id = #{countryId}
+      </if>
+      <if test="parametersName != null and parametersName != ''">
+        AND sp.parameters_name LIKE CONCAT('%', #{parametersName}, '%')
+      </if>
+      <if test="isNecessary != null and isNecessary != ''">
+        AND sp.is_necessary = #{isNecessary}
+      </if>
+    </where>
+  </select>
+
+  <select id="selectParametersCount" resultType="int">
+    SELECT
+    COUNT(*)
+    FROM
+    shop_parameters sp
+    <where>
+      <if test="countryId != null and countryId != ''">
+        AND sp.country_id = #{countryId}
+      </if>
+      <if test="parametersName != null and parametersName != ''">
+        AND sp.parameters_name LIKE CONCAT('%', #{parametersName}, '%')
+      </if>
+      <if test="isNecessary != null and isNecessary != ''">
+        AND sp.is_necessary = #{isNecessary}
+      </if>
+    </where>
+  </select>
 </mapper>

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/entity/BaseCountryServe.java

@@ -118,6 +118,11 @@ public class BaseCountryServe extends BaseEntity {
      */
     @TableField(value = "currency_id")
     private Long currencyId;
+    /**
+     * 语言表id（设置默认语言）
+     */
+    @TableField(value = "language_id")
+    private Long languageId;
 
     @TableField(exist = false)
     @LinkOne(linkField = "currencyId", linkMapper = ShopCurrencyMapper.class, linkPrimaryField = "id")

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/entity/ShopLanguage.java

@@ -23,7 +23,7 @@ public class ShopLanguage extends BaseEntity {
      * id
      */
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     /**
      * 中文语言名

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/service/impl/ShopLanguageServiceImpl.java

@@ -5,7 +5,6 @@ package edu.travel.country.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import edu.travel.country.entity.ShopLanguage;
 import edu.travel.country.mapper.ShopLanguageMapper;
 import edu.travel.country.service.ShopLanguageService;
@@ -21,13 +20,30 @@ import org.springframework.stereotype.Service;
 public class ShopLanguageServiceImpl extends SysServiceImpl<ShopLanguageMapper, ShopLanguage> implements ShopLanguageService {
 
 
-    @Override
     public RPCBaseResponse<IPage<ShopLanguageVo>> getLanguagePage(ShopLanguageDto shopLanguageDto) {
+        // 创建分页对象
         Page<ShopLanguage> shopLanguagePage = new Page<>(shopLanguageDto.getCurrentPage(), shopLanguageDto.getPageSize());
-        IPage<ShopLanguage> pageLink = super.getPageLink(new LambdaQueryWrapper<ShopLanguage>(), shopLanguagePage);
+
+        // 创建查询包装器
+        LambdaQueryWrapper<ShopLanguage> queryWrapper = new LambdaQueryWrapper<>();
+
+        // 使用模糊查询
+        if (shopLanguageDto.getLanguageNameZh() != null && !shopLanguageDto.getLanguageNameZh().isEmpty()) {
+            queryWrapper.like(ShopLanguage::getLanguageNameZh, shopLanguageDto.getLanguageNameZh());
+        }
+        if (shopLanguageDto.getLanguageNameEn() != null && !shopLanguageDto.getLanguageNameEn().isEmpty()) {
+            queryWrapper.like(ShopLanguage::getLanguageNameEn, shopLanguageDto.getLanguageNameEn());
+        }
+        if (shopLanguageDto.getLanguageNameLocal() != null && !shopLanguageDto.getLanguageNameLocal().isEmpty()) {
+            queryWrapper.like(ShopLanguage::getLanguageNameLocal, shopLanguageDto.getLanguageNameLocal());
+        }
+
+        // 执行分页查询
+        IPage<ShopLanguage> pageLink = super.getPageLink(queryWrapper, shopLanguagePage);
+        // 创建返回的页面对象
         IPage<ShopLanguageVo> pageVoLink = new Page<>();
-        BeanUtils.copyProperties(pageLink,pageVoLink);
-        RPCBaseResponse<IPage<ShopLanguageVo>> pageRPCPageResponse = new RPCBaseResponse<>(200,"SUCCESS",pageVoLink);
-        return pageRPCPageResponse;
+        BeanUtils.copyProperties(pageLink, pageVoLink);
+        // 封装返回结果
+        return new RPCBaseResponse<>(200, "SUCCESS", pageVoLink);
     }
 }

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/web/ShopLanguageController.java

@@ -1,12 +1,15 @@
 package edu.travel.country.web;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import edu.travel.country.entity.ShopLanguage;
 import edu.travel.country.service.ShopLanguageService;
 import edu.travel.dto.ShopLanguageDto;
+import edu.travel.dto.ShopLanguageWebAppupdateDto;
 import edu.travel.remote.ShopLanguageRemoteController;
 import edu.travel.rpc.RPCBaseResponse;
 import edu.travel.vo.ShopLanguageVo;
+import edu.travel.vo.ShopLanguageWebAppupdateVo;
 import edu.travel.web.BaseController;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,4 +111,16 @@ public class ShopLanguageController extends BaseController<ShopLanguage> impleme
         BeanUtils.copyProperties(listRPCBaseResponse, shopLanguageVoRPCBaseResponse);
         return shopLanguageVoRPCBaseResponse;
     }
+    /**
+     * 三端状态改变
+     */
+    //转换类型
+    @PostMapping("/updateAppStatus")
+    public RPCBaseResponse<ShopLanguageWebAppupdateVo> updateAppStatus(@RequestBody ShopLanguageWebAppupdateDto ShopLanguageWebAppupdateDto) {
+        ShopLanguage shopLanguage = BeanUtil.toBean(ShopLanguageWebAppupdateDto, ShopLanguage.class);
+        RPCBaseResponse<ShopLanguage> languageRPCBaseResponse = super.updateTargetById(shopLanguage);
+        RPCBaseResponse<ShopLanguageWebAppupdateVo> shopLanguageVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(languageRPCBaseResponse, shopLanguageVoRPCBaseResponse);
+        return shopLanguageVoRPCBaseResponse;
+    }
 }