修改人员采集以及添加人员信息ZIP打包

sql/hnxtbatoot0002.20190723_yl_创建一体化采集相关数据表.txt

+INSERT INTO SYS_DBLOG(SID,STATUS)VALUES('hnxt0003',0);
+INSERT INTO SYS_DBLOG(SID,STATUS)VALUES('hnxt0003',0);
+COMMIT;
+--------------------------------虹膜------------------------------------
+
+CREATE TABLE TB_XW_YTHCJ_HM
+(
+XXZJBH   VARCHAR2(32 BYTE)                primary key ,
+        RYBH VARCHAR2(23 BYTE) NOT NULL,
+        XM VARCHAR2(50 BYTE),
+        GMSFHM VARCHAR2(18 BYTE),
+        HMYWDM   VARCHAR2(2 BYTE),
+        HMSJ   BLOB,
+        HMQSQKDM   VARCHAR2(2 BYTE),
+        SBXH  VARCHAR2(40 BYTE),
+        XXZLDF  VARCHAR2(40 BYTE),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_HM IS '虹膜信息数据表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.XM IS '被采集人姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.GMSFHM IS '身份证号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.HMYWDM IS '虹膜眼位代码 0：左眼虹膜1：右眼虹膜9：未知';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.HMSJ IS '虹膜数据';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.HMQSQKDM IS '虹膜缺失情况0：正常1：残缺2：系统设置不采集3：受伤未采集9：其他缺失情况';
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.SBXH IS '设备型号';
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.XXZLDF IS '信息质量得分';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_HM.XXSC_PDBZ IS '删除标志';
+
+------------------------------------声纹--------------------------------------
+CREATE TABLE TB_XW_YTHCJ_SW
+(
+	XXZJBH   VARCHAR2(32 BYTE)   primary key ,
+        RYBH VARCHAR2(23 BYTE) NOT NULL,
+        XM VARCHAR2(50 BYTE),
+        GMSFHM VARCHAR2(18 BYTE),
+        YPSJ   BLOB NOT NULL,
+        SWSJ   BLOB NOT NULL,
+        QBYP_SC   VARCHAR2(23 BYTE),
+        YXYP_SC  VARCHAR2(23 BYTE),
+        XZB   VARCHAR2(23 BYTE),
+        NLZ   VARCHAR2(23 BYTE),
+        CJCD  VARCHAR2(23 BYTE),
+        XXZLDF VARCHAR2(23 BYTE),
+        LYYZDM   VARCHAR2(23 BYTE),
+        LYSB	VARCHAR2(23 BYTE),
+        FYFSDM	VARCHAR2(23 BYTE),
+        XDDM	VARCHAR2(23 BYTE),
+        HYFYDM	VARCHAR2(23 BYTE),
+	WJMC	VARCHAR2(100 BYTE),
+	WJLJ	VARCHAR2(200 BYTE),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_SW IS '声纹信息数据表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.XM IS '被采集人姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.GMSFHM IS '身份证号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.YPSJ IS '采集的音频数据';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.SWSJ IS '采集的声纹数据';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.QBYP_SC IS '音频总时长，单位为秒';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.YXYP_SC IS '音频有效时长，单位为秒';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.XZB IS '音频信噪比，单位：dB';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.NLZ IS '音频能量值';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.CJCD IS '采集场地';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.XXZLDF IS '信息质量得分，满分100';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.LYYZDM IS '录音语种';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.LYSB IS '录音设备';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.FYFSDM IS '发音方式';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.XDDM IS '信道';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.HYFYDM IS '汉语方言，录音语种选择汉语的，此项必填';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.WJMC IS '文件保存名称';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.WJLJ IS '文件存放路径';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SW.XXSC_PDBZ IS '删除标志';
+
+---------------------------------笔迹-----------------------------
+CREATE TABLE TB_XW_YTHCJ_BJ
+(
+	XXZJBH   VARCHAR2(32 BYTE)   primary key ,
+        RYBH VARCHAR2(23 BYTE) NOT NULL,
+        XM VARCHAR2(50 BYTE),
+        GMSFHM VARCHAR2(18 BYTE),
+        BJSJ   BLOB,
+        BJWJGSDM   VARCHAR2(1 BYTE),
+        BJFLDM  VARCHAR2(6 BYTE),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_BJ IS '笔迹信息数据表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.XM IS '被采集人姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.GMSFHM IS '身份证号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.BJSJ IS '被采集人的笔迹数据';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.BJWJGSDM IS '笔迹文件格式';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.BJFLDM IS '笔迹分类代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_BJ.XXSC_PDBZ IS '删除标志';
+
+---------------------------------------银行卡--------------------------------
+CREATE TABLE TB_XW_YTHCJ_YHKJBXX
+(
+	XXZJBH   VARCHAR2(32 BYTE) primary key ,
+        RYBH VARCHAR2(23 BYTE) NOT NULL,
+	YHK_WPBZH VARCHAR2(30 BYTE),
+        XM VARCHAR2(64 BYTE),
+        YHK_WPMC VARCHAR2(100 BYTE),
+	YHKLXDM VARCHAR2(2 BYTE),
+	ZJ_YXQJZRQ DATE,
+	FKDQ VARCHAR2(3 BYTE),
+	KHYHMC VARCHAR2(100 BYTE),
+	CYZJLXDM VARCHAR2(3 BYTE),
+	ZJHM VARCHAR2(128 BYTE),
+	BLXX_JYQK VARCHAR2(500 BYTE),
+	KHHHBH VARCHAR2(64 BYTE),
+	KHRQ DATE,
+	CXRQ DATE,
+	FJSXID VARCHAR2(32 BYTE),
+	XXSC_PDBZ VARCHAR2(1 BYTE),
+	XXSC_CLSJ DATE,
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+COMMENT ON TABLE TB_XW_YTHCJ_YHKJBXX IS '银行卡信息数据表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.YHK_WPBZH IS '银行卡卡号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.XM IS '姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.YHK_WPMC IS '银行卡名称';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.YHKLXDM IS '银行卡类型';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.ZJ_YXQJZRQ IS '证件无效日期';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.FKDQ IS '发卡地区(字典项，符合GB/T 2659)';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.KHYHMC IS '开户行';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.CYZJLXDM IS '证件类型';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.ZJHM IS '证件号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.BLXX_JYQK IS '保留信息';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.KHHHBH IS '开户行号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.KHRQ IS '开户日期';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.CXRQ IS '销户日期';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.FJSXID IS '附加属性 ID';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.XXSC_PDBZ IS '删除状态,0未删除 ，1已删除';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.XXSC_CLSJ IS '删除时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJBXX.XXSC_PDBZ IS '删除标志';
+
+------------------------------银行卡交易记录-------------------------------
+CREATE TABLE TB_XW_YTHCJ_YHKJYJL
+(
+	XXZJBH   VARCHAR2(32 BYTE)  primary key ,
+        RYBH VARCHAR2(23 BYTE),
+        YHKKH VARCHAR2(64 BYTE),
+        JYRQ DATE,
+        JYSJ DATE,
+        SQJE NUMBER(10),
+	QTJE NUMBER(10),
+        JYDD_XZQHDM  VARCHAR2(6 BYTE),
+        JYHBDM  VARCHAR2(3 BYTE),
+	SH_DWMC  VARCHAR2(128 BYTE),
+	JYLXDM  VARCHAR2(2 BYTE),
+	YYJYJSQ  NUMBER(10),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_YHKJYJL IS '银行卡交易记录数据表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.XXZJBH IS '信息主键编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.YHKKH IS '银行卡卡号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.JYRQ IS '交易日期';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.JYSJ IS '交易时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.SQJE IS '授权金额';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.QTJE IS '其它金额';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.JYDD_XZQHDM IS '行政区划，字典项，符合GB/T 2260－2007';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.JYHBDM IS '交易货币代码，字典项，符合 GBT 12406-2008';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.SH_DWMC IS '商户名称';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.JYLXDM IS '交易类型';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.YYJYJSQ IS '应用交易计数器';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_YHKJYJL.XXSC_PDBZ IS '删除标志';
+
+------------------------------随身携带物品信息表-------------------------------
+CREATE TABLE TB_XW_YTHCJ_SSXDWP
+(
+	XXZJBH   VARCHAR2(32 BYTE)  primary key ,
+        RYBH VARCHAR2(23 BYTE),
+        WPBH VARCHAR2(32 BYTE),
+	XDWP_ZP BLOB,
+	XDWP_ZP VARCHAR2(100 BYTE),
+	XDWP_WPLXDM VARCHAR2(5 BYTE),
+	WPBZH VARCHAR2(30 BYTE),
+	WPTZMS VARCHAR2(500 BYTE),
+        WPJZRMBY NUMBER(10),
+        WPYSDM  VARCHAR2(1 BYTE),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_SSXDWP IS '随身携带物品信息表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.XXZJBH IS '信息主键编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.WPBH IS '随身物品编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.XDWP_ZP IS '随身物品照片';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.XDWP_ZP IS '随身物品名称';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.XDWP_WPLXDM IS '随身物品类型代码，字典项，符合GA240. 10，CODE_SAWP';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.WPBZH IS '物品标识号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.WPTZMS IS '物品特征';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.WPJZRMBY IS '价值';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.WPYSDM IS '颜色代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_SSXDWP.XXSC_PDBZ IS '删除标志';
+
+------------------------------特殊体征信息表-------------------------------
+CREATE TABLE TB_XW_YTHCJ_TSTZ
+(
+	XXZJBH   VARCHAR2(32 BYTE)  primary key ,
+        RYBH VARCHAR2(23 BYTE),
+        XM VARCHAR2(50 BYTE),
+	GMSFHM VARCHAR2(18 BYTE),
+	TMTZMS VARCHAR2(4 BYTE),
+	TSTZ_ZP BLOB,
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_TSTZ IS '特殊体征信息表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.XXZJBH IS '信息主键编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.XM IS '姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.GMSFHM IS '公民身份号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.TMTZMS IS '体貌特征描述';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.TSTZ_ZP IS '体表标记照片';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_TSTZ.XXSC_PDBZ IS '删除标志';
+
+------------------------------足迹信息表-------------------------------
+CREATE TABLE TB_XW_YTHCJ_ZJ
+(
+	XXZJBH   VARCHAR2(32 BYTE)  primary key ,
+        RYBH VARCHAR2(23 BYTE),
+        XM VARCHAR2(50 BYTE),
+	GMSFHM VARCHAR2(18 BYTE),
+	ZJBWDM VARCHAR2(1 BYTE),
+	ZJBWDM VARCHAR2(1 BYTE),
+	ZJSJ BLOB,
+	XDHWDM VARCHAR2(5 BYTE),
+	XYDM VARCHAR2(8 BYTE),
+	XXZLDF NUMBER(3),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_ZJ IS '足迹信息表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.XXZJBH IS '信息主键编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.XM IS '姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.GMSFHM IS '公民身份号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.ZJBWDM IS '足迹部位';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.ZJBWDM IS '足迹类型';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.ZJSJ IS '足迹数据';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.XDHWDM IS '鞋底花纹代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.XYDM IS '鞋印代码';
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.XXZLDF IS '信息质量得分';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_ZJ.XXSC_PDBZ IS '删除标志';
+------------------------------DNA信息表-------------------------------
+CREATE TABLE TB_XW_YTHCJ_DNA
+(
+	XXZJBH   VARCHAR2(32 BYTE)  primary key ,
+        RYBH VARCHAR2(23 BYTE),
+        XM VARCHAR2(50 BYTE),
+	GMSFHM VARCHAR2(18 BYTE),
+	RYDNABH VARCHAR2(30 BYTE),
+	YBLXDM VARCHAR2(2 BYTE),
+	CJZKBSDM VARCHAR2(1 BYTE),
+        GXSJ	DATE,
+        CJSJ	DATE,
+        LRR	VARCHAR2(50 BYTE),
+	LRDWDM	VARCHAR2(12 BYTE),
+        LRR_POLICEMANID	VARCHAR2(10 BYTE),
+        XXSC_PDBZ VARCHAR2(1 BYTE)
+);
+
+COMMENT ON TABLE TB_XW_YTHCJ_DNA IS 'DNA信息表';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.XXZJBH IS '信息主键编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.RYBH IS '人员编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.XM IS '姓名';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.GMSFHM IS '公民身份号码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.RYDNABH IS 'DNA编号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.YBLXDM IS '样本类型代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.CJZKBSDM IS '采集状况标识代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.GXSJ IS '更新时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.CJSJ IS '创建时间';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.LRR IS '录入人';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.LRDWDM IS '录单位代码';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.LRR_POLICEMANID IS '录入人警号';
+
+COMMENT ON COLUMN TB_XW_YTHCJ_DNA.XXSC_PDBZ IS '删除标志';
+-------------------------------------------------------------------------------------------
+UPDATE SYS_DBLOG SET STATUS=1 WHERE SID='hnxt0003';
+COMMIT;
\ No newline at end of file

src/main/java/com/founder/XtbaBootApplication.java

@@ -2,7 +2,14 @@ package com.founder;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+
+import javax.servlet.annotation.MultipartConfig;
+
+import javax.servlet.MultipartConfigElement;
+
 
 /**
  * 项目运行启动类
@@ -15,4 +22,18 @@ public class XtbaBootApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(XtbaBootApplication.class, args);
 	}
+
+	/**
+	 * 文件上传配置
+	 * @return
+	 */
+	@Bean
+	public MultipartConfigElement multipartConfigElement() {
+		MultipartConfigFactory factory = new MultipartConfigFactory();
+		//单个文件最大
+		factory.setMaxFileSize("215040KB"); //210MB
+		/// 设置总上传数据总大小
+		factory.setMaxRequestSize("256000KB");//250MB
+		return factory.createMultipartConfig();
+	}
 }

src/main/java/com/founder/config/CorsConfig.java

@@ -42,7 +42,8 @@ public class CorsConfig extends WebMvcConfigurerAdapter  {
             registry.addMapping("/**")
                     .allowedOrigins("*")
                     .allowCredentials(true)
-                    .allowedMethods("GET", "POST", "DELETE", "PUT")
+                    .allowedMethods("GET", "POST", "DELETE", "PUT","OPTIONS")
+                    .allowedHeaders("*")
                     .maxAge(3600);
             super.addCorsMappings(registry);
       }

src/main/java/com/founder/config/SystemWebMvcConfigurer.java

@@ -18,6 +18,9 @@ public class SystemWebMvcConfigurer implements WebMvcConfigurer {
         excludeUrl.add("/toLogin");
         excludeUrl.add("/doLogin");
         excludeUrl.add("/noLogin");
+        excludeUrl.add("/getSwSjXx");
+        excludeUrl.add("/singleLoginAct");
+        excludeUrl.add("/SavePersonInfo4Nmtc");
         excludeUrl.add("/toHome");
 //        registry.addInterceptor(new SystemInterceptor()).addPathPatterns("/**").excludePathPatterns(excludeUrl);
 //        WebMvcConfigurer.super.addInterceptors(registry);

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

+package com.founder.controller;
+
+public class CertCard {
+
+	public static void main(String[] args) {
+
+		int hReader = JavaCallCppService.INSTANCE.ICC_Reader_Open("USB1");
+
+		System.out.println("hReader="+hReader);
+
+		if(hReader <= 0){//    结果大于0表示成功
+			System.err.println("==打开接口失败==hReader="+hReader+"=======状态码====="+hReader);
+			return;
+		}
+
+		String filepath = "D:\\zp.bmp";
+		byte[] pName = new byte[100];
+		byte[] pSex = new byte[100];
+		byte[] pNation = new byte[100];
+		byte[] pBirth = new byte[100];
+		byte[] pAddress = new byte[100];
+		byte[] pCertNo = new byte[100];
+		byte[] pDepartment = new byte[100];
+		byte[] pEffectDate = new byte[100];
+		byte[] pExpire = new byte[100];
+		byte[] pErrMsg = new byte[100];
+
+		int ret = JavaCallCppService.INSTANCE.PICC_Reader_ReadIDMsg(hReader,
+				filepath,
+				pName,
+				pSex,
+				pNation,
+				pBirth,
+				pAddress,
+				pCertNo,
+				pDepartment,
+				pEffectDate,
+				pExpire,
+				pErrMsg);
+
+		System.out.println("ret = " + ret + "\n姓名："+  new String(pName));
+		System.out.println("性別："+  new String(pSex));
+		System.out.println("民族："+  new String(pNation));
+		System.out.println("出生日期："+  new String(pBirth));
+		System.out.println("地址："+  new String(pAddress));
+		System.out.println("身份证号："+  new String(pCertNo));
+		System.out.println("签发机关："+  new String(pDepartment));
+		System.out.println("发卡日期："+  new String(pEffectDate));
+		System.out.println("有效期限："+  new String(pExpire));
+
+	}
+}

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

@@ -8,6 +8,7 @@ import com.founder.model.User;
 import com.founder.module.redis.service.IDicItemService;
 import com.founder.service.IHmCjService;
 import com.founder.service.IParamService;
+import com.founder.utils.FileUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@ import sun.misc.BASE64Decoder;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -142,11 +144,19 @@ public class HmCjController {
 
 
     @RequestMapping("/toHmCj")
-    public ModelAndView toTest(ModelAndView model, HttpServletRequest request) {
+    public ModelAndView toTest(ModelAndView model, HttpServletRequest request,HttpServletResponse response) {
         model.addObject("rybh",request.getParameter("rybh"));
         model.addObject("xm",request.getParameter("xm"));
         model.addObject("gmsfhm",request.getParameter("gmsfhm"));
         model.setViewName("hmcj/index");
+
+        //FileUtils fileUtils = new FileUtils();
+        //List<String> fileList= new ArrayList<String>();
+        //fileList.add("C:\\Users\\Administrator\\Desktop\\JCCJ-LT11764320195125101724\\JCCJ-LT11764320195125101724\\JCCJ-LT11764320195125101724.xml");
+        //fileList.add("C:\\Users\\Administrator\\Desktop\\JCCJ-LT11764320195125101724\\JCCJ-LT11764320195125101724\\LT11764320195125101724.fptx");
+        //fileList.add("C:\\Users\\Administrator\\Desktop\\JCCJ-LT11764320195125101724\\JCCJ-LT11764320195125101724\\JBXX-LT11764320195125101724.xml");
+        //fileList.add("C:\\Users\\Administrator\\Desktop\\JCCJ-LT11764320195125101724\\JCCJ-LT11764320195125101724\\HMXX-LT11764320195125101724.xml");
+        //fileUtils.downloadPictureZip(fileList,response);
         return model;
     }
 
@@ -337,6 +347,9 @@ public class HmCjController {
             //成功
             map.put("code", "0");
             map.put("msg", "虹膜数据保存成功!");
+            //Param param = paramService.getParamById("0099");
+            //String xmlStr = "";
+            //FileUtils.saveXmlFile(xmlStr,tbStHm.getRybh(),param.getParamvalue(),"HMXX-"+tbStHm.getRybh()+".xml");
         }
         return map;
 

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

+package com.founder.controller;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+
+public interface JavaCallCppService extends Library {
+	// javaCallCpp.dll
+	// 放到工程目录下才行（与.classpath一级），原文注释写到也可以放到C:\WINDOWS\system32下，但我放到system32下运行项目，依然会报错
+	JavaCallCppService INSTANCE = (JavaCallCppService) Native.loadLibrary(
+			"SSSE32_X64", JavaCallCppService.class);
+
+	// 打开指定的电脑接口.
+	public int ICC_Reader_Open(String data);// 用到
+	// 关闭已打开的电脑接口.
+
+	public int ICC_Reader_Close(int ReaderHandle);;// 用到
+
+	// 设置读写器为读 typeA 卡
+	public int PICC_Reader_SetTypeA(int ReaderHandle);
+
+	// 设置读写器为读 typeB 卡
+	public int PICC_Reader_SetTypeB(int ReaderHandle);
+
+	// 请求卡片
+	public int PICC_Reader_Request(int ReaderHandle);// 用到
+
+	// 防碰撞
+	public int PICC_Reader_anticoll(int ReaderHandle, byte[] uid);// 用到
+
+	// 选择卡片
+	public int PICC_Reader_Select(int ReaderHandle, byte cardtype);;// 用到
+
+	// M1卡认证密钥，该函数将使用参数PassWord传入的Key进行认证；
+	public int PICC_Reader_Authentication_Pass(int ReaderHandle, byte charMode,
+											   byte secNr, byte[] passWord);// 用到
+	// 读取M1卡片块数据
+
+	public int PICC_Reader_Read(int ReaderHandle, byte addr, byte[] data);// 用到
+
+	public int PICC_Reader_ReadIDMsg(int ReaderHandle, String pBmpFile,
+									 byte[] pName,
+									 byte[] pSex,
+									 byte[] pNation,
+									 byte[] pBirth,
+									 byte[] pAddress,
+									 byte[] pCertNo,
+									 byte[] pDepartment,
+									 byte[] pEffectData,
+									 byte[] pExpire,
+									 byte[] pErrMsg);
+
+}
\ No newline at end of file

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

+package com.founder.controller;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Date;
+
+public class JavaCallCppTest {
+
+
+	public static void print_byteArray(byte[] src, int length) {
+		for (int i = 0; i < length; ++i) {
+			String hex = Integer.toHexString(src[i] & 0xFF);
+			if (hex.length() == 1) {
+				hex = '0' + hex;
+			}
+			System.out.print(hex.toUpperCase());
+		}
+	}
+
+	public static void main(String[] args) {
+
+
+
+		/*******************M1卡读取部分********************/
+		byte[] anticollUid = new byte[10];
+		byte tpye = 0x41;
+		byte mode=0x60; //认证KeyA = 0x60， KeyB=0x61
+		byte secNr=0x01;;//此处填写实际的扇区 0~15
+		byte[] passWord = {(byte)0xff,(byte) 0xff,(byte)0xff,(byte)0xff,(byte)0xff,(byte)0xff};
+		byte[] data = new byte[50];
+		byte addr=4;//此处填写实际的块 0~63
+
+		int hReader = JavaCallCppService.INSTANCE.ICC_Reader_Open("USB1");
+
+		System.out.println(" hReader="+hReader);
+
+		if(hReader <= 0){//    结果大于0表示成功
+			System.err.println("==打开接口失败==hReader="+hReader+"=======状态码====="+hReader);
+			return;
+		}
+
+		int request = JavaCallCppService.INSTANCE.PICC_Reader_Request(hReader);
+
+		System.out.println(" request="+request);
+
+		if(request != 0){//结果等于0 表示成功
+			System.err.println("==请求卡片接口失败==request=="+request+"=======状态码====="+request);
+			return;
+		}
+
+		int anticoll = JavaCallCppService.INSTANCE.PICC_Reader_anticoll(hReader,anticollUid);
+
+		System.out.println(" anticoll="+anticoll);
+
+		if(anticoll != 0){//结果等于0 表示成功
+			System.out.println("==防碰撞接口失败==anticoll=="+anticoll+"=======状态码====="+anticoll);
+			return;
+		}
+
+		int select = JavaCallCppService.INSTANCE.PICC_Reader_Select(hReader,tpye);
+
+		System.out.println(" select="+select);
+
+		if(select!=0){//结果等于0表示成功
+			System.out.println("==选择接口失败==request=="+select+"=======状态码====="+select);
+			return;
+		}
+
+		int auPass = JavaCallCppService.INSTANCE.PICC_Reader_Authentication_Pass(hReader,mode,secNr,passWord);
+
+		System.out.println(" auPass="+auPass);
+
+		if(auPass!=0){
+			System.out.println("==验证接口失败==auPass=="+auPass+"=======状态码====="+auPass);
+			return;
+		}
+
+
+		int reader = JavaCallCppService.INSTANCE.PICC_Reader_Read(hReader,addr,data);
+
+		System.out.println(" reader="+reader);
+		if(reader!=0){
+			System.out.println("==读卡接口失败==reader=="+reader+"=======状态码====="+reader);
+			return;
+		}
+
+		System.out.println("ASC:" + new String(data));
+		System.out.println("HEXSTR:");
+		print_byteArray(data, 16);
+		/******************* end M1卡读取部分********************/
+
+
+
+	}
+}

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

@@ -7,27 +7,28 @@ import com.founder.model.Param;
 import com.founder.model.TbStHm;
 import com.founder.model.TbStSw;
 import com.founder.module.redis.service.IDicItemService;
+import com.founder.ryswtz.controller.CommonController;
 import com.founder.service.AutoTbXwRycjService;
 import com.founder.service.IParamService;
 import com.founder.service.ISwCjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.util.WebUtils;
+import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
+import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 声纹采集Controller
@@ -177,15 +178,22 @@ public class SwCjController {
      */
     @RequestMapping("/getSwSjXx")
     @ResponseBody
-    private Map<String, String> getSwSjXx(@RequestParam("voice") MultipartFile voice,HttpServletRequest request) {
-        System.out.println(voice.getName());
-
+    private Map<String, String> getSwSjXx(HttpServletRequest request) {
+        MultipartFile voice = null;
+        // 检测是否为上传请求
+        String contentType = request.getContentType();
+        if (contentType != null && contentType.toLowerCase().startsWith("multipart/")) {
+            MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class);
+            voice = multipartRequest.getFile("voice");
+        }
         TbStSw tbStSw = new TbStSw();
+        if(voice!=null){
             try {
                 tbStSw.setYpsj(voice.getBytes());
             } catch (IOException e) {
                 e.printStackTrace();
             }
+        }
         Map<String, String> map = new HashMap<>();
         String type = request.getParameter("type");
         String msg = request.getParameter("msg");
@@ -227,28 +235,78 @@ public class SwCjController {
                 map.put("msg", "声纹数据保存失败！");
             }
         }
+        if(voice!=null) {
             String rybhstr = tbStSw.getRybh();
-        String savePath = "/personphoto/"+ rybhstr.substring(rybhstr.length() - 10, rybhstr.length() - 4)+ "/" + rybhstr.substring(rybhstr.length() - 3, rybhstr.length());
+            int swcnt = swCjService.getSwSjXxCnt(rybhstr);
+            //List<TbStSw> tbStSws = swCjService.getSwSjXxList(rybhstr);
+            String savePath = "/personphoto/" + rybhstr.substring(rybhstr.length() - 10, rybhstr.length() - 4) + "/" + rybhstr.substring(rybhstr.length() - 3, rybhstr.length());
             Param param = paramService.getParamById("0099");
             String zplj = param.getParamvalue();
             String filePath = zplj;
-        filePath = filePath+savePath;
+            filePath = filePath + savePath;
             File filejia0 = new File(filePath);
             if (!filejia0.exists()) {
                 filejia0.mkdir();
             }
-        File filejia1 = new File(filePath+"/"+voice.getName()+"1.wav");
+            String paths = "";
+            if(swcnt>=0){
+                paths = filePath + "/" + voice.getName() + swcnt + ".wav";
+            }else{
+                paths = filePath + "/" + voice.getName() + "0.wav";
+            }
+            File filejia1 = new File(paths);
             if (!filejia1.exists()) {
                 filejia0.mkdir();
             }
             try {
                 filejia1.createNewFile();
+                boolean flg = GenerateImage(voice.getBytes(),paths);
             } catch (IOException e) {
                 e.printStackTrace();
             }
+        }
         return map;
     }
 
+    @PostMapping("/getSwDetail")
+    @ResponseBody
+    public Map getSwDetail(String asjxgrybh){
+        List<TbStSw> tbStSws = swCjService.getSwSjXxList(asjxgrybh);
+        CommonController commonController = new CommonController();
+        TbStSw swzh = new TbStSw();
+        List<Map<String,Object>> btList = commonController.showTblTitle(swzh,"swxx");//表头数据展示
+        List swzhInfoList = dealSwDataMatchTitle(tbStSws,btList);//datagrid所需格式的表数据
+        Map datamap = new HashMap();
+        datamap.put("title",btList);
+        datamap.put("dataResult",swzhInfoList);
+        return datamap;
+    }
+
+    //按照datagrid前台需要的格式处理表数据
+    public List dealSwDataMatchTitle(List<TbStSw> rowlist, List<Map<String,Object>> pkgs){
+        List pkgDataList = new ArrayList();
+        for(TbStSw data:rowlist){
+            Map<String, Object> commpkgmap = new HashMap<String, Object>();
+            for(int j=0;j<pkgs.size();j++){
+                Map<String,Object> map = pkgs.get(j);
+                String dataname = map.get("field").toString();
+                if ("rybh".equals(dataname) || "xm".equals(dataname) || "wjmc".equals(dataname) || "zsc".equals(dataname) || "yxsc".equals(dataname)|| "gxsj".equals(dataname)) {
+                    try {
+                        Field field = data.getClass().getField(dataname);
+                        commpkgmap.put(dataname, field.get(data));//title的名字也是对应的字段属性，如果有特殊需要，可参照if中的写法
+                    } catch (NoSuchFieldException e) {
+                        e.printStackTrace();
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            if(commpkgmap != null) {
+                pkgDataList.add(commpkgmap);
+            }
+        }
+        return pkgDataList;
+    }
 
     @RequestMapping("/toTest")
     public ModelAndView toTest(ModelAndView model){
@@ -339,4 +397,21 @@ public class SwCjController {
         return resultStr;
 
     }
+
+    public static boolean GenerateImage(byte[] bytes, String imgFilePath) {// 对字节数组字符串进行Base64解码并生成图片
+        try {            // Base64解码
+            for (int i = 0; i < bytes.length; ++i) {
+                if (bytes[i] < 0) {// 调整异常数据
+                    bytes[i] += 256;
+                }
+            }            // 生成文件
+            OutputStream out = new FileOutputStream(imgFilePath);
+            out.write(bytes);
+            out.flush();
+            out.close();
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

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

@@ -2,6 +2,7 @@ package com.founder.controller;
 
 import com.founder.model.AutoTbStRy;
 import com.founder.service.TbStRyService;
+import com.founder.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by libin on 2018/4/13.
  * 实体人员controller

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

 package com.founder.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.founder.login.service.LoginService;
 import com.founder.model.*;
 import com.founder.model.amsis.PCTInfo;
@@ -7,6 +10,7 @@ import com.founder.model.amsis.Plainimg;
 import com.founder.model.amsis.Rollimg;
 import com.founder.module.redis.service.IDicItemService;
 import com.founder.service.*;
+import com.founder.util.HttpClientUtil;
 import com.founder.util.TestTask;
 import com.founder.util.Zwsjzljc;
 import com.founder.utils.*;
@@ -21,10 +25,7 @@ import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
@@ -1719,14 +1720,79 @@ public class TbXwRycjController {
     //通过调用存储过程获得传给采集程序字符串
     @ResponseBody
     @RequestMapping("/ajaxGettoAfisStr")
-    public String ajaxGettoAfisStr(HttpServletResponse response,String clientVersion,String psnid,String ver) {
-        String rstr = null;
+    public String ajaxGettoAfisStr(HttpServletResponse response,HttpServletRequest request,String clientVersion,String psnid,String ver) {
+        String rstr = "";
+        String bj = "*#~";
         try {
             Map<String, Object> paramMap = new HashMap<>();
             if("1".equals(clientVersion)){
                 paramMap.put("ID_CODE", psnid);
                 paramMap.put("Edition", ver);
                 //rstr=afisQualityServiceImpl.getAjaxGettoAfisStrGK(paramMap);
+                AutoTbStRy xyrC = rycjService.getRyxxByRybh(psnid);
+                User user = (User)request.getSession().getAttribute("User");
+                rstr+="住址代码="+xyrC.getXzzXzqhdm()+bj;
+                rstr+="现住址详址="+xyrC.getXzzDzmc()+bj;
+                rstr+="姓名="+xyrC.getXm()+bj;
+                rstr+="籍贯代码="+xyrC.getJgssxdm()+bj;
+                rstr+="籍贯="+bj;
+                if(xyrC.getCyzjdm()=="111" || ("111").equals(xyrC.getCyzjdm())){
+                    rstr+="身份证号="+xyrC.getZjhm()+bj;
+                }else{
+                    rstr+="身份证号="+bj;
+                }
+                rstr+="捺印收集人="+user.getUsername()+bj;
+                if(xyrC.getLrsj()!=null){
+                    SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+                    String dateString = formatter.format(xyrC.getLrsj());
+                    rstr+="捺印日期="+dateString.replace("-", "").substring(0,8)+bj;
+                }else{
+                    rstr+="捺印日期="+bj;
+                }
+                rstr+="捺印机关代码="+user.getUnitcode()+bj;
+                String lrdw=dicItemService.queryNameByCode(user.getUnitcode(),"CODE_UNIT");
+                rstr+="捺印机关名称="+lrdw+bj;
+                rstr+="性别="+xyrC.getXbdm()+bj;
+                rstr+="职业="+xyrC.getZylbdm()+bj;
+                rstr+="民族="+xyrC.getMzdm()+bj;
+                rstr+="体貌特征="+xyrC.getTmtzms()+bj;
+                rstr+="血型="+bj;
+                rstr+="脚长="+xyrC.getZc()+bj;
+                rstr+="身高="+xyrC.getSgsx()+bj;
+                rstr+="口音="+bj;
+                rstr+="工作单位="+xyrC.getFwcs()+bj;
+                String sDate="";
+                if(xyrC.getCsrqQsrq()!=null && !xyrC.getCsrqQsrq().equals("")){
+                    String x = xyrC.getCsrqQsrq().toString();
+                    SimpleDateFormat sdf1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+                    try
+                    {
+                        Date date=sdf1.parse(x);
+                        SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMdd");
+                        sDate=sdf.format(date);
+                    }
+                    catch (Exception e)
+                    {
+                        e.printStackTrace();
+                    }
+                }
+                rstr+="出生日期="+sDate+bj;
+                rstr+="同案犯="+bj;
+                rstr+="判决记录="+bj;
+                rstr+="人员类别="+"犯罪嫌疑人"+bj;
+                rstr+="案件类别代码1="+bj;
+                rstr+="犯罪描述="+xyrC.getWffzjlms()+bj;
+                rstr+="逮捕或拘留日期="+bj;
+                rstr+="逮捕或拘留机关名称="+bj;
+                rstr+="人员编号="+xyrC.getRybh()+bj;
+                rstr+="国籍="+xyrC.getGjdm()+bj;
+                rstr+="户籍地代码="+xyrC.getHjdzXzqhdm()+bj;
+                rstr+="户籍地详址="+xyrC.getHjdzDzmc()+bj;
+                rstr+="在逃人员编号="+bj;
+                rstr+="案件类别代码="+bj;
+                rstr+="案件类别="+bj;
+                rstr+="相关案件编号="+xyrC.getAsjbh()+bj;
+                rstr=rstr.replace("null", "");
             }else{
                 paramMap.put("ID_CODE", psnid);
                 paramMap.put("RRENSTR", "");
@@ -1750,6 +1816,25 @@ public class TbXwRycjController {
     @ResponseBody
     @RequestMapping("/getGdimages")
     public Map<String,Object> testAsyncReturnGdImg(String zwbh) throws ExecutionException, InterruptedException {
+        /*
+        //调用指纹获取压缩图接口获取指纹图片
+        HttpClientUtil hu = new HttpClientUtil();
+        String imgstrs = null;
+        try {
+            imgstrs = hu.getJsonString("http://172.18.116.158:8081/data/getPSNRollByRybh?rybh=4400004419992010004892");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String,Object> rstmap = new HashMap<String,Object>();
+        JSONObject jsonObject = (JSONObject) JSONObject.parse(imgstrs);
+        JSONArray jsa = jsonObject.getJSONArray("ret");
+        for (int i = 0; i < jsa.size(); i++) {
+            JSONObject obj = jsa.getJSONObject(i);
+            String position= obj.getString("position");
+            String image= obj.getString("image");
+            rstmap.put("rfpimg"+position,image);
+        }
+*/
         long start = System.currentTimeMillis();
         Map<String,Object> rstmap = new HashMap<String,Object>();
         for(int i=1;i<=10;i++){
@@ -2161,14 +2246,17 @@ public class TbXwRycjController {
         }
         return rstmap;
     }
+
     public String getZwtp(String zwbh,String zwbw,String zwlx){
         String rst = "";
         try {
-            URL url = new URL("http://10.254.1.70:8081/AMSIS/getFingerOrg?barcode=R4331014300002018070068&orgType=1&position=1");
+            //URL url = new URL("http://10.254.1.70:8081/AMSIS/getFingerOrg?barcode=R4331014300002018070068&orgType=1&position=1");
+            URL url = new URL("http://172.18.116.158:8081/data/getPSNRollByRybh?rybh=164563");
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();// 此时cnnection只是为一个连接对象,待连接中
             connection.setDoOutput(true);
             connection.setDoInput(true);
-            connection.setRequestMethod("POST");
+            //connection.setRequestMethod("POST");
+            connection.setRequestMethod("GET");
             connection.setUseCaches(false);
             connection.setInstanceFollowRedirects(true);
             connection.setRequestProperty("Content-Type", "text/xml"); // json，也可以设定xml格式的
@@ -2216,6 +2304,7 @@ public class TbXwRycjController {
         String PDBS=StringUtil.checknull(request.getParameter("PDBS"));//判断标识
         String RYBH=StringUtil.checknull(request.getParameter("RYBH"));//人员编号
         xyrC.setJzrybh(RYBH);
+        xyrC.setRybh(RYBH);
         xyrC.setXm(StringUtil.checknull(request.getParameter("XM")));//	姓名
         xyrC.setXbdm(StringUtil.checknull(request.getParameter("XB")));//	性别
         xyrC.setCym(StringUtil.checknull(request.getParameter("CYM")));//	曾用名
@@ -2295,8 +2384,8 @@ public class TbXwRycjController {
                     user=loginService.getUserByUsername("admin");
                 }
                 user.setUnitcode(DJDW);
-                String rybhString = sequenceService.getNextSerialNo("TB_ST_RY",user.getUnitcode(), user);
-                xyrC.setRybh(rybhString);
+                //String rybhString = sequenceService.getNextSerialNo("TB_ST_RY",user.getUnitcode(), user);
+                //xyrC.setRybh(rybhString);
                 bool=rycjService.insertRyxx(xyrC);
                 //bool=insertRycj(RYBH,XM,XB,BMCH,GJ,CSRQ,MZ,SFZH,HJQH,HJXZ,XZQH,XZXZ,RYLX,DJDW,DJR,DJSJ,CYM,JG,WHCD,ZYLB,ZY,LXDH,HYZK,ZJXY,SF,ZC,ZJLX,ZHRQ,ZHFS,ZHDQ,ZHDD,ZHDW,AJBH,WFFZJL);
             }
@@ -2306,4 +2395,158 @@ public class TbXwRycjController {
         }
         return iRet+"";
     }
+
+    @RequestMapping(value="/singleLoginAct",method = {RequestMethod.POST,RequestMethod.GET})
+    public String singleLoginAct(HttpServletRequest request, HttpServletResponse response,Model model,String asjxgrybh,String username,String sfhlcjy){
+            String userId=request.getParameter("userId");
+            String rybh="";
+            String returnStr="";
+            String perurl="";
+            User user=null;
+            user=(User)request.getSession().getAttribute("User");
+            if(asjxgrybh!=null&&!"".equals(asjxgrybh)) {
+                String[] rst = asjxgrybh.split(",");
+                //System.out.println(rst);
+                if (rst.length >= 2) {
+                    rybh = rst[0];
+                    userId = rst[1];
+                    perurl=rst[2];
+                }
+            }
+            if(user==null){
+                if(asjxgrybh!=null&&!"".equals(asjxgrybh)){
+                    user=loginService.getUserByUsername(userId);
+                }else{
+                    user=loginService.getUserById(userId);
+                }
+            }
+            if(user!=null){
+                if(userId==null||"".equals(userId)){
+                    model.addAttribute("username",user.getUsername());
+                    model.addAttribute("unitname",user.getUnitname());
+                    model.addAttribute("truename",user.getTrueName());
+                    model.addAttribute("unitcode",user.getUnitcode());
+                    returnStr = "home.html";
+                    log.info("登陆成功");
+                }else{
+                    if(rybh==null||"".equals(rybh)){
+                        AutoTbStRy xyrC = new AutoTbStRy();
+                        model.addAttribute("ryxx",xyrC);
+                        model.addAttribute("saveflag","0");
+                    }else{
+                        AutoTbStRy xyrC = rycjService.getRyxxByRybh(rybh);
+                        if(xyrC.getLrr()!=null&&!"".equals(xyrC.getLrr())){
+                            try{
+                                xyrC.setLrrXm(dicItemService.queryNameByCode(xyrC.getLrr(),"CODE_JY"));
+                            }catch(Exception e){
+                                System.out.println("代码内容获取异常！" + e);
+                            }
+                            if(xyrC.getLrrXm()==null||"".equals(xyrC.getLrrXm())){
+                                xyrC.setLrrXm(xyrC.getLrr());
+                            }
+                        }else{
+                            xyrC.setLrrXm(user.getTrueName());
+                        }
+                        if(xyrC.getZwcjr()!=null&&!"".equals(xyrC.getZwcjr())){
+                            try{
+                                xyrC.setZwcjrXm(dicItemService.queryNameByCode(xyrC.getZwcjr(),"CODE_JY"));
+                            }catch(Exception e){
+                                System.out.println("代码内容获取异常！" + e);
+                            }
+                        }
+                        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+                        if(xyrC.getLrsj()!=null&&!"".equals(xyrC.getLrsj())){
+                            xyrC.setLrsjStr(df.format(xyrC.getLrsj()));
+                        }
+                        if(xyrC.getCsrqQsrq()!=null&&!"".equals(xyrC.getCsrqQsrq())) {
+                            xyrC.setCsrqQsrqStr(df.format(xyrC.getCsrqQsrq()));
+                        }
+                        if(xyrC.getZhsj()!=null&&!"".equals(xyrC.getZhsj())){
+                            xyrC.setZhsjStr(df.format(xyrC.getZhsj()));
+                        }
+                        if(xyrC.getZwcjsj()!=null&&!"".equals(xyrC.getZwcjsj())){
+                            xyrC.setZwcjsjStr(df.format(xyrC.getZwcjsj()));
+                        }
+
+                        String rybhstr = xyrC.getRybh();
+                        String savePath = "/personphoto/"+ rybhstr.substring(rybhstr.length() - 10, rybhstr.length() - 4)+ "/" + rybhstr.substring(rybhstr.length() - 3, rybhstr.length());
+                        //String hcfilePath = request.getServletContext().getRealPath("/").replaceAll("\\\\","/");
+
+                        Param param = paramService.getParamById("0099");
+                        String zplj = param.getParamvalue();
+                        String filePath = zplj;
+                        filePath = filePath+savePath;
+                        File filejia1 = new File(filePath+"/"+rybhstr+"1.jpg");
+                        if (filejia1.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"1.jpg");
+                            //insPic2(hcfilePath,zpBase64,rybhstr,"1");
+                            xyrC.setEdzzpStr64(zpBase64);
+                            //xyrC.setEdzzplj("static/img"+savePath+"/"+rybhstr+"1.jpg");
+                            xyrC.setEDZZPL64(String.valueOf(zpBase64.getBytes().length));
+                        }
+                        File filejia2 = new File(filePath+"/"+rybhstr+"2.jpg");
+                        if (filejia2.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"2.jpg");
+                            //insPic2(hcfilePath,zpBase64,rybhstr,"2");
+                            xyrC.setZmzpStr64(zpBase64);
+                            //xyrC.setZmzplj("static/img"+savePath+"/"+rybhstr+"2.jpg");
+                            xyrC.setZMZPL64(String.valueOf(zpBase64.getBytes().length));
+                        }
+                        File filejia3 = new File(filePath+"/"+rybhstr+"3.jpg");
+                        if (filejia3.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"3.jpg");
+                            //insPic2(hcfilePath,zpBase64,rybhstr,"3");
+                            xyrC.setCmzpStr64(zpBase64);
+                            //xyrC.setCmzplj("static/img"+savePath+"/"+rybhstr+"3.jpg");
+                            xyrC.setCMZPL64(String.valueOf(zpBase64.getBytes().length));
+                        }
+                        File filejia4 = new File(filePath+"/"+rybhstr+"4.jpg");
+                        if (filejia4.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"4.jpg");
+                            //insPic2(hcfilePath,zpBase64,rybhstr,"4");
+                            xyrC.setYcmzpStr64(zpBase64);
+                            //xyrC.setYcmzplj("static/img"+savePath+"/"+rybhstr+"4.jpg");
+                            xyrC.setYCMZPL64(String.valueOf(zpBase64.getBytes().length));
+                        }
+                        File filejia11 = new File(filePath+"/"+rybhstr+"11.jpg");
+                        if (filejia11.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"11.jpg");
+                            xyrC.setR_zjLeftBase64(zpBase64);
+                        }
+                        File filejia12 = new File(filePath+"/"+rybhstr+"12.jpg");
+                        if (filejia12.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"12.jpg");
+                            xyrC.setR_zjRightBase64(zpBase64);
+                        }
+                        File filejia21 = new File(filePath+"/"+rybhstr+"21.jpg");
+                        if (filejia21.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"21.jpg");
+                            xyrC.setR_hmLeftBase64(zpBase64);
+                        }
+                        File filejia22 = new File(filePath+"/"+rybhstr+"22.jpg");
+                        if (filejia22.exists()) {
+                            String zpBase64 = GetImageStrs(filePath+"/"+rybhstr+"22.jpg");
+                            xyrC.setR_hmRightBase64(zpBase64);
+                        }
+                        model.addAttribute("username",user.getUsername());
+                        model.addAttribute("unitcode",user.getUnitcode());
+                        model.addAttribute("ryxx",xyrC);
+                        model.addAttribute("saveflag","0");
+                        model.addAttribute("perurl",perurl);
+                    }
+                    if(sfhlcjy!=null&&!"1".equals(sfhlcjy)){
+                        returnStr = "rygl/addryxx_gk.html";
+                    }else{
+                        returnStr = "rygl/addryxx.html";
+                    }
+                    log.info("人员采集单点登陆成功");
+                }
+                request.getSession().setAttribute("User",user);
+
+            }else{
+                returnStr="login/login_hnxt.html";
+                log.info("没有登录");
+            }
+            return returnStr;
+        }
 }

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

+package com.founder.controller;
+
+import com.founder.model.TbXwSsxdwp;
+import com.founder.model.User;
+import com.founder.module.redis.service.IDicItemService;
+import com.founder.service.ISsxdwpCjService;
+import com.founder.service.SequenceService;
+import com.founder.utils.EasyUIPage;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+import sun.misc.BASE64Encoder;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * 银行卡信息采集Controller
+ */
+@Controller
+public class YhkCjController {
+
+    @Autowired
+    private SequenceService sequenceService;
+    @Autowired
+    private ISsxdwpCjService ssxdwpCjService;
+    @Autowired
+    private IDicItemService dicItemService;
+
+
+
+    /**
+     * 银行卡信息查询页面
+     */
+    @RequestMapping("/toYhkxxcj")
+    public ModelAndView toYhkxxcj(ModelAndView model, HttpServletRequest request) {
+        model.addObject("rybh",request.getParameter("rybh"));
+        model.addObject("xm",request.getParameter("xm"));
+        model.addObject("gmsfhm",request.getParameter("gmsfhm"));
+        model.setViewName("sswp/sswpcxlist");
+        return model;
+    }
+
+    /**
+     * 进入银行卡信息新增页面
+     */
+    @RequestMapping("/toAddYhkxx")
+    public ModelAndView toAddYhkxx(ModelAndView model, HttpServletRequest request) {
+        model.addObject("asjxgrybh",request.getParameter("asjxgrybh"));
+        model.addObject("xm",request.getParameter("xm"));
+        model.addObject("gmsfhm",request.getParameter("gmsfhm"));
+        TbXwSsxdwp ssxdwp = new TbXwSsxdwp();
+        model.addObject("ssxdwp",ssxdwp);
+        model.setViewName("sswp/addsswpxx");
+        return model;
+    }
+
+    /**
+     * 进入银行卡信息修改页面
+     */
+    @RequestMapping("/toEditYhkxx")
+    public ModelAndView toEditYhkxx(ModelAndView model, HttpServletRequest request) {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        User user = (User)request.getSession().getAttribute("User");
+        model.addObject("asjxgrybh",request.getParameter("asjxgrybh"));
+        TbXwSsxdwp sswp = ssxdwpCjService.getSsxdwpxxByXxzjbh(request.getParameter("xxzjbh"));
+        if(sswp!=null){
+            if(user.getTrueName()==null||"".equals(user.getTrueName())){
+                try{
+                    sswp.setXxdjry_xm(dicItemService.queryNameByCode(user.getUsername(),"CODE_JY"));
+                }catch(Exception e){
+                    System.out.println("代码内容获取异常！" + e);
+                }
+                if(sswp.getXxdjry_xm()==null||"".equals(sswp.getXxdjry_xm())){
+                    sswp.setXxdjry_xm(user.getUsername());
+                }
+            }else{
+                sswp.setXxdjry_xm(user.getTrueName());
+            }
+            if(sswp.getXdqtwp_wpscsj()!=null&&!"".equals(sswp.getXdqtwp_wpscsj())){
+                sswp.setXdqtwp_wpscsjStr(df.format(sswp.getXdqtwp_wpscsj()));
+            }
+            if(sswp.getXdqtwp_wpgzsj()!=null&&!"".equals(sswp.getXdqtwp_wpgzsj())) {
+                sswp.setXdqtwp_wpgzsjStr(df.format(sswp.getXdqtwp_wpgzsj()));
+            }
+            if(sswp.getXdqtwp_wpyxqqssj()!=null&&!"".equals(sswp.getXdqtwp_wpyxqqssj())){
+                sswp.setXdqtwp_wpyxqqssjStr(df.format(sswp.getXdqtwp_wpyxqqssj()));
+            }
+            if(sswp.getXdqtwp_wpyxqjzsj()!=null&&!"".equals(sswp.getXdqtwp_wpyxqjzsj())){
+                sswp.setXdqtwp_wpyxqjzsjStr(df.format(sswp.getXdqtwp_wpyxqjzsj()));
+            }
+            sswp.setWpzpimgBase64(GetImageStrsByByte(sswp.getXdqtwp_wpzp()));
+        }
+        model.addObject("ssxdwp",sswp);
+        model.setViewName("sswp/addsswpxx");
+        return model;
+    }
+
+    /**
+     * 删除银行卡信息
+     */
+    @RequestMapping("/toDeleteYhkxx")
+    @ResponseBody
+    public boolean toDeleteYhkxx(Model model,String xxzjbh){
+        boolean bool = ssxdwpCjService.deleteSsxdwpxx(xxzjbh);
+        return bool;
+    }
+
+    @RequestMapping("/doAddYhkxx")
+    public ModelAndView doAddYhkxx(@ModelAttribute TbXwSsxdwp ssxdwp, ModelAndView model, HttpServletRequest request,@RequestParam("sswpzpfile") MultipartFile sswpzpfile){
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        DateFormat df1 = new SimpleDateFormat("MM/dd/yyyy");
+        try {
+            if(ssxdwp.getXdqtwp_wpscsjStr()==null||ssxdwp.getXdqtwp_wpscsjStr().equals("")){
+                ssxdwp.setXdqtwp_wpscsj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpscsj(df.parse(ssxdwp.getXdqtwp_wpscsjStr()));
+            }
+            if(ssxdwp.getXdqtwp_wpgzsjStr()==null||ssxdwp.getXdqtwp_wpgzsjStr().equals("")){
+                ssxdwp.setXdqtwp_wpgzsj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpgzsj(df.parse(ssxdwp.getXdqtwp_wpgzsjStr()));
+            }
+            if(ssxdwp.getXdqtwp_wpyxqqssjStr()==null||ssxdwp.getXdqtwp_wpyxqqssjStr().equals("")){
+                ssxdwp.setXdqtwp_wpyxqqssj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpyxqqssj(df.parse(ssxdwp.getXdqtwp_wpyxqqssjStr()));
+            }
+            if(ssxdwp.getXdqtwp_wpyxqjzsjStr()==null||ssxdwp.getXdqtwp_wpyxqjzsjStr().equals("")){
+                ssxdwp.setXdqtwp_wpyxqjzsj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpyxqjzsj(df.parse(ssxdwp.getXdqtwp_wpyxqjzsjStr()));
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        User user = (User)request.getSession().getAttribute("User");
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+        String wpbhString = sequenceService.getNextSerialNo("TB_ST_RY_XDQTWP",user.getUnitcode(), user);
+        if(uuid!=null&&uuid.length()>30){
+            ssxdwp.setXxzjbh(uuid.substring(uuid.length()-30,uuid.length()));
+        }else{
+            ssxdwp.setXxzjbh(uuid);
+        }
+        ssxdwp.setXdqtwp_sawpbh(wpbhString);
+        String wpimg = null;
+        if("1".equals(ssxdwp.getWpzpflag())){
+            if (!sswpzpfile.isEmpty()) {
+                try {
+                    byte[] bytes = sswpzpfile.getBytes();
+                    ssxdwp.setWpzpimgBase64(GetImageStrsByByte(bytes));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }else{
+                if (ssxdwp.getWpzpimgBase64() != null && ssxdwp.getWpzpimgBase64().length() > 0) {
+                    if(ssxdwp.getWpzpimgBase64().indexOf("/9j/")>=0){
+                        wpimg = ssxdwp.getWpzpimgBase64().substring(ssxdwp.getWpzpimgBase64().indexOf("/9j/"));
+                    }
+                }
+                ssxdwp.setWpzpimgBase64(wpimg);
+            }
+        }
+        byte[] zpimg = Base64.decodeBase64(ssxdwp.getWpzpimgBase64());
+        ssxdwp.setXdqtwp_wpzp(zpimg);
+        ssxdwp.setDjsj(new Date());
+        ssxdwp.setXxdjdw_gajgjgdm(user.getUnitcode());
+        ssxdwp.setXxdjdw_gajgmc(user.getUnitname());
+        ssxdwp.setXxdjry_xm(user.getUsername());
+        ssxdwp.setXxdjry_gmsfhm(user.getIdentitycard());
+        boolean bool = ssxdwpCjService.saveSsxdwpxx(ssxdwp);
+        TbXwSsxdwp sswp = ssxdwpCjService.getSsxdwpxxByXxzjbh(ssxdwp.getXxzjbh());
+        if(sswp!=null){
+            if(user.getTrueName()==null||"".equals(user.getTrueName())){
+                try{
+                    sswp.setXxdjry_xm(dicItemService.queryNameByCode(user.getUsername(),"CODE_JY"));
+                }catch(Exception e){
+                    System.out.println("代码内容获取异常！" + e);
+                }
+                if(sswp.getXxdjry_xm()==null||"".equals(sswp.getXxdjry_xm())){
+                    sswp.setXxdjry_xm(user.getUsername());
+                }
+            }else{
+                sswp.setXxdjry_xm(user.getTrueName());
+            }
+            if(sswp.getXdqtwp_wpscsj()!=null&&!"".equals(sswp.getXdqtwp_wpscsj())){
+                sswp.setXdqtwp_wpscsjStr(df.format(sswp.getXdqtwp_wpscsj()));
+            }
+            if(sswp.getXdqtwp_wpgzsj()!=null&&!"".equals(sswp.getXdqtwp_wpgzsj())) {
+                sswp.setXdqtwp_wpgzsjStr(df.format(sswp.getXdqtwp_wpgzsj()));
+            }
+            if(sswp.getXdqtwp_wpyxqqssj()!=null&&!"".equals(sswp.getXdqtwp_wpyxqqssj())){
+                sswp.setXdqtwp_wpyxqqssjStr(df.format(sswp.getXdqtwp_wpyxqqssj()));
+            }
+            if(sswp.getXdqtwp_wpyxqjzsj()!=null&&!"".equals(sswp.getXdqtwp_wpyxqjzsj())){
+                sswp.setXdqtwp_wpyxqjzsjStr(df.format(sswp.getXdqtwp_wpyxqjzsj()));
+            }
+            sswp.setWpzpimgBase64(GetImageStrsByByte(sswp.getXdqtwp_wpzp()));
+        }
+        model.addObject("asjxgrybh",ssxdwp.getAsjxgrybh());
+        model.addObject("username",user.getUsername());
+        model.addObject("unitcode",user.getUnitcode());
+        model.addObject("ssxdwp",sswp);
+        model.addObject("saveflag","1");
+        model.setViewName("sswp/addsswpxx");
+        return model;
+    }
+
+    @RequestMapping("/doEditYhkxx")
+    public ModelAndView doEditYhkxx(@ModelAttribute TbXwSsxdwp ssxdwp, ModelAndView model, HttpServletRequest request,@RequestParam("sswpzpfile") MultipartFile sswpzpfile){
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        DateFormat df1 = new SimpleDateFormat("MM/dd/yyyy");
+        try {
+            if(ssxdwp.getXdqtwp_wpscsjStr()==null||ssxdwp.getXdqtwp_wpscsjStr().equals("")){
+                ssxdwp.setXdqtwp_wpscsj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpscsj(df.parse(ssxdwp.getXdqtwp_wpscsjStr()));
+            }
+            if(ssxdwp.getXdqtwp_wpgzsjStr()==null||ssxdwp.getXdqtwp_wpgzsjStr().equals("")){
+                ssxdwp.setXdqtwp_wpgzsj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpgzsj(df.parse(ssxdwp.getXdqtwp_wpgzsjStr()));
+            }
+            if(ssxdwp.getXdqtwp_wpyxqqssjStr()==null||ssxdwp.getXdqtwp_wpyxqqssjStr().equals("")){
+                ssxdwp.setXdqtwp_wpyxqqssj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpyxqqssj(df.parse(ssxdwp.getXdqtwp_wpyxqqssjStr()));
+            }
+            if(ssxdwp.getXdqtwp_wpyxqjzsjStr()==null||ssxdwp.getXdqtwp_wpyxqjzsjStr().equals("")){
+                ssxdwp.setXdqtwp_wpyxqjzsj(null);
+            }else{
+                ssxdwp.setXdqtwp_wpyxqjzsj(df.parse(ssxdwp.getXdqtwp_wpyxqjzsjStr()));
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        User user = (User)request.getSession().getAttribute("User");
+        String wpimg = null;
+        if("1".equals(ssxdwp.getWpzpflag())){
+            if (!sswpzpfile.isEmpty()) {
+                try {
+                    byte[] bytes = sswpzpfile.getBytes();
+                    ssxdwp.setWpzpimgBase64(GetImageStrsByByte(bytes));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }else{
+                if (ssxdwp.getWpzpimgBase64() != null && ssxdwp.getWpzpimgBase64().length() > 0) {
+                    if(ssxdwp.getWpzpimgBase64().indexOf("/9j/")>=0){
+                        wpimg = ssxdwp.getWpzpimgBase64().substring(ssxdwp.getWpzpimgBase64().indexOf("/9j/"));
+                    }
+                }
+                ssxdwp.setWpzpimgBase64(wpimg);
+            }
+        }
+        byte[] zpimg = Base64.decodeBase64(ssxdwp.getWpzpimgBase64());
+        ssxdwp.setXdqtwp_wpzp(zpimg);
+        ssxdwp.setGxsj(new Date());
+        ssxdwp.setXxczdw_gajgjgdm(user.getUnitcode());
+        ssxdwp.setXxczdw_gajgmc(user.getUnitname());
+        ssxdwp.setXxczry_xm(user.getUsername());
+        ssxdwp.setXxczry_gmsfhm(user.getIdentitycard());
+        boolean bool = ssxdwpCjService.updateSsxdwpxx(ssxdwp);
+        TbXwSsxdwp sswp = ssxdwpCjService.getSsxdwpxxByXxzjbh(ssxdwp.getXxzjbh());
+        if(sswp!=null){
+            if(user.getTrueName()==null||"".equals(user.getTrueName())){
+                try{
+                    sswp.setXxdjry_xm(dicItemService.queryNameByCode(user.getUsername(),"CODE_JY"));
+                }catch(Exception e){
+                    System.out.println("代码内容获取异常！" + e);
+                }
+                if(sswp.getXxdjry_xm()==null||"".equals(sswp.getXxdjry_xm())){
+                    sswp.setXxdjry_xm(user.getUsername());
+                }
+            }else{
+                sswp.setXxdjry_xm(user.getTrueName());
+            }
+            if(sswp.getXdqtwp_wpscsj()!=null&&!"".equals(sswp.getXdqtwp_wpscsj())){
+                sswp.setXdqtwp_wpscsjStr(df.format(sswp.getXdqtwp_wpscsj()));
+            }
+            if(sswp.getXdqtwp_wpgzsj()!=null&&!"".equals(sswp.getXdqtwp_wpgzsj())) {
+                sswp.setXdqtwp_wpgzsjStr(df.format(sswp.getXdqtwp_wpgzsj()));
+            }
+            if(sswp.getXdqtwp_wpyxqqssj()!=null&&!"".equals(sswp.getXdqtwp_wpyxqqssj())){
+                sswp.setXdqtwp_wpyxqqssjStr(df.format(sswp.getXdqtwp_wpyxqqssj()));
+            }
+            if(sswp.getXdqtwp_wpyxqjzsj()!=null&&!"".equals(sswp.getXdqtwp_wpyxqjzsj())){
+                sswp.setXdqtwp_wpyxqjzsjStr(df.format(sswp.getXdqtwp_wpyxqjzsj()));
+            }
+            sswp.setWpzpimgBase64(GetImageStrsByByte(sswp.getXdqtwp_wpzp()));
+        }
+        model.addObject("asjxgrybh",ssxdwp.getAsjxgrybh());
+        model.addObject("username",user.getUsername());
+        model.addObject("unitcode",user.getUnitcode());
+        model.addObject("ssxdwp",sswp);
+        model.addObject("saveflag","1");
+        model.setViewName("sswp/addsswpxx");
+        return model;
+    }
+
+    public static String GetImageStrsByByte(byte[] data) {// 将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        // 对字节数组Base64编码
+        if(data==null||data.length<=0){
+            return null;
+        }
+        BASE64Encoder encoder = new BASE64Encoder();
+        return encoder.encode(data);// 返回Base64编码过的字节数组字符串
+    }
+
+    @RequestMapping("/queryYhkxxList")
+    @ResponseBody
+    public EasyUIPage queryYhkxxList(@ModelAttribute TbXwSsxdwp ssxdwp,
+                                    EasyUIPage easyUIPage, Integer rows, HttpServletRequest request){
+        easyUIPage.setPagePara(rows);
+        User user = (User)request.getSession().getAttribute("User");
+        if(ssxdwp.getXxdjdw_gajgjgdm()==null||"".equals(ssxdwp.getXxdjdw_gajgjgdm())){
+            ssxdwp.setXxdjdw_gajgjgdm(user.getUnitcode());
+        }
+        easyUIPage=ssxdwpCjService.querySsxdwpxxPage(easyUIPage,ssxdwp);
+        return easyUIPage;
+    }
+}

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

 package com.founder.dao;
 
-import com.founder.model.AutoTbStRy;
 import com.founder.model.TbXwSsxdwp;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
@@ -17,5 +16,5 @@ public interface SsxdwpxxCjDao {
     public int deleteSsxdwpxx(String xxzjbh);
     public TbXwSsxdwp getSsxdwpxxByXxzjbh(String xxzjbh);
     public Integer queryPageCount(Map<String, Object> map);
-    public List<AutoTbStRy> queryPageList(Map<String, Object> map);
+    public List<TbXwSsxdwp> queryPageList(Map<String, Object> map);
 }

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

@@ -4,9 +4,13 @@ import com.founder.model.TbStSw;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @Mapper
 public interface SwCjDao {
 
     int insertSwSjXx(TbStSw tbStSw);
+    List<TbStSw> getSwSjXx(String rybh);
+    int getSwSjXxCnt(String rybh);
 }

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

+package com.founder.dao;
+
+import com.founder.model.TbXwYthcjYhkjbxx;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Mapper
+public interface YhkxxCjDao {
+
+    public int insertYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
+    public int updateYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
+    public int deleteYhkxx(String xxzjbh);
+    public TbXwYthcjYhkjbxx getYhkxxByXxzjbh(String xxzjbh);
+    public Integer queryPageCount(Map<String, Object> map);
+    public List<TbXwYthcjYhkjbxx> queryPageList(Map<String, Object> map);
+}

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

@@ -184,7 +184,12 @@ public class AutoTbStRy implements Serializable {
     private Date djsj = null;//登记时间
     private String xxczdwGajgjgdm = null;//信息操作单位_公安机关机构代码
 
-
+    private String zj;//是否采集足迹
+    private String hm;//是否采集虹膜
+    private String sw;//是否采集声纹
+    private String sjjbxx;//是否采集手机基本信息
+    private String sjlxrxx;//是否采集手机联系人信息
+    private String yhk;//是否采集银行卡
 
     public String getXxbh() {
         return xxbh;
@@ -1525,4 +1530,52 @@ public class AutoTbStRy implements Serializable {
     public void setR_hmRightBase64(String r_hmRightBase64) {
         this.r_hmRightBase64 = r_hmRightBase64;
     }
+
+    public String getZj() {
+        return zj;
+    }
+
+    public void setZj(String zj) {
+        this.zj = zj;
+    }
+
+    public String getHm() {
+        return hm;
+    }
+
+    public void setHm(String hm) {
+        this.hm = hm;
+    }
+
+    public String getSw() {
+        return sw;
+    }
+
+    public void setSw(String sw) {
+        this.sw = sw;
+    }
+
+    public String getSjjbxx() {
+        return sjjbxx;
+    }
+
+    public void setSjjbxx(String sjjbxx) {
+        this.sjjbxx = sjjbxx;
+    }
+
+    public String getSjlxrxx() {
+        return sjlxrxx;
+    }
+
+    public void setSjlxrxx(String sjlxrxx) {
+        this.sjlxrxx = sjlxrxx;
+    }
+
+    public String getYhk() {
+        return yhk;
+    }
+
+    public void setYhk(String yhk) {
+        this.yhk = yhk;
+    }
 }
\ No newline at end of file

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

 package com.founder.model;
 
+import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 声纹信息数据表
@@ -8,65 +10,82 @@ import java.io.Serializable;
 public class TbStSw implements Serializable {
 
     //信息主键编号
-    private String xxzjbh;
+    public String xxzjbh;
 
     //人员编号
-    private String rybh;
+    public String rybh;
 
     //姓名
-    private String xm;
+    public String xm;
 
     //公民身份证号码
-    private String gmsfhm;
+    public String gmsfhm;
 
     //音频数据
-    private byte[] ypsj;
+    public byte[] ypsj;
 
     //声纹数据
-    private byte[] swsj;
+    public byte[] swsj;
 
     //音频总时长
-    private String zsc;
+    public String zsc;
 
     //音频有效时长
-    private String yxsc;
+    public String yxsc;
 
     //音频信噪比
-    private String xzb;
+    public String xzb;
 
     //音频能量值
-    private String nlz;
+    public String nlz;
 
     //采集场地
-    private String cjcd;
+    public String cjcd;
 
     //信息质量得分
-    private String xxzldf;
+    public String xxzldf;
 
     //录音语种
-    private String lyyz;
+    public String lyyz;
 
     //录音设备
-    private String lysb;
+    public String lysb;
 
     //发音方式
-    private String fyfs;
+    public String fyfs;
 
     //信道
-    private String xd;
+    public String xd;
 
     //汉语方言
-    private String hyfy;
+    public String hyfy;
 
     //录入人
-    private String lrr;
+    public String lrr;
+
+    //录入单位代码
+    public String lrdwdm;
 
     //录入人身份证号
-    private String lrrSfzh;
+    public String lrrSfzh;
 
     //录入人警号
-    private String lrrPolicemanid;
+    public String lrrPolicemanid;
+
+    //更新时间
+    public Date gxsj;
+
+    //采集时间
+    public Date cjsj;
+
+    //删除标志
+    public String xxsc_pdbz;
 
+    //文件名称
+    public String wjmc;
+
+    //文件路径
+    public String wjlj;
 
     public String getXxzjbh() {
         return xxzjbh;
@@ -227,4 +246,52 @@ public class TbStSw implements Serializable {
     public void setLrrPolicemanid(String lrrPolicemanid) {
         this.lrrPolicemanid = lrrPolicemanid;
     }
+
+    public Date getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(Date gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getXxsc_pdbz() {
+        return xxsc_pdbz;
+    }
+
+    public void setXxsc_pdbz(String xxsc_pdbz) {
+        this.xxsc_pdbz = xxsc_pdbz;
+    }
+
+    public String getLrdwdm() {
+        return lrdwdm;
+    }
+
+    public void setLrdwdm(String lrdwdm) {
+        this.lrdwdm = lrdwdm;
+    }
+
+    public String getWjmc() {
+        return wjmc;
+    }
+
+    public void setWjmc(String wjmc) {
+        this.wjmc = wjmc;
+    }
+
+    public String getWjlj() {
+        return wjlj;
+    }
+
+    public void setWjlj(String wjlj) {
+        this.wjlj = wjlj;
+    }
 }

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

+package com.founder.model;
+
+import java.io.Serializable;
+
+/**
+ * 特殊体征信息表
+ */
+public class TbXwYthcjTstz implements Serializable {
+
+    public String xxzjbh;//信息主键编号
+    public String rybh;//人员编号
+    public String xm;//姓名
+    public String gmsfhm;//公民身份号码
+    public String tmtzms;//体貌特征描述
+    public String tstz_zp;//特殊体征照片
+    public String gxsj;//更新时间
+    public String cjsj;//创建时间
+    public String lrr;//录入人
+    public String lrdwdm;//录单位代码
+    public String lrr_policemanid;//录入人警号
+    public String xxsc_pdbz;//删除标志
+
+    public String getXxzjbh() {
+        return xxzjbh;
+    }
+
+    public void setXxzjbh(String xxzjbh) {
+        this.xxzjbh = xxzjbh;
+    }
+
+    public String getRybh() {
+        return rybh;
+    }
+
+    public void setRybh(String rybh) {
+        this.rybh = rybh;
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm;
+    }
+
+    public String getGmsfhm() {
+        return gmsfhm;
+    }
+
+    public void setGmsfhm(String gmsfhm) {
+        this.gmsfhm = gmsfhm;
+    }
+
+    public String getTmtzms() {
+        return tmtzms;
+    }
+
+    public void setTmtzms(String tmtzms) {
+        this.tmtzms = tmtzms;
+    }
+
+    public String getTstz_zp() {
+        return tstz_zp;
+    }
+
+    public void setTstz_zp(String tstz_zp) {
+        this.tstz_zp = tstz_zp;
+    }
+
+    public String getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(String gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public String getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(String cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getLrr() {
+        return lrr;
+    }
+
+    public void setLrr(String lrr) {
+        this.lrr = lrr;
+    }
+
+    public String getLrdwdm() {
+        return lrdwdm;
+    }
+
+    public void setLrdwdm(String lrdwdm) {
+        this.lrdwdm = lrdwdm;
+    }
+
+    public String getLrr_policemanid() {
+        return lrr_policemanid;
+    }
+
+    public void setLrr_policemanid(String lrr_policemanid) {
+        this.lrr_policemanid = lrr_policemanid;
+    }
+
+    public String getXxsc_pdbz() {
+        return xxsc_pdbz;
+    }
+
+    public void setXxsc_pdbz(String xxsc_pdbz) {
+        this.xxsc_pdbz = xxsc_pdbz;
+    }
+}

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

+package com.founder.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 银行卡基本信息表
+ */
+public class TbXwYthcjYhkjbxx implements Serializable {
+
+    public String xxzjbh;//
+    public String rybh;//人员编号
+    public String yhkkh;//银行卡卡号
+    public String xm;//姓名
+    public String yhkmc;//银行卡名称
+    public String yhklx;//银行卡类型
+    public Date zjwxrq;//证件无效日期
+    public String fkdq;//发卡地区(字典项，符合GB/T 2659)
+    public String khh;//开户行
+    public String zjlx;//证件类型
+    public String zjhm;//证件号码
+    public String blxx;//保留信息
+    public String khhh;//开户行号
+    public Date khrq;//开户日期
+    public Date xhrq;//销户日期
+    public String fjsxid;//附加属性 ID
+    public String sczt;//删除状态,0未删除 ，1已删除
+    public Date scsj;//删除时间
+    public Date gxsj;//更新时间
+    public Date cjsj;//创建时间
+    public String lrr;//录入人
+    public String lrdwdm;//录单位代码
+    public String lrr_policemanid;//录入人警号
+    public String xxsc_pdbz;//删除标志
+
+    public String getXxzjbh() {
+        return xxzjbh;
+    }
+
+    public void setXxzjbh(String xxzjbh) {
+        this.xxzjbh = xxzjbh;
+    }
+
+    public String getRybh() {
+        return rybh;
+    }
+
+    public void setRybh(String rybh) {
+        this.rybh = rybh;
+    }
+
+    public String getYhkkh() {
+        return yhkkh;
+    }
+
+    public void setYhkkh(String yhkkh) {
+        this.yhkkh = yhkkh;
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm;
+    }
+
+    public String getYhkmc() {
+        return yhkmc;
+    }
+
+    public void setYhkmc(String yhkmc) {
+        this.yhkmc = yhkmc;
+    }
+
+    public String getYhklx() {
+        return yhklx;
+    }
+
+    public void setYhklx(String yhklx) {
+        this.yhklx = yhklx;
+    }
+
+    public Date getZjwxrq() {
+        return zjwxrq;
+    }
+
+    public void setZjwxrq(Date zjwxrq) {
+        this.zjwxrq = zjwxrq;
+    }
+
+    public String getFkdq() {
+        return fkdq;
+    }
+
+    public void setFkdq(String fkdq) {
+        this.fkdq = fkdq;
+    }
+
+    public String getKhh() {
+        return khh;
+    }
+
+    public void setKhh(String khh) {
+        this.khh = khh;
+    }
+
+    public String getZjlx() {
+        return zjlx;
+    }
+
+    public void setZjlx(String zjlx) {
+        this.zjlx = zjlx;
+    }
+
+    public String getZjhm() {
+        return zjhm;
+    }
+
+    public void setZjhm(String zjhm) {
+        this.zjhm = zjhm;
+    }
+
+    public String getBlxx() {
+        return blxx;
+    }
+
+    public void setBlxx(String blxx) {
+        this.blxx = blxx;
+    }
+
+    public String getKhhh() {
+        return khhh;
+    }
+
+    public void setKhhh(String khhh) {
+        this.khhh = khhh;
+    }
+
+    public Date getKhrq() {
+        return khrq;
+    }
+
+    public void setKhrq(Date khrq) {
+        this.khrq = khrq;
+    }
+
+    public Date getXhrq() {
+        return xhrq;
+    }
+
+    public void setXhrq(Date xhrq) {
+        this.xhrq = xhrq;
+    }
+
+    public String getFjsxid() {
+        return fjsxid;
+    }
+
+    public void setFjsxid(String fjsxid) {
+        this.fjsxid = fjsxid;
+    }
+
+    public String getSczt() {
+        return sczt;
+    }
+
+    public void setSczt(String sczt) {
+        this.sczt = sczt;
+    }
+
+    public Date getScsj() {
+        return scsj;
+    }
+
+    public void setScsj(Date scsj) {
+        this.scsj = scsj;
+    }
+
+    public Date getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(Date gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getLrr() {
+        return lrr;
+    }
+
+    public void setLrr(String lrr) {
+        this.lrr = lrr;
+    }
+
+    public String getLrdwdm() {
+        return lrdwdm;
+    }
+
+    public void setLrdwdm(String lrdwdm) {
+        this.lrdwdm = lrdwdm;
+    }
+
+    public String getLrr_policemanid() {
+        return lrr_policemanid;
+    }
+
+    public void setLrr_policemanid(String lrr_policemanid) {
+        this.lrr_policemanid = lrr_policemanid;
+    }
+
+    public String getXxsc_pdbz() {
+        return xxsc_pdbz;
+    }
+
+    public void setXxsc_pdbz(String xxsc_pdbz) {
+        this.xxsc_pdbz = xxsc_pdbz;
+    }
+}

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

+package com.founder.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 银行卡交易记录表
+ */
+public class TbXwYthcjYhkjyjl implements Serializable {
+
+    public String xxzjbh;//信息主键编号
+    public String rybh;//人员编号
+    public String yhkkh;//银行卡卡号
+    public Date jyrq;//交易日期
+    public Date jysj;//交易时间
+    public String sqje;//授权金额
+    public String qtje;//其它金额
+    public String xzqh;//行政区划，字典项，符合GB/T 2260－2007
+    public String jyhbdm;//交易货币代码，字典项，符合 GBT 12406-2008
+    public String shmc;//商户名称
+    public String jylx;//交易类型
+    public String yyjyjsq;//应用交易计数器
+    public Date gxsj;//更新时间
+    public Date cjsj;//创建时间
+    public String lrr;//录入人
+    public String lrdwdm;//录单位代码
+    public String lrr_policemanid;//录入人警号
+    public String xxsc_pdbz;//删除标志
+
+    public String getXxzjbh() {
+        return xxzjbh;
+    }
+
+    public void setXxzjbh(String xxzjbh) {
+        this.xxzjbh = xxzjbh;
+    }
+
+    public String getRybh() {
+        return rybh;
+    }
+
+    public void setRybh(String rybh) {
+        this.rybh = rybh;
+    }
+
+    public String getYhkkh() {
+        return yhkkh;
+    }
+
+    public void setYhkkh(String yhkkh) {
+        this.yhkkh = yhkkh;
+    }
+
+    public Date getJyrq() {
+        return jyrq;
+    }
+
+    public void setJyrq(Date jyrq) {
+        this.jyrq = jyrq;
+    }
+
+    public Date getJysj() {
+        return jysj;
+    }
+
+    public void setJysj(Date jysj) {
+        this.jysj = jysj;
+    }
+
+    public String getSqje() {
+        return sqje;
+    }
+
+    public void setSqje(String sqje) {
+        this.sqje = sqje;
+    }
+
+    public String getQtje() {
+        return qtje;
+    }
+
+    public void setQtje(String qtje) {
+        this.qtje = qtje;
+    }
+
+    public String getXzqh() {
+        return xzqh;
+    }
+
+    public void setXzqh(String xzqh) {
+        this.xzqh = xzqh;
+    }
+
+    public String getJyhbdm() {
+        return jyhbdm;
+    }
+
+    public void setJyhbdm(String jyhbdm) {
+        this.jyhbdm = jyhbdm;
+    }
+
+    public String getShmc() {
+        return shmc;
+    }
+
+    public void setShmc(String shmc) {
+        this.shmc = shmc;
+    }
+
+    public String getJylx() {
+        return jylx;
+    }
+
+    public void setJylx(String jylx) {
+        this.jylx = jylx;
+    }
+
+    public String getYyjyjsq() {
+        return yyjyjsq;
+    }
+
+    public void setYyjyjsq(String yyjyjsq) {
+        this.yyjyjsq = yyjyjsq;
+    }
+
+    public Date getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(Date gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getLrr() {
+        return lrr;
+    }
+
+    public void setLrr(String lrr) {
+        this.lrr = lrr;
+    }
+
+    public String getLrdwdm() {
+        return lrdwdm;
+    }
+
+    public void setLrdwdm(String lrdwdm) {
+        this.lrdwdm = lrdwdm;
+    }
+
+    public String getLrr_policemanid() {
+        return lrr_policemanid;
+    }
+
+    public void setLrr_policemanid(String lrr_policemanid) {
+        this.lrr_policemanid = lrr_policemanid;
+    }
+
+    public String getXxsc_pdbz() {
+        return xxsc_pdbz;
+    }
+
+    public void setXxsc_pdbz(String xxsc_pdbz) {
+        this.xxsc_pdbz = xxsc_pdbz;
+    }
+}

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

+package com.founder.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 足迹信息表
+ */
+public class TbXwYthcjZj implements Serializable {
+
+    public String xxzjbh;//信息主键编号
+    public String rybh;//人员编号
+    public String xm;//姓名
+    public String gmsfhm;//公民身份号码
+    public String zjbw;//足迹部位
+    public String zjlx;//足迹类型
+    public String zjsj;//足迹数据
+    public String xdhwdm;//鞋底花纹代码
+    public String xydm;//鞋印代码
+    public String gxsj;//更新时间
+    public String cjsj;//创建时间
+    public String lrr;//录入人
+    public String lrdwdm;//录单位代码
+    public String lrr_policemanid;//录入人警号
+    public String xxsc_pdbz;//删除标志
+
+    public String getXxzjbh() {
+        return xxzjbh;
+    }
+
+    public void setXxzjbh(String xxzjbh) {
+        this.xxzjbh = xxzjbh;
+    }
+
+    public String getRybh() {
+        return rybh;
+    }
+
+    public void setRybh(String rybh) {
+        this.rybh = rybh;
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm;
+    }
+
+    public String getGmsfhm() {
+        return gmsfhm;
+    }
+
+    public void setGmsfhm(String gmsfhm) {
+        this.gmsfhm = gmsfhm;
+    }
+
+    public String getZjbw() {
+        return zjbw;
+    }
+
+    public void setZjbw(String zjbw) {
+        this.zjbw = zjbw;
+    }
+
+    public String getZjlx() {
+        return zjlx;
+    }
+
+    public void setZjlx(String zjlx) {
+        this.zjlx = zjlx;
+    }
+
+    public String getZjsj() {
+        return zjsj;
+    }
+
+    public void setZjsj(String zjsj) {
+        this.zjsj = zjsj;
+    }
+
+    public String getXdhwdm() {
+        return xdhwdm;
+    }
+
+    public void setXdhwdm(String xdhwdm) {
+        this.xdhwdm = xdhwdm;
+    }
+
+    public String getXydm() {
+        return xydm;
+    }
+
+    public void setXydm(String xydm) {
+        this.xydm = xydm;
+    }
+
+    public String getGxsj() {
+        return gxsj;
+    }
+
+    public void setGxsj(String gxsj) {
+        this.gxsj = gxsj;
+    }
+
+    public String getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(String cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getLrr() {
+        return lrr;
+    }
+
+    public void setLrr(String lrr) {
+        this.lrr = lrr;
+    }
+
+    public String getLrdwdm() {
+        return lrdwdm;
+    }
+
+    public void setLrdwdm(String lrdwdm) {
+        this.lrdwdm = lrdwdm;
+    }
+
+    public String getLrr_policemanid() {
+        return lrr_policemanid;
+    }
+
+    public void setLrr_policemanid(String lrr_policemanid) {
+        this.lrr_policemanid = lrr_policemanid;
+    }
+
+    public String getXxsc_pdbz() {
+        return xxsc_pdbz;
+    }
+
+    public void setXxsc_pdbz(String xxsc_pdbz) {
+        this.xxsc_pdbz = xxsc_pdbz;
+    }
+}

src/main/java/com/founder/ryswtz/controller/CommonController.java

@@ -227,6 +227,29 @@ public class CommonController {
                     commpkgmap.put("align", "center");
                     pkgs.add(commpkgmap);
                 }
+            }else if("swxx".equals(btly)){
+                if ("rybh".equals(dataname) || "xm".equals(dataname) || "wjmc".equals(dataname) || "zsc".equals(dataname) || "yxsc".equals(dataname)|| "gxsj".equals(dataname)) {
+                    Map<String, Object> commpkgmap = new HashMap<String, Object>();
+                    commpkgmap.put("field", dataname);
+                    if ("xm".equals(dataname)) {//声纹信息记录
+                        commpkgmap.put("title", "对象姓名");//title的名字也是对应的字段属性，如果有特殊需要，可参照if中的写法
+                        commpkgmap.put("width", "20%");
+                    } else if ("rybh".equals(dataname)) {//声纹信息记录
+                        commpkgmap.put("title", "文件名称");//title的名字也是对应的字段属性，如果有特殊需要，可参照if中的写法
+                        commpkgmap.put("width", "30%");
+                    } else if ("gxsj".equals(dataname)) {//声纹信息记录
+                        commpkgmap.put("title", "采集时间");//title的名字也是对应的字段属性，如果有特殊需要，可参照if中的写法
+                        commpkgmap.put("width", "20%");
+                    } else if ("zsc".equals(dataname)) {//声纹信息记录
+                        commpkgmap.put("title", "采集总时长");//title的名字也是对应的字段属性，如果有特殊需要，可参照if中的写法
+                        commpkgmap.put("width", "15%");
+                    } else if ("yxsc".equals(dataname)) {//声纹信息记录
+                        commpkgmap.put("title", "有效时长");//title的名字也是对应的字段属性，如果有特殊需要，可参照if中的写法
+                        commpkgmap.put("width", "15%");
+                    }
+                    commpkgmap.put("align", "center");
+                    pkgs.add(commpkgmap);
+                }
             }
         }
         return pkgs;

src/main/java/com/founder/ryswtz/controller/RyxxController.java

@@ -45,6 +45,8 @@ public class RyxxController {
 
     @Autowired
     private IHmCjService hmCjService;//虹膜信息
+    @Autowired
+    private ISwCjService swCjService;//声纹信息
 
     @GetMapping("/toRyJbxxDetail")
     public String toRyJbxxDetail(String asjxgrybh,String zjhm,String flg, Model model, HttpServletRequest request){
@@ -175,10 +177,14 @@ public class RyxxController {
                 yhkzs = yhkInfoList.get(0).getYhzhzs();
             }
         }
-        //获得笔记信息
+        //获得笔迹信息
         int bjxxzs = 0;
         //获得声纹信息
         int swxxzs = 0;
+        int swcnt = swCjService.getSwSjXxCnt(xyrC.getRybh());//声纹信息
+        if(swcnt>=0){
+            swxxzs = swcnt;
+        }
         //获得虹膜信息
         int hmxxzs = 0;
         List<TbStHm> hmxxList = hmCjService.getHmxxInfoList(xyrC.getRybh());//虹膜信息

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

@@ -2,6 +2,8 @@ package com.founder.service;
 
 import com.founder.model.TbStSw;
 
+import java.util.List;
+
 public interface ISwCjService {
 
     /**
@@ -10,4 +12,18 @@ public interface ISwCjService {
      * @return
      */
     Boolean saveSwSjXx(TbStSw tbStSw);
+
+    /**
+     * 查询声纹信息
+     * @param rybh
+     * @return
+     */
+    List<TbStSw> getSwSjXxList(String rybh);
+
+    /**
+     * 查询声纹信息
+     * @param rybh
+     * @return
+     */
+    int getSwSjXxCnt(String rybh);
 }

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

+package com.founder.service;
+
+import com.founder.model.TbXwSsxdwp;
+import com.founder.model.TbXwYthcjYhkjbxx;
+import com.founder.utils.EasyUIPage;
+
+public interface IYhkxxCjService {
+    public EasyUIPage queryYhkxxPage(EasyUIPage page, TbXwYthcjYhkjbxx yhkjbxx);
+    /**
+     * 保存随身携带物品信息
+     * @param yhkjbxx
+     * @return
+     */
+    Boolean saveYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
+    /**
+     * 获取随身携带物品信息
+     * @param xxzjbh
+     * @return
+     */
+    TbXwYthcjYhkjbxx getYhkxxByXxzjbh(String xxzjbh);
+
+    /**
+     * 修改随身携带物品信息
+     * @param yhkjbxx
+     * @return
+     */
+    Boolean updateYhkxx(TbXwYthcjYhkjbxx yhkjbxx);
+
+    /**
+     * 删除随身携带物品信息
+     * @param xxzjbh
+     * @return
+     */
+    Boolean deleteYhkxx(String xxzjbh);
+
+
+}

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

@@ -6,6 +6,8 @@ import com.founder.service.ISwCjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class SwCjServiceImpl implements ISwCjService {
 
@@ -25,4 +27,13 @@ public class SwCjServiceImpl implements ISwCjService {
         }
         return b;
     }
+    @Override
+    public List<TbStSw> getSwSjXxList(String rybh){
+        return swCjDao.getSwSjXx(rybh);
+    }
+
+    @Override
+    public int getSwSjXxCnt(String rybh){
+        return swCjDao.getSwSjXxCnt(rybh);
+    }
 }

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

+package com.founder.service.impl;
+
+
+import com.founder.dao.YhkxxCjDao;
+import com.founder.model.TbXwYthcjYhkjbxx;
+import com.founder.service.IYhkxxCjService;
+import com.founder.utils.EasyUIPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class YhkxxCjServiceImpl implements IYhkxxCjService {
+
+    @Autowired
+    private YhkxxCjDao yhkxxCjDao;
+
+    @Override
+    public Boolean saveYhkxx(TbXwYthcjYhkjbxx yhkjbxx) {
+        Boolean b = false;
+        try {
+            int a = yhkxxCjDao.insertYhkxx(yhkjbxx);
+            if (a > 0){
+                b = true;
+            }
+        }catch (Exception e){
+            System.out.println("插入随身物品数据失败"+e);
+        }
+        return b;
+    }
+
+    @Override
+    public TbXwYthcjYhkjbxx getYhkxxByXxzjbh(String xxzjbh) {
+        return yhkxxCjDao.getYhkxxByXxzjbh(xxzjbh);
+    }
+
+    @Override
+    public Boolean updateYhkxx(TbXwYthcjYhkjbxx yhkjbxx) {
+        Boolean b = false;
+        try {
+            int a = yhkxxCjDao.updateYhkxx(yhkjbxx);
+            if (a > 0){
+                b = true;
+            }
+        }catch (Exception e){
+            System.out.println("修改随身物品数据失败"+e);
+        }
+        return b;
+    }
+
+    @Override
+    public Boolean deleteYhkxx(String xxzjbh) {
+        Boolean b = false;
+        try {
+            int a = yhkxxCjDao.deleteYhkxx(xxzjbh);
+            if (a > 0){
+                b = true;
+            }
+        }catch (Exception e){
+            System.out.println("删除随身物品数据失败"+e);
+        }
+        return b;
+    }
+
+    @Override
+    public EasyUIPage queryYhkxxPage(EasyUIPage page, TbXwYthcjYhkjbxx yhkjbxx) {
+        Map<String, Object> map = new HashMap<>();
+        String djdw = yhkjbxx.getLrdwdm();
+        if(djdw!=null&&djdw!=""){
+            if (djdw.substring(2, 12).equals("0000000000")) {//省
+                yhkjbxx.setLrdwdm(djdw.substring(0,2));
+            } else if (djdw.substring(4, 12).equals("00000000")) {//市
+                yhkjbxx.setLrdwdm(djdw.substring(0,4));
+            }else if(djdw.substring(6, 12).equals("000000")){ //县
+                yhkjbxx.setLrdwdm(djdw.substring(0,6));
+            }else if(djdw.substring(8, 12).equals("0000")){ //所
+                yhkjbxx.setLrdwdm(djdw.substring(0,8));
+            }
+        }
+        map.put("begin", page.getBegin());
+        map.put("end", page.getEnd());
+        String sort = page.getSort();
+        String order = page.getOrder();
+        if (StringUtils.isEmpty(sort)) { // 默认排序
+            sort = "DJSJ";
+            order = "desc";
+        }
+        map.put("sort", sort);
+        map.put("order", order);
+        map.put("entity", yhkjbxx);
+        page.setTotal(yhkxxCjDao.queryPageCount(map));
+        if (page.getTotal() == 0) {
+            page.setRows(new ArrayList<>());
+        } else {
+            page.setRows(yhkxxCjDao.queryPageList(map));
+        }
+        return page;
+    }
+}

src/main/java/com/founder/util/HttpClientUtil.java

 package com.founder.util;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -17,9 +20,13 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 
-import java.io.IOException;
+import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -149,4 +156,43 @@ public class HttpClientUtil {
 			return res;
 		}
 
+	public static void main(String []args){
+		HttpClientUtil hu = new HttpClientUtil();
+		String imgstrs = null;
+		try {
+			imgstrs = hu.getJsonString("http://172.18.116.158:8081/data/getPSNRollByRybh?rybh=1506020149992010042416");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		//System.out.println(imgstrs);
+
+		//Map<String,Object> rstmap = new HashMap<String,Object>();
+		//JSONObject jsonObject = (JSONObject) JSONObject.parse(imgstrs);
+		//JSONArray jsa = jsonObject.getJSONArray("ret");
+		//for (int i = 0; i < jsa.size(); i++) {
+		//	JSONObject obj = jsa.getJSONObject(i);
+		//	String position= obj.getString("position");
+		//	String image= obj.getString("image");
+		//	rstmap.put("rfpimg"+i,image);
+		//}
+	}
+
+	public String getJsonString(String urlPath) throws Exception {
+		URL url = new URL(urlPath);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.connect();
+		InputStream inputStream = connection.getInputStream();
+		// 对应的字符编码转换
+		Reader reader = new InputStreamReader(inputStream, "UTF-8");
+		BufferedReader bufferedReader = new BufferedReader(reader);
+		String str = null;
+		StringBuffer sb = new StringBuffer();
+		while ((str = bufferedReader.readLine()) != null) {
+			sb.append(str);
+		}
+		reader.close();
+		connection.disconnect();
+		return sb.toString();
+	}
+
 }

src/main/java/com/founder/utils/FileUtils.java

 package com.founder.utils;
 
+import com.founder.model.Param;
+import com.founder.model.User;
+import sun.misc.BASE64Decoder;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 public class FileUtils {
     public static void uploadFile(byte[] file, String filePath, String fileName) throws Exception {
@@ -73,4 +86,240 @@ public class FileUtils {
             return false;
         }
     }
+
+    /**
+     * 压缩文件
+     * @param exportFilePathList
+     * @param response
+     */
+    public static void downloadPictureZip(List<String> exportFilePathList, HttpServletResponse response) {
+        ZipOutputStream zipos = null;
+        try {
+            zipos = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
+            zipos.setMethod(ZipOutputStream.DEFLATED);// 设置压缩方法DEFLATED
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        DataOutputStream os = null;
+        // 循环将文件写入压缩流
+        for (String filePath : exportFilePathList) {
+            File file = new File(filePath);
+            try {
+                // 添加ZipEntry，并ZipEntry中写入文件流
+                zipos.putNextEntry(new ZipEntry(file.getName()));
+                os = new DataOutputStream(zipos);
+                InputStream is = new FileInputStream(file);
+                byte[] b = new byte[100];
+                int length = 0;
+                while ((length = is.read(b)) != -1) {
+                    os.write(b, 0, length);
+                }
+                is.close();
+                zipos.closeEntry();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        // 关闭流
+        try {
+            os.flush();
+            os.close();
+            zipos.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //生成XML文件并且存入服务器端
+    public static void saveXmlFile(String xmlStr, String rybh, String xmlFilePath, String fileName, User user,HttpServletResponse response) {
+        String savePathS = "/xmlFile";
+        String filePathS = xmlFilePath;
+        filePathS = filePathS+savePathS;
+        File filejiaS = new File(filePathS); // 如果文件夹不存在则创建
+        if (!filejiaS.exists()) {
+            filejiaS.mkdir();
+        }
+
+        String savePathNY = "/xmlFile/"
+                + rybh.substring(rybh.length() - 10, rybh.length() - 4);
+        String filePathNY = xmlFilePath;
+        filePathNY = filePathNY+savePathNY;
+        File filejiaNY = new File(filePathNY); // 如果文件夹不存在则创建
+        if (!filejiaNY.exists()) {
+            filejiaNY.mkdir();
+        }
+        String savePath = "/xmlFile/"
+                + rybh.substring(rybh.length() - 10, rybh.length() - 4)
+                + "/" + rybh.substring(rybh.length() - 3, rybh.length());
+        String filePath = xmlFilePath;
+        filePath = filePath+savePath;
+        File filejia = new File(filePath); // 如果文件夹不存在则创建
+        if (!filejia.exists()) {
+            filejia.mkdir();
+        }
+        GenerateFile(xmlStr, filePath+"/"+fileName);
+
+        ArrayList<String> listFileName = getHeadXmlFileStr(filePath,rybh,user);
+        downloadPictureZip(listFileName,response);
+    }
+    public static byte[] GenerateFile(String imgStr, String imgFilePath) {// 对字节数组字符串进行Base64解码并生成图片
+        if (imgStr == null) // 文件数据为空
+            return null;
+        //BASE64Decoder decoder = new BASE64Decoder();
+        try {
+            byte[] bytes = imgStr.getBytes();
+            // 生成文件到指定路径
+            OutputStream out = new FileOutputStream(imgFilePath);
+            out.write(bytes);
+            out.flush();
+            out.close();
+            return bytes;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static ArrayList<String> getHeadXmlFileStr(String path,String rybh,User user){
+        String dataStr = "";
+        ArrayList<String> listFileName = new ArrayList<String>();
+        File file = new File(path);
+        String [] names = file.list();
+        if(names != null){
+            int jls = 0;
+            for(int i=0;i<names.length;i++){
+                if(names[i].indexOf(rybh)>=0){
+                    if(names[i].indexOf("JCCJ-")<0){
+                        jls+=1;
+                        if(names[i].indexOf("JBXX-")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM=\"JBXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf(".fptx")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM=\"ZZWXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("RXXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"RXXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if((rybh+".zip").equals(names[i])){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"SJXX\">\n" +
+                                    "\t\t\t<JLWJM>440000-705420347-1111222233334444-1387896541-00001.zip</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("HMXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"HMXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("SWXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"SWXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("BJXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"BJXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("YHKXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"YHKXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("SSWPXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"SSWPXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("DNAXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"DNAXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("ZJXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"ZJXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                        if(names[i].indexOf("TSTZXX")>=0){
+                            dataStr = dataStr +
+                                    "\t\t<RECORD CJXXLBDM =\"TSTZXX\">\n" +
+                                    "\t\t\t<JLWJM>"+names[i]+"</JLWJM>\t\n" +
+                                    "\t\t</RECORD>\n";
+                        }
+                    }
+
+
+                    listFileName.add(names[i]);
+                }
+            }
+            Date sysdate = new Date();
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss");
+            String dateString = formatter.format(sysdate);
+            String headXmlStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                    "<PACKAGE>\n" +
+                    "\t<PACKAGEHEAD>\n" +
+                    "\t\t<BBH>1.00</BBH>\n" +
+                    "\t\t<YYJCXXCJBH>"+rybh+"</YYJCXXCJBH>\n" +
+                    "\t\t<FSDW_GAJGJGDM>"+user.getUnitcode()+"</FSDW_GAJGJGDM>\n" +
+                    "\t\t<FSDW_GAJGMC>"+user.getUnitname()+"</FSDW_GAJGMC>\n" +
+                    "\t\t<DBSJ>"+dateString+"</DBSJ>\n" +
+                    "\t\t<JLS>"+jls+"</JLS>\n" +
+                    "\t</PACKAGEHEAD>\n" +
+                    "\t<DATA>\n";
+            GenerateFile(headXmlStr+dataStr, path+"/JCCJ-R4302020000002019080001.xml");
+            listFileName.add("JCCJ-R4302020000002019080001.xml");
+        }
+        return listFileName;
+    }
+
+  public  static void main(String []args){
+      User user = new User();
+      user.setUnitcode("430200000000");
+      user.setUnitname("湖南省株洲市公安局");
+      String xmlStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+              "<PACKAGE>\n" +
+              "\t<PACKAGEHEAD>\n" +
+              "\t\t<BBH>1.00</BBH>\n" +
+              "\t\t<YYJCXXCJBH>R3505240000002018090001</YYJCXXCJBH>\n" +
+              "\t\t<FSDW_GAJGJGDM>350524000000</FSDW_GAJGJGDM>\n" +
+              "\t\t<FSDW_GAJGMC>福建省安溪县公安局</FSDW_GAJGMC>\n" +
+              "\t\t<DBSJ>20130903150403</DBSJ>\n" +
+              "\t\t<JLS>5</JLS>\n" +
+              "\t</PACKAGEHEAD>\n" +
+              "\t<DATA>\n" +
+              "\t\t<RECORD CJXXLBDM=\"JBXX\">\n" +
+              "\t\t\t<JLWJM>JBXX-R1100000500002014070001.xml</JLWJM>\n" +
+              "\t\t</RECORD>\n" +
+              "\t\t<RECORD CJXXLBDM=\"ZZWXX \">\n" +
+              "\t\t\t<JLWJM>R1100000500002014070001.fptx</JLWJM>\t\n" +
+              "\t\t</RECORD>\n" +
+              "\t\t<RECORD CJXXLBDM =\"RXXX \">\n" +
+              "\t\t\t<JLWJM>RXXX-R1100000500002014070001.xml</JLWJM>\t\n" +
+              "\t\t</RECORD>\n" +
+              "\t\t<RECORD CJXXLBDM =\"SJXX \">\n" +
+              "\t\t\t<JLWJM>440000-705420347-1111222233334444-1387896541-00001.zip</JLWJM>\t\n" +
+              "\t\t</RECORD>\n" +
+              "\t\t<RECORD CJXXLBDM =\"HMXX \">\n" +
+              "\t\t\t<JLWJM>HMXX-R1100000500002014070001.xml</JLWJM>\t\n" +
+              "\t\t</RECORD>\n" +
+              "\t</DATA>\n" +
+              "</PACKAGE>";
+      FileUtils.saveXmlFile(xmlStr,"R4302020000002019080001","C:/Oracle/Middleware/user_projects/domains/XTBA_domain/autodeploy/XZZYXT/upload","HMXX-R4302020000002019080001.xml",user,null);
+  }
 }

src/main/resources/mapper/AfisQualityCkSqlMapper.xml

@@ -189,7 +189,7 @@
         A.R_RYBH as RRybh,
         A.R_XM as RXm,
         A.R_ZWBH as RZwbh,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_UNIT' and s.code = A.R_CJDW) as RCjdw,
+        (select name from sys_dictitem s where s.groupid='CODE_UNIT' and s.code = A.R_CJDW) as RCjdw,
         A.JCJG as jcjg,
         A.R_RX as RRx,
         A.R_WZXX as RWzxx,
@@ -200,11 +200,11 @@
         A.R_CJCS as RCjcs,
         A.R_CJSJ as RCjsj,
         A.ZWZT as zwzt,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_JY' and s.code = A.JCR) as jcr,
+        (select name from sys_dictitem s where s.groupid='CODE_JY' and s.code = A.JCR) as jcr,
         A.JCSJ as jcsj,
         A.QDZLJCJS as qdzljcjs ,
         B.R_SJLXDH as r_sjlxdh,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
+        (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S where 1=1
@@ -237,7 +237,7 @@
         A.R_XM as RXm,
         A.R_ZWBH as RZwbh,
         (select name
-        from sys_dictitem_xzxt s
+        from sys_dictitem s
         where s.groupid = 'CODE_UNIT'
         and s.code = A.R_CJDW) as RCjdw,
         cc.JCJG as jcjg,
@@ -249,11 +249,11 @@
         cc.BZ as bz,
         A.R_CJCS as RCjcs,
         A.R_CJSJ as RCjsj,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_JY' and s.code = cc.CCR) as ccr,
+        (select name from sys_dictitem s where s.groupid='CODE_JY' and s.code = cc.CCR) as ccr,
         cc.CCSJ as ccsj,
         cc.QDZLJCJS as qdzljcjs ,
         B.R_SJLXDH as r_sjlxdh,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
+        (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S,AFIS_QUALITY_CC cc where 1=1
@@ -283,7 +283,7 @@
         A.R_XM as RXm,
         A.R_ZWBH as RZwbh,
         (select name
-        from sys_dictitem_xzxt s
+        from sys_dictitem s
         where s.groupid = 'CODE_UNIT'
         and s.code = A.R_CJDW) as RCjdw,
         cc.JCJG as jcjg,
@@ -296,11 +296,11 @@
         cc.BZ as bz,
         A.R_CJCS as RCjcs,
         A.R_CJSJ as RCjsj,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_JY' and s.code = cc.CCR) as ccr,
+        (select name from sys_dictitem s where s.groupid='CODE_JY' and s.code = cc.CCR) as ccr,
         cc.CCSJ as ccsj,
         cc.QDZLJCJS as qdzljcjs ,
         B.R_SJLXDH as r_sjlxdh,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
+        (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S,AFIS_QUALITY_CC cc where 1=1
@@ -330,7 +330,7 @@
         A.R_XM as RXm,
         A.R_ZWBH as RZwbh,
         (select name
-        from sys_dictitem_xzxt s
+        from sys_dictitem s
         where s.groupid = 'CODE_UNIT'
         and s.code = A.R_CJDW) as RCjdw,
         cc.JCJG as jcjg,
@@ -343,11 +343,11 @@
         cc.BZ as bz,
         A.R_CJCS as RCjcs,
         A.R_CJSJ as RCjsj,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_JY' and s.code = cc.CCR) as ccr,
+        (select name from sys_dictitem s where s.groupid='CODE_JY' and s.code = cc.CCR) as ccr,
         cc.CCSJ as ccsj,
         cc.QDZLJCJS as qdzljcjs ,
         B.R_SJLXDH as r_sjlxdh,
-        (select name from sys_dictitem_xzxt s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
+        (select name from sys_dictitem s where s.groupid='CODE_XZQH' and s.code = B.HJDZ_XZQHDM) as hjd,
         B.ZJHM as zjhm,
         S.ZW_SX as zwsx
         from AFIS_QUALITY_CK A,TB_RY_RYCJ B,SYS_PARAM_DATE S,AFIS_QUALITY_CC cc where 1=1

src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -95,6 +95,12 @@
         <result column="R_RX"  property="RRx"  jdbcType="VARCHAR"/>
         <result column="BZ"  property="bz"  jdbcType="VARCHAR"/>
         <result column="JCJG"  property="jcjg"  jdbcType="VARCHAR"/>
+        <result column="SJJBXX"  property="sjjbxx"  jdbcType="VARCHAR"/>
+        <result column="SJLXRXX"  property="sjlxrxx"  jdbcType="VARCHAR"/>
+        <result column="HM"  property="hm"  jdbcType="VARCHAR"/>
+        <result column="ZJ"  property="zj"  jdbcType="VARCHAR"/>
+        <result column="SW"  property="sw"  jdbcType="VARCHAR"/>
+        <result column="YHK"  property="yhk"  jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="queryWhere">
@@ -172,6 +178,12 @@
         LRDWDM,
         LRR,
         LRSJ,
+        (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh) as HM,
+        (select count(1) from tb_xw_ythcj_sw s where s.rybh=TB_RY_RYCJ.rybh) as SW,
+        (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh) as ZJ,
+        (select count(1) from tb_xw_ythcj_yhkjbxx s where s.rybh=TB_RY_RYCJ.rybh) as YHK,
+        (select count(1) from tb_ph_fzxyrsjgl s where s.xyrbh=TB_RY_RYCJ.rybh) as SJJBXX,
+        (select count(1) from tb_ph_lxrxx s where s.xyrbh=TB_RY_RYCJ.rybh) as SJLXRXX,
         TB_RY_RYCJ.SCBZ,
         (select name from sys_dictitem s where s.groupid='CODE_XB' and s.code = TB_RY_RYCJ.XBDM) as XBDM,
         (select name from sys_dictitem s where s.groupid='CODE_UNIT' and s.code = TB_RY_RYCJ.ZWCJDWDM) as ZWCJDWDM,

src/main/resources/mapper/SwCjSqlMapper.xml

@@ -54,4 +54,12 @@
         )
 
     </insert>
+
+    <select id="getSwSjXx" parameterType="java.lang.String"  resultType="com.founder.model.TbStSw">
+        select * from TB_ST_SW where (XXSC_PDBZ='0' or XXSC_PDBZ is null) and RYBH = #{rybh , jdbcType=VARCHAR } order by gxsj
+    </select>
+
+    <select id="getSwSjXxCnt" parameterType="java.lang.String"  resultType="int">
+        select count(1) from TB_ST_SW where (XXSC_PDBZ='0' or XXSC_PDBZ is null) and RYBH = #{rybh , jdbcType=VARCHAR }
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/static/js/AjaxFunctoAfis_gk.js

+//script LANGUAGE="javaScript"
+//var myAfis =new ActiveXObject("PrtScan.Document"); 
+// edit by jfm 20061207
+var AjaxxmlHttp = false;
+var AjaxmyAfisT = false;
+var AjaxmyAfisL = false;
+var AjaxmyAfisAuto = false;
+var EnableZwSystem = 1;
+var AfisSvrName = '192.168.128.223';//'10.118.9.68';//<%//=application.getAttribute("AFISSvrName")%>';
+var AfisSvrPort = '5773';//'5773';//<%//=application.getAttribute("AFISSvrPort")%>';
+var AfisUserName = 'afisroot';
+var AfisPassword = 'afisroot';
+var AfisHttpSvrName = '';
+var AfisHttpSvrPort = '';
+var AfisScanMode=1;
+var AfisPsnUpMode=2;
+//var AfisHttpSvrName = "<%=application.getAttribute(\"AFISHttpSvrName\")%>";//'10.118.9.187';
+//var AfisHttpSvrPort = "<%=application.getAttribute(\"AFISHttpSvrPort\")%>";//'7001
+var myupAfis;
+//人员基本信息组成的str
+function GettoAfisStr(rybh)
+{
+	var rstr;
+	//人员基本信息组成的xml
+	$.ajax({
+		url : 'ajaxGettoAfisStr',
+		async: false,
+		type: 'post',
+		dataType: 'text',
+		data:{
+			psnid:rybh,
+			clientVersion:'1'
+		},
+		success : function(data){
+			if(data){
+				rstr=data;
+			}else{//未查询到数据
+				$.messager.alert({
+					title : '提示信息',
+					msg : '未获取到主键【'+$('#rybh').val()+'】有效的线索信息，页面即将关闭！',
+					fn : function(){
+						crossCloseTab();
+					}
+				});
+				return false;
+			}
+		},
+		error: function(XMLHttpRequest, textStatus, errorThrown) {
+			//alert("头 = " + XMLHttpRequest.getResponseHeader('Access-Control-Allow-Origin'));
+			alert("请求创建调用控件失败,错误状态=="+XMLHttpRequest.status);
+		}
+	});
+	return rstr;
+}
+
+
+//主要用的就是这个函数
+function scanPersonInfotoAfisEx(theForm,status,s1,s2,s3,flag){
+	debugger;
+	var zhiwenid,barcode;
+	var ret,rstr;
+	var myAfis = null;
+		var ri=1;
+		if(theForm){
+			barcode = theForm;
+		}
+		zhiwenid = $('#szzwbh').val();
+		if(zhiwenid == "") {
+			zhiwenid = barcode.substr(1);
+			//zhiwenid=zhiwenid.substring(0,18)+"5"+zhiwenid.substring(19,23);
+		}else{
+			if(zhiwenid.length!="22"){
+				$.messager.alert( '提示',"编号为"+barcode+"的人员，指纹编号输入不正确，请重新输入！指纹编号规则为人员编号去掉前面的‘R’");
+				return false;
+			}
+		}
+		ri=scanPersonInfotoAfis(zhiwenid,barcode);
+		return ri;
+}
+
+function scanPersonInfotoAfis(zhiwenid,rybh)
+{
+  
+  var ver,rstr;
+  var ret,sret;
+  var myAfis = null;
+  
+  if(EnableZwSystem) {
+	  var rs = newActiveXObject("PrtScan.Document");
+	  if(rs != "成功"){
+		  alert("调用指掌纹图像控件失败！");
+		  return;
+	  }
+  }
+  if(rs=="成功"){     
+     ver=GetVersion();
+     //20130114 shaomin 增加指纹版本号判断3.2版本与4.1版本分开调
+     if(ver==32){
+     	sret=getMyAfis32(zhiwenid,rybh);
+     	return sret;
+     }else{
+	     if(zhiwenid != ""){
+		  	rstr = GettoAfisStr(rybh);
+		  	if(rstr == "NULL"){
+		  	   alert("无相关人员信息！没有保存到指纹系统.");
+		  	   return -9;
+		  	}
+		  	SetLoginInfo(AfisUserName,AfisPassword,AfisSvrName);
+		  	SetScanMode(AfisScanMode);  	
+			ShowPrtScan(1);
+			sret= ScanFingerImage(zhiwenid,rybh,rstr);
+			//alert(sret);
+			if(sret>0){
+				 var fh=0;
+				 try{      
+						  var front=GetBase64String(zhiwenid,1);
+					      var left=GetBase64String(zhiwenid,2);
+					      var right=GetBase64String(zhiwenid,4);             
+					      if(front.length>0){
+							  $("#pic2").attr("src","data:image/jpg;base64,"+str);
+							  document.frminput.pic2.src = "data:image/jpg;base64,"+str;
+							  fh+=1;
+					      }
+					      if(left.length>0){
+							  $("#pic3").attr("src","data:image/jpg;base64,"+str);
+							  document.frminput.pic3.src = "data:image/jpg;base64,"+str;
+							  fh+=1;
+					      }
+					      if(right.length>0){
+							  $("#pic4").attr("src","data:image/jpg;base64,"+str);
+							  document.frminput.pic4.src = "data:image/jpg;base64,"+str;
+							  fh+=1;
+					      }
+				      
+				      if(fh>0){
+				    	  alert("指掌纹、人像、人员信息保存成功！");
+						  zhiwenid = $('#szzwbh').val();
+						  if(zhiwenid == "") {
+							  zhiwenid = barcode.substr(1);
+						  }
+						  $("#szzwbh").val(zhiwenid)
+				 		  //submitForm(this);
+				      }else{
+						  zhiwenid = $('#szzwbh').val();
+						  if(zhiwenid == "") {
+							  zhiwenid = barcode.substr(1);
+						  }
+						  $("#szzwbh").val(zhiwenid)
+				 		  //submitForm(this);
+				      }  
+				  }catch(e){
+				  		alert("指掌纹、人像、人员信息保存成功,更新指纹编号成功，同步照片失败！");
+					 zhiwenid = $('#szzwbh').val();
+					 if(zhiwenid == "") {
+						 zhiwenid = barcode.substr(1);
+					 }
+					 $("#szzwbh").val(zhiwenid)
+				 		 //submitForm(this);
+				  }  
+				  FinishPrtScanAuto();
+				  FinishCatchPhotoImgAuto();
+				  FinishIDHWReaderAuto();
+			 }
+		    return sret;
+	     }else {
+	    	alert("指纹编号不能为空！")
+	        return -9;
+	     }
+     }
+  }else{
+    //alert("请安装相关指纹系统！");
+    return -9;
+  }
+}
+//20130114 shaomin 指纹系统版本为3.2时调用
+function getMyAfis32(zwbh,rybh){
+  var sret;
+  var rstr;
+  myAfis=GetAfisObject();
+	  if(zwbh!=""){
+		  rstr = GettoAfisStr($('#rybh').val());
+		  if(rstr == "NULL"){
+		 	   alert("无相关人员信息！没有保存到指纹系统.");
+		 	   return -9;
+		  }
+		  SetLoginInfo(AfisUserName,AfisPassword,AfisSvrName);
+		  ShowPrtScan(1);
+		  sret= ScanFingerImage(zwbh,rybh,rstr);
+		  return sret;
+	  }else{
+	  	alert("指纹编号不能为空！");
+		return -9;
+	  }
+}
\ No newline at end of file

src/main/resources/static/js/activeObjUtil_gk.js

+//使用ajax来控制控件的创建与调用
+//add by qinzhijin on 20180311 改用http调用控件接口工具
+//创建控件对象
+function newActiveXObject(ActiveXObjectName){
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":ActiveXObjectName,"methodName":"GetVersion"};
+    $.ajax({
+        type: "post",
+        url: path,//调用该路径的控件
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",//解决跨域请求
+        crossDomain: true,
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = status;
+        	}else{
+        		//alert("调用控件错误，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+        	//alert("头 = " + XMLHttpRequest.getResponseHeader('Access-Control-Allow-Origin'));
+            alert("请求创建调用控件失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//=========二代证===================================================
+function ReadICCardInfo() {//二代证
+		var rs;
+        var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+        var param = {"autoSvrID":"IDHWReader.Document","methodName":"ReadICCardInfo"};
+        $.ajax({
+            type: "post",
+            url: path,
+            async: false,
+            data: param,
+            contentType: "application/x-www-form-urlencoded",  
+            dataType: "json",
+            success: function(data) {
+            	var rstemp = eval(data);
+            	var status = rstemp.apiStatus;
+            	if(status == "成功"){
+            		rs = rstemp.apiReturn;
+            	}else{
+            		alert("获取二代证信息失败，错误状态："+status);
+            		rs = "";
+            	}
+            },
+            error: function(XMLHttpRequest, textStatus, errorThrown) {
+                alert("获取二代证信息失败,错误状态=="+XMLHttpRequest.status+","+errorThrown);
+            }
+            });
+       return rs; 
+    }
+
+//=========身高体重===================================================
+function ReadHWInfo() {//身高体重
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"IDHWReader.Document","methodName":"ReadHWInfo"};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.apiReturn;
+        	}else{
+        		alert("获取身高体重信息失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("获取身高体重信息失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//=========人像===================================================
+//设置要保存的图像名称
+function SetBmpFileName(filename) {
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"CatchPhotoImg.Document","methodName":"SetBmpFileName","param1":filename};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = status;
+        	}else{
+        		alert("设置图像名称失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("设置图像名称失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//设置要人像的姓名
+function SetPersonName(tpName) {
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PhotoCatcher.Document","methodName":"SetPersonName","param1":tpName};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = status;
+        	}else{
+        		alert("设置图像人名失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("设置图像人名失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//获取人像数据
+function GetOneAfisPhotoForWeb() {
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"CatchPhotoImg.Document","methodName":"GetOneAfisPhotoForWeb"};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.apiReturn;
+        		//alert("人像数据==="+rs);
+        	}else{
+        		alert("获取人像数据失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("获取人像数据失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//获取人像照片保存在本地的路径
+function GetPhotoPath() {
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PhotoCatcher.Document","methodName":"GetPhotoPath","param1":"2"};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data:param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.apiReturn;
+        	}else{
+        		alert("获取图片路径失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("获取图片路径失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//==========指掌纹================================
+//获取接口版本
+function GetVersion() {
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = "{\"autoSvrID\":\"PrtScan.Document\",\"methodName\":\"GetVersion\"}";
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.apiReturn;
+        	}else{
+        		alert("获取指纹版本信息失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("获取指纹版本信息失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//设置用户名，密码，指纹服务器IP
+function SetLoginInfo(AfisUserName,AfisPassword,AfisSvrName){
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PrtScan.Document","methodName":"SetLoginInfo","param1":AfisUserName,"param2":AfisPassword,"param3":AfisSvrName};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = status;
+        	}else{
+        		alert("设置用户名，密码，指纹服务器IP失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("设置用户名，密码，指纹服务器IP失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//设置采集方式
+function SetScanMode(AfisScanMode){
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PrtScan.Document","methodName":"SetScanMode","param1":AfisScanMode};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = status;
+        	}else{
+        		alert("设置采集方式失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("设置采集方式失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+function ShowPrtScan(param1){
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PrtScan.Document","methodName":"ShowPrtScan","param1":param1};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = status;
+        	}else{
+        		alert("设置采集方式失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("设置采集方式失败,错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+function GetBase64String(param1,param2){
+	var rs;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"CatchPhotoImg.Document","methodName":"GetBase64String","param1":param1,"param2":param2};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	var rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.apiReturn;
+        	}else{
+        		alert("设置调用人像采集失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+//指掌纹采集控件CatchPrtImg.exe，并把基本信息，人像数据，指掌纹数据等打包成fpt文件
+/*
+strDactylogramID  ---- 指纹条码号			
+strPersonID       ---- 人员条码号
+strWordInfo      ---- 文字信息（文档中有人员基本信息详细内容，即步骤四中的rstr）
+输出：
+>0 表示已保存采集到的指掌纹信息, 接口调用成功
+=0 表示未保存采集到的指掌纹信息, 接口调用成功
+<0 表示未保存采集到的指掌纹信息, 接口调用失败
+*/
+function ScanFingerImage(strDactylogramID,strPersonID,strWordInfo){
+	var rs;
+	var rstemp;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PrtScan.Document","methodName":"ScanFingerImage","param1":strDactylogramID,"param2":strPersonID,"param3":strWordInfo};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.apiReturn;
+        	}else{
+        		alert("采集指掌纹失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+
+function FinishPrtScanAuto(){
+	var rs;
+	var rstemp;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"PrtScan.Document", "methodName":"FinishPrtScanAuto"};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.status;
+        	}else{
+        		alert("采集指掌纹失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+function FinishCatchPhotoImgAuto(){
+	var rs;
+	var rstemp;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"CatchPhotoImg.Document", "methodName":"FinishCatchPhotoImgAuto"};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.status;
+        	}else{
+        		alert("采集指掌纹失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
+function FinishIDHWReaderAuto(){
+	var rs;
+	var rstemp;
+    var path =  "http://127.0.0.1:8000/automationsvr/v1/";
+    var param = {"autoSvrID":"IDHWReader.Document", "methodName":"FinishIDHWReaderAuto"};
+    $.ajax({
+        type: "post",
+        url: path,
+        async: false,
+        data: param,
+        contentType: "application/x-www-form-urlencoded",  
+        dataType: "json",
+        success: function(data) {
+        	rstemp = eval(data);
+        	var status = rstemp.apiStatus;
+        	if(status == "成功"){
+        		rs = rstemp.status;
+        	}else{
+        		alert("采集指掌纹失败，错误状态："+status);
+        		rs = "";
+        	}
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            //alert("错误状态=="+XMLHttpRequest.status);
+        }
+        });
+   return rs; 
+}
\ No newline at end of file

src/main/resources/static/js/catchpic_gk.js

+var index;
+function getRxbclj(index_){
+	index = index_;
+	getTp();
+}
+
+function getTp(index){
+	var barcodeStr = frminput.rybh.value;
+	var nameStr = frminput.xm.value;
+	//test
+	//alert("frminput.NAME.value = " + nameStr);
+	if(index==2){
+		setTP(frminput.R_ZMZP64,barcodeStr+'_'+nameStr+'_2.jpg',$('#imghead2'),nameStr,index);
+	}else if(index==3){
+		setTP(frminput.R_CMZP64,barcodeStr+'_'+nameStr+'_3.jpg',$('#imghead3'),nameStr,index);
+	}else if(index==4){
+		setTP(frminput.R_YCMZP64,barcodeStr+'_'+nameStr+'_4.jpg',$('#imghead4'),nameStr,index);
+	}
+}
+
+
+function setTP(tpCode,tpFile,tpShow,tpName,index){
+	SetBmpFileName(tpFile);
+	SetPersonName(tpName);
+	var str=GetOneAfisPhotoForWeb();
+	if(str=="" || str==undefined){
+		alert("获取人像数据失败！");
+		return;
+	}
+	var ifIe = browserType();
+	var picfile = GetPhotoPath();
+	tpCode.value = str;
+	tpShow.src="";  //清空图片缓存，解决重采照片时不能刷新的问题
+	if(ifIe){
+		tpShow.src = picfile;
+	}else{
+		tpShow.src = "data:image/jpg;base64,"+str;
+	}
+	if(index==2){
+		var obj=document.getElementById("pic2");
+		if(ifIe){
+			$("#pic2").attr("src",picfile);
+		}else{
+			$("#imghead2").attr("src","data:image/jpg;base64,"+str);
+			document.frminput.imghead2.src = "data:image/jpg;base64,"+str;
+		}
+	}else if(index==3){
+		if(ifIe){
+			$("#pic3").attr("src",picfile);
+		}else{
+			$("#pic3").attr("src","data:image/jpg;base64,"+str);
+			document.frminput.pic3.src = "data:image/jpg;base64,"+str;
+		}
+	}else if(index==4){
+		if(ifIe){
+			$("#pic4").attr("src",picfile);
+		}else{
+			$("#pic4").attr("src","data:image/jpg;base64,"+str);
+			document.frminput.pic4.src = "data:image/jpg;base64,"+str;
+		}
+	}
+}
+
+function getObjectURL(file) {
+	var url = null;
+	if (window.createObjcectURL != undefined) {
+		url = window.createOjcectURL(file);
+	} else if (window.URL != undefined) {
+		url = window.URL.createObjectURL(file);
+	} else if (window.webkitURL != undefined) {
+		url = window.webkitURL.createObjectURL(file);
+	}
+	return url;
+}
+function showPreview(file,index) {
+	var str = getObjectURL(file.files[0]);
+	//alert("新路径=="+str);
+	var id = "pic"+index;
+	document.getElementById(id).innerHTML = "<img src = '"+str+"'/>";
+}
+
+function browserType(){
+
+	var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+
+	if (userAgent.indexOf("compatible") > -1 || userAgent.indexOf("MSIE") > -1 ) {
+		return true;
+	}else{
+		return false;
+	}
+
+}

src/main/resources/static/js/edzFunc_gk.js

+var edzAuto = false;
+var EnableedzSystem = 1;
+function GetedzInfo(){
+var tishixingxi="";
+var ss="";
+var ret=0;
+		var str = ReadICCardInfo();//"1&2$3$男$汉$1987年01月01日$山西太原$140106198505052236$"// 
+		if(str==undefined){
+			alert("获取二代证信息失败");
+			return false;
+		}
+	var ifIe = false;//browserType();
+	//console.log(str);
+	if(str!="" && str.indexOf("$")>0){
+		tishixingxi=str.substring(0,str.indexOf("&"));  //提示信息
+		str=str.substring(str.indexOf("&")+1,str.length);
+		try{
+			var imgs = str.substring(0,str.indexOf("$"));
+			//$("#imghead1").attr("src",imgs);//路径
+		}catch(e){}
+		str=str.substring(str.indexOf("$")+1,str.length);
+		try{
+			$("#xm").val(str.substring(0,str.indexOf("$")));//姓名
+		}catch(e){}
+		str=str.substring(str.indexOf("$")+1,str.length);
+		ss=str.substring(0,str.indexOf("$"));
+		//性别xbdm
+		if(ss=="女"){
+			$("#xbdm").combobox("setValue","2");
+		}
+		if(ss=="男"){
+			$("#xbdm").combobox("setValue","1");
+		}
+		//性别
+		str=str.substring(str.indexOf("$")+1,str.length);
+		ss=str.substring(0,str.indexOf("$"));
+		if(ss=="汉") $("#mzdm").combobox("setValue","01");//theForm.nNATION.value = "01";
+		else if(ss=="蒙古") $("#mzdm").combobox("setValue","02");//theForm.nNATION.value = "02";
+		else if(ss=="回") $("#mzdm").combobox("setValue","03");//theForm.nNATION.value ="03";
+		else if(ss=="藏") $("#mzdm").combobox("setValue","04");//theForm.nNATION.value="04";
+		else if(ss=="维吾尔") $("#mzdm").combobox("setValue","05");//theForm.nNATION.value="05";
+		else if(ss=="苗") $("#mzdm").combobox("setValue","06");//theForm.nNATION.value="06";
+		else if(ss=="彝") $("#mzdm").combobox("setValue","07");//$("#mzdm").combobox("setValue","07");//="07";
+		else if(ss=="壮") $("#mzdm").combobox("setValue","08");//="08";
+		else if(ss=="布依") $("#mzdm").combobox("setValue","09");//="09";
+		else if(ss=="朝鲜") $("#mzdm").combobox("setValue","10");//="10";
+		else if(ss=="满") $("#mzdm").combobox("setValue","11");//="11";
+		else if(ss=="侗") $("#mzdm").combobox("setValue","12");//="12";
+		else if(ss=="瑶") $("#mzdm").combobox("setValue","13");//="13";
+		else if(ss=="白") $("#mzdm").combobox("setValue","14");//="14";
+		else if(ss=="土家") $("#mzdm").combobox("setValue","15");//="15";
+		else if(ss=="哈尼") $("#mzdm").combobox("setValue","16");//="16";
+		else if(ss=="哈萨克") $("#mzdm").combobox("setValue","17");//="17";
+		else if(ss=="傣") $("#mzdm").combobox("setValue","18");//="18";
+		else if(ss=="黎") $("#mzdm").combobox("setValue","19");//="19";
+		else if(ss=="傈僳") $("#mzdm").combobox("setValue","20");//="20";
+		else if(ss=="佤") $("#mzdm").combobox("setValue","21");//="21";
+		else if(ss=="畲") $("#mzdm").combobox("setValue","22");//="22";
+		else if(ss=="高山") $("#mzdm").combobox("setValue","23");//="23";
+		else if(ss=="拉祜") $("#mzdm").combobox("setValue","24");//="24";
+		else if(ss=="水") $("#mzdm").combobox("setValue","25");//="25";
+		else if(ss=="东乡") $("#mzdm").combobox("setValue","26");//="26";
+		else if(ss=="纳西") $("#mzdm").combobox("setValue","27");//="27";
+		else if(ss=="景颇") $("#mzdm").combobox("setValue","28");//="28";
+		else if(ss=="柯尔克孜") $("#mzdm").combobox("setValue","29");//="29";
+		else if(ss=="土") $("#mzdm").combobox("setValue","30");//="30";
+		else if(ss=="达斡尔") $("#mzdm").combobox("setValue","31");//="31";
+		else if(ss=="仫佬") $("#mzdm").combobox("setValue","32");//="32";
+		else if(ss=="羌") $("#mzdm").combobox("setValue","33");//="33";
+		else if(ss=="布朗") $("#mzdm").combobox("setValue","34");//="34";
+		else if(ss=="撒拉") $("#mzdm").combobox("setValue","35");//="35";
+		else if(ss=="毛难") $("#mzdm").combobox("setValue","36");//="36";
+		else if(ss=="仡佬") $("#mzdm").combobox("setValue","37");//="37";
+		else if(ss=="锡伯") $("#mzdm").combobox("setValue","38");//="38";
+		else if(ss=="阿昌") $("#mzdm").combobox("setValue","39");//="39";
+		else if(ss=="普米") $("#mzdm").combobox("setValue","40");//="40";
+		else if(ss=="塔吉克") $("#mzdm").combobox("setValue","41");//="41";
+		else if(ss=="怒") $("#mzdm").combobox("setValue","42");//="42";
+		else if(ss=="乌孜别克") $("#mzdm").combobox("setValue","43");//="43";
+		else if(ss=="俄罗斯") $("#mzdm").combobox("setValue","44");//="44";
+		else if(ss=="鄂温克") $("#mzdm").combobox("setValue","45");//="45";
+		else if(ss=="崩龙") $("#mzdm").combobox("setValue","46");//="46";
+		else if(ss=="保安") $("#mzdm").combobox("setValue","47");//="47";
+		else if(ss=="裕固") $("#mzdm").combobox("setValue","48");//="48";
+		else if(ss=="京") $("#mzdm").combobox("setValue","49");//="49";
+		else if(ss=="塔塔尔") $("#mzdm").combobox("setValue","50");//="50";
+		else if(ss=="独龙") $("#mzdm").combobox("setValue","51");//="51";
+		else if(ss=="鄂伦春") $("#mzdm").combobox("setValue","52");//="52";
+		else if(ss=="赫哲") $("#mzdm").combobox("setValue","53");//="53";
+		else if(ss=="门巴") $("#mzdm").combobox("setValue","54");//="54";
+		else if(ss=="珞巴") $("#mzdm").combobox("setValue","55");//="55";
+		else if(ss=="基诺") $("#mzdm").combobox("setValue","56");//="56";
+		else if(ss=="其他") $("#mzdm").combobox("setValue","97");//="97";
+
+		//theForm.nNATION.value=theForm.aNATION.NameVal;
+		str=str.substring(str.indexOf("$")+1,str.length);
+		ss=str.substring(0,str.indexOf("$"));//出生日期
+		ss=ss.substring(0,ss.indexOf("日"));
+		ss=ss.replace("年","-");
+		ss=ss.replace("月","-");
+		//theForm.fBIRTHDATE.value=ss;
+		$("#csrqQsrqStr").datebox("setValue",ss);
+		//theForm.fBIRTHDATE.style.color = '#000000';
+		str=str.substring(str.indexOf("$")+1,str.length);
+		//theForm.HOUSEREG.value=str.substring(0,str.indexOf("$"));//住址
+		//alert(str.substring(0,str.indexOf("$")));
+		$("#hjdzDzmc").val(str.substring(0,str.indexOf("$")));
+		str=str.substring(str.indexOf("$")+1,str.length);
+		//theForm.IDNUMBER.value=str.substring(0,str.indexOf("$"));//身份证号码
+		$("#cyzjdm").combobox("setValue","111");
+		$("#zjhm").val(str.substring(0,str.indexOf("$")));
+		var hjd=$("#zjhm").val().substring(0,6);//theForm.IDNUMBER.value.substring(0,6);//户籍地区分
+		//theForm.aHOUSEREGCODE.setValue(hjd);
+		//theForm.nHOUSEREGCODE.value=theForm.aHOUSEREGCODE.NameVal;
+		//theForm.nHOUSEREGCODE.value=hjd;
+		$("#hjdzXzqhdm").combotree("setValue",hjd);
+		//end
+		//theForm.aR_XZZ.setValue(hjd);
+		//theForm.nR_XZZ.value=theForm.aR_XZZ.NameVal;
+		str=str.substring(str.indexOf("$")+1,str.length);
+
+
+		//theForm.nR_HJDPCS.value=str.substring(0,str.indexOf("$"));//发证机关
+		str=str.substring(str.indexOf("$")+1,str.length);
+		//theForm.R_XM.value=str.substring(0,str.indexOf("$"));//有效日期
+		str=str.substring(str.indexOf("$")+1,str.length);
+		//theForm.R_XZZXZ.value=str.substring(0,str.indexOf("$"));//最新住址
+		str=str.substring(str.indexOf("$")+1,str.length);
+		//theForm.R_XM.value=str.substring(0,str.indexOf("$"));//图像大小
+		str=str.substring(str.indexOf("$")+1,str.length);
+		//alert("图像数据 == "+str);
+		//theForm.R_EDZZP64.value=str;//图像数据
+		$("#imghead1").attr("src","data:image/gif;base64,"+str);
+		$("#edzzpStr64").val(str);
+		$("#R_EDZZP64").val(str);
+		//theForm.IFIDCARDNAM.value = "已采集";//采集二代证后页面显示二代证已采集
+		//convert(["nNATION","nHOUSEREGCODE","nSEX"]);
+		setCodeTexts();
+		return(1);
+	}else{
+		return(0);
+	}
+
+}
+
+function getWH(){
+	var strs= new Array();
+	var mysg = "";
+	var rets = "";
+	//获取身高体重信息
+	rets = ReadHWInfo();//"186$130$1";
+	strs = rets.split("$");
+	if(strs.length>=3) {
+		$("#sgsx").val(Math.round(strs[0]));
+		$("#tzsx").val(strs[1]);
+		if (strs.length > 3){
+			$("#zc").val(strs[3]);
+		}
+	}else{
+		$.messager.alert( '提示',"身高体重读取失败！");
+	}
+}

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

@@ -869,6 +869,7 @@
 				$.messager.alert( '提示',"初始化程序异常！");
 				return;
 			}
+			var cjfs=document.getElementById("cjfs").value;
             //var ri=scanPersonInfotoAfisEx(document.frminput,dbtime,status,cjfs);
             var ri=scanPersonInfotoAfisEx(document.frminput.rybh.value,status,cjfs,'1','1',true);
 			debugger;
@@ -881,7 +882,6 @@
 				if(ri.substring(num_start,num_end)=="A1"){
 					var rybh=$("#rybh").val();
 					var zwbh=$("#szzwbh").val();
-					var cjfs=document.getElementById("cjfs").value;
 					var RFP = ri.substring(ri.indexOf("B"),ri.indexOf("C"));//滚动
 					var PFP = ri.substring(ri.indexOf("C"),ri.indexOf("D"));//平面
 					if(RFP=="B0000000000"&&PFP=="C0000000000"){
@@ -1100,7 +1100,7 @@
 						//alert("获取二代证信息失败,错误状态=="+XMLHttpRequest.status);
 					}
 				});
-				alwer(rs);
+				alert(rs);
 			}
 		}
 
@@ -1109,33 +1109,10 @@
 			var xm = $("#xm").val();
 			var zjhm = $("#zjhm").val();
 			var lxdm = $("#lxdm").val();
-			var salb = $("#ajlbdm").val();
-			var jh = $("#username").val();
-			var jyszzzjgdm = $("#unitcode").val();
-			var bmch = $("#bmch").val();
-			var zz = $("#xzzXzqhdm").val();
-			var gzdw = $("#fwcs").val();
-			var hjxx = $("#hjdzXzqhdm").val();
 			if (lxdm == null || lxdm == "") {
 				lxdm = "0";
 			}
-					try{
-						StartupSJCJ();
-					}catch (e){
-						$.ajax({
-							url:"http://127.0.0.1:1500/Service/?param="+rybh+","+xm+","+zjhm+","+lxdm,//此处换成你的服务端地址
-							type:"Post",
-							data:{},
-							dataType:"jsonp",//jsonp 实现跨域
-							jsonpCallback:"fun",//服务器返回执行的方法名
-							success:function (data) {
-								alert("采集程序出错！处理方法：1、IE添加信任站点；2、自定义级别中ActiveX控件和插件全部选择启用；3、注册相应手机厂商采集控件；4、安装相应手机厂商采集软件！");
-							},
-							error:function (err) {
-								alert("采集程序出错！处理方法：1、IE添加信任站点；2、自定义级别中ActiveX控件和插件全部选择启用；3、注册相应手机厂商采集控件；4、安装相应手机厂商采集软件！");
-							}
-						});
-					}
+			yingyuansjcj(rybh,encodeURI(xm),zjhm,lxdm);
 		}
 
 		//=========手机采集===================================================
@@ -1186,6 +1163,7 @@
 				contentType: "application/x-www-form-urlencoded",
 				dataType: "json",
 				success: function(data) {
+					debugger;
 					var rstemp = eval(data);
 					var status = rstemp.apiStatus;
 					if(status == "success"){
@@ -1226,27 +1204,28 @@
 			return rs;
 		}
 
-		function lgsjcj() {
-			var objDriver = document.getElementById("OpDriver");
-			if (objDriver.object == null) {
-				alert("OpDriver插件未安装！");
-				return;
-			} else {
-				//alert("已检测到OpDriver插件！");
-			}
-			var rybh = $("#rybh").val();
-			var OpRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><RYXX><RYBH>"
-					+ rybh + "</RYBH></RYXX>";
-			try {
-				var ret = objDriver.OpDriver(OpRequest);
-				if (ret == 0) {
-					//txtSend.value = objDriver.OpResponse;
-					alert("操作成功！" + objDriver.OpResponse);
-				} else {
-					alert("操作失败！错误码为：" + ret);
+		function yingyuansjcj(rybh,xm,zjhm,lxdm) {
+			debugger;
+			try{
+				$.ajax({
+					url:"http://127.0.0.1:1500/Service/?param="+rybh+","+xm+","+zjhm+","+lxdm,//此处换成你的服务端地址
+					type:"post",
+					dataType:"json",//jsonp 实现跨域
+					contentType:"application/x-www-form-urlencoded;charset=gbk",
+					jsonpCallback:"fun",//服务器返回执行的方法名
+					xhrFields:{
+						withCredentials:true
+					},
+					crossdomain:true,
+					success:function (data) {
+						alert("采集程序出错！处理方法：1、IE添加信任站点；2、自定义级别中ActiveX控件和插件全部选择启用；3、注册相应手机厂商采集控件；4、安装相应手机厂商采集软件！①");
+					},
+					error:function (err) {
+						alert("采集程序出错！处理方法：1、IE添加信任站点；2、自定义级别中ActiveX控件和插件全部选择启用；3、注册相应手机厂商采集控件；4、安装相应手机厂商采集软件！②");
 					}
-			} catch (e) {
-				alert(e.message);
+				});
+			}catch (e){
+				alert("采集程序出错！处理方法：1、IE添加信任站点；2、自定义级别中ActiveX控件和插件全部选择启用；3、注册相应手机厂商采集控件；4、安装相应手机厂商采集软件！③");
 			}
 		}
 

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

@@ -406,7 +406,7 @@
 			$("#localPicture").hide();
 			$("#btnAddLoaclPic").show();
 		}
-		function submitForm() {
+		function submitForms() {
 			if (!isHaveLocalPicture) {
 				dialog.alert("请先选择一枚足迹！",function(){return true;});
 				return;
@@ -545,7 +545,7 @@
 		<div class="cjy-con-cd2" data-oper="BeSelected">
 			<div class="cjy-6-oper">
 				<a href="javascript:void(0);" class="btn-blue" onclick="$('#loadImage').click();">本地添加</a>
-				<a href="javascript:void(0);" id="uploadLocalPic" class="btn-blue btn-nouse" onclick="submitForm();">上传足迹</a>
+				<a href="javascript:void(0);" id="uploadLocalPic" class="btn-blue btn-nouse" onclick="submitForms();">上传足迹</a>
 				<a href="javascript:void(0);" class="btn-blue" onclick="clearLocalPicture();">清空足迹</a>
 			</div>
 			<div class="cjy-6-img-box" id="imageShow">

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

@@ -315,8 +315,7 @@
                 var rybh=row.rybh;
                 var xm=row.xm;
                 return "<span class='hg-btn' onclick=\"modify('"+rybh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+rybh+"','"+xm+"')\">删除</span>";
-            }
-            },
+            }},
             {title:"人员编号",field:"rybh",align:'left',width:240,formatter:function(val,row,index){
                 var rybh=row.rybh;
                 var xm=row.xm;
@@ -326,40 +325,92 @@
             {title:"性别",field:"xbdm",align:'left',width:80},
             {title:"证件号码",field:"zjhm",align:'left',width:200},
             {title:"指纹编号",field:"szzwbh",align:'left',width:220},
-            {title:"采集时间",field:"zwcjsjStr",align:'left',width:120},
-            {title:"采集单位",field:"zwcjdwdm",align:'left',width:280},
-            {title:"指纹状态",field:"r_sjlxdh",align:'center',color:'gree',width:120,formatter:function(val,row,index){
-                var szzwbh=row.szzwbh;
-                var jcjg=row.jcjg;
-                var rstStr
-                if(szzwbh==null||szzwbh==""){
-                    rstStr = "<span class='bhg-btn'>未采集</span>";
-                }else if(szzwbh!=""&&jcjg==""){
-                    rstStr = "<span class='hg-btn'>已采集</span>";
-                }else if(szzwbh!=""&&jcjg=="0"){
-                    rstStr = "<span class='hg-btn'>合格</span>";
-                }else if(szzwbh!=""&&jcjg=="1"){
-                    rstStr = "<span class='bhg-btn'>不合格</span>";
+            {title:"平面指纹",field:"pmzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){
+                var zwfkxx=row.zwfkxx;
+                var rstStr;
+                if(zwfkxx==null||zwfkxx==""){
+                    rstStr = "<span style='color: red;' title='平面指纹'>×</span>";
+                }else if(zwfkxx.substring(2,13)!='B0000000000'){
+                    rstStr = "<span style='color: green;' title='平面指纹'>√</span>";
                 }else{
-                    rstStr = "<span class='hg-btn'>已采集</span>";
+                    rstStr = "<span style='color: red;' title='平面指纹'>×</span>";
                 }
                 return rstStr;
             }},
-            {title:"人像状态",field:"rrx",align:'center',color:'gree',width:110,formatter:function(val,row,index){
+            {title:"滚动指纹",field:"gdzw",align:'center',color:'gree',width:90,formatter:function(val,row,index){
+                var zwfkxx=row.zwfkxx;
+                var rstStr;
+                if(zwfkxx==null||zwfkxx==""){
+                    rstStr = "<span style='color: red;' title='滚动指纹'>×</span>";
+                }else if(zwfkxx.substring(13,24)!='C0000000000'){
+                    rstStr = "<span style='color: green;' title='滚动指纹'>√</span>";
+                }else{
+                    rstStr = "<span style='color: red;' title='滚动指纹'>×</span>";
+                }
+                return rstStr;
+            }},
+            {title:"人像",field:"rrx",align:'center',color:'gree',width:70,formatter:function(val,row,index){
                 var rrx=row.rrx;
                 var zmzpxxbh=row.zmzpxxbh;
                 var cmzpxxbh=row.cmzpxxbh;
                 var ycmzpxxbh=row.ycmzpxxbh;
                 var jcjg=row.jcjg;
-                var rstStr
+                var rstStr;
                 if(zmzpxxbh==null||cmzpxxbh==null||ycmzpxxbh==null||zmzpxxbh==""||cmzpxxbh==""||ycmzpxxbh==""){
-                    rstStr = "<span class='bhg-btn'>未采集</span>";
-                }else if(rrx==""){
-                    rstStr = "<span class='hg-btn'>已采集</span>";
-                }else if(rrx=="1-1-1"){
-                    rstStr = "<span class='hg-btn'>合格</span>";
+                    rstStr = "<span style='color: red;' title='人像'>×</span>";
                 }else{
-                    rstStr = "<span class='bhg-btn'>不合格</span>";
+                    rstStr = "<span style='color: green;' title='人像'>√</span>";
+                }
+                return rstStr;
+            }},
+            {title:"虹膜",field:"hm",align:'center',color:'gree',width:70,formatter:function(val,row,index){
+                var hm=row.hm;
+                var rstStr;
+                if(hm==null||hm==""||hm<=0){
+                    rstStr = "<span style='color: red;' title='虹膜'>×</span>";
+                }else{
+                    rstStr = "<span style='color: green;' title='虹膜'>√</span>";
+                }
+                return rstStr;
+            }},
+            {title:"足迹",field:"zj",align:'center',color:'gree',width:70,formatter:function(val,row,index){
+                var zj=row.zj;
+                var rstStr;
+                if(zj==null||zj==""||zj<=0){
+                    rstStr = "<span style='color: red;' title='足迹'>×</span>";
+                }else{
+                    rstStr = "<span style='color: green;' title='足迹'>√</span>";
+                }
+                return rstStr;
+            }},
+            {title:"声纹",field:"sw",align:'center',color:'gree',width:70,formatter:function(val,row,index){
+                var sw=row.sw;
+                var rstStr;
+                if(sw==null||sw==""||sw<=0){
+                    rstStr = "<span style='color: red;' title='声纹'>×</span>";
+                }else{
+                    rstStr = "<span style='color: green;' title='声纹'>√</span>";
+            }
+                return rstStr;
+            }},
+            {title:"手机",field:"sjjbxx",align:'center',color:'gree',width:70,formatter:function(val,row,index){
+                var sjjbxx=row.sjjbxx;
+                var sjlxrxx=row.sjlxrxx;
+                var rstStr;
+                if(sjjbxx==null||sjjbxx==""||sjjbxx<=0||sjlxrxx==null||sjlxrxx==""||sjlxrxx<=0){
+                    rstStr = "<span style='color: red;' title='手机'>×</span>";
+                }else{
+                    rstStr = "<span style='color: green;' title='手机'>√</span>";
+                }
+                return rstStr;
+            }},
+            {title:"银行卡",field:"yhk",align:'center',color:'gree',width:80,formatter:function(val,row,index){
+                var yhk=row.yhk;
+                var rstStr;
+                if(yhk==null||yhk==""||yhk<=0){
+                    rstStr = "<span style='color: red;' title='银行卡'>×</span>";
+                }else{
+                    rstStr = "<span style='color: green;' title='银行卡'>√</span>";
                 }
                 return rstStr;
             }},
@@ -373,7 +424,7 @@
                 var gdzw=row.rgdzw;
                 var rx=row.rrx;
                 var bz=row.bz;
-                var rstStr
+                var rstStr;
                 if(szzwbh!=null&&jcjg==""){
                     rstStr = "<span style='color: red;'>检查中</span>";
                 }else{
@@ -391,15 +442,16 @@
                 }
                 return rstStr;
             }},
-            {title:"人员来源",field:"tbbz",align:'center',color:'gree',width:130,formatter:function(val,row,index){
+            {title:"上报刑专",field:"tbbz",align:'center',color:'gree',width:110,formatter:function(val,row,index){
+                var rybh=row.rybh;
                 var tbbz=row.tbbz;
                 var rstStr="";
                 if(tbbz=="0"){
-                    rstStr = "<span  style='color: green;'>新增人员</span>";
+                    rstStr = "<span class='djc-btn' title='点击向刑专系统上报该人员信息所包含的所有信息！' onclick=\"sbsj('0','"+rybh+"','')\">待上报</span>";
                 }else if(tbbz=="1"){
-                    rstStr = "<span style='color: blue;'>执法场所</span>";
+                    rstStr = "<span style='color: green;'>上报成功</span>";
                 }else if(tbbz=="2"){
-                    rstStr = "<span style='color: black;'>采集平台</span>";
+                    rstStr = "<span class='bhg-btn' title='点击查看失败原因说明，并重新上报！' onclick=\"sbsj('1','"+rybh+"','头文件解析失败')\">上报失败</span>";
                 }
                 return rstStr;
             }}
@@ -417,7 +469,7 @@
             checkOnSelect : false,
             fit:false,
             pagination : true,
-            pageSize : 10,
+            pageSize : 20,
             pageList : [10,20,50,100,200], //rows
             pageNumber : 1,
             loadFilter: function(data){
@@ -669,6 +721,18 @@
         window.location.href="/exportExcelToRyxx?rybh="+rybh+"&zjhm="+zjhm+"&xm="+xm+"&szzwbh="+szzwbh+"&jcjg="+jcjg+"&xbdm="+xbdm+"&hjdzXzqhdm="+hjdzXzqhdm+"&RRx="+RRx+"&r_sjlxdh="+r_sjlxdh+"&dnabh="+dnabh
                 +"&lrdwdm="+lrdwdm+"&fcsrqStr="+fcsrqStr+"&ecsrqStr="+ecsrqStr+"&lrr="+lrr+"&flrsjStr="+flrsjStr+"&elrsjStr="+elrsjStr;
     }
+
+    function sbsj(num,rybh,sbyy){
+        if(num=='1'){
+            $.messager.confirm('上报失败原因',sbyy+'！', function(r){
+                if(r) {
+                    $.messager.alert( '提示',"重新上报！");
+                }
+            });
+        }else{
+            $.messager.alert( '提示',"数据上报！");
+        }
+    }
 </script>
 </body>
 </html>
\ No newline at end of file

src/main/resources/templates/ryswtz/ryswtzxx.html

@@ -115,7 +115,7 @@
                 <li id="li_sj" class="tab1_lis" onclick="showSj(this)">手机信息<span class="bot" th:text="${qjsjzs}"></span></li>
                 <li id="li_yhk" class="tab1_lis" onclick="showYhk(this)">银行卡信息<span class="bot" th:text="${yhkzs}"></span></li>
                 <li id="li_bj" class="tab1_lis" onclick="tab1_toggle(this)">笔迹信息<span class="bot" th:text="${bjxxzs}"></span></li>
-                <li id="li_sw" class="tab1_lis" onclick="tab1_toggle(this)">声纹信息<span class="bot" th:text="${swxxzs}"></span></li>
+                <li id="li_sw" class="tab1_lis" onclick="showSw(this)">声纹信息<span class="bot" th:text="${swxxzs}"></span></li>
                 <li id="li_hm" class="tab1_lis" onclick="tab1_toggle(this)">虹膜信息<span class="bot" th:text="${hmxxzs}"></span></li>
             </ul>
             <!--人像信息-->
@@ -805,6 +805,33 @@
             }
         });
     }
+    //查询声纹信息
+    function showSw(Obj){
+        var asjxgrybh = $("#asjxgrybh").val();
+        //console.log([[${param.asjxgrybh}]]);
+        $.ajax({
+            url: "getSwDetail?asjxgrybh="+asjxgrybh,
+            type: "post",
+            dataType: "json",
+            success: function(data){
+                var dataResult = data.dataResult;
+                $("#Table_swxx").datagrid({
+                    striped: true,
+                    fitColumns: true,
+                    singleSelect: false,
+                    pagination: true,
+                    nowrap: true,
+                    pageSize: 20,
+                    pageList: [10, 20, 50, 100, 150, 200],
+                    showFooter: true,
+                    columns: [data.title]    //动态取标题
+                });
+                $("#Table_swxx").datagrid("loadData", pagerFilter(dataResult,$("#Table_swxx")));  //动态取数据
+            }
+        });
+        tab1_toggle(Obj);
+    }
+
     //查询手机信息
     function showSj(Obj){
         var asjxgrybh = $("#asjxgrybh").val();

src/main/resources/templates/sswp/addsswpxx.html

@@ -262,6 +262,9 @@ function editData() {//初始化数据
 }
 
 function getRxbclj(index){
+    //window.open("http://wwwwwww.baidu.com");
+    //window.open("C://personphoto//test.html");
+    //return;
     debugger;
     var rs=newActiveXObject("HLPhotoCatcher.Document");
     if(rs != "success"){

src/main/resources/templates/yhkcj/addyhkxx.html

+<!doctype html>
+<html xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>银行卡信息采集</title>
+    <link rel="stylesheet" href="/static/xtba/ssxdwp/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/static/xtba/ssxdwp/css/easyui.css">
+    <link rel="stylesheet" href="/static/xtba/ssxdwp/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/static/xtba/ssxdwp/css/base_initialize.css">
+    <link rel="stylesheet" href="/static/xtba/ssxdwp/css/collection.css">
+    <link rel="stylesheet" href="/static/xtba/ssxdwp/css/dialog-upload.css">
+</head>
+<body>
+<article class="w">
+    <div class="head clearfix">
+        <div class="aj_message">
+            <span class="aj_code" id="pagename">银行卡信息新增</span>
+        </div>
+    </div>
+    <div class="xzzxyw_bg ajxx_wrap">
+        <fieldset style="width:100%;">
+            <legend id="titlename">新增</legend>
+            <fieldset>
+            <form name="spForm" method="post" enctype="multipart/form-data">
+                <input type="hidden" id="xxzjbh" name="xxzjbh" th:value="${ssxdwp.xxzjbh}"/>
+                <input type="hidden" id="wpzpflag" name="wpzpflag" th:value="0"/>
+                <input type="hidden" id="saveflag" name="saveflag" th:value="${saveflag}"/>
+                <input type="hidden" name="wpzpimgBase64" id="wpzpimgBase64" th:value="${ssxdwp.wpzpimgBase64}"/>
+                <table class="sp_table" width="100%">
+                    <tbody>
+                        <tr style="height:0">
+                            <td class="ar" width="10%"></td>
+                            <td width="23.3%">
+                            </td>
+                            <td class="ar" width="10%"></td>
+                            <td width="23.3%">
+                            </td>
+                            <td class="ar" width="10%"></td>
+                            <td width="23.3%">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="ac" colspan="2" rowspan="5">
+                                    <img src="/images/wupin.jpg" class="fileImg" id="fileImg" width="150px" height="180px" style="margin:8px 0;"/>
+                                    <input id="sswpzpfile" name="sswpzpfile" value="" type="file" class="file" style="width:170px;font-size: 12px;margin:0 auto;" />
+                                    <a href="javascript:getRxbclj('21');" class="btn_a btn_search"><i class="fa fa-hand-lizard-o" aria-hidden="true"></i>采集</a>
+                            </td>
+                            <td class="ar">人员编号：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input readonly="readonly" type="text" id="asjxgrybh" name="asjxgrybh" th:value="${asjxgrybh}" class="form-control" title="人员编号为不可编辑" style="width:225px;height:32px;padding :0px !important;">
+                                </span>
+                            </td>
+                            <td class="ar">物品编号：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input readonly="readonly" type="text"  name="xdqtwp_sawpbh" th:value="${ssxdwp.xdqtwp_sawpbh}" value="" class="form-control" title="物品编号为不可编辑" style="width:225px;height:32px;padding :0px !important;">
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="ar">物品类型：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text" style="height: 30px;width: 100%;" id="xdqtwp_sawp_sawpdm" name="xdqtwp_sawp_sawpdm" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_SAWP',method:'get',textField : 'text', valueField : 'id'"/>
+                                    <input type="hidden" id="xdqtwp_sawp_sawpdmStr" th:value="${ssxdwp.xdqtwp_sawp_sawpdm}"/>
+                                </span>
+                            </td>
+                            <td class="ar">物品名称：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text" id="xdqtwp_wpmc"  name="xdqtwp_wpmc" th:value="${ssxdwp.xdqtwp_wpmc}"/>
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="ar">品牌型号：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text"  name="xdqtwp_ppxh" th:value="${ssxdwp.xdqtwp_ppxh}"/>
+                                </span>
+                            </td>
+                            <td class="ar">物品标识号：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text"  name="xdqtwp_wpbzh_wpbzh" th:value="${ssxdwp.xdqtwp_wpbzh_wpbzh}"/>
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="ar">物品颜色：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text" style="height: 30px;width: 100%;" id="xdqtwp_wpys_wpysdm" name="xdqtwp_wpys_wpysdm" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YS',method:'get',textField : 'text', valueField : 'id'"/>
+                                    <input type="hidden" id="xdqtwp_wpys_wpysdmStr" th:value="${ssxdwp.xdqtwp_wpys_wpysdm}"/>
+                                </span>
+                            </td>
+                            <td class="ar">物品特征：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text"  name="xdqtwp_wptzms" th:value="${ssxdwp.xdqtwp_wptzms}"/>
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="ar">生产时间：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text" id="xdqtwp_wpscsjStr" name="xdqtwp_wpscsjStr" class="easyui-datebox"   style="width:100%; height:30px;">
+						            <input type="hidden" id="xdqtwp_wpscsj" th:value="${ssxdwp.xdqtwp_wpscsjStr}"/>
+                                </span>
+                            </td>
+                            <td class="ar">有效期截止日期：</td>
+                            <td>
+                                <span class="textbox-wrap">
+                                    <input type="text" id="xdqtwp_wpyxqjzsjStr" name="xdqtwp_wpyxqjzsjStr" class="easyui-datebox"   style="width:100%; height:30px;">
+                                    <input type="hidden"  id="xdqtwp_wpyxqjzsj" th:value="${ssxdwp.xdqtwp_wpyxqjzsjStr}"/>
+                                </span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="6" class="ac">
+                               <a href="javascript:toSave();" class="btn_a btn_search"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>保存草稿</a>
+                               <a href="javascript:toSave();" class="btn_a btn_empty"><i class="fa fa-floppy-o" aria-hidden="true"></i>采集入库</a>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </form>
+        </fieldset>
+        </fieldset>
+    </div>
+    <div style="height:50px;"></div>
+</article>
+<div id="goTop">
+    <a href="#"><img src="/static/xtba/ssxdwp/img/gotop.png" alt=""></a>
+</div>
+<script type="text/javascript" src="/static/xtba/ssxdwp/js/jquery.min.js"></script>
+<script type="text/javascript" src="/static/xtba/ssxdwp/js/base.js"></script>
+<script type="text/javascript" src="/static/xtba/ssxdwp/js/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="/static/xtba/ssxdwp/js/easyui-lang-zh_CN.js"></script>
+<script type="text/javascript" src="/static/js/activeObjUtil.js" charset="utf-8"></script>
+<script type="text/javascript">
+$(function(){
+    editData();
+    $(".file").change(function(){
+        debugger;
+            var fileImg = $(".fileImg");
+            var explorer = navigator.userAgent;
+            var imgSrc = $(this)[0].value;
+
+            var start = imgSrc.indexOf('fakepath');
+            var end = imgSrc.lastIndexOf('.');
+            var fileName = imgSrc.substring(start+9,end);
+            $('.fjbt').textbox('setValue',fileName);
+
+            //大小
+            sizes='500'
+            units='kb';
+            var unitArr = new Array("bytes", "kb", "mb", "gb", "tb", "pb", "eb", "zb", "yb");
+            var index = -1;
+            for (var i = 0; i < unitArr.length; i++) {
+                if (unitArr[i] == units.toLowerCase()) {
+                    index = i;
+                    break;
+                }
+            }
+            // 转换为bytes公式
+            formula = 1;
+            while (index > 0) {
+                formula = formula * 1024;
+                index--;
+            }
+            //大小
+            if (explorer.indexOf('MSIE') >= 0) {
+                if (!/\.(jpg|jpeg|png|JPG|PNG|JPEG)$/.test(imgSrc)) {
+                    imgSrc = "";
+                    fileImg.attr("src","/img/default.png");
+                    $.messager.show({title: '提示', msg: '只能上传照片文件'});
+                    $("#save_info").hide();
+                    return false;
+                }else{
+                    if( $("#sswpzpfile")[0].files[0].size > parseFloat(sizes) * formula){
+                        $.messager.show({title: '提示', msg: '文件大小不能超过"' + sizes+units + '"'});
+                        return false;
+                    }else{
+                        fileImg.attr("src",imgSrc);
+                        $("#save_info").show();
+                        $("#wpzpflag").val("1");
+                    }
+                }
+            }else{
+                if (!/\.(jpg|jpeg|png|JPG|PNG|JPEG|bmp|gif)$/.test(imgSrc)) {
+                    imgSrc = "";
+                    fileImg.attr("src","/img/default.png");
+                    $.messager.show({title: '提示', msg: '只能上传照片文件'});
+                    $("#save_info").hide();
+                    return false;
+                }else{
+                    if( $("#sswpzpfile")[0].files[0].size > parseFloat(sizes) * formula){
+                        $.messager.show({title: '提示', msg: '文件大小不能超过"' + sizes+units + '"'});
+                        return false;
+                    }else{
+                        var file = $(this)[0].files[0];
+                        var url = URL.createObjectURL(file);
+                        fileImg.attr("src",url);
+                        $("#save_info").show();
+                        $("#wpzpflag").val("1");
+                    }
+                }
+            }
+
+
+        })
+})
+
+//保存和更新
+function toSave(){
+    //var num=avalidate();
+    //if(num==-1 || num==0){
+    //    return;
+    //}
+    var id=$("#xxzjbh").val();
+    if(id==""){
+        //新增
+        document.spForm.action = "/doAddSswpxx";
+    }else{
+        //修改
+        document.spForm.action = "/doEditSswpxx";
+    }
+    document.spForm.submit();
+}
+
+function editData() {//初始化数据
+    debugger;
+    var xxzjbh = $("#xxzjbh").val();
+    if (xxzjbh==null||xxzjbh == "") {
+        $("#pagename").text("物品信息新增");
+        $("#titlename").text("物品信息新增");
+    }else{
+        $("#pagename").text("物品信息修改");
+        $("#titlename").text("物品信息修改");
+    }
+    var saveflag = $("#saveflag").val();
+    if (saveflag == "1") {
+        $.messager.alert('提示', "保存成功！");
+    }
+    $("#xdqtwp_sawp_sawpdm").combobox("setValue", $("#xdqtwp_sawp_sawpdmStr").val());
+    $("#xdqtwp_wpys_wpysdm").combobox("setValue", $("#xdqtwp_wpys_wpysdmStr").val());
+    $("#xdqtwp_wpscsjStr").datebox("setValue", $("#xdqtwp_wpscsj").val());
+    $("#xdqtwp_wpyxqjzsjStr").datebox("setValue", $("#xdqtwp_wpyxqjzsj").val());
+    var FileReader = window.FileReader;
+    if (FileReader) {//chrome浏览器处理
+        var wpzpimgBase64 = $("#wpzpimgBase64").val();
+        if(wpzpimgBase64!=null&&wpzpimgBase64!=""){
+            $("#fileImg").attr("src","data:image/gif;base64,"+wpzpimgBase64);
+        }
+    }
+}
+
+function getRxbclj(index){
+    debugger;
+    var rs=newActiveXObject("HLPhotoCatcher.Document");
+    if(rs != "success"){
+        alert("调用人像采集控件失败！");
+        return;
+    }
+    setTP(spForm.wpzpimgBase64,spForm.asjxgrybh.value+'_'+spForm.xdqtwp_wpmc.value+'_21.jpg',$('#fileImg'),spForm.xdqtwp_wpmc.value,index);
+}
+function setTP(tpCode,tpFile,tpShow,tpName,index){//将控件采集的信息放到web端
+    SetBmpFileName(tpFile);
+    //设置嫌疑人姓名
+    SetPersonName(tpName);
+    var str = GetOneAfisPhotoForWeb();//获取人像数据
+    if(str==""){
+        alert("获取人像数据失败！");
+        return;
+    }
+    var ifIe = browserType();
+    var picfile = GetPhotoPath();
+    tpCode.value = str;
+    tpShow.src="";  // update by baoyx on 20140930 清空图片缓存，解决重采照片时不能刷新的问题
+    if(ifIe){
+        tpShow.src = picfile;
+    }else{
+        tpShow.src = "data:image/jpg;base64,"+str;
+    }
+    if(index==21){
+        $("#wpzpimgBase64").attr("src","data:image/jpg;base64,"+str);
+        document.spForm.wpzpimgBase64.src = "data:image/jpg;base64,"+str;
+        $("#wpzpflag").val("1");
+    }
+}
+</script>
+</body>
+
+</html>
+
+

src/main/resources/templates/yhkcj/yhkcxlist.html

+<!doctype html>
+<html xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>银行卡信息</title>
+    <link rel="icon" href="/static/zwbdxq/img/favicon.ico" type="image/x-icon">
+    <!--- 用采合一-->
+    <link rel="stylesheet" href="/static/zwbdxq/css/ychy.css">
+    <!--- 时间插件-->
+    <link rel="stylesheet" href="/static/zwbdxq/css/datepicker/skin/WdatePicker.css">
+    <link rel="stylesheet" href="/static/zwbdxq/css/datepicker/skin/default/datepicker.css">
+    <!--- 代码框-->
+    <link rel="stylesheet" href="/static/zwbdxq/easyui-window/css/easyui.css">
+    <link rel="stylesheet" href="/static/zwbdxq/easyui-window/css/icon.css">
+    <link rel="stylesheet" href="/static/zwbdxq/layer/layer.css">
+
+    <link rel="stylesheet" href="/static/zwbdxq/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/static/zwbdxq/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/static/zwbdxq/css/base_initialize.css">
+    <link rel="stylesheet" href="/static/zwbdxq/css/style.css">
+    <link rel="stylesheet" href="/static/zwbdxq/css/append.css">
+</head>
+
+<body  style="overflow: auto" onload="pop();">
+    <header class="heade-box">
+        <img src="/static/xtba/ssxdwp/css/images/title_sswpxx.png" class="header-title-img" alt="">
+    </header>
+    <article class="main-cen-box" style="padding: 18px;margin: 13px auto;width: 95%;box-shadow: 2px 2px 23px #909090;">
+        <div class="cxtj">
+            <input type="hidden" name="rybh" id="rybh" th:value="${rybh}">
+            <input type="hidden" name="xm" id="xm" th:value="${xm}">
+            <input type="hidden" name="gmsfhm" id="gmsfhm" th:value="${gmsfhm}">
+            <form name="yhkxxForm">
+                <input type="hidden" name="asjxgrybh" id="asjxgrybh" th:value="${rybh}">
+                <fieldset>
+                    <legend>查询条件</legend>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td colspan="6" style="height:20px;"></td>
+                            </tr>
+                            <tr>
+                                <td class="ar" width="13.3%">银行卡号：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                         <input type="text" name="yhkkh">
+                                    </span>
+                                </td>
+                                <td class="ar" width="13.3%">姓名：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" style="height: 30px;" id="xm" name="xm" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_SAWP',method:'get',textField : 'text', valueField : 'id'"/>
+                                    </span>
+                                </td>
+                                <td class="ar" width="13.3%">证件号码：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="zjhm">
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="ar" width="13.3%">开户时间：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="khrqQsrq">
+                                    </span>
+                                </td>
+                                <td class="ar" width="13.3%">至：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="khrqJzrq">
+                                    </span>
+                                </td>
+                                <td class="ar" width="13.3%">银行卡类型：</td>
+                                <td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" style="height: 30px;" id="yhklx" name="yhklx" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_YS',method:'get',textField : 'text', valueField : 'id'"/>
+                                    </span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="6">
+                                    <div style="width: 100%; float: left; text-align: center;height: 44px;line-height: 44px;">
+                                        <a class="btn_a btn_search" onclick="doQuery()">查询</a>
+                                        <a class="btn_a btn_empty" onclick="doClear()">清空</a>
+                                        <a href="javascript:toAddpage();" class="btn_a btn_search">新增</a>
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </fieldset>
+            </form>
+        </div>
+
+        <div class="main-table-div">
+            <div class="statistics">列表展示
+                <span class="st-span total">0</span>
+            </div>
+            <div style="margin-top:10px">
+                <table class="easyui-datagrid" style="border-top:1px dashed #ccc;" id="ssxdwpxxtable">
+                </table>
+            </div>
+        </div>
+
+    </article>
+    <script src="/static/zwbdxq/js/jquery.min.js" type="text/javascript"></script>
+    <script src="/static/zwbdxq/js/base.js" type="text/javascript"></script>
+    <script src="/static/zwbdxq/layer/layer.js" type="text/javascript"></script>
+    <!--- 代码框-->
+    <script type="text/javascript" src="/static/zwbdxq/easyui-window/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/zwbdxq/easyui-window/js/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/static/zwbdxq/easyui-window/js/function.js"></script>
+    <script type="text/javascript" src="/static/zwbdxq/easyui-window/js/easyui-lang-zh_CN.js"></script>
+    <!--- 日期时间-->
+    <script type="text/javascript" src="/static/zwbdxq/css/datepicker/WdatePicker.js"></script>
+    <script type="text/javascript" src="/static/zwbdxq/css/datepicker/calendar.js"></script>
+
+    <script src="/static/zwbdxq/js/zlxq.js" type="text/javascript"></script>
+    <script id="scripturlid" src="/static/common/js/checkurl.js?url=${perurl}" type="text/javascript"></script>
+    <script>
+        function pop(){
+            $("#flrsjStr").datebox("setValue",$("#cxqssj").val());
+            doQuery();
+        }
+        //将表单序列化
+        function serializeObject(form){
+            var o={};
+            $.each(form.serializeArray(),function(index){
+                if(o[this['name'] ]){
+                    o[this['name'] ] = o[this['name'] ] + "," + this['value'];
+                }else{
+                    o[this['name'] ]=this['value'];
+                }
+            })
+            return o;
+        }
+        function doQuery(){
+            var table_title = [
+                {title:"操作",field:"xxsc_pdbz",align:'center',color:'gree',width:140,formatter:function(val,row,index){
+                    var xxzjbh=row.xxzjbh;
+                    var xdqtwp_wpmc=row.xdqtwp_wpmc;
+                    return "<span style='color: blue;' class='hg-btn' onclick=\"modify('"+xxzjbh+"')\">修改</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;' onclick=\"cut('"+xxzjbh+"','"+xdqtwp_wpmc+"')\">删除</span>";
+                }},
+                {title:"银行卡号",field:"yhkkh",align:'left',width:180},
+                {title:"姓名",field:"xm",align:'left',width:150},
+                {title:"证件号码",field:"zjhm",align:'left',width:180},
+                {title:"银行卡类型",field:"yhklx",align:'left',width:200},
+                {title:"开户行",field:"khh",align:'left',width:200},
+                {title:"开户日期",field:"khrq",align:'left',width:80},
+                {title:"销户日期",field:"xhrq",align:'left',width:280}
+            ];
+            $('#yhkxxForm').datagrid({
+                url: "queryYhkxxList",
+                columns : [table_title],
+                striped : true,
+                queryParams:serializeObject($("form[name='yhkxxForm']")),
+                singleSelect:true,
+                nowrap:true, //设置是否换行，false换行，true不换行
+                fitColumns:true,
+                scrollbarSize: 0,
+                selectOnCheck : false,
+                checkOnSelect : false,
+                fit:false,
+                pagination : true,
+                pageSize : 10,
+                pageList : [10,20,50,100,200], //rows
+                pageNumber : 1,
+                loadFilter: function(data){
+                    return data;
+                }
+            });
+        }
+        //清空
+        function doClear(){
+            $("form[name='yhkxxForm']") .find("input").val('');
+            $("#asjxgrybh").val($("#rybh").val());
+        }
+
+        //新增
+        function toAddpage(){
+            var url = "/toAddWpxx?asjxgrybh="+$("#rybh").val();
+            window.open(url);
+        }
+
+        //修改
+        function modify(xxzjbh){
+            var url = "/toEditWpxx?asjxgrybh="+$("#rybh").val()+"&xxzjbh="+xxzjbh;
+            window.open(url);
+        }
+
+        //删除
+        function cut(xxzjbh,wpmc){
+            $.messager.confirm('信息删除','确定要删除物品名称为：'+wpmc+'  的信息？', function(r){
+                if(r) {
+                    $.ajax({
+                        url:"/toDeleteWpxx?xxzjbh="+xxzjbh,
+                        date:{"xxzjbh":xxzjbh},
+                        type:"POST",
+                        success:function(data){
+                            if (data) {
+                                $.messager.alert( '提示',"删除成功！",'',function(r){doQuery();});
+                            } else {
+                                $.messager.alert( '提示',"删除失败！");
+                            }
+                        }
+                    });
+                }
+            });
+        }
+    </script>
+</body>
+
+</html>
\ No newline at end of file

src/main/resources/templates/yhkcj/yhkdetail.html

+<!doctype html>
+<html xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>损失物品</title>
+	<link rel="stylesheet" href="/static/rygl/css/bootstrap.min.css">
+	<link rel="stylesheet" href="/static/rygl/css/font-awesome.min.css">
+	<link rel="stylesheet" href="/static/rygl/css/base_initialize.css">
+	<link rel="stylesheet" href="/static/rygl/css/detailStyle.css">
+	<link rel="stylesheet" href="/static/rygl/css/easyui.css">
+	<link rel="stylesheet" href="/static/css/style.css" />
+</head>
+<body>
+<article class="main-cen-box">
+	<div class="head clearfix">
+		<div class="aj_message">
+			<th class="aj_code" th:text="1">人员编号</th>&nbsp;&nbsp;
+			<th class="aj_code" th:text="2">姓名</th>
+		</div>
+	</div>
+	<div class="xzzxyw_bg ajxx_wrap" >
+		<fieldset style="width:1000px;margin-left: 15%;overflow: inherit;">
+			<legend>物品信息</legend>
+			<form action="" name="frminput" method="post" enctype="multipart/form-data">
+				<input type="hidden" id="rybh" name="rybh" th:value="${rybh}"/>
+				<input type="hidden" id="xm" name="xm" th:value="${xm}"/>
+			<table class="detail_table stat_table">
+				<tbody>
+				<tr class="empty_tr">
+					<td colspan="6" class="empty"></td>
+				</tr>
+				<tr>
+					<td class="ct" colspan="2" rowspan="6">
+						<div class="img-upload" style="margin-left:55px;width: 200px;">
+							<div class="img-div">
+								<img style="width: 100%;height: 100%" name="rpic" id="rpic"  src="/images/wupin.jpg" alt="物品照片">
+							</div>
+							<input type="file" class="input" id="R_ZMZP_File" style="width: 185px;" name="R_ZMZP_File" size="3" onchange="showpic2(this)" />
+							<!-- <input type="file" onchange="previewImage2(this)" /> -->
+							<div class="btn-group btn-group-sm" style=" margin-left: 32px; margin-top: 8px;">
+								<button type="button" class="btn btn-primary" onclick="getRxbclj('2')"><i class="fa fa-hand-lizard-o"></i> 采集 </button>
+							</div>
+							<input type="hidden" name="edzzpxxbh" id="edzzpxxbh" />
+							<input type="hidden" id="edzzpStr64" name="edzzpStr64"  />
+						</div>
+					</td>
+				<tr>
+					<td class="ar" width="13.3%">人员编号：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="asjxgrybh" id="asjxgrybh" >
+                                    </span>
+					</td>
+					<td class="ar" width="13.3%">物品编号：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                         <input type="text" name="wpbh" id="wpbh" >
+                                    </span>
+					</td>
+				</tr>
+				<tr>
+					<td class="ar" width="13.3%">物品类型：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input id="wplx" name="wplx"  type="text" style="width:66%; height:32px;" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_WPLX',method:'get',textField : 'text', valueField : 'id'"/>
+                                        <input type="hidden" name="wplxStr" id="wplxStr">
+                                    </span>
+					</td>
+					<td class="ar" width="13.3%">物品名称：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                         <input type="text" name="wpmc" id="wpmc" >
+                                    </span>
+					</td>
+				</tr>
+				<tr>
+					<td class="ar" width="13.3%">品牌型号：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="ppxh">
+                                    </span>
+					</td>
+					<td class="ar" width="13.3%">物品标识号：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="wpbsh">
+                                    </span>
+					</td>
+				</tr>
+				<tr>
+					<td class="ar" width="13.3%">物品颜色：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="wpys">
+                                    </span>
+					</td>
+					<td class="ar" width="13.3%">物品特征：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input type="text" name="wptz">
+                                    </span>
+					</td>
+				</tr>
+				<tr>
+					<td class="ar">生产时间：</td>
+					<td class="20%">
+                                    <span class="textbox">
+                                        <input id="scsj" name="scsj" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({minDate:'#F{$dp.$D(\'fbsj_s\')}',dateFmt:'yyyy-MM-dd'})"/>
+                                    </span>
+					</td>
+					<td class="ar" width="13.3%">有效期截止日期：</td>
+					<td width="20%">
+                                    <span class="textbox">
+                                        <input id="yxq" name="yxq" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({minDate:'#F{$dp.$D(\'fbsj_s\')}',dateFmt:'yyyy-MM-dd'})"/>
+                                    </span>
+					</td>
+				</tr>
+				<tr class="empty_tr">
+					<td colspan="6" class="empty"></td>
+				</tr>
+				</tbody>
+			</table>
+				</form>
+		</fieldset>
+	</div>
+	<!--第一个easyui表格的表头和内容错位，加上隐藏的easyUI表格就可以了，造成这个的问题还没有找到-->
+	<div style="display: none">
+		<table id="bug" class="easyui-datagrid" cellpadding="0" cellspacing="0" ></table>
+	</div>
+	<div style="height:50px;"></div>
+</article>
+<div id="goTop">
+	<a href="#"><img src="../rygl/img/gotop.png" alt=""></a>
+</div>
+<script type="text/javascript" src="/static/rygl/js/jquery.min.js"></script>
+<script type="text/javascript" src="/static/rygl/js/base.js"></script>
+<script type="text/javascript" src="/static/rygl/js/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="/static/rygl/js/easyui-lang-zh_CN.js"></script>
+<script type="text/javascript">
+	$("#table1").datagrid({
+		striped: true,
+		fitColumns: true,
+		singleSelect: false,
+		rownumbers: true,
+		pagination: true,
+		nowrap: true,
+		pageSize: 10,
+		pageList: [10, 20],
+		showFooter: true,
+	});
+	$("#table2").datagrid({
+		striped: true,
+		fitColumns: true,
+		singleSelect: false,
+		rownumbers: true,
+		pagination: true,
+		nowrap: true,
+		pageSize: 10,
+		pageList: [10, 20],
+		showFooter: true,
+	});
+/*
+	$(function() {//初始化数据
+		var edzzpStr64 = $("#edzzpStr64").val();
+		if (edzzpStr64 != null && edzzpStr64 != "") {
+			$("#rpic").attr("src", "data:image/gif;base64," + edzzpStr64);
+		};
+		$("#cyzjdm").text(codeFormatter($("#cyzjdmStr").val(),"CODE_ZJ"));
+		$("#xbdm").text(codeFormatter($("#xbdmStr").val(),"CODE_XB"));
+		$("#gjdm").text(codeFormatter($("#gjdmStr").val(),"CODE_GJ"));
+		$("#jgdm").text(codeFormatter($("#jgdmStr").val(),"CODE_XZQH"));
+		$("#hjdzXzqhdm").text(codeFormatter($("#hjdzXzqhdmStr").val(),"CODE_XZQH"));
+		$("#xzzXzqhdm").text(codeFormatter($("#xzzXzqhdmStr").val(),"CODE_XZQH"));
+		$("#csdXzqhdm").text(codeFormatter($("#csdXzqhdmStr").val(),"CODE_XZQH"));
+		$("#mzdm").text(codeFormatter($("#mzdmStr").val(),"CODE_MZ"));
+		$("#xldm").text(codeFormatter($("#xldmStr").val(),"CODE_WHCD"));
+		$("#zzmmdm").text(codeFormatter($("#zzmmdmStr").val(),"CODE_ZZMM"));
+		$("#hyzkdm").text(codeFormatter($("#hyzkdmStr").val(),"CODE_HYZK"));
+		$("#zylbdm").text(codeFormatter($("#zylbdmStr").val(),"CODE_ZY"));
+		$("#tszcdm").text(codeFormatter($("#tszcdmStr").val(),"CODE_FZXYRTSZC"));
+		$("#asjxgrysfdm").text(codeFormatter($("#asjxgrysfdmStr").val(),"CODE_SF"));
+		$("#byzkdm").text(codeFormatter($("#byzkdmStr").val(),"CODE_BYQK"));
+		$("#tmtzms").text($("#tmtzmsStr").val());
+		$("#tbbjms").text($("#tbbjmsStr").val());
+		$("#rqttzJyqk").text($("#rqttzJyqkStr").val());
+		$("#daztdm").text(codeFormatter($("#daztdmStr").val(),"CODE_DAZT"));
+		$("#zhddXzqhdm").text(codeFormatter($("#zhddXzqhdmStr").val(),"CODE_XZQH"));
+		$("#zhdwGajgjgdm").text(codeFormatter($("#zhdwGajgjgdmStr").val(),"CODE_UNIT"));
+		$("#sadwzydm").text(codeFormatter($("#sadwzydmStr").val(),"CODE_GTFZFZXYRSADWZY"));
+		$("#zhfsdm").text(codeFormatter($("#zhfsdmStr").val(),"CODE_ZHFS"));
+		$("#sfyxdsPdbz").text(codeFormatter($("#sfyxdsPdbzStr").val(),"CODE_IF"));
+		$("#dpnjsfyxPdbz").text(codeFormatter($("#dpnjsfyxPdbzStr").val(),"CODE_IF"));
+		$("#sfazbbdxdzPdbz").text(codeFormatter($("#sfazbbdxdzPdbzStr").val(),"CODE_IF"));
+		$("#sfszryPdbz").text(codeFormatter($("#sfszryPdbzStr").val(),"CODE_IF"));
+		$("#sftazsPdbz").text(codeFormatter($("#sftazsPdbzStr").val(),"CODE_IF"));
+		$("#sfswztPdbz").text(codeFormatter($("#sfswztPdbzStr").val(),"CODE_IF"));
+		$("#sfhyPdbz").text(codeFormatter($("#sfhyPdbzStr").val(),"CODE_IF"));
+		$("#sfjsbrPdbz").text(codeFormatter($("#sfjsbrPdbzStr").val(),"CODE_IF"));
+		$("#sfzdjbhzPdbz").text(codeFormatter($("#sfzdjbhzPdbzStr").val(),"CODE_IF"));
+		$("#xxdjdwGajgjgdm").text(codeFormatter($("#xxdjdwGajgjgdmStr").val(),"CODE_UNIT"));
+		doQueryGxr();
+		doQueryXfgk();
+		thxxTable();
+	});
+*/
+	function serializeObject(form){
+		var o={};
+		$.each(form.serializeArray(),function(index){
+			if(o[this['name'] ]){
+				o[this['name'] ] = o[this['name'] ] + "," + this['value'];
+			}else{
+				o[this['name'] ]=this['value'];
+			}
+		})
+		return o;
+	}
+</script>
+</body>
+
+</html>
+
+

src/main/resources/templates/zljc/zljccx.html

@@ -333,7 +333,7 @@ function doQuery(){
             }else if(jcjg==null||jcjg==""){
                 rstStr = "<span class='djc-btn' onclick=\"openNew('"+rybh+"','"+szzwbh+"','"+zwcjsjStr+"')\">待检查</span>";
             }else if(jcjg=="0"){
-                rstStr = "<span class='hg-btn' onclick=\"openJcjg('"+rybh+"','"+xm+"','"+wzxx+"','"+pmzw+"','"+gdzw+"','"+rx+"','"+bz+"','"+jcjg+"')\">合&nbsp;&nbsp;&nbsp;&nbsp;格</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;cursor: pointer' onclick=\"cut1('"+szzwbh+"')\">撤销结果</span>";
+                rstStr = "<span class='hg-btn' onclick=\"openJcjg('"+rybh+"','"+xm+"','"+wzxx+"','"+pmzw+"','"+gdzw+"','"+rx+"','"+bz+"','"+jcjg+"')\">合&nbsp;&nbsp;&nbsp;&nbsp;格</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;cursor: pointer' onclick=\"cut1('"+szzwbh+"')\">撤销结果</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;cursor: pointer' onclick=\"sendZwbd('"+rybh+"')\">发送比对</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;cursor: pointer' onclick=\"getZwbd('"+rybh+"')\">比对结果</span>";
             }else if(jcjg=="1"){
                 rstStr = "<span class='bhg-btn' onclick=\"openJcjg('"+rybh+"','"+xm+"','"+wzxx+"','"+pmzw+"','"+gdzw+"','"+rx+"','"+bz+"','"+jcjg+"')\">不合格</span>&nbsp;&nbsp;&nbsp;&nbsp;<span style='color: red;cursor: pointer' onclick=\"cut1('"+szzwbh+"')\">撤销结果</span>";
             }else if(jcjg=="2"){
@@ -684,6 +684,75 @@ function openRyxq(rybh){
     window.open("/toRyJbxxDetail?asjxgrybh="+rybh,'_blank');
 }
 
+//发比对
+function sendZwbd(rybh){
+    debugger;
+    alert("send==="+rybh);
+    var url="http://172.18.116.158:8081/szxc/query/person";
+    $.ajax({
+        url: url,
+        data: {
+            "fsdw_gajgjgdm":"430200000000",
+            "fsdw_gajgmc":"株洲市公安局",
+            "fsr_xm":"测试人员",
+            "fsr_gmsfhm":"430201199909090909",
+            "fsr_lxdh":"13111111111",
+            "ysxt_asjxgrybh":"1506020149992010042416","zzhwbdrwlxdm":"0", "sfzw_pdbz":"1"},
+        type:"post",
+        dataType:"json",
+        success:function(data){
+            alert(data);
+            console.log("结果反馈："+data.rwbh);
+        },
+        error:function(){
+            console.log("服务请求失败！");
+        }
+    });
+
+}
+
+//获取比对结果
+function getZwbd(rybh){
+    debugger;
+    alert("get==="+rybh);
+    var url="http://172.18.116.158:8081/szxc/result/ttMatch?rwbh=B2019072915475318721239";
+    $.ajax({
+        url: url,
+        type:"get",
+        dataType:"json",
+        success:function(data){
+            alert(data);
+            console.log("结果反馈："+data.TTResultPackage);
+        },
+        error:function(){
+            console.log("服务请求失败！");
+        }
+    });
+
+}
+
+//登录株洲协同办案系统
+function loginXtbaxt(){
+    var url="http://10.143.242.44:9100/doLogin";
+    $.ajax({
+        url: url,
+        data: {"userId":"admin","psw":"hnzzadmin"},
+        type:"post",
+        dataType:"json",
+        xhrFields:{
+            withCredentials:true
+        },
+        crossdomain:true,
+        success:function(data){
+            console.log("协同登录结果反馈："+data.msg);
+        },
+        error:function(){
+            console.log("登录协同办案服务失败！");
+        }
+    });
+
+}
+
 function doExportExcel(){
     var rybh = $("#RRybh").val();
     var zjhm = $("#zjhm").val();