增加导出空白耳标号功能

huimv-manage/pom.xml

@@ -245,6 +245,11 @@
             <artifactId>commons-compress</artifactId>
             <version>1.9</version>
         </dependency>
+        <!-- actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -188,6 +188,23 @@ public class EarmarkController {
         earmarkService.exportEarmarkByApply(applyId,printState,quantity,response,request);
     }
 
+    @RequestMapping(value = "/exportPageNoWriteEarmarkByApply",method = RequestMethod.GET)
+    public void exportPageNoWriteEarmarkByApply(@RequestParam(value = "applyId",required = true) Integer applyId,
+                                         @RequestParam(value = "printState",required = false) Integer printState,
+                                          @RequestParam(value = "writeState",required = false) Integer writeState,
+                                         @RequestParam(value = "quantity",required = true) Integer quantity,
+                                         HttpServletResponse response,HttpServletRequest request) throws IOException, ArchiveException {
+        log.info("applyId="+applyId);
+        log.info("printState="+printState);
+        log.info("writeState="+writeState);
+        log.info("quantity="+quantity);
+        if(writeState == null){
+            writeState = 0;
+        }
+        //导出数据到excel格式
+        earmarkService.exportEarmarkByApply(applyId,printState,writeState,quantity,response,request);
+    }
+
     /**
      * @Method      : exportEarmarkByEarmark
      * @Description : 通过耳标号到处耳标数据

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

@@ -44,4 +44,7 @@ public interface IEarmarkService {
     void exportTest2(Integer applyId, Integer printState, Integer quantity, HttpServletResponse response, HttpServletRequest request) throws IOException;
 
     void export1(Integer applyId, Integer printState, Integer quantity, HttpServletResponse response, HttpServletRequest request) throws IOException, ArchiveException;
+
+    //
+    void exportEarmarkByApply(Integer applyId, Integer printState, Integer writeState, Integer quantity, HttpServletResponse response, HttpServletRequest request) throws IOException, ArchiveException;
 }

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

@@ -351,6 +351,7 @@ public class EarmarkServiceImpl implements IEarmarkService {
         }
     }
 
+    //--old
     public void exportEarmarkByApply_old(Integer applyId, Integer printState, Integer quantity, HttpServletResponse response) throws IOException {
         Specification<EtEarmarkEntity> specific = (Specification<EtEarmarkEntity>) (root, criteriaQuery, criteriaBuilder) -> {
             //
@@ -657,6 +658,44 @@ public class EarmarkServiceImpl implements IEarmarkService {
 
     }
 
+    @Override
+    public void exportEarmarkByApply(Integer applyId, Integer printState, Integer writeState, Integer quantity, HttpServletResponse response, HttpServletRequest request) throws IOException, ArchiveException {
+        Specification<EtEarmarkEntity> specific = (Specification<EtEarmarkEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            //applyId
+            if (null != applyId) {
+                predList.add(criteriaBuilder.equal(root.get("applyId").as(Integer.class), applyId));
+            }
+            //printState
+            if (null != printState && printState != 0) {
+                predList.add(criteriaBuilder.equal(root.get("printState").as(Integer.class), printState));
+            }
+            //writeState
+            if (null != writeState) {
+                predList.add(criteriaBuilder.equal(root.get("setWriteState").as(Integer.class), writeState));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.asc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        //
+        List<EtEarmarkEntity> dataList = earmarkRepo.findAll(specific);
+        log.info("导出数据数量=" + dataList.size());
+        if(dataList.size()>0){
+            //导出耳标数据到文本文件
+            txtUtil.exportEarmarkToTxt(response,String.valueOf(applyId), dataList, quantity,request);
+        }else{
+            //导出空数据到文本文件
+            txtUtil.exportEmptyEarmarkToTxt(response,String.valueOf(applyId),request);
+        }
+    }
+
     /**
      * 获取项目根路径
      *

huimv-manage/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: gov_eartag
+    name: huimv-manage
 
   #------DataSource-----
   datasource:

huimv-manage/src/main/resources/application-prod.yml

@@ -0,0 +1,26 @@
+server:
+  port: 8991
+
+spring:
+  application:
+    name: huimv-manage
+
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://122.112.224.199:3306/huimv?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    database: mysql
+    hibernate:
+      ddl-auto: update
+      naming:
+        physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    show-sql: true
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+

huimv-manage/src/main/resources/application-public.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: gov_eartag
+    name: huimv-manage
 
   #------DataSource-----
   datasource:

huimv-manage/src/main/resources/application.properties

@@ -1,5 +1,6 @@
 #spring.profiles.active=dev
-spring.profiles.active=public
+#spring.profiles.active=public
+spring.profiles.active=prod
 
 #���ӳ�
 #spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource
@@ -19,4 +20,7 @@ webservice.url=http://atap.cadc.net.cn:80/EarMarkManage/WebService2/ProduceMissi
 #测试producerId
 #webservice.producerId=161374
 #正式producerId
-webservice.producerId=162048
+webservice.producerId=162048
+
+#开启健康监控
+management.endpoints.web.exposure.include=*