Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

.gitignore

@@ -168,3 +168,5 @@ deployment.yaml
 ######################
 Dockerfile
 /.recommenders/
+templates/1657067591042.png
+templates/1657067591895.png

src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyBaoTokenController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录token 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-15
+ */
+@RestController
+@RequestMapping("/hyBaoToken")
+public class HyBaoTokenController {
+
+}
+

src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyBaoToken.java

@@ -0,0 +1,43 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import BaseModel;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.Version;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录token
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class HyBaoToken extends BaseModel<HyBaoToken> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * token
+     */
+    private String token;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyBaoTokenMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBaoToken;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录token Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-15
+ */
+public interface HyBaoTokenMapper extends BaseMapper<HyBaoToken> {
+
+}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyBaoTokenService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBaoToken;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录token 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-15
+ */
+public interface IHyBaoTokenService extends IService<HyBaoToken> {
+
+}

src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyBaoTokenServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBaoToken;
+import com.yh.saas.plugin.yiliangyiyun.mapper.HyBaoTokenMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IHyBaoTokenService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录token 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-15
+ */
+@Service
+public class HyBaoTokenServiceImpl extends ServiceImpl<HyBaoTokenMapper, HyBaoToken> implements IHyBaoTokenService {
+
+}

src/main/resources/mapper/HyBaoTokenMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.yh.saas.plugin.yiliangyiyun.mapper.HyBaoTokenMapper">
+
+</mapper>

winsea-haixin-platform-backend/pom.xml

@@ -128,12 +128,12 @@
             <artifactId>winsea-haixin-plugin-operation</artifactId>
             <version>0.7.0</version>
         </dependency>
-        <!--修船-->
-<!--        <dependency>-->
-<!--            <groupId>com.yh.haixin</groupId>-->
-<!--            <artifactId>winsea-haixin-plugin-repair</artifactId>-->
-<!--            <version>0.7.0</version>-->
-<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.10.3</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -141,6 +141,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+
 
         <dependency>
             <groupId>mysql</groupId>

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/LoginController.java

