增加虹膜数据推送时的代码转换

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

@@ -3832,6 +3832,7 @@ public class TbXwRycjController {
                         model.addAttribute("unitcode",user.getUnitcode());
                         returnStr="home.html";
                     }else if("RYXX".equals(pagetype)||"ryxx".equals(pagetype)){
+                        model.addAttribute("user",user);
                         model.addAttribute("username",user.getUsername());
                         String scheme = request.getScheme();//http
                         String serverName = request.getServerName();//IP

src/main/java/com/founder/dao/HmCjDao.java

 package com.founder.dao;
 
+import com.founder.model.SysCodeSwitching;
 import com.founder.model.TbStHm;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
@@ -13,4 +14,5 @@ public interface HmCjDao {
     int insertHmSjXx(TbStHm tbStHm);
     int updateHmSjXx(TbStHm tbStHm);
     List<TbStHm> getHmxxInfoList(String rybh);
+    SysCodeSwitching getCodexx(String code);
 }

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

+package com.founder.model;
+
+import java.util.Date;
+
+public class SysCodeSwitching extends PageBean{
+
+    private String id;
+    private String code_old;
+    private String code_new;
+    private String name_old;
+    private String name_new;
+    private String groupid;
+    private String remark;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCode_old() {
+        return code_old;
+    }
+
+    public void setCode_old(String code_old) {
+        this.code_old = code_old;
+    }
+
+    public String getCode_new() {
+        return code_new;
+    }
+
+    public void setCode_new(String code_new) {
+        this.code_new = code_new;
+    }
+
+    public String getName_old() {
+        return name_old;
+    }
+
+    public void setName_old(String name_old) {
+        this.name_old = name_old;
+    }
+
+    public String getName_new() {
+        return name_new;
+    }
+
+    public void setName_new(String name_new) {
+        this.name_new = name_new;
+    }
+
+    public String getGroupid() {
+        return groupid;
+    }
+
+    public void setGroupid(String groupid) {
+        this.groupid = groupid;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
\ No newline at end of file

src/main/java/com/founder/service/IHmCjService.java

 package com.founder.service;
 
+import com.founder.model.SysCodeSwitching;
 import com.founder.model.TbStHm;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IHmCjService {
 
@@ -21,4 +23,6 @@ public interface IHmCjService {
     Boolean updateHmSjXx(TbStHm tbStHm,String ssdw);
     //获取虹膜信息
     List<TbStHm> getHmxxInfoList(String rybh);
+    //获取转换的单位信息
+    SysCodeSwitching getCodexx(String code);
 }

src/main/java/com/founder/service/impl/HmCjServiceImpl.java

@@ -4,6 +4,7 @@ package com.founder.service.impl;
 import com.founder.dao.HmCjDao;
 import com.founder.dao.SwCjDao;
 import com.founder.jwzhDao.JwzhDao;
+import com.founder.model.SysCodeSwitching;
 import com.founder.model.TbStHm;
 import com.founder.service.IHmCjService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,4 +58,9 @@ public class HmCjServiceImpl implements IHmCjService {
         List<TbStHm> tbStHm = hmCjDao.getHmxxInfoList(rybh);
         return tbStHm;
     }
+    @Override
+    public SysCodeSwitching getCodexx(String code) {
+        SysCodeSwitching scs = hmCjDao.getCodexx(code);
+        return scs;
+    }
 }

src/main/resources/mapper/HmCjSqlMapper.xml

@@ -87,4 +87,13 @@
         SBCSDM,
         XXSC_PDBZ from TB_XW_YTHCJ_HM where (XXSC_PDBZ='0' or XXSC_PDBZ is null) and RYBH = #{rybh , jdbcType=VARCHAR }
     </select>
+    <select id="getCodexx" parameterType="java.lang.String"  resultType="com.founder.model.SysCodeSwitching">
+        select ID,
+        CODE_OLD,
+        CODE_NEW,
+        NAME_OLD,
+        NAME_NEW,
+        GROUPID,
+        REMARK from SYS_CODE_SWITCHING where (SCBZ='0' or SCBZ is null) and CODE_OLD = #{code , jdbcType=VARCHAR }
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/templates/hmcj/index.html

@@ -121,6 +121,7 @@
                 </tr>
                 <tr>
                     <td colspan="3" style="text-align: center">
+                        <!--<img id="leftEye" src="/static/hmcj/images/eyesuggest.png" style="width: 200px;height: 200px">-->
                         <img id="leftEye" src="/static/hmcj/images/eyesuggest.png" style="width: 200px;height: 200px">
                         <div >
                             <h3 style="float: left;margin-left: 22px;">左眼</h3>
@@ -159,6 +160,11 @@
                         <button type="button" class="btn_style" id="baocun" onclick="baocun()">保存</button>
                     </td>
                 </tr>
+                <tr>
+                    <td colspan="3" style="text-align: center">
+                        <button type="button" class="btn_style" id="ts" onclick="hbhmts()">数据推送</button>
+                    </td>
+                </tr>
             </table>
         </td>
         <td class="display_panel">

src/main/resources/templates/rygl/addryxx.html

@@ -1893,32 +1893,53 @@
 
         //虹膜采集
         function hmcj2(){
-            var url = "http://26.13.5.62:20082?client_id=nmfangzheng&client_secret=nmfangzheng&version=1.0" +
-                    "&personCode="+$("#rybh").val()+"&user_id="+$("#identitycard").val()+"&user_dept="+$("#unitcode").val()+"&user_deptname="+$("#lrdwmc").val() +"&lrbz=3" +
-                    "&zjbz=1&rylb=900&cjcd=11&xm="+$("#xm").val()+"&zjdm=111&zjhm="+$("#gmsfhm").val()+"&xbdm="+$("#xbdm").combobox("getValue")+
-                    "&mzdm="+$("#mzdm").combobox("getValue")+"&gjdm="+$("#gjdm").combobox("getValue")+"&csrq="+$("#gmsfhm").val().substr(6,4)+"-"+$("#gmsfhm").val().substr(10,2)+"-"+$("#gmsfhm").val().substr(12,2)+
-                    "&cjr_xm="+$("#truename").val()+"&cjr_gmsfhm="+$("#identitycard").val()+"&zjqfjg=&zjyxqx=" +
-                    "&hjdz="+$("#hjdzDzmc").val()+"&jzdz="+$("#xzzDzmc").val()+"&zjzpsrc=&sjhm="+ $("#lxdm").val()+
-                    "&cjbz=&hxjk=&token=";
-            //alert(url);
-            winOpens=window.open(encodeURI(url));
-            //设置定时器
-            timerss=window.setInterval(function IfWindowClosed() {
-                //alert("状态====="+winOpens.closed)
-                if (winOpens.closed == true) {
-                    hmcx();
-                    //清空定时器
-                    window.clearInterval(timerss);
-                }
-            },2000);
+            if(ifhm==1){
+                if($("#unitcode").val().substr(0,4)=="4301"||$("#unitcode").val().substr(0,4)=="4302"||$("#unitcode").val().substr(0,4)=="4303"||$("#unitcode").val().substr(0,4)=="4304"||$("#unitcode").val().substr(0,4)=="4305"||$("#unitcode").val().substr(0,4)=="4306"||$("#unitcode").val().substr(0,4)=="4307"||$("#unitcode").val().substr(0,4)=="4310"||$("#unitcode").val().substr(0,4)=="4331") {
+                    var url = "http://26.13.5.62:20082?client_id=xietong&client_secret=xietong&version=1.0" +
+                            "&personCode=" + $("#rybh").val() + "&user_id=" + $("#identitycard").val() + "&user_dept=" + $("#unitcode").val() + "&user_deptname=" + $("#unitname").val() + "&lrbz=3" +
+                            "&zjbz=1&rylb=900&cjcd=11&xm=" + $("#xm").val() + "&zjdm=111&zjhm=" + $("#gmsfhm").val() + "&xbdm=" + $("#xbdm").combobox("getValue") +
+                            "&mzdm=" + $("#mzdm").combobox("getValue") + "&gjdm=" + $("#gjdm").combobox("getValue") + "&csrq=" + $("#gmsfhm").val().substr(6, 4) + "-" + $("#gmsfhm").val().substr(10, 2) + "-" + $("#gmsfhm").val().substr(12, 2) +
+                            "&cjr_xm=" + $("#truename").val() + "&cjr_gmsfhm=" + $("#identitycard").val() + "&zjqfjg=&zjyxqx=" +
+                            "&hjdz=" + $("#hjdzDzmc").val() + "&jzdz=" + $("#xzzDzmc").val() + "&zjzpsrc=&sjhm=" + $("#lxdm").val() +
+                            "&cjbz=&hxjk=&token=";
+                    winOpens = window.open(encodeURI(url));
+                    //设置定时器
+                    timerss = window.setInterval(function IfWindowClosed() {
+                        //alert("状态====="+winOpens.closed)
+                        if (winOpens.closed == true) {
+                            hmcx("10.5.47.33");
+                            //清空定时器
+                            window.clearInterval(timerss);
+                        }
+                    }, 2000);
+                }else{
+                    var url = "http://10.5.47.33:20082?client_id=xietong&client_secret=xietong&version=1.0" +
+                            "&personCode=" + $("#rybh").val() + "&user_id=" + $("#identitycard").val() + "&user_dept=" + $("#unitcode").val() + "&user_deptname=" + $("#unitname").val() + "&lrbz=3" +
+                            "&zjbz=1&rylb=900&cjcd=11&xm=" + $("#xm").val() + "&zjdm=111&zjhm=" + $("#gmsfhm").val() + "&xbdm=" + $("#xbdm").combobox("getValue") +
+                            "&mzdm=" + $("#mzdm").combobox("getValue") + "&gjdm=" + $("#gjdm").combobox("getValue") + "&csrq=" + $("#gmsfhm").val().substr(6, 4) + "-" + $("#gmsfhm").val().substr(10, 2) + "-" + $("#gmsfhm").val().substr(12, 2) +
+                            "&cjr_xm=" + $("#truename").val() + "&cjr_gmsfhm=" + $("#identitycard").val() + "&zjqfjg=&zjyxqx=" +
+                            "&hjdz=" + $("#hjdzDzmc").val() + "&jzdz=" + $("#xzzDzmc").val() + "&zjzpsrc=&sjhm=" + $("#lxdm").val() +
+                            "&cjbz=&hxjk=&token=";
+                    winOpens = window.open(encodeURI(url));
+                    //设置定时器
+                    timerss = window.setInterval(function IfWindowClosed() {
+                        //alert("状态====="+winOpens.closed)
+                        if (winOpens.closed == true) {
+                            hmcx("10.5.47.33");
+                            //清空定时器
+                            window.clearInterval(timerss);
+                        }
+                    }, 2000);
+                }
+            }
         }
 
         //虹膜查询
-        function hmcx(){
+        function hmcx(ipstr){
             debugger;
             //var url = "http://39.104.54.227:9080/Api/iris/queryrybh";
             $.ajax({
-                url:"hmxxCx?asjxgrybh="+$("#rybh").val(),
+                url:"hmxxCx?asjxgrybh="+$("#rybh").val()+"&hmurlstr="+ipstr,
                 type:"post",
                 dataType:"json",
                 success:function(data){
@@ -1960,6 +1981,7 @@
         <input type="hidden" id="flag" name="flag" th:value="1"/>
         <input type="hidden" id="username" th:value="${username}"/>
         <input type="hidden" id="unitcode" th:value="${unitcode}"/>
+        <input type="hidden" id="unitname" th:value="${user.unitname}"/>
         <input type="hidden" id="identitycard" th:value="${user.identitycard}"/>
         <input type="hidden" id="truename" th:value="${user.trueName}"/>
         <input type="hidden" id="cjsb" name="cjsb" th:value="${cjsb}"/>