声纹信息与考核详情性别修改

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

@@ -63,6 +63,7 @@ import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
 
 @Controller
 public class TbXwRycjController {
+    PropertiesUtil p = new PropertiesUtil("application.properties");
     private Logger log= LoggerFactory.getLogger(this.getClass());
     @Autowired
     private AfisQualityService afisQualityService;
@@ -2909,17 +2910,17 @@ public class TbXwRycjController {
             long startTime=System.currentTimeMillis();//获取开始时间
             if(zwbh!=null&&zwbh.indexOf("4601")==0){
                 //imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNPalmByRybh?rybh="+zwbh);//株洲
-                imgstrs = hu.getJsonString("http://10.185.207.31:8082/data/getPSNPalmByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("pmzwurl4601")+"?rybh="+zwbh);
             }else if(zwbh!=null&&zwbh.indexOf("4602")==0){
                 //imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNPalmByRybh?rybh="+zwbh);//株洲
-                imgstrs = hu.getJsonString("http://74.41.47.102:8082/data/getPSNPalmByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("pmzwurl4602")+"?rybh="+zwbh);
             }else if(zwbh!=null&&zwbh.indexOf("469003")==0){
                 //imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNPalmByRybh?rybh="+zwbh);//株洲
-                imgstrs = hu.getJsonString("http://74.55.64.132:8082/data/getPSNPalmByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("pmzwurl469003")+"?rybh="+zwbh);
             }else{
                 //imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNPalmByRybh?rybh="+zwbh);
                 //imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNPalmByRybh?rybh="+zwbh);//湖南省厅
-                imgstrs = hu.getJsonString("http://74.10.26.181:8082/data/getPSNPalmByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("pmzwurl")+"?rybh="+zwbh);
             }
             long endTime=System.currentTimeMillis();//获取结束时间
             System.out.println("接口调用掌纹返回时长： "+(endTime-startTime)+"ms");
@@ -2964,17 +2965,17 @@ public class TbXwRycjController {
             long startTime=System.currentTimeMillis();//获取开始时间
             if(zwbh!=null&&zwbh.indexOf("4601")==0){
                 //imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNRollByRybh?rybh="+zwbh);//株洲
-                imgstrs = hu.getJsonString("http://10.185.207.31:8082/data/getPSNRollByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("gdzwurl4601")+"?rybh="+zwbh);
             }else if(zwbh!=null&&zwbh.indexOf("4602")==0){
                 //imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNRollByRybh?rybh="+zwbh);//株洲
-                imgstrs = hu.getJsonString("http://74.41.47.102:8082/data/getPSNRollByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("gdzwurl4602")+"?rybh="+zwbh);
             }else if(zwbh!=null&&zwbh.indexOf("469003")==0){
                 //imgstrs = hu.getJsonString("http://65.65.66.27:8081/data/getPSNRollByRybh?rybh="+zwbh);//株洲
-                imgstrs = hu.getJsonString("http://74.55.64.132:8082/data/getPSNRollByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("gdzwurl469003")+"?rybh="+zwbh);
             }else{
                 //imgstrs = hu.getJsonString("http://65.38.37.118:8081/data/getPSNRollByRybh?rybh="+zwbh);
                 //imgstrs = hu.getJsonString("http://10.142.16.171:8082/data/getPSNRollByRybh?rybh="+zwbh);//湖南省厅
-                imgstrs = hu.getJsonString("http://74.10.26.181:8082/data/getPSNRollByRybh?rybh="+zwbh);
+                imgstrs = hu.getJsonString(p.getValue("gdzwurl")+"?rybh="+zwbh);
             }
             long endTime=System.currentTimeMillis();//获取结束时间
             System.out.println("接口调用滚动指纹返回时长： "+(endTime-startTime)+"ms");

src/main/java/com/founder/khtj/controller/KhtjController.java

@@ -513,15 +513,7 @@ public class KhtjController {
             content[i] = new String[title.length];
             content[i][0] = autoTbStRy.getRybh();
             content[i][1] = autoTbStRy.getXm();
-            if ("1".equals(autoTbStRy.getXbdm())) {
-                content[i][2] = "男";
-            } else if ("2".equals(autoTbStRy.getXbdm())) {
-                content[i][2] = "女";
-            } else if ("9".equals(autoTbStRy.getXbdm())) {
-                content[i][2] = "未说明性别";
-            } else if ("0".equals(autoTbStRy.getXbdm())) {
-                content[i][2] = "未知性别";
-            }
+            content[i][2] = autoTbStRy.getXbdm();
             if (autoTbStRy.getGmsfhm() == null || "".equals(autoTbStRy.getGmsfhm())) {
                 content[i][3] = autoTbStRy.getZjhm();
             } else {

src/main/java/com/founder/model/TbStSw.java

@@ -27,6 +27,7 @@ public class TbStSw implements Serializable {
 
     //声纹数据
     public byte[] swsj;
+    public String swsjStr;
 
     //音频总时长
     public String zsc;
@@ -90,6 +91,24 @@ public class TbStSw implements Serializable {
     public String wjlj;
     //采集次数
     public int cjcs;
+    //设备厂商
+    public String sbcs;
+
+    public String getSwsjStr() {
+        return swsjStr;
+    }
+
+    public void setSwsjStr(String swsjStr) {
+        this.swsjStr = swsjStr;
+    }
+
+    public String getSbcs() {
+        return sbcs;
+    }
+
+    public void setSbcs(String sbcs) {
+        this.sbcs = sbcs;
+    }
 
     public String getXxzjbh() {
         return xxzjbh;

src/main/resources/application.properties

@@ -4,6 +4,17 @@ spring.profiles.active=dev
 #server.context-path=/demo
 #server.servlet.session.cookie.name=mycookies
 
+pmzwurl4601=http://74.10.26.181:8082/data/getPSNPalmByRybh
+pmzwurl4602=http://74.10.26.181:8082/data/getPSNPalmByRybh
+pmzwurl469003=http://74.10.26.181:8082/data/getPSNPalmByRybh
+pmzwurl=http://74.10.26.181:8082/data/getPSNPalmByRybh
+
+gdzwurl4601=http://74.10.26.181:8082/data/getPSNRollByRybh
+gdzwurl4602=http://74.10.26.181:8082/data/getPSNRollByRybh
+gdzwurl469003=http://74.10.26.181:8082/data/getPSNRollByRybh
+gdzwurl=http://74.10.26.181:8082/data/getPSNRollByRybh
+
+
 zwrwurl=http://172.18.117.11:8081/szxc/query/person
 zwrwurl4601=http://172.18.117.11:8081/szxc/query/person
 zwrwurl4602=http://172.18.117.11:8081/szxc/query/person