@@ -0,0 +1,160 @@
+package com.yh.saas.platform.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.winsea.svc.base.security.config.SecurityProperties;
+import com.winsea.svc.base.security.entity.Account;
+import com.winsea.svc.base.security.service.IAccountService;
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.util.WebUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
+
+import static cn.hutool.core.net.NetUtil.LOCAL_IP;
+
+@RestController
+@RequestMapping("/loginController")
+public class LoginController {
+    @Autowired
+    private RedisTemplate redisTemplate;
+    @Autowired
+    private SecurityProperties securityProperties;
+    @Autowired
+    private IAccountService accountService;
+
+    @GetMapping("/query/login")
+    public void login(Account user, HttpServletRequest request) throws Exception {
+        String password = user.getLoginPassword();
+        // 获取IP
+        String keyStr = getIpRequest(request);
+        if(redisTemplate.hasKey(keyStr)) {
+            // 登录时候先判断是否有登录错误的计数
+            int errorNum = Integer.valueOf((String) redisTemplate.opsForValue().get(keyStr));
+            if(errorNum==5){
+                throw new YException(YExceptionEnum.CONG_TERM_OF_VADMIN);
+            }
+        }
+        Account u = this.getTargetUser(user);
+        if(!checkPassWord(password, u.getLoginPassword())) {
+
+            //新增登录失败记录
+            loginErrorRecord(keyStr,request);
+            throw new YException(YExceptionEnum.CONG_TERM_OF_VADMIN);
+        }
+        // 删除登录错误的记录
+        redisTemplate.delete(keyStr);
+
+    }
+
+
+    /**
+     * 获取Ip
+     *
+     * @param request  请求
+     */
+    public static String getIpRequest(HttpServletRequest request) {
+        String unknown = "unknown";
+
+//        String ip0 = request.getHeader("x-forwarded-for");
+        String ip = request.getHeader("X-Real-IP");
+
+        if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+
+        if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+
+        if (LOCAL_IP.equals(ip)) {
+            ip = "local";
+        }
+
+        return ip;
+    }
+
+    /**
+     * 记录登录错误次数
+     *
+     * @param keyStr
+     * @param request
+     */
+    private void loginErrorRecord(String keyStr, HttpServletRequest request) {
+        if(redisTemplate.hasKey(keyStr)){
+            int errorNum = Integer.valueOf((String)redisTemplate.opsForValue().get(keyStr));
+            redisTemplate.opsForValue().set(keyStr, errorNum+1,900, TimeUnit.SECONDS);
+        }else{
+            redisTemplate.opsForValue().set(keyStr, 1,900, TimeUnit.SECONDS);
+        }
+    }
+
+
+    /**
+     * 校验密码
+     * @param oldPassWord
+     * @param newPassWord
+     */
+    public Boolean checkPassWord(String oldPassWord, String newPassWord) {
+        String a = this.encryptPassword(oldPassWord);
+        if (!a.equals(newPassWord)) {
+
+            return false;
+        }
+        return true;
+    }
+
+    public String encryptPassword(String originalPassword) {
+        if (null == originalPassword) {
+            return null;
+        } else {
+            return this.securityProperties.getEnableEncryption() ? DigestUtils.md5DigestAsHex(originalPassword.getBytes()).toLowerCase() : originalPassword;
+        }
+    }
+
+
+
+    private Account getTargetUser(Account user) {
+        Account.AccountType accountType = null != user.getAccountType() ? user.getAccountType() : Account.AccountType.valueOf(this.securityProperties.getDefaultUserKind());
+        Account targetUser = this.getUserByLoginName(user.getLoginName(), user.getCompId(), accountType);
+        if (null == targetUser) {
+            targetUser = new Account();
+        }
+
+
+        return targetUser;
+    }
+
+
+    public Account getUserByLoginName(String loginName, String compId, Account.AccountType accountType) {
+        Wrapper<Account> wrapper = (new EntityWrapper()).andNew("(1=1", new Object[0]).eq("login_name", loginName).or().eq("user_mobile_phone", loginName).andNew("1=1)", new Object[0]);
+        if (StringUtils.isEmpty(compId)) {
+            wrapper.isNull("comp_id");
+        } else {
+            wrapper.eq("comp_id", compId);
+        }
+
+        if (null != accountType) {
+            wrapper = wrapper.eq("account_type", accountType.name());
+        }
+
+        return (Account)accountService.selectOne(wrapper);
+    }
+
+
+}

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/StaffController.java

