修复下载任务号数据和耳标号数据的状态默认值。

huimv-manage/pom.xml

@@ -221,6 +221,22 @@
             <artifactId>jjwt</artifactId>
             <version>0.9.1</version>
         </dependency>
+        <!--Excel-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>3.17</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -69,7 +69,6 @@ public class EarmarkController {
      */
     @RequestMapping(value = "/getEarmark",method = RequestMethod.GET)
     public Result getEarmark(@RequestParam(value = "applyId") int applyId, HttpServletRequest request) throws IOException {
-        System.out.println("applyId="+applyId);
         //
         return earmarkService.getEarmark(applyId);
     }

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

@@ -126,11 +126,11 @@ public class EarmarkServiceImpl implements IEarmarkService {
     public Result getEarmark(int applyId) throws IOException {
         // 构造请求
         String requestXML = earmarkTask.getRequestEarmarkXML(applyId);
-        System.out.println("requestXML="+requestXML);
+//        System.out.println("requestXML="+requestXML);
 
         // 调用接口返回结果
         String earMarkReponseXML = soap.callSoap(requestXML,webServiceUrl);
-        System.out.println("earMarkReponseXML="+earMarkReponseXML);
+//        System.out.println("earMarkReponseXML="+earMarkReponseXML);
 
         // 解析结果
         JSONArray downloadEarmarkJa = earmarkTask.parseEarMarkReponseXML(earMarkReponseXML);
@@ -139,7 +139,6 @@ public class EarmarkServiceImpl implements IEarmarkService {
         if(newEarmarkJa.size() == 0){
             return new Result(Const.CODE_NO_NEW_EARMARK,Const.NO_NEW_EARMARK,false);
         }
-
         for(int a=0;a<newEarmarkJa.size();a++){
             JSONObject earmarkJo = newEarmarkJa.getJSONObject(a);
             EtEarmarkEntity earmarkEntity = new EtEarmarkEntity();
@@ -148,6 +147,10 @@ public class EarmarkServiceImpl implements IEarmarkService {
             earmarkEntity.setEarmarkNumber(earmarkJo.getString("earmarkNumber"));
             earmarkEntity.setApplyId(earmarkJo.getString("applyId"));
             earmarkEntity.setEarmarkData(codeUtil.convertBase64BinaryToHex(earmarkJo.getString("earmarkData")));
+            earmarkEntity.setSetPrintState(0);
+            earmarkEntity.setSetWriteState(0);
+            earmarkEntity.setSetDownState(0);
+            earmarkEntity.setSetUploadState(0);
             earmarkRepo.saveAndFlush(earmarkEntity);
         }
         return new Result(Const.CODE_OK,"本次下载"+newEarmarkJa.size()+"个新耳标号数据.",false);

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

@@ -104,18 +104,17 @@ public class PackageServiceImpl implements IPackageService {
 
         //调用接口获取远程数据
         String answerXML = soap.callSoap(packageTask.getNewPackageRequestXML(applyId),webServiceUrl);
-        log.info("应答文件="+answerXML);
+//        log.info("应答文件="+answerXML);
 
         //解析应答数据
         JSONArray downPackageJa = packageTask.parseNewPackageAnswerXML(answerXML);
-        System.out.println("downPackageJa.zie="+downPackageJa.size());
+//        System.out.println("downPackageJa.zie="+downPackageJa.size());
 
         // 过滤已经存在批次数据
         JSONArray newPackageJa = filterPackage(downPackageJa);
         if(newPackageJa.size() == 0){
             return new Result(Const.CODE_PACKAGE_EXIST, Const.PACKAGE_EXIST,false);
         }
-
         //新批次数据入库
         for(int a=0;a<newPackageJa.size();a++){
             JSONObject packageJo = newPackageJa.getJSONObject(a);
@@ -125,6 +124,7 @@ public class PackageServiceImpl implements IPackageService {
             newPackageEntity.setApplyId(packageJo.getIntValue("applyID"));
             newPackageEntity.setPackageData(packageJo.getString("packageData"));
             newPackageEntity.setDownloadDate(new Timestamp(new Date().getTime()));
+            newPackageEntity.setProduceState(0);
             packageRepo.saveAndFlush(newPackageEntity);
         }
         return new Result(Const.CODE_OK,Const.SAVE_NEW_PACKAGE,true);