Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

s9th 3 lat temu
rodzic
commit
56a7777f57
20 zmienionych plików z 300 dodań i 118 usunięć
  1. 13 10
      leiSP-admin/src/main/resources/static/ruoyi/js/ry-ui.js
  2. 12 0
      leiSP-common/src/main/java/com/sooka/common/core/controller/BaseController.java
  3. 7 1
      mybusiness/src/main/java/com/business/controller/VisualizationController.java
  4. 13 0
      mybusiness/src/main/java/com/business/domain/deptInNumbersBean.java
  5. 11 0
      mybusiness/src/main/java/com/business/mapper/VisualizationMapper.java
  6. 9 0
      mybusiness/src/main/java/com/business/service/VisualizationService.java
  7. 26 0
      mybusiness/src/main/java/com/business/service/impl/VisualizationServiceImpl.java
  8. 10 0
      mybusiness/src/main/java/com/sooka/apply/domain/IntBo.java
  9. 24 0
      mybusiness/src/main/java/com/sooka/apply/domain/IntDetailed.java
  10. 20 7
      mybusiness/src/main/java/com/sooka/apply/service/impl/IntRecordServiceImpl.java
  11. 3 5
      mybusiness/src/main/java/com/sooka/system/controller/TUSfzController.java
  12. 2 0
      mybusiness/src/main/java/com/sooka/system/domain/BaseBusinessEntity.java
  13. 12 11
      mybusiness/src/main/java/com/sooka/system/domain/TUInterfaceinfo.java
  14. 2 1
      mybusiness/src/main/java/com/sooka/system/service/impl/TUSfzServiceImpl.java
  15. 11 6
      mybusiness/src/main/resources/mapper/apply/IntRecordMapper.xml
  16. 15 0
      mybusiness/src/main/resources/mapper/visualization/VisualizationMapper.xml
  17. 8 2
      mybusiness/src/main/resources/templates/apply/record/add.html
  18. 17 8
      mybusiness/src/main/resources/templates/apply/record/edit.html
  19. 5 0
      mybusiness/src/main/resources/templates/apply/record/record.html
  20. 80 67
      mybusiness/src/main/resources/templates/system/sfz/sfz.html

