Merge remote-tracking branch 'remotes/origin/master'

pom.xml

@@ -35,6 +35,8 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+
         <!-- servlet 依赖 -->
         <dependency>
             <groupId>javax.servlet</groupId>

src/main/java/com/founder/common/CodeMsg.java

+package com.founder.common;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@ConfigurationProperties(prefix = "codemsg")
+public class CodeMsg {
+    public List<Map<String, String>> getStatus() {
+        return status;
+    }
+
+    public void setStatus(List<Map<String, String>> status) {
+        this.status = status;
+    }
+
+    private List<Map<String, String>> status = new ArrayList<>();
+}
\ No newline at end of file

src/main/java/com/founder/controller/FaceController.java

 package com.founder.controller;
 
 
+import com.founder.common.CodeMsg;
 import com.founder.model.Face;
 import com.founder.service.AutoSeqService;
 import com.founder.service.FaceService;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
+import java.util.Map;
 
 @Controller
 public class FaceController {
@@ -16,9 +18,20 @@ public class FaceController {
     private FaceService faceService;
     @Autowired
     private AutoSeqService autoSeqService;
+    @Autowired
+    private CodeMsg codeMsg;
     @RequestMapping("/query")
     public String query() {
      List<Face> face = faceService.query();
+        for (Map<String, String> item : codeMsg.getStatus()) {
+            if (item.get("code").equals("001"))
+               System.out.println( item.get("name"));
+        }
+        codeMsg.getStatus().forEach(item->{
+            if("001".equals(item.get("code"))){
+                System.out.println(item.get("name"));
+            }
+        });
      String noo=   autoSeqService.xxzjbhFnVal("TB_ST_ASJ","1400000000000");
         return noo;
     }

src/main/resources/application-dev.yml

@@ -10,3 +10,43 @@ spring:
   jpa:
     show-sql: true
 
+
+ftpserverip: 47.92.129.99
+ftpport: 4546
+ftpuser: ftpuser
+ftppass: p@ssw0rd[123]
+ftpbathPath: /home/ftpuser/www/xinjiangbingtuan/FZXZ
+ftpfilePath: /xinjiangbingtuan/FZXZ
+
+codemsg:
+    status:
+      - code: "10101"
+        name: "入库成功"
+      - code: "10102"
+        name: "入库执行中"
+      - code: "10103"
+        name: "结果查询成功"
+      - code: "10104"
+        name: "比对核查进行中"
+      - code: "10105"
+        name: "比对核查已完成"
+      - code: "10201"
+        name: "Zip解压失败"
+      - code: "10202"
+        name: "头文件解析失败"
+      - code: "10203"
+        name: "内容文件解析失败"
+      - code: "10299"
+        name: "服务方执行异常"
+      - code: "10301"
+        name: "采集信息类别代码错误"
+      - code: "10303"
+        name: "数据内容质量验证错误"
+      - code: "10304"
+        name: "数据量超限"
+      - code: "10305"
+        name: "数据包编号重复（任务号重复）"
+      - code: "10306"
+        name: "用户信息验证错误"
+      - code: "19999"
+        name: "其他错误"