@@ -125,6 +125,7 @@ public class StaffController {
 	/**
 	 * 根据公司ID和库点id获得有权限的人员集合
 	 *
+	 *
 	 * @param compId
 	 * @return
 	 */

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -37,6 +37,10 @@ auth:
     - /auth/api/retrievePassword
     - /veriCode/api/send
     - /veriCode/api/check
+    - /companyInfo/*
+    - /companyInfo/**/*
+    - /loginController/query/login
+    - /system/query/isLandBased
     - /company/query/companyInfoByDomainName
     - /webservice/**/*
     - /workflowSync/api/startFlow
@@ -98,8 +102,6 @@ auth:
     - /cargoOwnerInfo/**/*
     - /cargoOwnerCompInfo/*
     - /cargoOwnerCompInfo/**/*
-    - /companyInfo/*
-    - /companyInfo/**/*
     - /orderInfo/*
     - /orderInfo/**/*
     - /commonRoute/*
@@ -153,7 +155,7 @@ auth:
   expire-in: 2592000
   login-url: /login.html
   logout-url: /auth/api/logout
-  session-timeout: -1
+  session-timeout: 900
   success-url: ''
   unauthorized-url: ''
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","hy_oper_log");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","hy_bao_token");
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.openapi.sdk.service.DataExchangeService;
@@ -25,9 +26,16 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.UserDefinedBean;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
+import com.yh.saas.plugin.yiliangyiyun.service.IHyBaoTokenService;
 import com.yh.saas.plugin.yiliangyiyun.service.IHyTokenService;
 import com.yh.saas.plugin.yiliangyiyun.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +47,7 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.google.gson.Gson;
 
 
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import com.aliyuncs.sts.model.v20150401.*;
@@ -81,6 +90,8 @@ public class CommonUserController {
     private WebSocket webSocket;
     @Autowired
     private IHyTokenService hyToken;
+    @Autowired
+    private IHyBaoTokenService hyBaoTokenService;
 
 
     @GetMapping("/getAuth")
@@ -482,5 +493,141 @@ public class CommonUserController {
             orderPath();
         }
     }
+
+
+
+
+
+    public void loginBao() {
+        try {
+            Map<String, String> map = new HashMap<String, String>(4);
+            map.put("user", "d25e76de-31f6-4dc1-8009-3dbd17628e76");
+            map.put("pwd", "Xw846GfNv073t8779PrtMa6z02Ui43");
+            map.put("srt", "e8eaf629-014c-4884-a976-459380b9cb66");
+            map.put("cid", "dfaf33d6-68f0-4b3a-b9ba-9228a2480faf");
+            String url = "https://testopen.95155.com/save/apis/login";
+            // 设置http读写超时
+            DataExchangeService des = new DataExchangeService(5000, 8000);
+            System.out.println("请求地址:"+url);
+            // 通过https方式调用，此方法内部会使用私钥生成签名参数sign,私钥不会发送
+            String res = des.postHttps(url, map);
+            res = res.substring(1, res.length() - 1);
+            String[] strs = res.split(",");
+            Map<String, String> map1 = new HashMap<String, String>();
+            for (String string : strs) {
+                String key = string.split(":")[0];
+                String value = string.split(":")[1];
+                // 去掉头部空格
+                String key1 = key.trim().replaceAll("\"", "");
+                String value1 = value.trim().replaceAll("\"", "");
+                map1.put(key1, value1);
+            }
+            hyBaoTokenService.delete(new EntityWrapper<HyBaoToken>().eq("delete_flag", "0"));
+            HyBaoToken token = new HyBaoToken();
+            token.setId(IdGenerator.generateUUID());
+            token.setToken(map1.get("\"result\"").replaceAll("\"", ""));
+            hyBaoTokenService.insert(token);
+            System.out.println("返回:" + res);
+        } catch (Exception e) {
+            System.out.println("e:" + e.getMessage());
+        }
+    }
+
+
+    @PostMapping("/baodan")
+    public void baodan() throws Exception {
+        HyBaoToken token = hyBaoTokenService.selectOne(new EntityWrapper<HyBaoToken>()
+                .eq("delete_flag", 0));
+        if (token == null) {
+            login();
+            token = hyBaoTokenService.selectOne(new EntityWrapper<HyBaoToken>()
+                    .eq("delete_flag", "0"));
+        }
+        JSONObject params = new JSONObject();
+        params.put("token", token.getToken());
+        params.put("cid", "dfaf33d6-68f0-4b3a-b9ba-9228a2480faf");
+        params.put("srt", "e8eaf629-014c-4884-a976-459380b9cb66");
+        JSONObject insurance = new JSONObject();
+        insurance.put("channelOrderId", "450324");
+        insurance.put("productCode", "P200001");
+        insurance.put("amount", 10000);
+        insurance.put("payMoney", 5);
+        JSONObject startPlace = new JSONObject();
+        startPlace.put("areaName", "安徽省安庆市枞阳县");
+        startPlace.put("areaCode", "340000-340800-340823");
+        JSONObject finishPlace = new JSONObject();
+        finishPlace.put("areaName", "安徽省安庆市枞阳县");
+        finishPlace.put("areaCode", "340000-340800-340823");
+        insurance.put("startPlace", startPlace);
+        insurance.put("finishPlace", finishPlace);
+
+//        JSONObject vehicleInfoList  = new JSONObject();
+        JSONObject vehicleInfoList1  = new JSONObject();
+        vehicleInfoList1.put("licensePlateNo", "陕YH0009");
+        List<JSONObject> vehicleInfoLists = new ArrayList<>();
+        vehicleInfoLists.add(vehicleInfoList1);
+        insurance.put("vehicleInfoList", vehicleInfoLists);
+
+//        JSONObject goodsInfoList  = new JSONObject();
+        JSONObject goodsInfoList1  = new JSONObject();
+        goodsInfoList1.put("goodsName", "玉米");
+        List<JSONObject> goodsInfoLists = new ArrayList<>();
+        goodsInfoLists.add(goodsInfoList1);
+        insurance.put("goodsInfoList", goodsInfoLists);
+
+        insurance.put("schemeCode",0);
+
+        JSONObject insurantInfoList  = new JSONObject();
+        insurantInfoList.put("personnelType ", "1");
+        insurantInfoList.put("name", "王东镇");
+        insurantInfoList.put("certificateType", "01");
+        insurantInfoList.put("certificateNo", "210103195103222113");
+        insurantInfoList.put("mobile", "13333333333");
+        List<JSONObject> insurantInfoLists = new ArrayList<>();
+        insurantInfoLists.add(insurantInfoList);
+        insurance.put("insurantInfoList", insurantInfoLists);
+        params.put("insuranceInfoList", insurance);
+        String url = "https://testopen.95155.com/save/apis/bxcx_openapi_insure";
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.setEntity(new StringEntity("[" + params.toString() + "]", StandardCharsets.UTF_8));
+        // 设置header信息
+        httpPost.setHeader("Content-type", "application/json");
+        httpPost.setHeader("token", token.getToken());
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = httpClient.execute(httpPost);
+
+        // 设置 http 读写超时
+        DataExchangeService des = new DataExchangeService(5000, 8000);
+        System.out.println("请求地址:" + url);
+
+        try {
+            // 执行请求操作，并拿到结果（同步阻塞）
+            String body = EntityUtils.toString(response.getEntity());
+            JSONObject jsonObject = JSONObject.parseObject(body);
+            String result = jsonObject.getString("result");
+            System.out.println("result = " + result);
+            // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
+            if (result.contains("1016")) {
+                login();
+                baodan();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            // 释放链接
+            response.close();
+            httpClient.close();
+        }
+
+    }
+
+
+//    public static void main(String[] args)throws Exception {
+//        this.baodan();
+//    }
+
 }
 
+
+
+

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyBaoTokenController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 记录token 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-09
+ */
+@RestController
+@RequestMapping("/hyBaoToken")
+public class HyBaoTokenController {
+
+}
+

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/YinghangController.java

@@ -0,0 +1,62 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+import java.io.*;
+import java.net.Socket;
+import java.util.Date;
+
+public class YinghangController {
+
+//    public static final String DEFAULT_CHARSET = "GBK";
+//
+//    public static void main(String[] args) throws Exception {
+//        String head = " <tr_code>310401</tr_code><corp_no>0008000041</corp_no><user_no>00002</user_no><req_no>00010239</req_no><tr_acdt>20061206</tr_acdt><tr_time>100108</tr_time><atom_tr_count>1</atom_tr_count><channel>0</channel><reserved></reserved>";
+//        String body ="<acno>6214 8302 4945 1609</acno><start_date>"+new Date()+"</start_date><end_date>"+new Date()+"</end_date>";
+//        doSocket(head, body);
+//    }
+//
+//    public static String doSocket(String headMsg, String bodyMsg)
+//            throws Exception {
+//        int soTimeOut = 5000; //超时设置 5s
+//        Socket socket = new Socket("124.74.240.144", 9003);
+//        // 建立socket
+//        socket.setSoTimeout(soTimeOut);
+//        BufferedOutputStream wr = null;
+//        String head = "<head>" + headMsg + "</head>";
+//        String body = "<body>" + bodyMsg + "</body>";
+//        String message = "<ap>" + head + body + "</ap>";
+//        byte[] messageByte = message.getBytes(DEFAULT_CHARSET);
+//        //先转换成 GBK 的 byte 数组
+//        String length = "0" + messageByte.length + " ";
+//        //7 位头
+//        length = length.substring(0, 4);
+//        message = length + message;
+//        System.out.println(message);
+//        messageByte = message.getBytes(DEFAULT_CHARSET);
+//        int sleepTime = 1000; //1s，线程休眠时间
+//        try {
+//            Thread.sleep(sleepTime);
+//        } catch (Exception e) {
+//        }
+//        wr = new BufferedOutputStream(socket.getOutputStream());
+//        //开始发送消息
+//        wr.write(messageByte);
+//        wr.flush();
+//        //接收回应消息
+//        BufferedReader rd = new BufferedReader(new
+//                InputStreamReader(socket.getInputStream(), DEFAULT_CHARSET));
+//        String line = null;
+//
+//        StringBuffer sb = new StringBuffer();
+//        while ((line = rd.readLine()) != null) {
+//            sb.append(line);
+//        }
+//
+//        //处理返回
+//        String returnStr = new String(sb.toString().getBytes());
+//        wr.close();
+//        rd.close();
+//        socket.close();
+//        System.out.println("======" + returnStr);
+//        return returnStr;
+//    }
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyBaoToken.java

@@ -0,0 +1,45 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 记录token
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hy_bao_token")
+public class HyBaoToken extends BaseModel<HyBaoToken> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * token
+     */
+    private String token;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -49,6 +49,8 @@ public enum YExceptionEnum {
 	TERM_OF_VALIDITY("ERROR26", "请重新选择身份证有效期"),
 	DRIVER_TERM_OF_VALIDITY("ERROR27", "请重新选择驾驶证有效期"),
 	CONG_TERM_OF_VALIDITY("ERROR28", "请重新选择从业资格证有效期"),
+	CONG_TERM_OF_VADMIN("ERROR29", "该账号已被锁定"),
+	CONG_TERM_OF_PASS("ERROR30", "用户名或密码错误！"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyBaoTokenMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBaoToken;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录token Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-09
+ */
+public interface HyBaoTokenMapper extends BaseMapper<HyBaoToken> {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyBaoTokenService.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBaoToken;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 记录token 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-09
+ */
+public interface IHyBaoTokenService extends IService<HyBaoToken> {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverCarInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonSysParameter;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.NewsInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverCarInfoMapper;
@@ -16,6 +17,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
+import com.yh.saas.plugin.yiliangyiyun.service.INewsInfoService;
 import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +46,8 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
     private ICommonSysParameterService commonSysParameterService;
     @Autowired
     private IDriverInfoService driverInfoService;
+    @Autowired
+    private INewsInfoService newsInfoService;
 
     /**
      * 后台管理车辆列表
@@ -225,6 +229,14 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, H
             else if ("2".equals(hyDriverCarInfo.getFlag())) {
                 hyDriverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
                 hyDriverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                //发送消息
+                NewsInfo newsInfo = new NewsInfo();
+                newsInfo.setReCommonId(hyDriverCarInfo1.getCommonId());
+                newsInfo.setNewsContent(hyDriverCarInfo1.getCarNumber() + "车辆信息被驳回！" + "驳回原因：" + "\n" + hyDriverCarInfo1.getRejectReasonDescription());
+                newsInfo.setBussId(hyDriverCarInfo1.getId());
+                newsInfo.setNewsTypeKey("1");
+                newsInfo.setNewsType("系统消息");
+                newsInfoService.addNewsInfo(newsInfo);
             }
             //更改车辆状态信息
             this.updateById(hyDriverCarInfo1);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyBaoTokenServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.HyBaoToken;
+import com.yh.saas.plugin.yiliangyiyun.mapper.HyBaoTokenMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IHyBaoTokenService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 记录token 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-08-09
+ */
+@Service
+public class HyBaoTokenServiceImpl extends ServiceImpl<HyBaoTokenMapper, HyBaoToken> implements IHyBaoTokenService {
+
+}

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -28,7 +28,6 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 
 import org.apache.commons.httpclient.util.DateUtil;
-import org.apache.http.HttpStatus;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -438,7 +437,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId(orderInfo1.getCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCargoCommonId());
-                newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被司机 " + orderInfo1.getDriverName() + " 终止。");
+                newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被司机 " + orderInfo1.getDriverName() + " 终止。" + "\n" + "终止原因" + orderInfo1.getTerminationReasonDescription());
                 newsInfo.setNumber(orderInfo1.getOrderNo());
                 newsInfo.setBussId(orderInfo1.getId());
                 newsInfo.setNewsTypeKey("2");
@@ -455,7 +454,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setCrtCommonId(orderInfo1.getCargoCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
-                newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被货主 " + orderInfo1.getCargoOwner() + " 终止。");
+                newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "已被货主 " + orderInfo1.getCargoOwner() + " 终止。" + "\n" + "终止原因" + orderInfo1.getTerminationReasonDescription());
                 newsInfo.setNumber(orderInfo1.getOrderNo());
                 newsInfo.setBussId(orderInfo1.getId());
                 newsInfo.setNewsTypeKey("2");
@@ -949,27 +948,24 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     orderInfo1.setCargoOwnerStatusKey(StatusEnum.PLATFORM_REJECT_LOADING.getFlag());
                     //非垫付订单
                     if ("0".equals(orderInfo1.getFreightAdvance())) {
-                        //查询费用信息
-                        FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
-                                .eq("order_id", orderInfo1.getId()).eq("delete_flag", "0"));
                         if (orderInfo1.getCompId() != null && !orderInfo1.getCompId().isEmpty()) {
                             //货主是公司
                             HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo1.getCompId());
                             //将货主冻结金额解冻
                             Double d = hyCompanyInfo.getAccountBalance();
                             Double d1 = hyCompanyInfo.getFrozenAmount();
-                            hyCompanyInfo.setAccountBalance(d + freightInfo.getPrepaidFreight());
-                            hyCompanyInfo.setFrozenAmount(d1 - freightInfo.getPrepaidFreight());
+                            hyCompanyInfo.setAccountBalance(d + orderInfo1.getAdvanceCharge());
+                            hyCompanyInfo.setFrozenAmount(d1 - orderInfo1.getAdvanceCharge());
                             companyInfoService.updateById(hyCompanyInfo);
-                        } else if(freightInfo != null) {
+                        } else {
                             //货主是个人
                             HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
                                     .eq("common_id", orderInfo1.getCargoCommonId()).eq("delete_flag", "0"));
                             //将货主冻结金额解冻
                             Double d = hyCargoOwnerInfo.getAccountBalance();
                             Double d1 = hyCargoOwnerInfo.getFrozenAmount();
-                            hyCargoOwnerInfo.setAccountBalance(d + freightInfo.getPrepaidFreight());
-                            hyCargoOwnerInfo.setFrozenAmount(d1 - freightInfo.getPrepaidFreight());
+                            hyCargoOwnerInfo.setAccountBalance(d + orderInfo1.getAdvanceCharge());
+                            hyCargoOwnerInfo.setFrozenAmount(d1 - orderInfo1.getAdvanceCharge());
                             cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
                         }
                     }
@@ -1138,9 +1134,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String setPdf(OrderInfo orderInfo) throws DocumentException, IOException, URISyntaxException {
+        //订单信息
+        OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
         //货主签合同
         if (orderInfo.getTypeFlag().equals("1")) {
-            OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
             if ("2".equals(orderInfo.getSubmitFlag())) {
                 orderInfo1.setCargoOwnerContract("1");
             }
@@ -1155,7 +1152,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         else {
             //查询车辆信息
             HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>().eq("car_number", orderInfo.getCarNumber())
-                    .eq("delete_flag", "0"));
+                    .eq("common_id",orderInfo1.getCommonId()).eq("delete_flag", "0"));
             //车辆不存在
             if (hyDriverCarInfo == null){
                 throw new YException(YExceptionEnum.CAR_NOT_EXIST);
@@ -1170,8 +1167,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
                 }
             }
-            //订单信息
-            OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
             if ("2".equals(orderInfo.getSubmitFlag())) {
                 orderInfo1.setDriverContract("1");
             }

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyBaoTokenMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.yh.saas.plugin.yiliangyiyun.mapper.HyBaoTokenMapper">
+
+</mapper>