中英文切换代码提交

dgtly-api/src/main/java/com/dgtly/api/controller/CommonController.java

@@ -13,6 +13,7 @@ import com.dgtly.common.utils.file.FileUploadUtils;
 import com.dgtly.common.utils.file.FileUtils;
 import com.dgtly.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,7 +49,10 @@ public class CommonController extends ApiBaseController
 
 
     @ApiOperation(value = "获取字典")
-    @ApiImplicitParam(name = "params" , paramType = "body")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body"),
+            @ApiImplicitParam(name = "language" , paramType = "header")
+    })
     @PostMapping("/dict")
     public Object getDict(){
         ParameterObject obj = getParameterObject();

dgtly-common/src/main/java/com/dgtly/common/utils/TranslateUtil.java

@@ -87,14 +87,16 @@ public class TranslateUtil {
     public static String getEnTranslateInfo(String msg){
 
         try{
-            String params = "keyfrom=pdblog&key=993123434&type=data&doctype=json&version=1.1&q="+ URLEncoder.encode(msg,"utf-8");
-            String enInfo = HttpUtils.sendGet(TRANSLATE_URL, params);
-            JSONObject jsonObject = JSONObject.fromObject(enInfo);
-            if(jsonObject!=null){
-                Object obj = jsonObject.get("translation");
-                JSONArray jsonArray = JSONArray.fromObject(obj);
-                if(jsonArray!=null && jsonArray.size()>0){
-                    return jsonArray.get(0)==null?"":jsonArray.get(0).toString();
+            if(StringUtils.isNotEmpty(msg)){
+                String params = "keyfrom=pdblog&key=993123434&type=data&doctype=json&version=1.1&q="+ URLEncoder.encode(msg,"utf-8");
+                String enInfo = HttpUtils.sendGet(TRANSLATE_URL, params);
+                JSONObject jsonObject = JSONObject.fromObject(enInfo);
+                if(jsonObject!=null){
+                    Object obj = jsonObject.get("translation");
+                    JSONArray jsonArray = JSONArray.fromObject(obj);
+                    if(jsonArray!=null && jsonArray.size()>0){
+                        return jsonArray.get(0)==null?"":jsonArray.get(0).toString();
+                    }
                 }
             }
         }catch (Exception e){

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/mapper/GoodsInfoMapper.java

@@ -84,8 +84,8 @@ public interface GoodsInfoMapper
      * @auther: qxp
      * @date: 2020/3/3 10:43
      */
-    @SwitchEn(oldfiles ={"gi.name","gi.material","gt.name"},
-            newfiles = {"gi.name_en name","gi.material_en material","gt.name_en"})
+    @SwitchEn(oldfiles ={"gi.name","gi.material","gt.name","sc.company_name"},
+            newfiles = {"gi.name_en name","gi.material_en material","gt.name_en","sc.company_name_en"})
     public List<GoodsInfo> selectGoodsInfoListInWeb(GoodsInfo gi);
 
     /**

dgtly-system/src/main/java/com/dgtly/system/domain/SysCompany.java

@@ -25,6 +25,7 @@ public class SysCompany extends BaseEntity
     /** 公司名称 */
     @Excel(name = "公司名称")
     private String companyName;
+    private String companyNameEn;
 
     private Integer status;//公司状态
 
@@ -47,6 +48,7 @@ public class SysCompany extends BaseEntity
     /** 企业法人 */
     @Excel(name = "企业法人")
     private String legalPerson;
+    private String legalPersonEn;
 
     /** 联系电话 */
     @Excel(name = "联系电话")
@@ -76,6 +78,7 @@ public class SysCompany extends BaseEntity
     /** 企业介绍 */
     @Excel(name = "企业介绍")
     private String companyIntroduce;
+    private String companyIntroduceEn;
 
     /** 版本号 */
     @Excel(name = "版本号")
@@ -87,6 +90,7 @@ public class SysCompany extends BaseEntity
 
     /** 主营业务*/
     private String primaryBusiness;
+    private String primaryBusinessEn;
 
     /** 商品数量*/
     private String goodsCount;
@@ -261,6 +265,38 @@ public class SysCompany extends BaseEntity
         this.goodsCount = goodsCount;
     }
 
+    public String getCompanyNameEn() {
+        return companyNameEn;
+    }
+
+    public void setCompanyNameEn(String companyNameEn) {
+        this.companyNameEn = companyNameEn;
+    }
+
+    public String getLegalPersonEn() {
+        return legalPersonEn;
+    }
+
+    public void setLegalPersonEn(String legalPersonEn) {
+        this.legalPersonEn = legalPersonEn;
+    }
+
+    public String getCompanyIntroduceEn() {
+        return companyIntroduceEn;
+    }
+
+    public void setCompanyIntroduceEn(String companyIntroduceEn) {
+        this.companyIntroduceEn = companyIntroduceEn;
+    }
+
+    public String getPrimaryBusinessEn() {
+        return primaryBusinessEn;
+    }
+
+    public void setPrimaryBusinessEn(String primaryBusinessEn) {
+        this.primaryBusinessEn = primaryBusinessEn;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-system/src/main/java/com/dgtly/system/domain/SysDictData.java

@@ -28,6 +28,7 @@ public class SysDictData extends BaseEntity
     /** 字典标签 */
     @Excel(name = "字典标签")
     private String dictLabel;
+    private String dictLabelEn;
 
     /** 字典键值 */
     @Excel(name = "字典键值")
@@ -154,6 +155,14 @@ public class SysDictData extends BaseEntity
         this.status = status;
     }
 
+    public String getDictLabelEn() {
+        return dictLabelEn;
+    }
+
+    public void setDictLabelEn(String dictLabelEn) {
+        this.dictLabelEn = dictLabelEn;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-system/src/main/java/com/dgtly/system/domain/SysDictType.java

@@ -23,6 +23,7 @@ public class SysDictType extends BaseEntity
     /** 字典名称 */
     @Excel(name = "字典名称")
     private String dictName;
+    private String dictNameEn;
 
     /** 字典类型 */
     @Excel(name = "字典类型 ")
@@ -76,6 +77,14 @@ public class SysDictType extends BaseEntity
         this.status = status;
     }
 
+    public String getDictNameEn() {
+        return dictNameEn;
+    }
+
+    public void setDictNameEn(String dictNameEn) {
+        this.dictNameEn = dictNameEn;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

dgtly-system/src/main/java/com/dgtly/system/mapper/SysDictDataMapper.java

@@ -1,6 +1,8 @@
 package com.dgtly.system.mapper;
 
 import java.util.List;
+
+import com.dgtly.common.annotation.SwitchEn;
 import org.apache.ibatis.annotations.Param;
 import com.dgtly.system.domain.SysDictData;
 
@@ -100,5 +102,6 @@ public interface SysDictDataMapper
      * @auther: qxp
      * @date: 2020-2-25
      */
+    @SwitchEn(oldfiles = {"dict_label"},newfiles = {"dict_label_en dict_label"})
     public List<SysDictData> selectSimpleDictDataByType(String dictType);
 }

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysCompanyServiceImpl.java

@@ -9,6 +9,7 @@ import com.dgtly.common.core.domain.Ztree;
 import com.dgtly.common.exception.BusinessException;
 import com.dgtly.common.utils.DateUtils;
 import com.dgtly.common.utils.ShiroSaltUtil;
+import com.dgtly.common.utils.TranslateUtil;
 import com.dgtly.common.utils.security.EncryptPassWordClass;
 import com.dgtly.companyext.domain.CompanyExamine;
 import com.dgtly.companyext.domain.CompanyReviewed;
@@ -315,12 +316,14 @@ public class SysCompanyServiceImpl implements ISysCompanyService
     public SysCompany reviewedTocompany (CompanyReviewed cr) {
         SysCompany result = new SysCompany();
         result.setCompanyName(cr.getCompanyName());
+        result.setCompanyNameEn(TranslateUtil.getEnTranslateInfo(cr.getCompanyName()));
         result.setStatus(0);
         result.setCompanyType(cr.getCompanyType());
         result.setDetailAddress(cr.getDetailAddress());
         result.setLongitude(cr.getLongitude());
         result.setLatitude(cr.getLatitude());
         result.setLegalPerson(cr.getLegalPerson());
+        result.setLegalPersonEn(TranslateUtil.getEnTranslateInfo(cr.getLegalPerson()));
         result.setContactNumber(cr.getContactNumber());
         result.setEstablishDate(cr.getEstablishDate());
         result.setUnifiedSocialCreditCode(cr.getUnifiedSocialCreditCode());
@@ -328,8 +331,10 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         result.setDefaultImgUrl(cr.getDefaultImgUrl());
         result.setPropagandaImgUrl(cr.getPropagandaImgUrl());
         result.setCompanyIntroduce(cr.getCompanyIntroduce());
+        result.setCompanyIntroduceEn(TranslateUtil.getEnTranslateInfo(cr.getCompanyIntroduce()));
         result.setRemark(cr.getRemark());
         result.setPrimaryBusiness(cr.getPrimaryBusiness());
+        result.setPrimaryBusinessEn(TranslateUtil.getEnTranslateInfo(cr.getPrimaryBusiness()));
         return result;
     }
 

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysDictDataServiceImpl.java

@@ -1,6 +1,8 @@
 package com.dgtly.system.service.impl;
 
 import java.util.List;
+
+import com.dgtly.common.utils.TranslateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.dgtly.common.core.text.Convert;
@@ -101,6 +103,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     @Override
     public int insertDictData(SysDictData dictData)
     {
+        dictData.setDictLabelEn(TranslateUtil.getEnTranslateInfo(dictData.getDictLabel()));
         return dictDataMapper.insertDictData(dictData);
     }
 
@@ -113,6 +116,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     @Override
     public int updateDictData(SysDictData dictData)
     {
+        dictData.setDictLabelEn(TranslateUtil.getEnTranslateInfo(dictData.getDictLabel()));
         return dictDataMapper.updateDictData(dictData);
     }
 

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysDictTypeServiceImpl.java

@@ -2,6 +2,8 @@ package com.dgtly.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.dgtly.common.utils.TranslateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -118,6 +120,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public int insertDictType(SysDictType dictType)
     {
+        dictType.setDictNameEn(TranslateUtil.getEnTranslateInfo(dictType.getDictName()));
         return dictTypeMapper.insertDictType(dictType);
     }
 
@@ -132,6 +135,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     public int updateDictType(SysDictType dictType)
     {
         SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId());
+        dictType.setDictNameEn(TranslateUtil.getEnTranslateInfo(dictType.getDictName()));
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType());
         return dictTypeMapper.updateDictType(dictType);
     }

dgtly-system/src/main/resources/mapper/system/SysCompanyMapper.xml

@@ -61,11 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time,
             <if test="status != null  and status != ''">status,</if>
             <if test="companyName != null  and companyName != ''">company_name,</if>
+            <if test="companyNameEn != null  and companyNameEn != ''">company_name_en,</if>
             <if test="companyType != null  and companyType != ''">company_type,</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address,</if>
             <if test="longitude != null  and longitude != ''">longitude,</if>
             <if test="latitude != null  and latitude != ''">latitude,</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person,</if>
+            <if test="legalPersonEn != null  and legalPersonEn != ''">legal_person_en,</if>
             <if test="contactNumber != null  and contactNumber != ''">contact_number,</if>
             <if test="establishDate != null ">establish_date,</if>
             <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">unified_social_credit_code,</if>
@@ -73,22 +75,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="defaultImgUrl != null  and defaultImgUrl != ''">default_img_url,</if>
             <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">propaganda_img_url,</if>
             <if test="companyIntroduce != null  and companyIntroduce != ''">company_introduce,</if>
+            <if test="companyIntroduceEn != null  and companyIntroduceEn != ''">company_introduce_en,</if>
             <if test="versionNum != null  and versionNum != ''">version_num,</if>
             <if test="createBy != null  and createBy != ''">create_by,</if>
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">primary_business,</if>
+            <if test="primaryBusinessEn != null  and primaryBusinessEn != ''">primary_business_en,</if>
             <if test="sort != null  and sort != ''">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             now(),
             <if test="status != null  and status != ''">#{status},</if>
             <if test="companyName != null  and companyName != ''">#{companyName},</if>
+            <if test="companyNameEn != null  and companyNameEn != ''">#{companyNameEn},</if>
             <if test="companyType != null  and companyType != ''">#{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">#{detailAddress},</if>
             <if test="longitude != null  and longitude != ''">#{longitude},</if>
             <if test="latitude != null  and latitude != ''">#{latitude},</if>
             <if test="legalPerson != null  and legalPerson != ''">#{legalPerson},</if>
+            <if test="legalPersonEn != null  and legalPersonEn != ''">#{legalPersonEn},</if>
             <if test="contactNumber != null  and contactNumber != ''">#{contactNumber},</if>
             <if test="establishDate != null ">#{establishDate},</if>
             <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">#{unifiedSocialCreditCode},</if>
@@ -96,11 +102,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="defaultImgUrl != null  and defaultImgUrl != ''">#{defaultImgUrl},</if>
             <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">#{propagandaImgUrl},</if>
             <if test="companyIntroduce != null  and companyIntroduce != ''">#{companyIntroduce},</if>
+            <if test="companyIntroduceEn != null  and companyIntroduceEn != ''">#{companyIntroduceEn},</if>
             <if test="versionNum != null  and versionNum != ''">#{versionNum},</if>
             <if test="createBy != null  and createBy != ''">#{createBy},</if>
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">#{primaryBusiness},</if>
+            <if test="primaryBusinessEn != null  and primaryBusinessEn != ''">#{primaryBusinessEn},</if>
             <if test="sort != null  and sort != ''">#{sort},</if>
          </trim>
     </insert>
@@ -112,11 +120,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             version_num=version_num+1,
             <if test="status != null">status = #{status},</if>
             <if test="companyName != null  and companyName != ''">company_name= #{companyName},</if>
+            <if test="companyNameEn != null  and companyNameEn != ''">company_name_en = #{companyNameEn},</if>
             <if test="companyType != null  and companyType != ''">company_type= #{companyType},</if>
             <if test="detailAddress != null  and detailAddress != ''">detail_address= #{detailAddress},</if>
             <if test="longitude != null  and longitude != ''">longitude= #{longitude},</if>
             <if test="latitude != null  and latitude != ''">latitude= #{latitude},</if>
             <if test="legalPerson != null  and legalPerson != ''">legal_person= #{legalPerson},</if>
+            <if test="legalPersonEn != null  and legalPersonEn != ''">legal_person_en = #{legalPersonEn},</if>
             <if test="contactNumber != null  and contactNumber != ''">contact_number= #{contactNumber},</if>
             <if test="establishDate != null ">establish_date= #{establishDate},</if>
             <if test="unifiedSocialCreditCode != null  and unifiedSocialCreditCode != ''">unified_social_credit_code= #{unifiedSocialCreditCode},</if>
@@ -124,10 +134,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="defaultImgUrl != null  and defaultImgUrl != ''">default_img_url= #{defaultImgUrl},</if>
             <if test="propagandaImgUrl != null  and propagandaImgUrl != ''">propaganda_img_url= #{propagandaImgUrl},</if>
             <if test="companyIntroduce != null  and companyIntroduce != ''">company_introduce= #{companyIntroduce},</if>
+            <if test="companyIntroduceEn != null  and companyIntroduceEn != ''">company_introduce_en = #{companyIntroduceEn},</if>
             <if test="createBy != null  and createBy != ''">create_by= #{createBy},</if>
             <if test="updateBy != null  and updateBy != ''">update_by= #{updateBy},</if>
             <if test="remark != null  and remark != ''">remark= #{remark},</if>
             <if test="primaryBusiness != null  and primaryBusiness != ''">primary_business=#{primaryBusiness},</if>
+            <if test="primaryBusinessEn != null  and primaryBusinessEn != ''">primary_business_en=#{primaryBusinessEn},</if>
             <if test="sort != null  and sort != ''">sort=#{sort},</if>
         </trim>
         where id = #{id}

dgtly-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		<set>
  			<if test="dictSort != null and dictSort != ''">dict_sort = #{dictSort},</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
+ 			<if test="dictLabelEn != null and dictLabelEn != ''">dict_label_en = #{dictLabelEn},</if>
  			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
  			<if test="cssClass != null">css_class = #{cssClass},</if>
@@ -96,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		insert into sys_dict_data(
  			<if test="dictSort != null and dictSort != ''">dict_sort,</if>
  			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
+ 			<if test="dictLabelEn != null and dictLabelEn != ''">dict_label_en,</if>
  			<if test="dictValue != null and dictValue != ''">dict_value,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>
  			<if test="cssClass != null and cssClass != ''">css_class,</if>
@@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		)values(
  		    <if test="dictSort != null and dictSort != ''">#{dictSort},</if>
  		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
+ 		    <if test="dictLabelEn != null and dictLabelEn != ''">#{dictLabelEn},</if>
  			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
  			<if test="dictType != null and dictType != ''">#{dictType},</if>
  			<if test="cssClass != null and cssClass != ''">#{cssClass},</if>

dgtly-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_dict_type
  		<set>
  			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
+ 			<if test="dictNameEn != null and dictNameEn != ''">dict_name_en = #{dictNameEn},</if>
  			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
@@ -87,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	<insert id="insertDictType" parameterType="SysDictType">
  		insert into sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
+ 			<if test="dictNameEn != null and dictNameEn != ''">dict_name_en,</if>
  			<if test="dictType != null and dictType != ''">dict_type,</if>
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			create_time
  		)values(
  			<if test="dictName != null and dictName != ''">#{dictName},</if>
+ 			<if test="dictNameEn != null and dictNameEn != ''">#{dictNameEn},</if>
  			<if test="dictType != null and dictType != ''">#{dictType},</if>
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>