给每个接口增加Token，并重建目录

huimv-manage/src/main/java/com/huimv/manage/controller/ApplyController.java

@@ -1,7 +1,7 @@
-package com.huimv.manage.controller;
+package com.huimv.manage.eartag.controller;
 
 import com.alibaba.fastjson.JSONArray;
-import com.huimv.manage.service.IApplyService;
+import com.huimv.manage.eartag.service.IApplyService;
 import com.huimv.manage.util.Const;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.webservice.Soap;
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 
 /**
@@ -48,14 +49,15 @@ public class ApplyController {
      * @Time        : 20:28
      */
     @RequestMapping(value = "/listApply",method = RequestMethod.GET)
-//    public Result listApply(@RequestParam(value = "accessToken",required=false) String accessToken,
-//                            @RequestParam(value = "applyId",required=false) int applyId,
-//                            @RequestParam(value = "startDate",required=false) String startDate,
-//                            @RequestParam(value = "endDate",required=false) String endDate,
-//                            @RequestParam(value = "returnState",required=false) int returnState,
-//                            @RequestParam(value = "deliverState",required=false) int deliverState,
-//                            @RequestParam(value = "pageSize",required=true) int pageSize)
-    public Result listApply()
+    public Result listApply(@RequestParam(value = "accessToken",required=false) String accessToken,
+                            @RequestParam(value = "applyId",required=false) int applyId,
+                            @RequestParam(value = "startDate",required=false) String startDate,
+                            @RequestParam(value = "endDate",required=false) String endDate,
+                            @RequestParam(value = "returnState",required=false) int returnState,
+                            @RequestParam(value = "deliverState",required=false) int deliverState,
+                            @RequestParam(value = "pageSize",required=true) int pageSize,
+                            HttpServletRequest request)
+//    public Result listApply()
     {
 
         return applyService.listApply();
@@ -72,7 +74,7 @@ public class ApplyController {
      * @Time        : 20:29
      */
     @RequestMapping(value = "/getNewApply",method = RequestMethod.GET)
-    public Result getNewTask() throws UnsupportedEncodingException {
+    public Result getNewTask(HttpServletRequest request) throws UnsupportedEncodingException {
         log.info("producerId>>"+producerId);
         log.info("webServiceUrl>>"+webServiceUrl);
         // 从远程接口下载新任务号数据
@@ -109,7 +111,7 @@ public class ApplyController {
      * @Time        : 11:08
      */
     @RequestMapping(value = "/setReturnDownloadState",method = RequestMethod.GET)
-    public Result setReturnDownloadState(@RequestParam(value = "applyId") int applyId) throws UnsupportedEncodingException {
+    public Result setReturnDownloadState(@RequestParam(value = "applyId") int applyId, HttpServletRequest request) throws UnsupportedEncodingException {
         // Step1.构造请求字串
         // Step2.发送请求传
         // Step3.请求结果入库

huimv-manage/src/main/java/com/huimv/manage/controller/EarmarkController.java

@@ -1,7 +1,6 @@
-package com.huimv.manage.controller;
+package com.huimv.manage.eartag.controller;
 
-import com.huimv.manage.service.IEarmarkService;
-import com.huimv.manage.util.CodeUtil;
+import com.huimv.manage.eartag.service.IEarmarkService;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.webservice.task.EarmarkTask;
 import lombok.extern.slf4j.Slf4j;
@@ -9,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
@@ -31,13 +31,14 @@ public class EarmarkController {
 //    private String producerId;
 //    @Autowired
 //    private Soap soap;
+
     @Autowired
     private EarmarkTask earmarkTask;
     @Autowired
     private IEarmarkService earmarkService;
 
     @RequestMapping(value = "/listEarmark",method = RequestMethod.GET)
-    public Result listEarmark(@RequestParam(value = "pageSize") int pageSize){
+    public Result listEarmark(@RequestParam(value = "pageSize") int pageSize, HttpServletRequest request){
 //    public Result listEarmark(@RequestParam(value = "accessToken",required = true) String accessToken,
 //                              @RequestParam(value = "applyId",required = true) int applyId,
 //                              @RequestParam(value = "packageId",required = false) int packageId,
@@ -48,7 +49,7 @@ public class EarmarkController {
 //                              @RequestParam(value = "printState",required = false) int printState,
 //                              @RequestParam(value = "startDate",required = false) String startDate,
 //                              @RequestParam(value = "endDate",required = false) String endDate,
-//                              @RequestParam(value = "pageSize",required = true) int pageSize){
+//                              @RequestParam(value = "pageSize",required = true) int pageSize, HttpServletRequest request){
         //
         return earmarkService.listEarmark(pageSize);
     }
@@ -64,7 +65,8 @@ public class EarmarkController {
      * @Time        : 22:58
      */
     @RequestMapping(value = "/getEarmark",method = RequestMethod.GET)
-    public Result getEarmark(@RequestParam(value = "applyId") int applyId) throws IOException {
+    public Result getEarmark(@RequestParam(value = "applyId") int applyId, HttpServletRequest request) throws IOException {
+        System.out.println("applyId="+applyId);
         //
         return earmarkService.getEarmark(applyId);
     }
@@ -80,7 +82,7 @@ public class EarmarkController {
      * @Time        : 22:59
      */
     @RequestMapping(value = "/setUpdateDownState",method = RequestMethod.GET)
-    public Result setUpdateDownState(@RequestParam(value = "earMarkIDs") String earmarkIDs) throws UnsupportedEncodingException {
+    public Result setUpdateDownState(@RequestParam(value = "earMarkIDs") String earmarkIDs, HttpServletRequest request) throws UnsupportedEncodingException {
         //
         return earmarkService.setUpdateDownState(earmarkIDs);
     }
@@ -96,7 +98,7 @@ public class EarmarkController {
      * @Time        : 23:55
      */
     @RequestMapping(value = "/setProduceState",method = RequestMethod.GET)
-    public Result setProduceState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state){
+    public Result setProduceState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state, HttpServletRequest request){
         //
         return earmarkService.setProduceState(ids,state);
     }
@@ -112,7 +114,7 @@ public class EarmarkController {
      * @Time        : 0:02
      */
     @RequestMapping(value = "/setWriteState",method = RequestMethod.GET)
-    public Result setWriteState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state){
+    public Result setWriteState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state, HttpServletRequest request){
         //
         return earmarkService.setWriteState(ids,state);
     }
@@ -128,7 +130,7 @@ public class EarmarkController {
      * @Time        : 0:03
      */
     @RequestMapping(value = "/setPrintState",method = RequestMethod.GET)
-    public Result setPrintState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state){
+    public Result setPrintState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state, HttpServletRequest request){
         //
         return earmarkService.setPrintState(ids,state);
     }

huimv-manage/src/main/java/com/huimv/manage/controller/PackageController.java

@@ -1,6 +1,6 @@
-package com.huimv.manage.controller;
+package com.huimv.manage.eartag.controller;
 
-import com.huimv.manage.service.IPackageService;
+import com.huimv.manage.eartag.service.IPackageService;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.webservice.Soap;
 import com.huimv.manage.webservice.task.PackageTask;
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 
 /**
@@ -53,7 +54,7 @@ public class PackageController {
 //                              @RequestParam(value = "startDate",required = false) String startDate,
 //                              @RequestParam(value = "endDate",required = false) String endDate,
 //                              @RequestParam(value = "returnState",required = false) int returnState,
-//                              @RequestParam(value = "pageSize",required = true) int pageSize){
+//                              @RequestParam(value = "pageSize",required = true) int pageSize, HttpServletRequest request){
 
         //
         return packageService.listPackage(pageSize);
@@ -70,7 +71,7 @@ public class PackageController {
      * @Time        : 15:42
      */
     @RequestMapping(value = "/getNewPackage",method = RequestMethod.GET)
-    public Result getNewPackage(@RequestParam(value = "applyId") int applyId) throws UnsupportedEncodingException {
+    public Result getNewPackage(@RequestParam(value = "applyId") int applyId, HttpServletRequest request) throws UnsupportedEncodingException {
         //
         return packageService.getNewPackage(applyId);
     }
@@ -86,7 +87,7 @@ public class PackageController {
      * @Time        : 18:51
      */
     @RequestMapping(value = "/setReturnDownloadState",method = RequestMethod.GET)
-    public Result setReturnDownloadState(@RequestParam(value = "packageIds") String packageIds,@RequestParam(value = "ids") String ids) throws UnsupportedEncodingException {
+    public Result setReturnDownloadState(@RequestParam(value = "packageIds") String packageIds,@RequestParam(value = "ids") String ids, HttpServletRequest request) throws UnsupportedEncodingException {
         //
         return packageService.setReturnDownloadState(packageIds,ids);
     }
@@ -102,7 +103,7 @@ public class PackageController {
      * @Time        : 19:22
      */
     @RequestMapping(value = "/setProduceState",method = RequestMethod.GET)
-    public Result setProduceState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state){
+    public Result setProduceState(@RequestParam(value = "ids") String ids,@RequestParam(value = "state") int state, HttpServletRequest request){
         //
         return packageService.setProduceState(ids,state);
     }

huimv-manage/src/main/java/com/huimv/manage/service/IApplyService.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.service;
+package com.huimv.manage.eartag.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.huimv.manage.dao.entity.EtApplyEntity;

huimv-manage/src/main/java/com/huimv/manage/service/IEarmarkService.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.service;
+package com.huimv.manage.eartag.service;
 
 import com.huimv.manage.util.Result;
 

huimv-manage/src/main/java/com/huimv/manage/service/IPackageService.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.service;
+package com.huimv.manage.eartag.service;
 
 import com.huimv.manage.util.Result;
 

huimv-manage/src/main/java/com/huimv/manage/service/impl/ApplyServiceImpl.java

@@ -1,10 +1,10 @@
-package com.huimv.manage.service.impl;
+package com.huimv.manage.eartag.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.manage.dao.entity.EtApplyEntity;
 import com.huimv.manage.dao.repo.EtApplyRepo;
-import com.huimv.manage.service.IApplyService;
+import com.huimv.manage.eartag.service.IApplyService;
 import com.huimv.manage.util.Const;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.util.ResultCode;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
 import java.util.Date;
-import java.util.List;
 import java.util.Optional;
 
 /**

huimv-manage/src/main/java/com/huimv/manage/service/impl/EarmarkServiceImpl.java

@@ -1,20 +1,16 @@
-package com.huimv.manage.service.impl;
+package com.huimv.manage.eartag.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.manage.dao.entity.EtApplyEntity;
 import com.huimv.manage.dao.entity.EtEarmarkEntity;
-import com.huimv.manage.dao.entity.EtPackageEntity;
 import com.huimv.manage.dao.repo.EarmarkRepo;
-import com.huimv.manage.dao.repo.PackageRepo;
-import com.huimv.manage.service.IEarmarkService;
+import com.huimv.manage.eartag.service.IEarmarkService;
 import com.huimv.manage.util.CodeUtil;
 import com.huimv.manage.util.Const;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.util.ResultCode;
 import com.huimv.manage.webservice.Soap;
 import com.huimv.manage.webservice.task.EarmarkTask;
-import com.huimv.manage.webservice.task.PackageTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;

huimv-manage/src/main/java/com/huimv/manage/service/impl/PackageServiceImpl.java

@@ -1,10 +1,10 @@
-package com.huimv.manage.service.impl;
+package com.huimv.manage.eartag.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.manage.dao.entity.EtPackageEntity;
 import com.huimv.manage.dao.repo.PackageRepo;
-import com.huimv.manage.service.IPackageService;
+import com.huimv.manage.eartag.service.IPackageService;
 import com.huimv.manage.util.Const;
 import com.huimv.manage.util.Result;
 import com.huimv.manage.util.ResultCode;

huimv-manage/src/test/java/com/huimv/manage/controller/ApplyTest.java

@@ -1,12 +1,11 @@
-package com.huimv.manage.controller;
+package com.huimv.manage.eartag.controller;
 
 import com.huimv.manage.dao.entity.EtApplyEntity;
-import com.huimv.manage.service.IApplyService;
+import com.huimv.manage.eartag.service.IApplyService;
 import com.huimv.manage.util.Result;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
 

huimv-manage/src/test/java/com/huimv/manage/controller/Base64Test.java

@@ -1,4 +1,4 @@
-package com.huimv.manage.controller;
+package com.huimv.manage.eartag.controller;
 
 import com.huimv.manage.util.ImageUtils;
 import org.junit.jupiter.api.Test;

huimv-manage/src/test/java/com/huimv/manage/controller/ByteTest.java

@@ -1,23 +1,19 @@
-package com.huimv.manage.controller;
+package com.huimv.manage.eartag.controller;
 
 import com.huimv.manage.util.CodeUtil;
 import com.huimv.manage.util.HexUtils;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 
 import javax.xml.bind.DatatypeConverter;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
-import java.sql.SQLOutput;
 import java.util.Base64;//注意：这是jdk8才有的
 //import org.apache.commons.codec.binary.Base64;
 
-import java.util.Arrays;
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller