重构ShopLanguage文件，完成基础功能

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

@@ -0,0 +1,85 @@
+package edu.travel.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import edu.travel.po.PagePO;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 语言表
+ */
+@Data
+
+public class ShopLanguageDto extends PagePO {
+    /**
+     * id
+     */
+
+    private Long id;
+
+    /**
+     * 中文语言名
+     */
+
+    private String languageNameZh;
+
+    /**
+     * 英文语言名
+     */
+
+    private String languageNameEn;
+
+    /**
+     * 当地语言名
+     */
+
+    private String languageNameLocal;
+
+    /**
+     * web前端状态 0未完成 1完成
+     */
+
+    private Integer webStatus;
+
+    /**
+     * 移动端状态 0未完成 1完成
+     */
+
+    private Integer mobileStatus;
+
+    /**
+     * web后端状态 0未完成 1完成
+     */
+
+    private Integer webBackendStatus;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    private Integer deleteFlag;
+}

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryRemoteController.java

@@ -12,12 +12,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
-@FeignClient(path = "/base_country",name = "commodity")
+@FeignClient(path = "/baseCountry",name = "commodity")
 public interface BaseCountryRemoteController extends RemoteBaseController<BaseCountryVo, BaseCountryDto> {
 
-
-
-
     //国家树
     @GetMapping("/getCountryTree")
     public RPCBaseResponse<List<BaseCountryVo>> getCountryTree();

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/BaseCountryServeRemoteController.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(path = "/base_country_serve",name = "commodity")
+@FeignClient(path = "/baseCountryServe",name = "commodity")
 public interface BaseCountryServeRemoteController extends RemoteBaseController<BaseCountryServeVo, BaseCountryDto> {
     @GetMapping("/getByControlId")
     RPCBaseResponse getByControlId( @RequestBody String id);

edu-travel-remote/edu-travel-remote-country/src/main/java/edu/travel/remote/ShopLanguageRemoteController.java

@@ -0,0 +1,14 @@
+package edu.travel.remote;
+
+import edu.travel.dto.ShopLanguageDto;
+import edu.travel.remote.base.RemoteBaseController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopLanguageVo;
+import org.springframework.cloud.openfeign.FeignClient;
+
+import java.util.List;
+
+@FeignClient(path = "/shopLanguage",name = "commodity")
+public interface ShopLanguageRemoteController extends RemoteBaseController<ShopLanguageVo, ShopLanguageDto> {
+
+}

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

@@ -0,0 +1,47 @@
+package edu.travel.vo;
+
+import edu.travel.entity.BaseEntity;
+import lombok.Data;
+
+
+/**
+ * 语言表
+ */
+@Data
+public class ShopLanguageVo extends BaseEntity {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 中文语言名
+     */
+    private String languageNameZh;
+
+    /**
+     * 英文语言名
+     */
+    private String languageNameEn;
+
+    /**
+     * 当地语言名
+     */
+    private String languageNameLocal;
+
+    /**
+     * web前端状态 0未完成 1完成
+     */
+    private Integer webStatus;
+
+    /**
+     * 移动端状态 0未完成 1完成
+     */
+    private Integer mobileStatus;
+
+    /**
+     * web后端状态 0未完成 1完成
+     */
+    private Integer webBackendStatus;
+
+}

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

@@ -1,4 +1,4 @@
-package edu.travel.commodity.entity;
+package edu.travel.country.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopLanguageMapper.java → edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/mapper/ShopLanguageMapper.java

@@ -1,7 +1,7 @@
-package edu.travel.commodity.mapper;
+package edu.travel.country.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import edu.travel.commodity.entity.ShopLanguage;
+import edu.travel.country.entity.ShopLanguage;
 
 public interface ShopLanguageMapper extends BaseMapper<ShopLanguage> {
 }

edu-travel-service/edu-travel-service-country/src/main/java/edu/travel/country/service/ShopLanguageService.java

@@ -0,0 +1,14 @@
+package edu.travel.country.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import edu.travel.country.entity.ShopLanguage;
+import edu.travel.dto.ShopLanguageDto;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopLanguageVo;
+
+public interface ShopLanguageService extends IService<ShopLanguage>{
+
+//分页查询
+    RPCBaseResponse<IPage<ShopLanguageVo>> getLanguagePage(ShopLanguageDto shopLanguageDto);
+}

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

@@ -0,0 +1,32 @@
+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;
+
+import edu.travel.dto.ShopLanguageDto;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopLanguageVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ShopLanguageServiceImpl extends ServiceImpl<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);
+        IPage<ShopLanguageVo> pageVoLink = new Page<>();
+        BeanUtils.copyProperties(pageLink,pageVoLink);
+        RPCBaseResponse<IPage<ShopLanguageVo>> pageRPCPageResponse = new RPCBaseResponse<>(200,"SUCCESS",pageVoLink);
+        return pageRPCPageResponse;
+    }
+}

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

@@ -0,0 +1,111 @@
+package edu.travel.country.web;
+
+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.remote.ShopLanguageRemoteController;
+import edu.travel.rpc.RPCBaseResponse;
+import edu.travel.vo.ShopLanguageVo;
+import edu.travel.web.BaseController;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+* 语言表(shop_language)表控制层
+*
+* @author xxxxx
+*/
+@RestController
+@RequestMapping("/shop_language")
+public class ShopLanguageController extends BaseController<ShopLanguage> implements ShopLanguageRemoteController {
+    /**
+     * 服务对象
+     */
+@Autowired
+    private ShopLanguageService shopLanguageService;
+
+/**
+ * 语言分页
+ */
+@GetMapping("/getLanguagePage")
+    public RPCBaseResponse<IPage<ShopLanguageVo>> getLanguagePage(ShopLanguageDto shopLanguageDto) {
+        return shopLanguageService.getLanguagePage(shopLanguageDto);
+    }
+
+    /**
+     * 获取语言详情
+     * @param id
+     * @return
+     */
+    @Override
+    @GetMapping("/getFormId")
+    public RPCBaseResponse<ShopLanguageVo> getFormId(String id) {
+        RPCBaseResponse<ShopLanguage> languageRPCBaseResponse = super.getId(id);
+        RPCBaseResponse<ShopLanguageVo> shopLanguageVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(languageRPCBaseResponse, shopLanguageVoRPCBaseResponse);
+        return shopLanguageVoRPCBaseResponse;
+    }
+
+    /**
+     * 更新语言信息
+     * @param entity
+     * @return
+     */
+    @Override
+    @PostMapping("/updateFormId")
+    public RPCBaseResponse<ShopLanguageVo> updateTargetFormId(ShopLanguageDto entity) {
+        ShopLanguage shopLanguage = new ShopLanguage();
+        BeanUtils.copyProperties(entity, shopLanguage);
+        RPCBaseResponse<ShopLanguage> languageRPCBaseResponse = super.updateTargetById(shopLanguage);
+        RPCBaseResponse<ShopLanguageVo> shopLanguageVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(languageRPCBaseResponse, shopLanguageVoRPCBaseResponse);
+        return shopLanguageVoRPCBaseResponse;
+    }
+
+    /**
+     * 新增语言信息
+     * @param entity
+     * @return
+     */
+    @Override
+    @PostMapping("/saveForm")
+    public RPCBaseResponse<ShopLanguageVo> saveFormTarget(ShopLanguageDto entity) {
+        ShopLanguage shopLanguage = new ShopLanguage();
+        BeanUtils.copyProperties(entity, shopLanguage);
+        RPCBaseResponse<ShopLanguage> languageRPCBaseResponse = super.saveTarget(shopLanguage);
+        RPCBaseResponse<ShopLanguageVo> shopLanguageVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(languageRPCBaseResponse, shopLanguageVoRPCBaseResponse);
+        return shopLanguageVoRPCBaseResponse;
+    }
+
+    /**
+     * 删除语言
+     * @param ids
+     * @return
+     */
+    @Override
+    @PostMapping("/deleteFormId")
+    public RPCBaseResponse<ShopLanguageVo> deleteTargetFormId(List<String> ids) {
+        RPCBaseResponse<ShopLanguage> languageRPCBaseResponse = super.deleteTargetById(ids);
+        RPCBaseResponse<ShopLanguageVo> shopLanguageVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(languageRPCBaseResponse, shopLanguageVoRPCBaseResponse);
+    return shopLanguageVoRPCBaseResponse;
+    }
+
+    /**
+     * 获取语言表
+     * @return
+     */
+    @Override
+    @GetMapping("/LanguagelistForm")
+    public RPCBaseResponse<List<ShopLanguageVo>> getAllForm() {
+        RPCBaseResponse<List<ShopLanguage>> listRPCBaseResponse = super.listAll();
+        RPCBaseResponse<List<ShopLanguageVo>> shopLanguageVoRPCBaseResponse = new RPCBaseResponse<>();
+        BeanUtils.copyProperties(listRPCBaseResponse, shopLanguageVoRPCBaseResponse);
+        return shopLanguageVoRPCBaseResponse;
+    }
+}

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopLanguageMapper.xml → edu-travel-service/edu-travel-service-country/src/main/resources/mapper/ShopLanguageMapper.xml

@@ -1,7 +1,7 @@
 <?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="edu.travel.commodity.mapper.ShopLanguageMapper">
-  <resultMap id="BaseResultMap" type="edu.travel.commodity.entity.ShopLanguage">
+<mapper namespace="edu.travel.country.mapper.ShopLanguageMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.country.entity.ShopLanguage">
     <!--@mbg.generated-->
     <!--@Table shop_language-->
     <id column="id" jdbcType="BIGINT" property="id" />