Skip to content

X
xzxt-solr
Commit d7ef13ce by YANGYANG
Options

mis 物品查询

parent db9b867d
Showing with 55 additions and 33 deletions
src/main/java/com/cc/controller/MisSolrController.java
......@@ -248,7 +248,7 @@ public class MisSolrController {
System.out.println(page+"----------"+rows);
return iMisSolrService.queryMisSolrSawp(q,fqList,misAsjRyRelateVO,page,rows, sorlAddress, sorlInstance,groupids,sort,order,unitcode,configMap,daohan,groupidvalue);
}
// 案件
private Map<String,Object> getMisAsjFqList(MisAsjRyRelateVO misAsjRyRelateVO,String unitcode,String grade) {
Map<String, Object> map = new HashedMap();
List<String> fqList = new ArrayList<>();
......@@ -309,12 +309,14 @@ public class MisSolrController {
misAsjq += " AND REGISTERDATE:[* TO " + misAsjRyRelateVO.getRegisterdate()+"]";
}
//死亡人数
if(null!=misAsjRyRelateVO.getDeadamount() && !"".equals(misAsjRyRelateVO.getDeadamount())){
if("null".equals(misAsjRyRelateVO.getDeadamount())){
misAsjq += " AND -DEADAMOUNT:*";
}else{
misAsjq += " AND DEADAMOUNT:"+misAsjRyRelateVO.getDeadamount();
if(null!=misAsjRyRelateVO.getDeadamount()&& !"".equals(misAsjRyRelateVO.getDeadamount())) {
if (null != misAsjRyRelateVO.getDeadamount() && !"".equals(misAsjRyRelateVO.getDeadamount())) {
misAsjq += " AND DEADAMOUNT:[" + misAsjRyRelateVO.getDeadamount() + " TO " + misAsjRyRelateVO.getDeadamountmax() + "]";
} else {
misAsjq += " AND DEADAMOUNT:[" + misAsjRyRelateVO.getDeadamount() + " TO " + "*]";
}
}else if (null != misAsjRyRelateVO.getDeadamountmax() && !"".equals(misAsjRyRelateVO.getDeadamountmax())) {
misAsjq += " AND DEADAMOUNT:[* TO " + misAsjRyRelateVO.getDeadamountmax()+"]";
}
......@@ -447,15 +449,6 @@ public class MisSolrController {
}else if(null!=misAsjRyRelateVO.getMisxyr_weightsx() && !"".equals(misAsjRyRelateVO.getMisxyr_weightsx())) {
misAsjq += " AND MISXYR_WEIGHT:[* TO " + misAsjRyRelateVO.getMisxyr_weightsx()+"]";
}
/* if(null!=asjRyRelateVO.getAsjswry_rsxx() && !"".equals(asjRyRelateVO.getAsjswry_rsxx())) {
if (null != asjRyRelateVO.getAsjswry_rssx() && !"".equals(asjRyRelateVO.getAsjswry_rssx())) {
asjQ += " AND ASJSWRY_RS:[" + asjRyRelateVO.getAsjswry_rsxx() + " TO " + asjRyRelateVO.getAsjswry_rssx() + "]";
} else {
asjQ += " AND ASJSWRY_RS:[" + asjRyRelateVO.getAsjswry_rsxx() + " TO " + "*]";
}
}else if (null != asjRyRelateVO.getAsjswry_rssx() && !"".equals(asjRyRelateVO.getAsjswry_rssx())) {
asjQ += " AND ASJSWRY_RS:[* TO " + asjRyRelateVO.getAsjswry_rssx()+"]";
}*/
if(null!=misAsjRyRelateVO.getMisxyr_address() && !"".equals(misAsjRyRelateVO.getMisxyr_address())){
if("null".equals(misAsjRyRelateVO.getMisxyr_address())){
......@@ -1345,7 +1338,7 @@ public class MisSolrController {
/**
* @return 生成文件
* @return 案件生成文件
*/
@RequestMapping("/createFileMisAsj")
@ResponseBody
......@@ -1445,7 +1438,7 @@ public class MisSolrController {
}
Properties properties = propertiesUtil("solr.properties");
String sorlAddress = properties.getProperty("sorlAddress");
List<Map<String, Object>> listMap = iMisSolrService.getMisAsjSorlByFQ(ssdw,listMapStr,maxValue,sorlAddress, sorlInstance,checkIds);
List<Map<String, Object>> listMap = iMisSolrService.getMisSjSorlByFQ(ssdw,listMapStr,maxValue,sorlAddress, sorlInstance,checkIds);
// 表格头
String [] cols = selectedCols.split(",");
Object [] head = new String[cols.length];
......@@ -1521,7 +1514,7 @@ public class MisSolrController {
return "";
}
/**
* @return 生成文件
* @return 车辆生成文件
*/
@RequestMapping("/createFileMisCl")
@ResponseBody
......@@ -1533,7 +1526,7 @@ public class MisSolrController {
}
Properties properties = propertiesUtil("solr.properties");
String sorlAddress = properties.getProperty("sorlAddress");
List<Map<String, Object>> listMap = iMisSolrService.getMisAsjSorlByFQ(ssdw,listMapStr,maxValue,sorlAddress, sorlInstance,checkIds);
List<Map<String, Object>> listMap = iMisSolrService.getMisClSorlByFQ(ssdw,listMapStr,maxValue,sorlAddress, sorlInstance,checkIds);
// 表格头
String [] cols = selectedCols.split(",");
Object [] head = new String[cols.length];
......@@ -1609,7 +1602,7 @@ public class MisSolrController {
return "";
}
/**
* @return 生成文件
* @return 涉案物品生成文件
*/
@RequestMapping("/createFileMisSawp")
@ResponseBody
......@@ -1621,7 +1614,7 @@ public class MisSolrController {
}
Properties properties = propertiesUtil("solr.properties");
String sorlAddress = properties.getProperty("sorlAddress");
List<Map<String, Object>> listMap = iMisSolrService.getMisAsjSorlByFQ(ssdw,listMapStr,maxValue,sorlAddress, sorlInstance,checkIds);
List<Map<String, Object>> listMap = iMisSolrService.getMisSawpSorlByFQ(ssdw,listMapStr,maxValue,sorlAddress, sorlInstance,checkIds);
// 表格头
String [] cols = selectedCols.split(",");
Object [] head = new String[cols.length];
......
src/main/java/com/cc/controller/RecordController.java
......@@ -44,9 +44,9 @@ public class RecordController {
record.setMisxyr_record("案事件编号:caseid,姓名:misxyr_name,性别:misxyr_sex,出生日期:misxyr_birthday,民族:misxyr_nation,身份证号:misxyr_idcardno,户籍地行政区划:misxyr_doormc,现住地行政区划:misxyr_addressmc");
record.setMisshr_record("案事件编号:caseid,姓名:name,性别:sex,出生日期:birthday,单位:unit,住址详情:addrdetail,伤害程度:harmgread,户籍地址:hjdetail");
record.setMisbar_record("案事件编号:caseid,姓名:name,性别:sex,出生日期:birthday,住址详情:addre,身份证号:idcardnumb,电话:phone,报案方式:reportmethod");
record.setMissj_record("案事件编号:caseid,手机品牌:brand");
record.setMiscl_record("案事件编号:caseid");
record.setMissawp_record("案事件编号:caseid");
record.setMissj_record("案事件编号:caseid,手机品牌:brand,序号:serial,手机颜色:colorcode,手机价值:value,手机外形描述:odel,手机IMEI:imei");
record.setMiscl_record("案事件编号:caseid,车辆类型:cartype,车牌号:carnumb,厂牌:brand,车身颜色:colorcode,价值:value,车主姓名:mastername");
record.setMissawp_record("案事件编号:caseid,产地:producearea,品名:name,品牌:brand,价值:value,颜色:colorcode,物品详细名字:namedetail");
recordService.insertRecord(record);
}else{
record = recordService.queryRybhRecord(users.getIdentitycard());
......
src/main/java/com/cc/model/MisAsjRyRelateVO.java
......@@ -66,6 +66,7 @@ public class MisAsjRyRelateVO {
private String analyse ;
private String deducetime ;
private String deadamount ;
private String deadamountmax;
private String deduceamount ;
private String harmamount ;
private String unitmind ;
......@@ -3714,4 +3715,12 @@ public class MisAsjRyRelateVO {
public void setValuesawpmin(String valuesawpmin) {
this.valuesawpmin = valuesawpmin;
}
public String getDeadamountmax() {
return deadamountmax;
}
public void setDeadamountmax(String deadamountmax) {
this.deadamountmax = deadamountmax;
}
}
src/main/webapp/misajwpcx.jsp
......@@ -94,20 +94,24 @@
<td class="td_title">案事件编号：</td>
<td><input type="text" class="input-sm form-control input-common" id="caseid" name="caseid"></td>
<td class="td_title">案件类别：</td>
<td><p class="code-w"><input type="text" id="casetype" name="casetype" showtype="code" class="val easyui-combotree" data-options="codetype: 'queryTypeCode?type=CODE_UNIT_MIS',method:'get',fit:true,multiple:true,textField : 'text', valueField : 'id'"/></p>
<td><p class="code-w"><input type="text" id="casetype" name="casetype" showtype="code" class="val easyui-combotree" data-options="codetype: 'queryTypeCode?type=CODE_AJLB_MIS',method:'get',fit:true,multiple:true,textField : 'text', valueField : 'id'"/></p>
</td>
<td class="td_title">发案地域：</td>
<td><p class="code-w"><input type="text" id="casearea" name="casearea" showtype="code" class="val easyui-combotree" data-options="codetype: 'queryTypeCode?type=CODE_CLYS_MIS',method:'get',fit:true,multiple:true,textField : 'text', valueField : 'id'"/></p>
<td class="td_title">发案区域：</td>
<td><p class="code-w"><input type="text" id="casearea" name="casearea" showtype="code" class="val easyui-combotree" data-options="codetype: 'queryTypeCode?type=CODE_FADY_MIS',method:'get',fit:true,multiple:true,textField : 'text', valueField : 'id'"/></p>
</td>
</tr>
<tr>
<td class="td_title">案事件发生时间：</td>
<td><input id="casetimef" name="casetimef" order="1" type="text" showtype="date" showname="lasjRqsj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'casetimef\')}',dateFmt:'yyyy-MM-dd'})"/>
<td><input id="casetimef" name="casetimef" order="1" type="text" showtype="date" showname="lasjRqsj" class="Wdate" onfocus="WdatePicker({maxDateCASETYPE:'#F{$dp.$D(\'casetimef\')}',dateFmt:'yyyy-MM-dd'})"/>
-<input id="casetimee" name="casetimee" order="2" type="text" showtype="date" showname="lasjRqsj" class="Wdate" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'casetimee\')}',dateFmt:'yyyy-MM-dd'})"/></td>
<td class="td_title">发案地址：</td>
<td><input type="text" class="input-sm form-control input-common" id="caseplace" name="caseplace"></td>
<td class="td_title">死亡人数：</td>
<td><input type="text" class="input-sm form-control input-common" id="deadamount" name="deadamount"></td>
<td><input type="text" showtype="range" showname="deadamount" order="1"
class="input-sm form-control time date" id="deadamount" name="deadamount">
-<input type="text" showtype="range" showname="deadamount" order="2"
class="input-sm form-control time date" id="deadamount2" name="deadamountmax">
</td>
</tr>
<tr>
<td class="td_title">简要案情：</td>
......@@ -117,6 +121,11 @@
<td class="td_title">破案类型：</td>
<td ><input type="text" class="input-sm form-control input-common"id="solvetype" name="solvetype"></td>
</tr>
<tr>
<td class="td_title">立案时间：</td>
<td><input id="registerdate" name="registerdate" order="1" type="text" showtype="date" showname="lasjRqsj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'casetimef\')}',dateFmt:'yyyy-MM-dd'})"/>
-<input id="registerdate2" name="registerdate2" order="2" type="text" showtype="date" showname="lasjRqsj" class="Wdate" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'casetimee\')}',dateFmt:'yyyy-MM-dd'})"/></td>
</tr>
</tbody>
</table>
<div class="more-bt-line">
......@@ -251,7 +260,8 @@
</tr>
<tr>
<td class="td_title">注册日期：</td>
<td><input id="registerdatecl" name="registerdate" order="1" type="text" showtype="date" showname="bhsj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'pa_spsjjssj\')}',dateFmt:'yyyy-MM-dd'})"/></td>
<td><input id="registerdates" name="registerdate" order="1" type="text" showtype="date" showname="bhsj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'pa_spsjjssj\')}',dateFmt:'yyyy-MM-dd'})"/></td>
<td class="td_title">创建时间：</td>
<td><input id="createtime" name="createtime" order="1" type="text" showtype="date" showname="bhsj" class="Wdate" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'pa_spsjjssj\')}',dateFmt:'yyyy-MM-dd'})"/></td>
</tr>
......@@ -598,7 +608,11 @@
<li><div rel="casetypemc" name="案件类别">案发结束时间</div></li>
<li><div rel="registerdate" name="立案日期">立案日期</div></li>
<li><div rel="casetypemc" name="案件类别">案件类别</div></li>
<li><div rel="registerunit_gajgmc" name="立案单位">立案单位</div></li>
<li><div rel="casetimef" name="立案单位">发案开始时间</div></li>
<li><div rel="casetimee" name="立案单位">发案结束时间</div></li>
<li><div rel="findtime" name="立案单位">发现案事件时间</div></li>
<li><div rel="caseplace" name="立案单位">发案地点</div></li>
<li><div rel="handler" name="立案单位">办案人</div></li>
</ul>
</div>
<div class="tips">
......@@ -758,7 +772,12 @@
'4':['casestatusmc','案件状态'],
'5':['casetypemc','案件类别'],
'6':['registerunit_gajgmc','立案单位'],
'7':['brief','简要案情']
'7':['brief','简要案情'],
'8':['casetimef','发案开始时间'],
'9':['casetimee','发案结束时间'],
'10':['findtime','发现案事件时间'],
'12':['caseplace','发案地点'],
'13':['handler','办案人']
}
]
};
......@@ -784,6 +803,7 @@
'11':['amount','数量'],
'12':['amountunit','数量单位'],
'13':['value','手机价值'],
'14':['telno','手机号码'],
}
]
......@@ -1319,7 +1339,7 @@
var sorlInstance = "";
if(searchType == 'ajzlz'){
url = "createFileMisAsj";
sorlInstance = "CASE_S_MOBILE";
sorlInstance = "CASE_M_AJZLZ";
}else if(searchType == 'missj'){
url = "createFileMisSj";
sorlInstance = "CASE_S_MOBILE";
......
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