From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Tue, 14 May 2019 02:40:30 +0000 (+0800)
Subject: 临时提交
X-Git-Tag: 1.0.0^2~223
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=b63e3782b43b51d0d9ef61bc7a505df3175eeb2f;p=epayment%2Ffood_payapi.git

临时提交
---

diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt
index d8390bc9..1d5953ce 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/consume_api_controller.kt
@@ -45,9 +45,9 @@ class ConsumeController {
      * 流水结果查询统一接口
      * */
     fun queryDtlResult(@RequestBody param: QueryDtlResultParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+         try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -57,7 +57,7 @@ class ConsumeController {
                 personBalancePayService.getUserdtlByBillnoForUpdateNowait(param.billno!!, param.shopaccno!!)
             }
             val person = dtl.userid?.let { userService.findPersonByUserid(dtl.userid) }
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .data("refno", dtl.refno)
                     .data("amount", dtl.amount)
                     .data("paytype", dtl.paytype)
@@ -70,10 +70,10 @@ class ConsumeController {
                     .success("查询成功"))
 
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "查询错误"))
         }
 
@@ -86,9 +86,9 @@ class ConsumeController {
      * */
     @PostMapping("/balance/pay")
     fun balancePay(@RequestBody param: CitizenCardPayinitParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+         try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -125,20 +125,20 @@ class ConsumeController {
                         }
                         .done(personBalancePayService)
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("refno", dtl.refno)
                         .data("amount", dtl.amount)
                         .success("交易成功"))
             }
 
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.BUSINESS_PAYTYPE_NOSUPPORT, "不支持支付方式<账户余额>"))
 
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
@@ -152,9 +152,9 @@ class ConsumeController {
      * */
     @PostMapping("/citizencard/payinit")
     fun citizencardPayinit(@RequestBody param: CitizenCardPayinitParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+         try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -180,20 +180,20 @@ class ConsumeController {
                         }
                         .init(personBalancePayService)
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("refno", dtl.refno)
                         .data("amount", dtl.amount)
                         .success("交易初始化成功"))
             }
 
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.BUSINESS_PAYTYPE_NOSUPPORT, "不支持支付方式<市民卡代扣>"))
 
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
@@ -205,9 +205,9 @@ class ConsumeController {
      * */
     @PostMapping("/citizencard/payfinish")
     fun citizencardPayinit(@RequestBody param: CitizenCardPayfinishParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+         try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -221,7 +221,7 @@ class ConsumeController {
                         .addResult(code.data)
                         .success(personBalancePayService) //流水置成功
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("refno", dtl.refno)
                         .data("billno", dtl.outtradeno)
                         .success())
@@ -231,15 +231,15 @@ class ConsumeController {
                         .addResult("errmsg", code.retmsg!!)
                         .finish(personBalancePayService, TradeDict.DTL_STATUS_FAIL) //流水置成功
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "交易扣费失败-${code.retmsg}"))
             }
 
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
@@ -253,9 +253,9 @@ class ConsumeController {
      * */
     @PostMapping("/ykt/payinit")
     fun yktPayInit(@RequestBody param: YktCardPayinitParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+         try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -287,20 +287,20 @@ class ConsumeController {
                         //.addExtendParam(param.extendmap)  //fixme: 保存调一卡通附加参数 (是否直接传附加参数map)
                         .init(personBalancePayService)
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("refno", dtl.refno)
                         .data("amount", dtl.amount)
                         .success("交易初始化成功"))
 
             }
 
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.BUSINESS_PAYTYPE_NOSUPPORT, "不支持支付方式<一卡通支付>"))
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
@@ -313,9 +313,9 @@ class ConsumeController {
      * */
     @PostMapping("/ykt/payfinish")
     fun yktPayFinish(@RequestBody param:CitizenCardPayfinishParam,request: HttpServletRequest,response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+         try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -331,7 +331,7 @@ class ConsumeController {
                         .addResult(code.data)
                         .success(personBalancePayService) //流水置成功
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("refno", dtl.refno)
                         .data("billno", dtl.outtradeno)
                         .success())
@@ -341,15 +341,15 @@ class ConsumeController {
                         .addResult("errmsg", code.retmsg!!)
                         .finish(personBalancePayService, TradeDict.DTL_STATUS_FAIL) //流水置成功
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "交易扣费失败-${code.retmsg}"))
             }
 
         }catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+             return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt
index f6cd045f..85abe653 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/shop_api_controller.kt
@@ -25,13 +25,13 @@ class ShopAPIController {
 
     @PostMapping("/open")
     fun openAccount(@RequestBody param: OpenShopParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+        try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
             shopService.findByThirdUniqueId(param.shopUniqueId)?.let {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.BUSINESS_SHOP_EXISTS, "该商户唯一号[${param.shopUniqueId}]已经存在"))
             }
 
@@ -39,44 +39,44 @@ class ShopAPIController {
             param.contactman = param.contactman?.let { URLDecoder.decode(param.contactman, Charsets.UTF_8.toString()) } //解码
             param.address = param.address?.let { URLDecoder.decode(param.address, Charsets.UTF_8.toString()) } //解码
             shopService.registerShop(param).let {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("shopid", it.shopid)
                         .data("shopaccno", it.shopaccno ?: "")
                         .success("注册成功"))
             }
 
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "商户注册失败"))
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
 
     @GetMapping("/query")
     fun queryShop(@RequestBody param: QueryShopParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+        try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
             shopService.findByShopBySearch(param.shopid, param.shopaccno, param.shopUniqueId)?.let {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .data("shop", it)
                         .success())
             }
 
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.SHOP_NOT_EXISTS, "商户不存在"))
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index 5b838e40..b3f8d4fd 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
@@ -29,45 +29,40 @@ class UserAPIController {
 
     @PostMapping("/open")
     fun openAccount(@RequestBody param: OpenUserParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+        try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
             useService.findByThirdUniqueIdenty(param.uid).let {
                 if (null != it) {
-                    ResponseEntity.ok(ResponseBodyBuilder.create()
+                    return ResponseEntity.ok(ResponseBodyBuilder.create()
                             .fail(TradeErrorCode.REGISTER_USER_EXIST, "改用户唯一号已经注册"))
                 }
 
                 param.name = URLDecoder.decode(param.name, Charsets.UTF_8.toString()) //解码
                 param.address = param.address?.let { URLDecoder.decode(param.address, Charsets.UTF_8.toString()) }  //解码
                 useService.registerUser(param).let {
-                    if (null != it) {
-                        ResponseEntity.ok(ResponseBodyBuilder.create()
-                                .data("userid", it.userid)
-                                .data("uid", param.uid)
-                                .success())
-                    }
-
-                    ResponseEntity.ok(ResponseBodyBuilder.create()
-                            .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "用户注册失败"))
+                    return ResponseEntity.ok(ResponseBodyBuilder.create()
+                            .data("userid", it.userid)
+                            .data("uid", param.uid)
+                            .success())
                 }
             }
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
 
     @PostMapping("/query")
     fun queryAccount(@RequestBody param: QueryUserParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+        try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
 
@@ -75,7 +70,7 @@ class UserAPIController {
                 if (null != it) {
                     val account = useService.findAccountByUserid(it.userid, null)
                     val pointacc = useService.findPointsAccountByUserid(it.userid)
-                    ResponseEntity.ok(ResponseBodyBuilder.create()
+                    return ResponseEntity.ok(ResponseBodyBuilder.create()
                             .data("userid", it.userid)
                             .data("name", it.name)
                             .data("idtype", it.idtype)
@@ -100,44 +95,44 @@ class UserAPIController {
                             .success())
                 }
 
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.ACCOUNT_NOT_EXISTS, "账户不存在"))
             }
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
 
     @PostMapping("/modify")
     fun modifyAccount(@RequestBody param: ModifyUserParam, request: HttpServletRequest, response: HttpServletResponse): ResponseEntity<Any> {
-        return try {
+        try {
             if (param.checkParam() && param.checkSign(commonService.getAppidSecretByRequest(request))) {
-                ResponseEntity.ok(ResponseBodyBuilder.create()
+                return ResponseEntity.ok(ResponseBodyBuilder.create()
                         .fail(TradeErrorCode.REQUEST_SIGN_ERROR, "参数签名错误"))
             }
             useService.findByUseridOrThirdUniqueIdenty(param.userid, param.uid)?.let {
                 param.name = param.name?.let { URLDecoder.decode(param.name, Charsets.UTF_8.toString()) } //解码
                 param.address = param.address?.let { URLDecoder.decode(param.address, Charsets.UTF_8.toString()) } //解码
                 if (useService.modifyUserInfo(it, param)) {
-                    ResponseEntity.ok(ResponseBodyBuilder.create()
+                    return ResponseEntity.ok(ResponseBodyBuilder.create()
                             .success("修改成功"))
                 } else {
-                    ResponseEntity.ok(ResponseBodyBuilder.create()
+                    return ResponseEntity.ok(ResponseBodyBuilder.create()
                             .fail(TradeErrorCode.BUSINESS_DEAL_ERROR, "账户信息修改失败"))
                 }
             }
 
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .fail(TradeErrorCode.ACCOUNT_NOT_EXISTS, "账户不存在"))
         } catch (ex: RequestParamCheckException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .requestException(ex, "请求参数错误"))
         } catch (et: TransactionException) {
-            ResponseEntity.ok(ResponseBodyBuilder.create()
+            return ResponseEntity.ok(ResponseBodyBuilder.create()
                     .transException(et, "业务处理错误"))
         }
     }
diff --git a/src/main/resources/templates/system/param/businesspara.html b/src/main/resources/templates/system/param/businesspara.html
index 57b1e768..80bcf389 100644
--- a/src/main/resources/templates/system/param/businesspara.html
+++ b/src/main/resources/templates/system/param/businesspara.html
@@ -9,9 +9,10 @@
     <div class="layui-card-body">
         <div class="layui-form toolbar">
             搜索：
-            <input id="search-paraname" class="layui-input search-input" type="text" maxlength="40" placeholder="输入参数名称"/>&emsp;
+            <input id="search-paraname" class="layui-input search-input" type="text" maxlength="40" placeholder="输入参数名查询"/>&emsp;
             <button id="btn-search" class="layui-btn icon-btn" data-type="search"><i class="layui-icon">&#xe615;</i>搜索
             </button>
+            <button id="btn-add" class="layui-btn icon-btn" data-type="add"><i class="layui-icon"></i>新增</button>
         </div>
         <table class="layui-table" id="businessparaTable" lay-filter="businessparaTable-filter"></table>
     </div>
@@ -23,71 +24,25 @@
         var admin = layui.admin;
         // 渲染表格
         table.render({
-            elem: '#sysparaTable',
-            url: '/param/sysparalist',
+            elem: '#businessparaTable',
+            url: '/param/businessparalist',
             page: true,
             cols: [
                 [
-                    {field: 'paraid', title: 'ID', width: 80, align: 'center', fixed: 'left', sort: true},
-                    {field: 'paraname', title: '参数名称', width: 250, align: 'center', fixed: 'left'},
-                    {field: 'paraval', title: '参数值', fixed: 'left', edit: 'text'},
-                    {
-                        field: 'valueType', title: '格式', width: 75, align: 'center', templet: function (item) {
-                            if("amount"==item["valueType"]) return "金额";
-                            else if("switch"==item["valueType"]) return "开关";
-                            else if("date"==item["valueType"]) return "yyyyMMdd";
-                            else if("datetime"==item["valueType"]) return "yyyyMMddHHmmss";
-                            else if("decimal"==item["valueType"]) return "数值";
-                            else if("number"==item["valueType"]) return "整数";
-                            else  return "字符串";
-                        }
-                    },
-                    {field: 'paraunit', title: '单位', width: 75, align: 'center'},
-                    {field: 'remark', title: '备注'}
+                    {field: 'parakey', title: '参数名', width: 150, align: 'center', fixed: 'left', sort: true},
+                    {field: 'paraval', title: '参数值', width: 250, align: 'center'}
                 ]
             ]
         });
         // 搜索按钮点击事件
         $('#btn-search').click(function () {
-            var paraid = $("#search-paraid").val();
             var paraname = $("#search-paraname").val();
-            if (null != paraid && paraid.length > 0 && !(/^\d+$/.test(paraid))) {
-                layer.msg("参数ID请输入数字", {icon: 2});
-            }else{
-                table.reload('sysparaTable', {where: {paraid: paraid, paraname: paraname}, page: {curr: 1}});
-            }
+            table.reload('sysparaTable', {where: {paraid: paraid, paraname: paraname}, page: {curr: 1}});
         });
 
-        $('#btn-reset').click(function () {
-            $("#search-paraid").val("");
-            $("#search-paraname").val("");
-        });
-
-
         //监听单元格编辑
         table.on('edit(sysparaTable-filter)', function (obj) {
-            var row = obj.data; //得到所在行所有键值
-            var newval = obj.value; //得到修改后的值
-            admin.go('/param/sysparaupdate', {
-                paraid: row.paraid,
-                paraval: newval,
-                _csrf: $("meta[name='_csrf_token']").attr("value"),
-            }, function (data) {
-                if (data.code == 200) {
-                    layer.msg("修改成功", {icon: 1});
-                } else if (data.code == 401) {
-                    layer.msg(data.msg, {icon: 2, time: 1500}, function () {
-                        location.replace('/login');
-                    }, 1000);
-                    return;
-                } else {
-                    layer.msg(data.msg, {icon: 2});
-                    table.reload('sysparaTable');
-                }
-            },function () {
-                layer.msg('修改失败了，请稍后再试', {icon: 2});
-                table.reload('sysparaTable');
-            });
+
         });
 
     });