无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/controller/param/ParamController.java

@@ -2,6 +2,7 @@ package com.jkcredit.invoice.controller.param;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
+import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.util.RespR;
@@ -36,7 +37,7 @@ public class ParamController {
      */
     @PostMapping("/page")
     @ApiOperation(value="分页查询参数管理", notes="分页查询参数管理")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR getParamPage(Page page, Param param) {
         return new RespR<>(paramService.getParamWithRolePage(page, param));
     }
@@ -51,7 +52,7 @@ public class ParamController {
      */
     @PostMapping
     @ApiOperation(value="新增参数详细信息", notes="新增参数详细信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR param(@RequestBody Param param) {
         Param param1 = paramService.getParamsByParamName(param.getParamName());
         if(param1 != null){
@@ -71,7 +72,7 @@ public class ParamController {
      */
     @PostMapping("/updateParam")
     @ApiOperation(value="更新参数信息", notes="更新参数信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateUser(@RequestBody Param param) {
         return new RespR<>(paramService.updateParam(param));
     }

src/main/java/com/jkcredit/invoice/controller/user/RoleController.java

@@ -1,6 +1,7 @@
 package com.jkcredit.invoice.controller.user;
 
 import com.jkcredit.invoice.annotation.LoginRequired;
+import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
 import com.jkcredit.invoice.service.user.RoleService;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
@@ -24,7 +25,7 @@ public class RoleController {
     @Autowired
     private RoleService roleService;
 
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     @PostMapping(value = "/list")
     @ApiOperation(value="角色列表", notes="角色列表")
     public RespR roleList(){

src/main/java/com/jkcredit/invoice/controller/user/UserController.java

@@ -40,7 +40,10 @@ public class UserController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "用id", required = true, dataType = "Integer")
     })
-    public RespR user(@PathVariable Integer id) {
+    public RespR user(@PathVariable Integer id,User user) {
+        if(!AuthenticationInterceptor.AUTH_ADMIN.equals(user.getRoleId()) && !(user.getId().compareTo(id)==0)){
+            return new RespR<>(false,"无权限");
+        }
         return new RespR<>(userService.selectUserById(id));
     }
 
@@ -52,7 +55,7 @@ public class UserController {
      */
     @DeleteMapping("/{id}")
     @ApiOperation(value="根据用户名id删除用户信息", notes="根据用户名id删除用户信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR userDel(@PathVariable Integer id) {
         User sysUser = userService.getById(id);
         return new RespR<>(userService.deleteUserById(sysUser));
@@ -66,7 +69,7 @@ public class UserController {
      */
     @PostMapping
     @ApiOperation(value="新增用户详细信息", notes="新增用户详细信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR user(@RequestBody User user) {
         user.setPassword(MD5Util.encrypt(user.getPassword()));
         User user1 = userService.selectUserByUserName(user.getUserName());
@@ -84,7 +87,7 @@ public class UserController {
      */
     @PostMapping("/updateUser")
     @ApiOperation(value="更新用户信息", notes="更新用户信息")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateUser(@RequestBody User user) {
         if(user.getPassword()!=null){
             user.setPassword(MD5Util.encrypt(user.getPassword()));
@@ -113,7 +116,7 @@ public class UserController {
      */
     @PutMapping("/restPassword")
     @ApiOperation(value="重置密码", notes="重置密码")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateUserInfoPassWord(@RequestBody User user) {
         user.setPassword(MD5Util.encrypt(user.getPassword()));
         return userService.restPassword(user);
@@ -127,7 +130,7 @@ public class UserController {
      */
     @PutMapping("/lock")
     @ApiOperation(value="修改锁定状态", notes="修改锁定状态")
-    @LoginRequired
+    @LoginRequired(role = AuthenticationInterceptor.AUTH_ADMIN)
     public RespR updateLock(@RequestBody User user) {
         return userService.updateLock(user);
     }

src/main/java/com/jkcredit/invoice/credit/interserver/NoCarInterServiceImpl.java

@@ -32,8 +32,6 @@ import java.util.List;
 
 import static com.jkcredit.invoice.common.CommonConst.*;
 import static java.util.stream.Collectors.toList;
-
-
 @Service("noCarInterService")
 @Slf4j
 public class NoCarInterServiceImpl implements NoCarInterService {

src/main/java/com/jkcredit/invoice/service/thead/ThreadPoolFactory.java

@@ -0,0 +1,16 @@
+package com.jkcredit.invoice.service.thead;
+
+import java.util.concurrent.*;
+
+public class ThreadPoolFactory {
+
+    public static ExecutorService getThreadPool(String name,int coreSize,int maxSize){
+        ExecutorService executorService = new ThreadPoolExecutor(coreSize, maxSize, 2000, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(2000), new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                return new Thread(r,name);
+            }
+        });
+        return executorService;
+    }
+}

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -12,6 +12,7 @@ import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerservice.vo.SelfCarDueQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.selfcar.SelfCarTradeService;
+import com.jkcredit.invoice.service.thead.ThreadPoolFactory;
 import com.jkcredit.invoice.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,8 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * @description:
@@ -35,7 +38,7 @@ import java.util.List;
 @Slf4j
 public class ScheduledBillTask {
     
-    
+    ExecutorService executorService = ThreadPoolFactory.getThreadPool("qupaioxiancheng",40,50);
     @Autowired
     NoCarWaybillMapper noCarWaybillMapper;
 
@@ -94,21 +97,18 @@ public class ScheduledBillTask {
                if(noCarWayBillsMdEndi == null || noCarWayBillsMdEndi.size()==0){
                    continue;
                }
-               new Thread(new Runnable() {
-                   @Override
-                   public void run() {
-                       log.info("qupiaoshumu"+noCarWayBillsMdEndi.size());
-                       for(NoCarWayBill noCarWayBill:noCarWayBillsMdEndi){
-                           log.info("实时取票运单"+noCarWayBill.getBillNum());
-                           try {
-                               noCarService.getInvoiceByWayBillNumReal(noCarWayBill,false);
-                           }catch (Exception e){
-                               log.debug("取票失败"+noCarWayBill.getBillNum()+e.getMessage());
-                           }
+               executorService.execute(()->{
+                   log.info("qupiaoshumu"+noCarWayBillsMdEndi.size());
+                   for(NoCarWayBill noCarWayBill:noCarWayBillsMdEndi){
+                       log.info("实时取票运单"+noCarWayBill.getBillNum());
+                       try {
+                           noCarService.getInvoiceByWayBillNumReal(noCarWayBill,false);
+                       }catch (Exception e){
+                           log.debug("取票失败"+noCarWayBill.getBillNum()+e.getMessage());
                        }
-                       log.info("qupiaoshumujiesu"+noCarWayBillsMdEndi.size());
                    }
-               },"qupaioxiancheng"+page).start();
+                   log.info("qupiaoshumujiesu"+noCarWayBillsMdEndi.size());
+               });
             }
 
             log.info("实时取票数量"+noCarWayBillsMdEnd.size()+"jiesula");

src/main/java/com/jkcredit/invoice/util/DateUtil.java

@@ -13,9 +13,8 @@ import java.util.Date;
 
 /**
  * @description: 日期时间工具类
- * @author: sunzhaoning
- * @create: 2019-06-19 15:58
- * @version: V1.0
+ * @author: hyh
+ * @create: 2023-01-08 15:58
  **/
 
 public class DateUtil {