Skip to content

B
bigdatainterservice
Commit ed8cfb02 by caojingji
Options

Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1

parents f280b18a 32a29196
Showing with 111 additions and 63 deletions
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
...@@ -27,6 +27,7 @@ public class Bkxx { ...@@ -27,6 +27,7 @@ public class Bkxx {
private String bkyj; private String bkyj;
private String bkyq; private String bkyq;
private String asjbh ;//案事件编号 private String asjbh ;//案事件编号
private String sms;//是否短信通知(0:否 1：是)
@JSONField(format = "yyyy-MM-dd") @JSONField(format = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date bksj_start ; private java.util.Date bksj_start ;
...@@ -45,14 +46,4 @@ public class Bkxx { ...@@ -45,14 +46,4 @@ public class Bkxx {
private Date xgsj;//修改时间 private Date xgsj;//修改时间
private String bkqx;//布控期限 private String bkqx;//布控期限
/* private String bkbsh; //布控标识号
private String bshlxdm; //布控号类型代码
private String bshlxmc;//布控号类型名称
private String bkrSfzh; //布控人身份证号
private String bkrXm;//布控人姓名
private String bkrJh;//布控人警号
private String bkrLxdh;//布控人联系电话
private Date bkKssj;//布控开始时间*/
} }
src/main/java/com/founder/interservice/controller/MinistrySuspectInfoController.java
...@@ -26,7 +26,6 @@ public class MinistrySuspectInfoController { ...@@ -26,7 +26,6 @@ public class MinistrySuspectInfoController {
@ResponseBody @ResponseBody
public JSONObject queryMinistrySuspectInfo(String sfzh){//ZHFZXYR_CYZJ_ZJHM 查询资源所需的条件 513624198110310011 510211198301103713 510218198208064953 public JSONObject queryMinistrySuspectInfo(String sfzh){//ZHFZXYR_CYZJ_ZJHM 查询资源所需的条件 513624198110310011 510211198301103713 510218198208064953
JSONObject resultObj = new JSONObject(); JSONObject resultObj = new JSONObject();
System.out.println("resultObj============================="+resultObj);
List<Map<String,Object>> resultList = new ArrayList<Map<String, Object>>(); List<Map<String,Object>> resultList = new ArrayList<Map<String, Object>>();
try { try {
//通过身份证号调取案事件编号list（asjbhList） //通过身份证号调取案事件编号list（asjbhList）
...@@ -39,8 +38,10 @@ public class MinistrySuspectInfoController { ...@@ -39,8 +38,10 @@ public class MinistrySuspectInfoController {
Map<String,Object> mapQg = call.getGabZyInfoByJyaq("fzxyr",os,gabConfig); Map<String,Object> mapQg = call.getGabZyInfoByJyaq("fzxyr",os,gabConfig);
List<Map<String,Object>> asjbhList = (List<Map<String,Object>>)mapQg.get("dataResult"); List<Map<String,Object>> asjbhList = (List<Map<String,Object>>)mapQg.get("dataResult");
//通过案事件编号调取案事件信息resultList //通过案事件编号调取案事件信息resultList
for (Map<String,Object> asjbh:asjbhList) { for (Map<String,Object> map:asjbhList) {
JSONObject jsonObject1 = new JSONObject(); JSONObject jsonObject1 = new JSONObject();
String asjbh = (String) map.get("ASJBH");
jsonObject1.put("ASJBH", asjbh); jsonObject1.put("ASJBH", asjbh);
JSONArray jsonArray1 = new JSONArray(); JSONArray jsonArray1 = new JSONArray();
jsonArray1.add(jsonObject1); jsonArray1.add(jsonObject1);
...@@ -52,7 +53,6 @@ public class MinistrySuspectInfoController { ...@@ -52,7 +53,6 @@ public class MinistrySuspectInfoController {
resultList.add(result.get(i)); resultList.add(result.get(i));
} }
} }
System.out.println("resultList============================="+resultList);
if(!resultList.isEmpty() && resultList != null){ if(!resultList.isEmpty() && resultList != null){
resultObj.put("code", ResultEnum.SUCCESS.getCode()); resultObj.put("code", ResultEnum.SUCCESS.getCode());
resultObj.put("message",ResultEnum.SUCCESS.getMessage()); resultObj.put("message",ResultEnum.SUCCESS.getMessage());
......
src/main/java/com/founder/interservice/qgzyfw/action/CallDygabxxfw.java
...@@ -12,7 +12,7 @@ import java.util.Map; ...@@ -12,7 +12,7 @@ import java.util.Map;
import com.founder.interservice.qgzyfw.domain.*; import com.founder.interservice.qgzyfw.domain.*;
import com.founder.interservice.util.StringUtil; import com.founder.interservice.util.StringUtil;
import net.sf.json.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.apache.axis.client.Call; import org.apache.axis.client.Call;
import org.apache.axis.client.Service; import org.apache.axis.client.Service;
...@@ -82,7 +82,6 @@ public class CallDygabxxfw{ ...@@ -82,7 +82,6 @@ public class CallDygabxxfw{
call.setTargetEndpointAddress(new java.net.URL(endpoint)); call.setTargetEndpointAddress(new java.net.URL(endpoint));
call.setOperationName("syncBizProcess"); call.setOperationName("syncBizProcess");
res = (String) call.invoke(new Object[]{sendId,serviceId,bizParamXml}); res = (String) call.invoke(new Object[]{sendId,serviceId,bizParamXml});
System.out.println(res);
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
} }
...@@ -116,7 +115,7 @@ public class CallDygabxxfw{ ...@@ -116,7 +115,7 @@ public class CallDygabxxfw{
//以下是为了拿到属性名对应的属性值 //以下是为了拿到属性名对应的属性值
for(int i=0;i<os.length;i++){ for(int i=0;i<os.length;i++){
String o = os[i].toString(); String o = os[i].toString();
JSONObject jsonobj = JSONObject.fromObject(o); JSONObject jsonobj = JSONObject.parseObject(o);;
if("class java.util.Date".equals(stype) || "class java.lang.Number".equals(stype)){ if("class java.util.Date".equals(stype) || "class java.lang.Number".equals(stype)){
Object objt1 = jsonobj.get(sname+"1"); Object objt1 = jsonobj.get(sname+"1");
Object objt2 = jsonobj.get(sname+"2"); Object objt2 = jsonobj.get(sname+"2");
...@@ -178,7 +177,6 @@ public class CallDygabxxfw{ ...@@ -178,7 +177,6 @@ public class CallDygabxxfw{
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
System.out.println(bizParamXml);
return bizParamXml; return bizParamXml;
} }
//以下方法处理的是部级反馈的结果 //以下方法处理的是部级反馈的结果
...@@ -211,7 +209,6 @@ public class CallDygabxxfw{ ...@@ -211,7 +209,6 @@ public class CallDygabxxfw{
Element rootElement = doc.getRootElement(); Element rootElement = doc.getRootElement();
Element accountElement = rootElement.element("AMOUNT"); Element accountElement = rootElement.element("AMOUNT");
int account = Integer.parseInt(accountElement.getText());//返回数据的条数 int account = Integer.parseInt(accountElement.getText());//返回数据的条数
System.out.println("total==="+account);
datamap.put("account", String.valueOf(account));//存放的是返回结果数量 datamap.put("account", String.valueOf(account));//存放的是返回结果数量
String id = "";//服务类型 String id = "";//服务类型
List pkgs = new ArrayList(); List pkgs = new ArrayList();
......
src/main/resources/application.yml
...@@ -22,9 +22,9 @@ mybatis: ...@@ -22,9 +22,9 @@ mybatis:
# port: # port:
gab_url: gab_url:
ip: 10.172.20.13:9002 ip: 10.178.8.68:7101
#请求方地址 #请求方地址
senderId: C00-10001940 senderId: C00-10002910
#asj-服务方地址 #asj-服务方地址
receiverAsjId: S10-10005788 receiverAsjId: S10-10005788
#fzxyr-4.10全国刑侦案事件犯罪嫌疑人信息查询服务 #fzxyr-4.10全国刑侦案事件犯罪嫌疑人信息查询服务
......
src/main/resources/static/css/style_bkxx.css
...@@ -183,6 +183,11 @@ a.left-list-ftitle:hover{ ...@@ -183,6 +183,11 @@ a.left-list-ftitle:hover{
margin-top: -4px; margin-top: -4px;
width:100%; width:100%;
} }
.cxtj table input[type='radio']{
width: 18px;
height: 18px;
margin-right:5px;
}
.cxtj table .panel-noscroll{ .cxtj table .panel-noscroll{
border:none; border:none;
} }
......
src/main/resources/static/js/bkxxInsert.js
...@@ -60,30 +60,39 @@ ...@@ -60,30 +60,39 @@
$("#bkdxlx").combobox({ $("#bkdxlx").combobox({
onChange: function (lx,o) { onChange: function (lx,o) {
var validStr=""; if(lx ==""){
if(lx=="001"){//手机
validStr=['mobile'];
}else if(lx=="002"){//QQ号码
validStr=['QQ'];
}else if(lx=="003"){//微信号码
}else if(lx=="004"){//身份证号
validStr=['idCode'];
}else if(lx=="005"){//车牌号
validStr=['cphm'];
}else if(lx=="009"){//微信ID
}else if(lx=="006"){//IMSI
validStr=['imsi'];
}else if(lx=="007"){//IMEI
validStr=['imei'];
}
if(validStr!=""){
$("#bkdxhm").textbox({ $("#bkdxhm").textbox({
required: true, required: false
validType:validStr
}); });
}else{
var validStr="";
if(lx=="001"){//手机
validStr=['mobile'];
}else if(lx=="002"){//QQ号码
validStr=['QQ'];
}else if(lx=="003"){//微信号码
}else if(lx=="004"){//身份证号
validStr=['idCode'];
}else if(lx=="005"){//车牌号
validStr=['cphm'];
}else if(lx=="009"){//微信ID
}else if(lx=="006"){//IMSI
validStr=['imsi'];
}else if(lx=="007"){//IMEI
validStr=['imei'];
}
if(validStr!=""){
$("#bkdxhm").textbox({
required: true,
validType:validStr
});
}
} }
} }
}); });
...@@ -137,10 +146,11 @@ function doClear(){ ...@@ -137,10 +146,11 @@ function doClear(){
$("#bklx").combobox('setValue',""); $("#bklx").combobox('setValue',"");
$("#bkyj").val(""); $("#bkyj").val("");
$("#bkyq").val(""); $("#bkyq").val("");
$("#sqr_xm").val('');
$("#sqr_jh").val('');
$("#djsj").val('');
$("#bksj_start").val(''); $("#bksj_start").val('');
$("#bksj_end").val(''); $("#bksj_end").val('');
$("#bkqx").val(""); $("#bkqx").val('');
} }
\ No newline at end of file
src/main/resources/static/sql/S031.20190319_chentian_布控信息表增加字段.txt 0 → 100644
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S031',0);
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S031',0);
COMMIT;
-------------------------------------------------------------------------------------------
-- Add/modify columns
alter table TB_ST_BKXX add SMS VARCHAR2(2);
-- Add comments to the columns
comment on column TB_ST_BKXX.SMS
is '是否短信通知(0:否 1：是)';
-------------------------------------------------------------------------------------------
UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S031';
COMMIT;
\ No newline at end of file
src/main/webapp/WEB-INF/jsp/Insert.jsp
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
</header> </header>
<article class="main-cen-box"> <article class="main-cen-box">
<div class="cxtj"> <div class="cxtj">
<form name="wfqdzczlForm" id="form1" class="easyui-form" data-options=""> <form name="wfqdzczlForm" id="form1" class="easyui-form" data-options="novalidate:true">
<input type = "hidden" name="yhCate" id = "yhCate" value="00" />
<input type = "hidden" name="projectName" id = "projectName" value="00" />
<fieldset> <fieldset>
<legend>采集时空伴随任务信息 </legend> <legend>采集时空伴随任务信息 </legend>
<table> <table>
...@@ -39,19 +41,18 @@ ...@@ -39,19 +41,18 @@
<td class="ar" width="13.3%">案事件编号：</td> <td class="ar" width="13.3%">案事件编号：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" id = "" name="" class="easyui-textbox" disabled="disabled" style="height:26px;"/> <input type="text" id = "taskCaseId" name="taskCaseId" class="easyui-textbox" disabled="disabled" style="height:26px;" value="${trackParam.taskCaseId}"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">标识号：</td> <td class="ar" width="13.3%">标识号：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox" style="border:none">
<input type="text" id = "" name="" class="easyui-textbox" style="height:26px;"/> <input type="text" id = "objectValue" name="objectValue" class="easyui-textbox" style="height:26px;" data-options="required:true"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">标识号类型：</td> <td class="ar" width="13.3%">标识号类型：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox" style="border:none;">
<select name = "bkdxlx" id = "bkdxlx" class="easyui-combobox" style="height:26px;"> <select name = "bkdxlx" id = "bkdxlx" class="easyui-combobox" style="height:26px;">
<option value=""></option> <option value=""></option>
<option value="3996">手机号码</option> <option value="3996">手机号码</option>
...@@ -64,20 +65,20 @@ ...@@ -64,20 +65,20 @@
<tr> <tr>
<td class="ar">任务名称：</td> <td class="ar">任务名称：</td>
<td> <td>
<span class="textbox"> <span class="textbox" style="border:none;">
<input type="text" id = "" name="" class="easyui-textbox" style="height:26px;"/> <input type="text" id = "taskName" name="taskName" class="easyui-textbox" style="height:26px;" data-options="required:true"/>
</span> </span>
</td> </td>
<td class="ar">伴随开始时间：</td> <td class="ar">伴随开始时间：</td>
<td> <td>
<span class="textbox"> <span class="textbox" style="border:none;">
<input id="datepicker1" name="" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'%y-%M-%d'})"/> <input id="datepicker1" name="sTime" class="val easyui-validatebox Wdate zdy-wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'%y-%M-%d'})" data-options="required:true"/>
</span> </span>
</td> </td>
<td class="ar">伴随结束时间：</td> <td class="ar">伴随结束时间：</td>
<td> <td>
<span class="textbox"> <span class="textbox" style="border:none;">
<input id="datepicker2" name="" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datepicker1\')}',maxDate:'#F{$dp.$D(\'datepicker1\',{d:+1})&&\'%y-%M-%d\'}'})"/> <input id="datepicker2" name="eTime" class="val easyui-validatebox Wdate zdy-wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',minDate:'#F{$dp.$D(\'datepicker1\')}',maxDate:'#F{$dp.$D(\'datepicker1\',{d:+1})&&\'%y-%M-%d\'}'})" data-options="required:true"/>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -85,20 +86,20 @@ ...@@ -85,20 +86,20 @@
<td class="ar" width="13.3%">发送人警号：</td> <td class="ar" width="13.3%">发送人警号：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" name="" disabled="disabled" id = "" class="easyui-textbox" style="height:26px;"> <input type="text" name="fsrjh" disabled="disabled" id = "fsrjh" value="${trackParam.fsrjh}" class="easyui-textbox" style="height:26px;">
</span> </span>
</td> </td>
<td class="ar" width="13.3%">发送人身份证号：</td> <td class="ar" width="13.3%">发送人身份证号：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input type="text" disabled="disabled" class="easyui-textbox" name="" id = "" style="height:26px;"> <input type="text" disabled="disabled" class="easyui-textbox" name="fsrIdentity" id = "fsrIdentity" value="${trackParam.fsrIdentity}" style="height:26px;">
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="6" style="text-align: center;height:50px;"> <td colspan="6" style="text-align: center;height:50px;">
<a class="btn_a btn_search easyui-linkbutton" onclick="" >发送</a> <a class="btn_a btn_search easyui-linkbutton" onclick="submit()" >发送</a>
<a class="btn_a btn_empty easyui-linkbutton" onclick="">重置</a> <a class="btn_a btn_empty easyui-linkbutton" onclick="dreset()">重置</a>
<input type="hidden" id="bkdxlxmc" name="bkdxlxmc" /> <input type="hidden" id="bkdxlxmc" name="bkdxlxmc" />
<input type="hidden" id="asjbh" name="asjbh" /> <input type="hidden" id="asjbh" name="asjbh" />
<input type="hidden" id="sqr_sfzh" name="sqr_sfzh" /> <input type="hidden" id="sqr_sfzh" name="sqr_sfzh" />
......
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
...@@ -136,14 +136,15 @@ ...@@ -136,14 +136,15 @@
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input id="bksj_start" name="bksj_start" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();" <input id="bksj_start" name="bksj_start" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" /> onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_end\',{d:-15});}',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" />
</span> </span>
</td> </td>
<td class="ar" width="13.3%"><span class="red">*</span>至：</td> <td class="ar" width="13.3%"><span class="red">*</span>至：</td>
<td width="20%"> <td width="20%">
<span class="textbox"> <span class="textbox">
<input id="bksj_end" name="bksj_end" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();" <input id="bksj_end" name="bksj_end" class="val easyui-validatebox Wdate zdy-wdate " data-options="required: true" type="text" onkeypress="return checkDateFmt();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_start\')}'})"/> onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'bksj_start\')}',maxDate:'#F{$dp.$D(\'bksj_start\',{d:15});}'})"/>
</span> </span>
</td> </td>
<td class="ar" width="13.3%">布控期限：</td> <td class="ar" width="13.3%">布控期限：</td>
...@@ -153,6 +154,24 @@ ...@@ -153,6 +154,24 @@
</span> </span>
</td> </td>
</tr> </tr>
<tr>
<td class="ar" width="13.3%"><span class="red">*</span>是否短信通知：</td>
<td width="20%">
<span style="border:none">
<input id="r1" type="radio" value="0" name="sms">否</input>
<input id="r2" type="radio" value="1" name="sms">是</input>
</span>
</td>
<td class="ar" width="13.3%"></td>
<td width="20%">
</td>
<td class="ar" width="13.3%"></td>
<td width="20%">
</td>
</tr>
<tr> <tr>
<td colspan="6" style="text-align: center;height:50px;"> <td colspan="6" style="text-align: center;height:50px;">
...@@ -203,6 +222,15 @@ ...@@ -203,6 +222,15 @@
//用户提示弹窗 //用户提示弹窗
$(function() { $(function() {
$("#yhtsxx").show(); $("#yhtsxx").show();
var sms='${bkxx.sms}';
if(sms=="null" || sms==""){
$(":radio[name='sms'][value='0']").prop("checked", "checked");
}else if(sms=="1" || sms=="0"){
$(":radio[name='sms'][value='" + sms + "']").prop("checked", "checked");
}else{
$(":radio[name='sms'][value='0']").prop("checked", "checked");
}
}); });
function hideTip(){ function hideTip(){
$("#wrap_mask_yhts").fadeOut(); $("#wrap_mask_yhts").fadeOut();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment