Merge branch 'lggj' of http://192.168.168.245:8888/panzhaov5/bsth_control into lggj

ljq
2 parents 7c68baa1 b8e2698f
Showing 6 changed files with 24 additions and 7 deletions
src/main/java/com/bsth/controller/realcontrol/ReportRegisterController.java
src/main/java/com/bsth/util/ReportRegisterHTTPUtil.java
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/add.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/update.html
@@ -10,6 +10,7 @@ import com.bsth.util.HttpClientUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
@@ -36,9 +37,11 @@ public class ReportRegisterController extends BaseController&lt;ReportRegister, Lon
     Logger log = LoggerFactory.getLogger(this.getClass());
-    final static String url = "http://61.171.28.220:8018/complaint/TsReport/input.do";
+//    final static String url = "http://61.171.28.220:8018/complaint/TsReport/input.do";
 //    final static String url = "http://114.80.178.13/complaint/TsReport/input.do";
 //    final static String url = "http://192.168.168.228:8080/complaint/TsReport/input.do";
+	@Value("${report_register.complaint.url}")
+	private String url;
     @Autowired
     ReportRegisterService reportRegisterService;
@@ -69,7 +72,7 @@ public class ReportRegisterController extends BaseController&lt;ReportRegister, Lon
 //            map = baseService.delete(id);
             reportRegisterService.deleteInfo(t);
             String data = "{ID:'"+t.getID()+"', STATUS:'2'}";
-            StringBuilder sb = HttpClientUtils.post(url,data);
+            StringBuilder sb = HttpClientUtils.post(url, data);
             JSONObject obj = JSON.parseObject(sb.toString());
             map.put("status2", obj);
         } catch (Exception e) {
@@ -86,7 +89,7 @@ public class ReportRegisterController extends BaseController&lt;ReportRegister, Lon
             reportRegisterService.save(t);
             map.put("status", ResponseCode.SUCCESS);
             map.put("t", t);
-            StringBuilder sb = HttpClientUtils.post(url,t.toString());
+            StringBuilder sb = HttpClientUtils.post(url, t.toString());
             JSONObject obj = JSON.parseObject(sb.toString());
             map.put("status2", obj);
         } catch (Exception e) {
@@ -24,7 +24,8 @@ public class ReportRegisterHTTPUtil extends HttpServlet {
             //创建默认连接
             CloseableHttpClient httpClient = HttpClients.createDefault();
             //创建HttpGet对象,处理get请求,转发到A站点
-            HttpPost httpPost = new HttpPost("http://114.80.178.13/complaint/TsReport/input.do");
+//            HttpPost httpPost = new HttpPost("http://114.80.178.13/complaint/TsReport/input.do");
+            HttpPost httpPost = new HttpPost("http://10.10.200.113:8060/complaint/TsReport/input.do");
             //执行
             CloseableHttpResponse response = httpClient.execute(httpPost);
             int code = response.getStatusLine().getStatusCode();
@@ -44,3 +44,5 @@ baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
 passengerFlow.url = http://192.168.168.32:9999/images/
 electricity.importFile.path= /home/control/elecImportFile
+
+report_register.complaint.url= http://10.10.200.113:8060/complaint/TsReport/input.do
@@ -44,3 +44,5 @@ baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
 passengerFlow.url = http://127.0.0.1:9999/images/
 electricity.importFile.path= E:/elecImportFile
+
+report_register.complaint.url= http://192.168.168.172:8080/complaint/TsReport/input.do
@@ -568,7 +568,9 @@
                 //校验
                 formActive.formValidation({framework: 'uikit', locale: 'zh_CN'});
-                //提交
+                //解绑事件（防止重复绑定同一事件提交多份数据）
+                formActive.off('success.form.fv');
+                //提交事件
                 formActive.on('success.form.fv', function (e) {
                     e.preventDefault();
                     // disabled_submit_btn(formActive);
@@ -578,8 +578,13 @@
                 //校验
                 formActive.formValidation({framework: 'uikit', locale: 'zh_CN'});
-                //提交
-                formActive.on('success.form.fv', function (e) {
+                //解绑事件（防止重复绑定同一事件提交多份数据）
+                formActive.off('success.form.fv');
+                formActive.off('success');
+                formActive.off('click');
+                formActive.off('err');
+                //提交事件(one:只触发一次后自动解绑)
+                formActive.one('success.form.fv', function (e) {
                     e.preventDefault();
                     var headData = $('#add_head_table').serializeJSON();
                     var bodyData = $(formActive).serializeJSON();
@@ -600,6 +605,8 @@
                         notify_err('修改失败！');
                     });
                 });
+//                 var events = $._data($('#'+tableActiveStr)[0], "events");
+//                 console.log(events);
             }
             //submit