Browse Source

修改需求

zhs 3 years ago
parent
commit
54bb43ee90

+ 4 - 5
src/main/java/com/travel/baidu/Translation.java

@@ -29,7 +29,7 @@ public class Translation {
      */
     @RequestMapping("translation")
     @ResponseBody
-    public JSONObject translation(String translationVal, String from, String to, HttpServletRequest request){
+    public String 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<>();
@@ -47,10 +47,9 @@ public class Translation {
             String accessToken = accessToken();
             String result = HttpUtil.post(url, accessToken, "application/json", param);
             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;
+            JSONObject jsonObject1 = (JSONObject) jsonObject.get("result");
+            List<Map<Object, Object>> list = (List<Map<Object, Object>>) jsonObject1.get("trans_result");
+            return (String) list.get(0).get("dst");
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 4 - 0
src/main/java/com/travel/controller/UsedUserController.java

@@ -37,6 +37,7 @@ public class UsedUserController {
             List<UsedUser> list1 = new ArrayList<>();
             for(UsedUser usedUser1 : list){
                 usedUser1.setIdNumber(DesDecry.decrypt(usedUser1.getIdNumber()));
+                usedUser1.setPhone(DesDecry.decrypt(usedUser1.getPhone()));
                 list1.add(usedUser1);
             }
             map.put("data", list1);
@@ -65,6 +66,7 @@ public class UsedUserController {
             String id = UUID.randomUUID().toString().replace("-", "");
             usedUser.setUuid(id);
             usedUser.setIdNumber(DesEncry.encrypt(usedUser.getIdNumber()));
+            usedUser.setPhone(DesEncry.encrypt(usedUser.getPhone()));
             usedUserService.addUsed(usedUser);
             map.put("msg", "200");
         }catch (Exception e){
@@ -109,6 +111,8 @@ public class UsedUserController {
         try{
             Map<String, Object> userMap = ParsingToken.tokenParsing(request);
             usedUser.setCode((String) userMap.get("code"));
+            usedUser.setIdNumber(DesEncry.encrypt(usedUser.getIdNumber()));
+            usedUser.setPhone(DesEncry.encrypt(usedUser.getPhone()));
             usedUserService.updateUsed(usedUser);
             map.put("msg", "200");
         }catch (Exception e){

+ 4 - 0
src/main/java/com/travel/model/ConfirmOrdering.java

@@ -73,4 +73,8 @@ public class ConfirmOrdering implements Serializable {
      * 目的地
      */
     private String destination;
+    /**
+     * 签名图片
+     */
+    private String signatureImage;
 }

+ 2 - 2
src/main/resources/config/mapping/ConfirmOrderingMapper.xml

@@ -4,8 +4,8 @@
 <mapper namespace="com.travel.mapper.ConfirmOrderingMapper">
     <!-- 新增确认方案主表数据 -->
     <insert id="addConfirm" parameterType="ConfirmOrdering">
-        insert into bus_confirm_ordering(uuid,code,jdrq,name,phone,email,is_invoice,invoie_remark,release_uuid)
-        values(#{uuid},#{code},SYSDATETIME(),#{name},#{phone},#{email},#{isInvoice},#{invoiceRemark},#{releaseUuid})
+        insert into bus_confirm_ordering(uuid,code,jdrq,name,phone,email,is_invoice,invoie_remark,release_uuid,signature_image)
+        values(#{uuid},#{code},SYSDATETIME(),#{name},#{phone},#{email},#{isInvoice},#{invoiceRemark},#{releaseUuid},#{signatureImage})
     </insert>
     <!-- 新增旅客信息 -->
     <insert id="addUsedConfirm" parameterType="UsedUser">