修改需求

src/main/java/com/travel/baidu/Test.java

@@ -5,6 +5,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
@@ -19,7 +21,7 @@ import java.util.Map;
 @Controller
 @RequestMapping("translationInterface")
 @CrossOrigin(origins = "*")
-public class Test {
+public class Translation {
     /**
      * 翻译接口
      * @param translationVal 参数
@@ -27,11 +29,14 @@ public class Test {
      */
     @RequestMapping("translation")
     @ResponseBody
-    public String translation(String translationVal, String from, String to){
+    public JSONObject translation(String translationVal, String from, String to, HttpServletRequest request){
         // 请求url
         String url = "https://aip.baidubce.com/rpc/2.0/mt/texttrans/v1";
+        Map<String, Object> mapVal = new HashMap<>();
 
         try {
+            String ip = request.getHeader("Host");
+            System.out.println(ip);
             Map<String, Object> map = new HashMap<>();
             map.put("from", from);
             map.put("to", to);
@@ -41,8 +46,11 @@ public class Test {
             // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。
             String accessToken = accessToken();
             String result = HttpUtil.post(url, accessToken, "application/json", param);
-            System.out.println(result);
-            return result;
+            JSONObject jsonObject = JSONObject.parseObject(result);
+//            JSONObject jsonObject1 = (JSONObject) jsonObject.get("result");
+            System.out.println(jsonObject);
+//            List<Map<Object, Object>> list = (List<Map<Object, Object>>) jsonObject1.get("trans_result");
+            return jsonObject;
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -87,7 +95,6 @@ public class Test {
              * 返回结果示例
              */
             JSONObject jsonObject = JSONObject.parseObject(result);
-            System.out.println(jsonObject);
             String access_token = jsonObject.getString("access_token");
             return access_token;
         } catch (Exception e) {

src/main/java/com/travel/controller/ConfirmOrderingController.java

@@ -7,6 +7,7 @@ import com.travel.model.Release;
 import com.travel.model.UsedUser;
 import com.travel.service.ConfirmOrderingService;
 import com.travel.service.PrivateOrderService;
+import com.travel.util.DesEncry;
 import com.travel.util.ParsingToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,6 +54,7 @@ public class ConfirmOrderingController {
                 List<UsedUser> list = JSON.parseArray(confirmOrdering.getUsedUserArrayString(), UsedUser.class);
                 for(UsedUser usedUser : list){
                     usedUser.setConfirmUuid(confirmOrdering.getUuid());
+                    usedUser.setIdNumber(DesEncry.encrypt(usedUser.getIdNumber()));
                     confirmOrderingService.addUsedConfirm(usedUser);
                 }
                 map.put("msg", "200");
@@ -82,6 +84,7 @@ public class ConfirmOrderingController {
             List<UsedUser> list = JSON.parseArray(confirmOrdering.getUsedUserArrayString(), UsedUser.class);
             for(UsedUser usedUser : list){
                 usedUser.setConfirmUuid(id);
+                usedUser.setIdNumber(DesEncry.encrypt(usedUser.getIdNumber()));
                 confirmOrderingService.addUsedConfirm(usedUser);
             }
             map.put("msg", "200");

src/main/java/com/travel/controller/PersonalController.java

@@ -307,11 +307,6 @@ public class PersonalController {
         return map;
     }
 
-    public static void main(String[] args) {
-        Double a = 12.34;
-        System.out.println(Integer.parseInt(String.valueOf(a)));
-    }
-
     /**
      * 修改手机号发送验证码
      * @param user 参数

src/main/java/com/travel/controller/SupplierController.java

@@ -170,7 +170,7 @@ public class SupplierController {
     public Map<String, Object> SendSms(Supplier supplier, int type) {
         Map<String, Object> map = new HashMap<>();
         try {
-            DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", "LTAI5tPxERgiaSgZXSmDNiya", "Y09YLpp6NJE67PF9iCXCNxngPZAPWK");
+            DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", "LTAI5tBqqAPaSEWZ3JK1qC6m", "6IAqbAUf47CWUIGOTThpKYO2vMXuX4");
             IAcsClient client = new DefaultAcsClient(profile);
             CommonRequest request = new CommonRequest();
             request.setSysMethod(MethodType.POST);
@@ -179,14 +179,14 @@ public class SupplierController {
             request.setSysAction("SendSms");
             request.putQueryParameter("RegionId", "cn-hangzhou");
             request.putQueryParameter("PhoneNumbers", supplier.getPhone());//手机号
-            request.putQueryParameter("SignName", "阿里云短信测试");
+            request.putQueryParameter("SignName", "途丫");
             switch (type) {
                 case 1 :
-                    request.putQueryParameter("TemplateCode", "SMS_242688296");
+                    request.putQueryParameter("TemplateCode", "SMS_247410045");
                     request.putQueryParameter("TemplateParam", "{\"code\":\"" + supplier.getCaptcha() + "\"}");//验证码
                     break;
                 case 4 :
-                    request.putQueryParameter("TemplateCode", "SMS_242688296");
+                    request.putQueryParameter("TemplateCode", "SMS_247410045");
                     request.putQueryParameter("TemplateParam", "{\"code\":\"" + supplier.getCaptcha() + "\"}");//验证码
                     break;
             }

src/main/java/com/travel/controller/TravelCommentsController.java

@@ -1,6 +1,5 @@
 package com.travel.controller;
 
-import com.travel.model.Travel;
 import com.travel.model.TravelComments;
 import com.travel.service.TravelCommentsService;
 import com.travel.util.BeanMap;
@@ -54,7 +53,7 @@ public class TravelCommentsController {
      * @return 返回结果
      */
     @DeleteMapping("delComments")
-    public Map<String, Object> delComments(TravelComments comments, HttpServletRequest request){
+    public Map<String, Object> delComments(TravelComments comments, HttpServletRequest request, String to){
         Map<String, Object> map = new HashMap<>();
         try {
             //获取token
@@ -62,7 +61,7 @@ public class TravelCommentsController {
             comments.setCode((String) userMap.get("code"));
             //查询要删除的评论下的所有评论 并删除
             comments.setParentUuid(comments.getUuid());
-            Map<String, Object> dataMap = getComments(comments, request);
+            Map<String, Object> dataMap = getComments(comments, request, to);
             delCommentData((List<Map<String, Object>>) dataMap.get("data"));//删除所有子集
             travelCommentsService.delComments(comments);
             map.put("msg", "200");
@@ -81,7 +80,7 @@ public class TravelCommentsController {
      * @return 返回结果
      */
     @GetMapping("getComments")
-    public Map<String, Object> getComments(TravelComments comments, HttpServletRequest request){
+    public Map<String, Object> getComments(TravelComments comments, HttpServletRequest request, String to){
         Map<String, Object> map = new HashMap<>();
         try {
             //获取token
@@ -143,7 +142,7 @@ public class TravelCommentsController {
      * @return 返回结果
      */
     @GetMapping("getCommentsUser")
-    public Map<String, Object> getCommentsUser(TravelComments travelComments, HttpServletRequest request){
+    public Map<String, Object> getCommentsUser(TravelComments travelComments, HttpServletRequest request, String to){
         Map<String, Object> map = new HashMap<>();
         try{
             if(travelComments.getCode() == null){

src/main/java/com/travel/controller/UsedUserController.java

@@ -2,15 +2,14 @@ package com.travel.controller;
 
 import com.travel.model.UsedUser;
 import com.travel.service.UsedUserService;
+import com.travel.util.DesDecry;
+import com.travel.util.DesEncry;
 import com.travel.util.ParsingToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 常用旅客信息
@@ -35,7 +34,12 @@ public class UsedUserController {
             Map<String, Object> userMap = ParsingToken.tokenParsing(request);
             usedUser.setCode((String) userMap.get("code"));
             List<UsedUser> list = usedUserService.getUsed(usedUser);
-            map.put("data", list);
+            List<UsedUser> list1 = new ArrayList<>();
+            for(UsedUser usedUser1 : list){
+                usedUser1.setIdNumber(DesDecry.decrypt(usedUser1.getIdNumber()));
+                list1.add(usedUser1);
+            }
+            map.put("data", list1);
             map.put("msg", "200");
         }catch (Exception e){
             map.put("msg", "500");
@@ -60,6 +64,7 @@ public class UsedUserController {
             //生成uuid
             String id = UUID.randomUUID().toString().replace("-", "");
             usedUser.setUuid(id);
+            usedUser.setIdNumber(DesEncry.encrypt(usedUser.getIdNumber()));
             usedUserService.addUsed(usedUser);
             map.put("msg", "200");
         }catch (Exception e){

src/main/java/com/travel/model/TravelComments.java

@@ -10,8 +10,8 @@ import java.io.Serializable;
  */
 @Data
 @Accessors(chain = true)
-@SuppressWarnings("serial")
-public class TravelComments implements Serializable {
+//@SuppressWarnings("serial")
+public class TravelComments {
     /**
      * 主键自增
      */

src/main/java/com/travel/util/BeanMap.java

@@ -1,13 +1,17 @@
 package com.travel.util;
 
+import com.travel.baidu.Translation;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * 对象转map
  */
 public class BeanMap {
+    //对象转map
     public static Map<String, Object> objectToMap(Object object){
         Map<String,Object> dataMap = new HashMap<>();
         Class<?> clazz = object.getClass();
@@ -21,4 +25,27 @@ public class BeanMap {
         }
         return dataMap;
     }
+
+    /**
+     * 翻译
+     * @param list 参数
+     * @return 返回结果
+     */
+//    public <T> List<Object> forListArray(List<T> list, String to){
+//        Map<String, Object> map = new HashMap<>();
+//        List<Object> list1 = new ArrayList<>();
+//        for(Object val : list){
+//            Map<Object, Object> valMap = (Map) val;
+//            for(Map.Entry entry : valMap.entrySet()){
+////                if(!(entry.getValue() instanceof Integer)){
+////
+////                }
+//                if(!entry.getKey().equals("jdrq") && !entry.getKey().equals("typeForm") && !entry.getKey().equals("titleImg") && !entry.getKey().equals("id")){
+//                    map.put((String) entry.getKey(), Translation.translation((String) entry.getValue(), "auto", to, null));
+//                }
+//            }
+//            list1.add((T) map);
+//        }
+//        return list1;
+//    }
 }

src/main/resources/config/mapping/SupplierMapper.xml

@@ -13,6 +13,9 @@
                 <if test="contact != null and contact != ''">
                     contact = #{contact},
                 </if>
+                <if test="code != null and code != ''">
+                    code = #{code},
+                </if>
                 <if test="name != null and name != ''">
                     name = #{name},
                 </if>