+ 13 - 10
leiSP-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -91,7 +91,7 @@ var table = {
                     pagination: options.pagination,                     // 是否显示分页(*)
                     paginationLoop: options.paginationLoop,             // 是否启用分页条无限循环的功能
                     pageNumber: 1,                                      // 初始化加载第一页,默认第一页
-                    pageSize: options.pageSize,                         // 每页的记录行数(*) 
+                    pageSize: options.pageSize,                         // 每页的记录行数(*)
                     pageList: options.pageList,                         // 可供选择的每页的行数(*)
                     firstLoad: options.firstLoad,                       // 是否首次请求加载数据,对于数据较大可以配置false
                     escape: options.escape,                             // 转义HTML字符串
@@ -141,7 +141,7 @@ var table = {
             // 获取实例ID,如存在多个返回#id1,#id2 delimeter分隔符
             getOptionsIds: function(separator) {
             	var _separator = $.common.isEmpty(separator) ? "," : separator;
-            	var optionsIds = "";  
+            	var optionsIds = "";
             	$.each(table.config, function(key, value){
             		optionsIds += "#" + key + _separator;
             	});
@@ -158,7 +158,7 @@ var table = {
                         isAsc:          params.order
             		};
             	var currentId = $.common.isEmpty(table.options.formId) ? $('form').attr('id') : table.options.formId;
-            	return $.extend(curParams, $.common.formToJSON(currentId)); 
+            	return $.extend(curParams, $.common.formToJSON(currentId));
             },
             // 请求获取数据后处理回调函数
             responseHandler: function(res) {
@@ -794,9 +794,9 @@ var table = {
             },
             // 弹出层指定参数选项
             openOptions: function (options) {
-            	var _url = $.common.isEmpty(options.url) ? "/404.html" : options.url; 
-            	var _title = $.common.isEmpty(options.title) ? "系统窗口" : options.title; 
-                var _width = $.common.isEmpty(options.width) ? "800" : options.width; 
+            	var _url = $.common.isEmpty(options.url) ? "/404.html" : options.url;
+            	var _title = $.common.isEmpty(options.title) ? "系统窗口" : options.title;
+                var _width = $.common.isEmpty(options.width) ? "800" : options.width;
                 var _height = $.common.isEmpty(options.height) ? ($(window).height() - 50) : options.height;
                 var _btn = ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-close"></i> 关闭'];
                 if ($.common.isEmpty(options.yes)) {
@@ -946,7 +946,7 @@ var table = {
             detail: function(id, width, height) {
             	table.set();
             	var _url = $.operate.detailUrl(id);
-            	var _width = $.common.isEmpty(width) ? "800" : width; 
+            	var _width = $.common.isEmpty(width) ? "800" : width;
                 var _height = $.common.isEmpty(height) ? ($(window).height() - 50) : height;
             	//如果是移动端,就使用自适应大小弹窗
             	if ($.common.isMobile()) {
@@ -958,7 +958,7 @@ var table = {
        				width: _width,
        				height: _height,
        				url: _url,
-       				skin: 'layui-layer-gray', 
+       				skin: 'layui-layer-gray',
        				btn: ['关闭'],
        				yes: function (index, layero) {
        	                layer.close(index);
@@ -993,7 +993,7 @@ var table = {
 	            	    $.operate.submit(url, "post", "json", data);
 	                }
             	});
-            	
+
             },
             // 批量删除信息
             removeAll: function() {
@@ -1161,6 +1161,7 @@ var table = {
             },
             // 保存结果弹出msg刷新table表格
             ajaxSuccess: function (result) {
+
             	if (result.code == web_status.SUCCESS && table.options.type == table_type.bootstrapTable) {
                 	$.modal.msgSuccess(result.msg);
             		$.table.refresh();
@@ -1178,6 +1179,7 @@ var table = {
             },
             // 成功结果提示msg(父窗体全局更新)
             saveSuccess: function (result) {
+
             	if (result.code == web_status.SUCCESS) {
             		$.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS);
                 } else if (result.code == web_status.WARNING) {
@@ -1189,6 +1191,7 @@ var table = {
             },
             // 成功回调执行事件(父窗体静默更新)
             successCallback: function(result) {
+
                 if (result.code == web_status.SUCCESS) {
                 	var parent = window.parent;
                     if (parent.table.options.type == table_type.bootstrapTable) {
@@ -1604,4 +1607,4 @@ modal_status = {
     SUCCESS: "success",
     FAIL: "error",
     WARNING: "warning"
-};
+};

+ 12 - 0
leiSP-common/src/main/java/com/sooka/common/core/controller/BaseController.java

@@ -1,6 +1,7 @@
 package com.sooka.common.core.controller;
 
 import java.beans.PropertyEditorSupport;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
@@ -114,6 +115,17 @@ public class BaseController
         return rspData;
     }
 
+
+    protected TableDataInfo getDataTable(String msg)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(1);
+        rspData.setMsg(msg);
+        rspData.setRows(new ArrayList<>());
+        rspData.setTotal(0);
+        return rspData;
+    }
+
     /**
      * 响应返回结果
      * 

+ 7 - 1
mybusiness/src/main/java/com/business/controller/VisualizationController.java

@@ -1,16 +1,22 @@
 package com.business.controller;
 
+import com.sooka.common.core.controller.BaseController;
+import com.sooka.common.core.domain.AjaxResult;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 @RequestMapping("VisualizationController")
-public class VisualizationController {
+public class VisualizationController extends BaseController {
 
     @GetMapping("index")
     public String index(){
         return "/visualization/index";
     }
 
+    public AjaxResult initVisualization(){
+       return null;
+    }
+
 }

+ 13 - 0
mybusiness/src/main/java/com/business/domain/deptInNumbersBean.java

@@ -0,0 +1,13 @@
+package com.business.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class deptInNumbersBean {
+
+    Long dept_id;
+    String dept_name;
+    Integer int_numbers;
+}

+ 11 - 0
mybusiness/src/main/java/com/business/mapper/VisualizationMapper.java

@@ -0,0 +1,11 @@
+package com.business.mapper;
+
+import java.util.List;
+
+public interface VisualizationMapper {
+
+    public List getDeptInNumbers();
+
+
+
+}

+ 9 - 0
mybusiness/src/main/java/com/business/service/VisualizationService.java

@@ -0,0 +1,9 @@
+package com.business.service;
+
+import com.sooka.common.core.domain.AjaxResult;
+
+public interface VisualizationService {
+
+    public AjaxResult initVisualizaton();
+
+}

+ 26 - 0
mybusiness/src/main/java/com/business/service/impl/VisualizationServiceImpl.java

@@ -0,0 +1,26 @@
+package com.business.service.impl;
+
+import com.business.mapper.VisualizationMapper;
+import com.business.service.VisualizationService;
+import com.sooka.common.core.domain.AjaxResult;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class VisualizationServiceImpl  implements VisualizationService {
+
+    @Resource
+    VisualizationMapper visualizationMapper;
+
+    @Override
+    public AjaxResult initVisualizaton() {
+        List deptInNumbers =  visualizationMapper.getDeptInNumbers();
+        Map map = new HashMap();
+        map.put("deptInNumbers",deptInNumbers);
+        return AjaxResult.success(deptInNumbers);
+    }
+}

+ 10 - 0
mybusiness/src/main/java/com/sooka/apply/domain/IntBo.java

@@ -14,6 +14,8 @@ public class IntBo {
 
     private String intIds;
 
+    private String intCodes;
+
     private Long deptId;
 
     private String datetime;
@@ -34,6 +36,14 @@ public class IntBo {
         this.intIds = intIds;
     }
 
+    public String getIntCodes() {
+        return intCodes;
+    }
+
+    public void setIntCodes(String intCodes) {
+        this.intCodes = intCodes;
+    }
+
     public Long getDeptId() {
         return deptId;
     }

+ 24 - 0
mybusiness/src/main/java/com/sooka/apply/domain/IntDetailed.java

@@ -26,6 +26,14 @@ public class IntDetailed extends BaseEntity
     @Excel(name = "接口表id")
     private String intId;
 
+    /** 接口编码 */
+    @Excel(name = "接口编码")
+    private String intCode;
+
+    /** 接口名称 */
+    @Excel(name = "接口名称")
+    private String intName;
+
     /** 开始时间 */
     @Excel(name = "开始时间")
     private String strAt;
@@ -107,6 +115,22 @@ public class IntDetailed extends BaseEntity
         return status;
     }
 
+    public String getIntCode() {
+        return intCode;
+    }
+
+    public void setIntCode(String intCode) {
+        this.intCode = intCode;
+    }
+
+    public String getIntName() {
+        return intName;
+    }
+
+    public void setIntName(String intName) {
+        this.intName = intName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 20 - 7
mybusiness/src/main/java/com/sooka/apply/service/impl/IntRecordServiceImpl.java

@@ -89,9 +89,13 @@ public class IntRecordServiceImpl implements IIntRecordService
 
         intBo.setId(intRecord.getId());
 
-        int rows = intRecordMapper.insertIntRecord(intRecord);
-        insertIntDetailed(intBo);
-        return rows;
+        try {
+            insertIntDetailed(intBo);
+            return intRecordMapper.insertIntRecord(intRecord);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return 0;
     }
 
     /**
@@ -125,19 +129,28 @@ public class IntRecordServiceImpl implements IIntRecordService
      * 
      * @param intBo 申请记录对象
      */
-    private void insertIntDetailed(IntBo intBo)
-    {
+    private void insertIntDetailed(IntBo intBo) throws Exception {
 
         String[] intIds = intBo.getIntIds().split(",");
+        String[] intCodes = intBo.getIntCodes().split(",");
+
+        if (intIds.length != intCodes.length) {
+            throw new Exception("接口信息不全,无法完成申请");
+        }
+
         String id = intBo.getId();
         String str_at = intBo.getDatetime().split(" - ")[0];
         String end_at = intBo.getDatetime().split(" - ")[1];
 
         List<IntDetailed> list = new ArrayList<IntDetailed>();
-        for (String intId : intIds) {
+
+        for (int i = 0; i < intIds.length; i++) {
+            String intId = intIds[i];
+            String intCode = intCodes[i];
             IntDetailed intDetailed = new IntDetailed();
             intDetailed.setId(IdUtils.fastSimpleUUID());
             intDetailed.setIntId(intId);
+            intDetailed.setIntCode(intCode);
             intDetailed.setRecordId(id);
             intDetailed.setStrAt(str_at);
             intDetailed.setEndAt(end_at);
@@ -145,8 +158,8 @@ public class IntRecordServiceImpl implements IIntRecordService
             intDetailed.setStatus("1");
             list.add(intDetailed);
         }
+        
         if (list.size() > 0) {
-            System.out.println(Arrays.toString(list.toArray()));
             intRecordMapper.batchIntDetailed(list);
         }
     }

+ 3 - 5
mybusiness/src/main/java/com/sooka/system/controller/TUSfzController.java

@@ -64,11 +64,9 @@ public class TUSfzController extends BaseController {
         tUSfz.setOs(os);
         tUSfz.setIpaddress(ipaddress);
         List<TUSfz> list = tUSfzService.selectTUSfzList(tUSfz);
-//        if(list == null){
-//            TableDataInfo dataInfo = getDataTable(new ArrayList<>());
-//            dataInfo.setMsg("秘钥不正确或已过期,请联系管理员");
-//            return dataInfo;
-//        }
+        if(list == null){
+            return getDataTable("秘钥错误或过期,请联系管理员");
+        }
         return getDataTable(list);
     }
 

+ 2 - 0
mybusiness/src/main/java/com/sooka/system/domain/BaseBusinessEntity.java

@@ -12,5 +12,7 @@ public class BaseBusinessEntity extends BaseEntity {
     private String ipaddress;
     private String os;
 
+    private String secretKey;
+
 
 }

+ 12 - 11
mybusiness/src/main/java/com/sooka/system/domain/TUInterfaceinfo.java

@@ -20,6 +20,10 @@ public class TUInterfaceinfo extends BaseEntity
     private String id;
 
     /** 状态 */
+    @Excel(name = "编码")
+    private String code;
+
+    /** 状态 */
     @Excel(name = "状态")
     private String status;
 
@@ -66,17 +70,6 @@ public class TUInterfaceinfo extends BaseEntity
     @Excel(name = "AK/SK方式")
     private String typeAksk;
 
-    private String code;
-
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public void setId(String id)
     {
         this.id = id;
@@ -195,6 +188,14 @@ public class TUInterfaceinfo extends BaseEntity
         return typeAksk;
     }
 
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 2 - 1
mybusiness/src/main/java/com/sooka/system/service/impl/TUSfzServiceImpl.java

@@ -63,7 +63,8 @@ public class TUSfzServiceImpl implements ITUSfzService {
     @Override
     public List<TUSfz> selectTUSfzList(TUSfz tUSfz) {
         Map map = new HashMap();
-        map.put("secretKey", "0f0806f206544597840df9cade4127bb");
+        map.put("secretKey", tUSfz.getSecretKey());
+        map.put("intCode", "00001");
         String r = HttpUtil.doGet("http://127.0.0.1:88/api/test/sfz", "", map);
         JSONObject jsonpObject = JSONObject.parseObject(r);
         if(jsonpObject != null && jsonpObject.getString("code").equals("1000")){

+ 11 - 6
mybusiness/src/main/resources/mapper/apply/IntRecordMapper.xml

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="recordId"    column="record_id"    />
         <result property="intId"    column="int_id"    />
+        <result property="intCode"    column="int_code"    />
+        <result property="intName"    column="interface_name"    />
         <result property="strAt"    column="str_at"    />
         <result property="endAt"    column="end_at"    />
         <result property="secretKey"    column="secret_key"    />
@@ -51,12 +53,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.id,
             b.record_id,
             b.int_id,
+            i.interface_name,
+            b.int_code,
             b.str_at,
             b.end_at,
             b.secret_key,
             b.STATUS
         FROM
-            int_detailed b
+            int_detailed b,
+            t_u_interfaceinfo i
+        WHERE
+            b.int_id = i.id
     </sql>
 
     <select id="selectIntRecordList" parameterType="IntRecord" resultMap="IntRecordResult">
@@ -72,9 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectIntDetailedList" parameterType="IntDetailed" resultMap="IntDetailedResult">
         <include refid="selectIntDetailedVo"/>
-        <where>
-            <if test="recordId != null "> and record_id = #{recordId}</if>
-        </where>
+        <if test="recordId != null "> and b.record_id = #{recordId}</if>
     </select>
     
     <select id="selectIntRecordById" parameterType="String" resultMap="IntRecordIntDetailedResult">
@@ -130,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchIntDetailed">
-        insert into int_detailed( id, record_id, int_id, str_at, end_at, secret_key, status) values
+        insert into int_detailed( id, record_id, int_id, int_code, str_at, end_at, secret_key, status) values
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.recordId}, #{item.intId}, #{item.strAt}, #{item.endAt}, #{item.secretKey}, #{item.status})
+            ( #{item.id}, #{item.recordId}, #{item.intId} ,#{item.intCode}, #{item.strAt}, #{item.endAt}, #{item.secretKey}, #{item.status})
         </foreach>
     </insert>
 

+ 15 - 0
mybusiness/src/main/resources/mapper/visualization/VisualizationMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.business.mapper.VisualizationMapper">
+
+
+    <resultMap id="deptInNumbersBean" type="com.business.domain.deptInNumbersBean"></resultMap>
+    <select id="getDeptInNumbers" resultMap="deptInNumbersBean">
+select a.dept_id dept_id,a.dept_name dept_name,b.int_numbers int_numbers from sys_dept a,
+(select apply_oid ,sum(int_numbers) int_numbers from int_record a group by apply_oid order by  int_numbers desc) b
+where a.dept_id=b.apply_oid
+    </select>
+
+</mapper>

+ 8 - 2
mybusiness/src/main/resources/templates/apply/record/add.html

@@ -42,6 +42,7 @@
                     </div>
                     <div class="col-sm-12 select-table table-striped">
                         <input type="hidden" id="intIds" name="intIds">
+                        <input type="hidden" id="intCodes" name="intCodes">
                         <table id="bootstrap-table"></table>
                     </div>
                 </div>
@@ -103,6 +104,9 @@
                 field: 'interfaceName',
                 title: '接口名称'
             },{
+                field: 'code',
+                title: '接口编码'
+            },{
                 field: 'usageScenarios',
                 title: '使用场景'
             },{
@@ -135,8 +139,10 @@
     // 选中数据
     function checkItem(){
         // var arrays = $.table.selectColumns("userId");
-        var arrays = $.table.selectColumns("id");
-        $("#intIds").val(arrays);
+        var intIds = $.table.selectColumns("id");
+        $("#intIds").val(intIds);
+        var intCodes = $.table.selectColumns("code");
+        $("#intCodes").val(intCodes);
     }
 
     $('#btnExpand').click(function() {

+ 17 - 8
mybusiness/src/main/resources/templates/apply/record/edit.html

@@ -7,6 +7,11 @@
 <body class="white-bg">
     <div class="container-div">
         <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="record_form">
+                    <input type="hidden" id="recordId" name="recordId" th:value="${intRecord.id}">
+                </form>
+            </div>
             <div class="col-sm-12">
                 <div class="col-sm-12 select-table table-striped">
                     <table id="bootstrap-table"></table>
@@ -40,23 +45,27 @@
                     	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
                     	return columnIndex + $.table.serialNumber(index);
                     }
-                },
-                {
+                },{
+                    field: 'intName',
+                    align: 'center',
+                    title: '接口名称'
+                },{
+                    field: 'intCode',
+                    align: 'center',
+                    title: '接口编码'
+                },{
                     field: 'strAt',
                     align: 'center',
                     title: '开始时间'
-				},
-                {
+				},{
                     field: 'endAt',
                     align: 'center',
                     title: '结束时间'
-				},
-                {
+				},{
                     field: 'secretKey',
                     align: 'center',
                     title: 'secret_key'
-				},
-                {
+				},{
                     visible: editFlag !== 'hidden',
                     title: '状态',
                     align: 'center',

+ 5 - 0
mybusiness/src/main/resources/templates/apply/record/record.html

@@ -111,6 +111,11 @@
             };
             $.table.init(options);
         });
+
+        function info(recordId) {
+
+        }
+
     </script>
 </body>
 </html>

+ 80 - 67
mybusiness/src/main/resources/templates/system/sfz/sfz.html

@@ -1,73 +1,86 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('身份证列表')" />
+    <th:block th:include="include :: header('身份证列表')"/>
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>姓名:</label>
-                                <input type="text" name="name"/>
-                            </li>
-                            <li>
-                                <label>公民身份号码:</label>
-                                <input type="text" name="idcardNo"/>
-                            </li>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>姓名:</label>
+                            <input type="text" name="name"/>
+                        </li>
+                        <li>
+                            <label>公民身份号码:</label>
+                            <input type="text" name="idcardNo"/>
+                        </li>
+                        <li>
+                            <label>授权码:</label>
+                            <input type="text" id="secretKey" name="secretKey"/>
+                        </li>
 
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="query()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:sfz:add">-->
-                    <!--<i class="fa fa-plus"></i> 添加-->
-                <!--</a>-->
-                <!--<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:sfz:edit">-->
-                    <!--<i class="fa fa-edit"></i> 修改-->
-                <!--</a>-->
-                <!--<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:sfz:remove">-->
-                    <!--<i class="fa fa-remove"></i> 删除-->
-                <!--</a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:sfz:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:sfz:add">-->
+            <!--<i class="fa fa-plus"></i> 添加-->
+            <!--</a>-->
+            <!--<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:sfz:edit">-->
+            <!--<i class="fa fa-edit"></i> 修改-->
+            <!--</a>-->
+            <!--<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:sfz:remove">-->
+            <!--<i class="fa fa-remove"></i> 删除-->
+            <!--</a>-->
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:sfz:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
+</div>
 
-     <input type="hidden" id="birthDate">
+<input type="hidden" id="birthDate">
 
 
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('system:sfz:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('system:sfz:remove')}]];
-        var prefix = ctx + "system/sfz";
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:sfz:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:sfz:remove')}]];
+    var prefix = ctx + "system/sfz";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "身份证",
-                columns: [{
-                    checkbox: true
-                },
+    function query() {
+
+        var secretKey = $("#secretKey").val();
+        if (secretKey == null || secretKey === '') {
+            $.modal.msgError('请输入授权码!');
+            return;
+        }
+
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "身份证",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'id',
                     title: '主键ID',
@@ -118,29 +131,29 @@
                 {
                     field: 'photograph',
                     title: '相片',
-                    formatter: function(value, row, index) {
-                        return  "<image src='data:image/jpg;base64,"+value+"'>"+"</image>";
+                    formatter: function (value, row, index) {
+                        return "<image src='data:image/jpg;base64," + value + "'>" + "</image>";
                     }
                 },
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
+        };
+        $.table.init(options);
+    }
 
-        function detail(id) {
-            $.modal.open("身份证详情","/system/sfz/detail/"+id);
-        }
 
+    function detail(id) {
+        $.modal.open("身份证详情", "/system/sfz/detail/" + id);
+    }
 
 
-    </script>
+</script>
 </body>
 </html>