Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
曹鹏
bigdatainterservice
Commits
ed8cfb02
Commit
ed8cfb02
authored
Mar 19, 2019
by
caojingji
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/master/master' into caopeng_bate1
parents
f280b18a
32a29196
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
111 additions
and
63 deletions
+111
-63
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
+1
-10
src/main/java/com/founder/interservice/controller/MinistrySuspectInfoController.java
+3
-3
src/main/java/com/founder/interservice/qgzyfw/action/CallDygabxxfw.java
+2
-5
src/main/resources/application.yml
+2
-2
src/main/resources/static/css/style_bkxx.css
+5
-0
src/main/resources/static/js/bkxxInsert.js
+36
-25
src/main/resources/static/sql/S031.20190319_chentian_布控信息表增加字段.txt
+15
-0
src/main/webapp/WEB-INF/jsp/Insert.jsp
+17
-16
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
+30
-2
No files found.
src/main/java/com/founder/interservice/bkxx/model/Bkxx.java
View file @
ed8cfb02
...
...
@@ -27,6 +27,7 @@ public class Bkxx {
private
String
bkyj
;
private
String
bkyq
;
private
String
asjbh
;
//案事件编号
private
String
sms
;
//是否短信通知(0:否 1:是)
@JSONField
(
format
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
private
java
.
util
.
Date
bksj_start
;
...
...
@@ -45,14 +46,4 @@ public class Bkxx {
private
Date
xgsj
;
//修改时间
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
View file @
ed8cfb02
...
...
@@ -26,7 +26,6 @@ public class MinistrySuspectInfoController {
@ResponseBody
public
JSONObject
queryMinistrySuspectInfo
(
String
sfzh
){
//ZHFZXYR_CYZJ_ZJHM 查询资源所需的条件 513624198110310011 510211198301103713 510218198208064953
JSONObject
resultObj
=
new
JSONObject
();
System
.
out
.
println
(
"resultObj============================="
+
resultObj
);
List
<
Map
<
String
,
Object
>>
resultList
=
new
ArrayList
<
Map
<
String
,
Object
>>();
try
{
//通过身份证号调取案事件编号list(asjbhList)
...
...
@@ -39,8 +38,10 @@ public class MinistrySuspectInfoController {
Map
<
String
,
Object
>
mapQg
=
call
.
getGabZyInfoByJyaq
(
"fzxyr"
,
os
,
gabConfig
);
List
<
Map
<
String
,
Object
>>
asjbhList
=
(
List
<
Map
<
String
,
Object
>>)
mapQg
.
get
(
"dataResult"
);
//通过案事件编号调取案事件信息resultList
for
(
Map
<
String
,
Object
>
asjbh
:
asjbhList
)
{
for
(
Map
<
String
,
Object
>
map
:
asjbhList
)
{
JSONObject
jsonObject1
=
new
JSONObject
();
String
asjbh
=
(
String
)
map
.
get
(
"ASJBH"
);
jsonObject1
.
put
(
"ASJBH"
,
asjbh
);
JSONArray
jsonArray1
=
new
JSONArray
();
jsonArray1
.
add
(
jsonObject1
);
...
...
@@ -52,7 +53,6 @@ public class MinistrySuspectInfoController {
resultList
.
add
(
result
.
get
(
i
));
}
}
System
.
out
.
println
(
"resultList============================="
+
resultList
);
if
(!
resultList
.
isEmpty
()
&&
resultList
!=
null
){
resultObj
.
put
(
"code"
,
ResultEnum
.
SUCCESS
.
getCode
());
resultObj
.
put
(
"message"
,
ResultEnum
.
SUCCESS
.
getMessage
());
...
...
src/main/java/com/founder/interservice/qgzyfw/action/CallDygabxxfw.java
View file @
ed8cfb02
...
...
@@ -12,7 +12,7 @@ import java.util.Map;
import
com.founder.interservice.qgzyfw.domain.*
;
import
com.founder.interservice.util.StringUtil
;
import
net.sf.
json.JSONObject
;
import
com.alibaba.fast
json.JSONObject
;
import
org.apache.axis.client.Call
;
import
org.apache.axis.client.Service
;
...
...
@@ -82,7 +82,6 @@ public class CallDygabxxfw{
call
.
setTargetEndpointAddress
(
new
java
.
net
.
URL
(
endpoint
));
call
.
setOperationName
(
"syncBizProcess"
);
res
=
(
String
)
call
.
invoke
(
new
Object
[]{
sendId
,
serviceId
,
bizParamXml
});
System
.
out
.
println
(
res
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
...
...
@@ -116,7 +115,7 @@ public class CallDygabxxfw{
//以下是为了拿到属性名对应的属性值
for
(
int
i
=
0
;
i
<
os
.
length
;
i
++){
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
)){
Object
objt1
=
jsonobj
.
get
(
sname
+
"1"
);
Object
objt2
=
jsonobj
.
get
(
sname
+
"2"
);
...
...
@@ -178,7 +177,6 @@ public class CallDygabxxfw{
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
System
.
out
.
println
(
bizParamXml
);
return
bizParamXml
;
}
//以下方法处理的是部级反馈的结果
...
...
@@ -211,7 +209,6 @@ public class CallDygabxxfw{
Element
rootElement
=
doc
.
getRootElement
();
Element
accountElement
=
rootElement
.
element
(
"AMOUNT"
);
int
account
=
Integer
.
parseInt
(
accountElement
.
getText
());
//返回数据的条数
System
.
out
.
println
(
"total==="
+
account
);
datamap
.
put
(
"account"
,
String
.
valueOf
(
account
));
//存放的是返回结果数量
String
id
=
""
;
//服务类型
List
pkgs
=
new
ArrayList
();
...
...
src/main/resources/application.yml
View file @
ed8cfb02
...
...
@@ -22,9 +22,9 @@ mybatis:
# port:
gab_url
:
ip
:
10.17
2.20.13:9002
ip
:
10.17
8.8.68:7101
#请求方地址
senderId
:
C00-1000
194
0
senderId
:
C00-1000
291
0
#asj-服务方地址
receiverAsjId
:
S10-10005788
#fzxyr-4.10全国刑侦案事件犯罪嫌疑人信息查询服务
...
...
src/main/resources/static/css/style_bkxx.css
View file @
ed8cfb02
...
...
@@ -183,6 +183,11 @@ a.left-list-ftitle:hover{
margin-top
:
-4px
;
width
:
100%
;
}
.cxtj
table
input
[
type
=
'radio'
]
{
width
:
18px
;
height
:
18px
;
margin-right
:
5px
;
}
.cxtj
table
.panel-noscroll
{
border
:
none
;
}
...
...
src/main/resources/static/js/bkxxInsert.js
View file @
ed8cfb02
...
...
@@ -60,30 +60,39 @@
$
(
"#bkdxlx"
).
combobox
({
onChange
:
function
(
lx
,
o
)
{
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
!=
""
){
if
(
lx
==
""
){
$
(
"#bkdxhm"
).
textbox
({
required
:
true
,
validType
:
validStr
required
:
false
});
}
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(){
$
(
"#bklx"
).
combobox
(
'setValue'
,
""
);
$
(
"#bkyj"
).
val
(
""
);
$
(
"#bkyq"
).
val
(
""
);
$
(
"#sqr_xm"
).
val
(
''
);
$
(
"#sqr_jh"
).
val
(
''
);
$
(
"#djsj"
).
val
(
''
);
$
(
"#bksj_start"
).
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
View file @
ed8cfb02
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
View file @
ed8cfb02
...
...
@@ -30,7 +30,9 @@
</header>
<article class="main-cen-box">
<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>
<legend>采集时空伴随任务信息 </legend>
<table>
...
...
@@ -39,19 +41,18 @@
<td class="ar" width="13.3%">案事件编号:</td>
<td width="20%">
<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>
</td>
<td class="ar" width="13.3%">标识号:</td>
<td width="20%">
<span class="textbox">
<input type="text" id = "
" name="" class="easyui-textbox" style="height:26px;
"/>
<span class="textbox"
style="border:none"
>
<input type="text" id = "
objectValue" name="objectValue" class="easyui-textbox" style="height:26px;" data-options="required:true
"/>
</span>
</td>
<td class="ar" width="13.3%">标识号类型:</td>
<td width="20%">
<span class="textbox">
<span class="textbox" style="border:none;">
<select name = "bkdxlx" id = "bkdxlx" class="easyui-combobox" style="height:26px;">
<option value=""></option>
<option value="3996">手机号码</option>
...
...
@@ -64,20 +65,20 @@
<tr>
<td class="ar">任务名称:</td>
<td>
<span class="textbox">
<input type="text" id = "
" name="" class="easyui-textbox" style="height:26px;
"/>
<span class="textbox"
style="border:none;"
>
<input type="text" id = "
taskName" name="taskName" class="easyui-textbox" style="height:26px;" data-options="required:true
"/>
</span>
</td>
<td class="ar">伴随开始时间:</td>
<td>
<span class="textbox">
<input id="datepicker1" name="
" class="Wdate" type="text" onkeypress="return checkDateFmt();" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate:'%y-%M-%d'})
"/>
<span class="textbox"
style="border:none;"
>
<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>
</td>
<td class="ar">伴随结束时间:</td>
<td>
<span class="textbox">
<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\'}'})
"/>
<span class="textbox"
style="border:none;"
>
<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>
</td>
</tr>
...
...
@@ -85,20 +86,20 @@
<td class="ar" width="13.3%">发送人警号:</td>
<td width="20%">
<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>
</td>
<td class="ar" width="13.3%">发送人身份证号:</td>
<td width="20%">
<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>
</td>
</tr>
<tr>
<td colspan="6" style="text-align: center;height:50px;">
<a class="btn_a btn_search easyui-linkbutton" onclick="" >发送</a>
<a class="btn_a btn_empty easyui-linkbutton" onclick="">重置</a>
<a class="btn_a btn_search easyui-linkbutton" onclick="
submit()
" >发送</a>
<a class="btn_a btn_empty easyui-linkbutton" onclick="
dreset()
">重置</a>
<input type="hidden" id="bkdxlxmc" name="bkdxlxmc" />
<input type="hidden" id="asjbh" name="asjbh" />
<input type="hidden" id="sqr_sfzh" name="sqr_sfzh" />
...
...
src/main/webapp/WEB-INF/jsp/bkxx/bkxxInsert.jsp
View file @
ed8cfb02
...
...
@@ -136,14 +136,15 @@
<td width="20%">
<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();"
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'bksj_end\')}'})" />
onFocus="WdatePicker({onpicked:checkfinish,dateFmt:'yyyy-MM-dd',m
inDate:'#F{$dp.$D(\'bksj_end\',{d:-15});}',m
axDate:'#F{$dp.$D(\'bksj_end\')}'})" />
</span>
</td>
<td class="ar" width="13.3%"><span class="red">*</span>至:</td>
<td width="20%">
<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();"
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>
</td>
<td class="ar" width="13.3%">布控期限:</td>
...
...
@@ -153,6 +154,24 @@
</span>
</td>
</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>
<td colspan="6" style="text-align: center;height:50px;">
...
...
@@ -203,6 +222,15 @@
//用户提示弹窗
$(function() {
$("#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(){
$("#wrap_mask_yhts").fadeOut();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment