Skip to content

B
bigdatainterservice
Commit 0ed6a51c by liuyongshuai
Options

Merge remote-tracking branch 'remotes/origin/master'

parents fb19cf96 57104eea
Showing with 554 additions and 185 deletions
src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskResultDetailMapper.java
......@@ -21,4 +21,7 @@ public interface RegionalTaskResultDetailMapper {
public int findRegionalTaskResultDetailListTotalCount(RegionalTaskResultDetail param) throws Exception;
public List<RegionalTaskResultDetail> getRegionalTaskResultDetailExcelList(RegionalTaskResultDetail param)throws Exception;
public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail param) throws Exception;
public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail param) throws Exception;
}
src/main/java/com/founder/interservice/mapper/xzxt/RegionalTaskResultMapper.java
......@@ -23,4 +23,8 @@ public interface RegionalTaskResultMapper {
Integer regionalTaskDetailIsExist(RegionalTaskResultDetail detail) throws Exception;
public void saveRegionalTaskResultDetail(RegionalTaskResultDetail regionalTaskResultDetail) throws Exception;
public void updateRegionalTaskResultDetail(RegionalTaskResultDetail regionalTaskResultDetail) throws Exception;
Integer togetherDetailIsExist(RegionalTaskResultDetail detail) throws Exception;
public void saveTogetherDetail(RegionalTaskResultDetail detail) throws Exception;
public void updateTogetherDetail(RegionalTaskResultDetail detail) throws Exception;
}
src/main/java/com/founder/interservice/regionalanalysis/model/RegionalTaskResultDetail.java
package com.founder.interservice.regionalanalysis.model;
import lombok.Data;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
@Data
@Entity
@DynamicUpdate
@Table(name = "REGIONALTASKRESULTDETAIL")
public class RegionalTaskResultDetail {
@Id
private String XXZJBH;
@Transient
private String taskId;
private String taskResultId;
private String objectType;
private String objectTypeName;
private String objectValue;
private int count; //伴随次数
private String birthday;
private String name;
private byte[] ryzp;
......@@ -33,14 +29,10 @@ public class RegionalTaskResultDetail {
private String sex;
private String zjlx;
private String zjlxCode;
@Transient
private Date djsj;
private int startNum;
@Transient
private int endNum;
@Transient
private String csrqStart;
@Transient
private String csrqEnd;
@Transient
private String ryzpStr;
}
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
......@@ -9,6 +9,7 @@ import com.founder.interservice.model.AutoTbStRy;
import com.founder.interservice.regionalanalysis.VO.RegionalTaskResultVO;
import com.founder.interservice.regionalanalysis.model.RegionalTask;
import com.founder.interservice.regionalanalysis.model.RegionalTaskResult;
import com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail;
import com.founder.interservice.service.IphoneTrackService;
import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
......@@ -269,102 +270,6 @@ public class TrackTogetherContoller {
return jsonObject;
}
/**
*
* @Description: 通过任务编号查询任务结果
* @Param:
* @param taskId 任务编号
* @return: java.util.List<com.founder.interservice.tracktraveltogether.vo.TogetherTaskResultVO>
* @Author: cao peng
* @date: 2018/9/11 0011-21:31
*/
@RequestMapping(value = "/getTogetherTaskResults",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public List<TogetherTaskResultVO> getTaskResults(Integer page, Integer size,String taskId){
List<TogetherTaskResultVO> taskResultVOS = new ArrayList<>();
try {
Page<TogetherTaskResult> resultPage = trackTogetherService.findTogetherTaskResult( page, size,taskId);
List<TogetherTaskResult> taskResults = resultPage.getContent();
if(taskResults != null && !taskResults.isEmpty()){
for(int i = 0; i <= taskResults.size() - 1; i++){
TogetherTaskResultVO taskResultVO = new TogetherTaskResultVO();
BeanUtils.copyProperties(taskResults.get(i),taskResultVO);
if(!StringUtil.ckeckEmpty(taskResultVO.getObjectValue())){
JSONObject jsonObject = iphoneTrackService.getObjectRelation(taskResultVO.getObjectValue());
if(jsonObject != null){
JSONArray jsonArray = jsonObject.getJSONArray("results");
if(jsonArray != null && jsonArray.size() > 0){
for (int j = 0; j <= jsonArray.size() - 1;j++){
JSONObject resObj = jsonArray.getJSONObject(j);
String relativeType = resObj.getString("relativeType"); //关联类型 4402（手机-IMSI）
String objectFromType = resObj.getString("objectFromType"); //数据来源值类型 4314(IMSI)
String objectFromValue = resObj.getString("objectFromValue"); //数据来源值
String objectToType = resObj.getString("objectToType"); //所得对象值类型 20（联系方式） 4394（电话号码） 3996（手机号码）
if ("4402".equals(relativeType) && "4314".equals(objectFromType)
&& Arrays.asList("20","4394","3996").contains(objectToType) && taskResultVO.getObjectValue().equals(objectFromValue)){
String sjhm = resObj.getString("objectToValue");
if(null != sjhm && 11 == sjhm.length()){
taskResultVO.setSjhm(sjhm); //将得到手机号码赋值到对象
break;
}
}
}
}
}
}
//2 通过手机号码调取身份证号
if(!StringUtil.ckeckEmpty(taskResultVO.getSjhm())){
JSONObject jsonObj = iphoneTrackService.getObjectRelationAll(taskResultVO.getSjhm());
if(jsonObj != null && "1".equals(jsonObj.getString("objType"))){
String zjhm = jsonObj.getString("objValue");
if(StringUtil.ckeckEmpty(zjhm)){ //如果第四个接口获取的身份证号为空 则使用第一个接口进行获取
JSONObject jsonObject = iphoneTrackService.getObjectRelation(taskResultVO.getSjhm());
if(jsonObject != null){
JSONArray jsonArray = jsonObject.getJSONArray("results");
if(jsonArray != null && jsonArray.size() > 0){
for (int j = 0; j <= jsonArray.size() - 1;j++){
JSONObject resObj = jsonArray.getJSONObject(j);
String relativeType = resObj.getString("relativeType"); //关联类型 20（联系方式）
String objectFromType = resObj.getString("objectFromType"); //数据来源值类型 20（联系方式） 4394（电话号码） 3996（手机号码）
String objectFromValue = resObj.getString("objectFromValue"); //数据来源值
String objectToType = resObj.getString("objectToType"); //所得对象值类型 1（身份证号码）
if ("20".equals(relativeType) && taskResultVO.getSjhm().equals(objectFromValue)
&& Arrays.asList("20","4394","3996").contains(objectFromType) && "1".equals(objectToType)){
String zjhm1 = resObj.getString("objectToValue");
taskResultVO.setZjhm(zjhm1);
break;
}
}
}
}
}else{
taskResultVO.setZjhm(zjhm); //如果第四个接口获取的身份证号码 不为空 则直接赋值
}
}
}
//3 通过身份证号调取二代证信息
if(!StringUtil.ckeckEmpty(taskResultVO.getZjhm())){
AutoTbStRy tbStRy = new Qgckzp().getQgckAllxxXml(taskResultVO.getZjhm());
taskResultVO.setXzzDzmc(tbStRy.getXzzDzmc());//现住址
taskResultVO.setCsdDzmc(tbStRy.getCsdDzmc());//出生地
if(tbStRy.getCsrqRqgzxx() != null){
taskResultVO.setCsrq(DateUtil.convertDateToChineseString(tbStRy.getCsrqRqgzxx()));//出生日期
taskResultVO.setAge(DateUtil.getAge(tbStRy.getCsrqRqgzxx())); //age
}
taskResultVO.setName(tbStRy.getXm());//姓名
taskResultVO.setRyzp(tbStRy.getEdzzplj());//人员照片
}
taskResultVOS.add(taskResultVO);
}
}
} catch (Exception e) {
e.printStackTrace();
}
return taskResultVOS;
}
/**
*
* @Description: 发送伴随任务
......@@ -456,17 +361,17 @@ public class TrackTogetherContoller {
}
/**
* 分页查询伴随任务结果
* 分页查询伴随任务结果的详情列表
* @param page
* @param rows
* @return
*/
@RequestMapping(value = "/getTogetherTaskResultList",method = {RequestMethod.GET,RequestMethod.POST})
@RequestMapping(value = "/getTogetherResultDetailList",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public Map<String,Object> getTogetherTaskResultList(TogetherTaskResult taskParam,@RequestParam(value = "page",defaultValue = "0") int page,
public Map<String,Object> getTogetherResultDetailList(RegionalTaskResultDetail taskParam,@RequestParam(value = "page",defaultValue = "0") int page,
@RequestParam(value = "rows",defaultValue = "0") int rows){
Map<String,Object> resultMap = new HashMap<>();
List<TogetherTaskResult> taskResults = new ArrayList<>();
Map<String, Object> resultMap = new HashMap<>();
List<RegionalTaskResultDetail> detailList = new ArrayList<>();
int totalCount = 0;
try{
EasyUIPage easyUIPage = new EasyUIPage();
......@@ -476,13 +381,20 @@ public class TrackTogetherContoller {
int end = easyUIPage.getEnd();
taskParam.setStartNum(begin);
taskParam.setEndNum(end);
taskResults = trackTogetherService.getTogetherTaskResultList(taskParam);
totalCount = trackTogetherService.getTogetherTaskResultListTotalCount(taskParam);
detailList = trackTogetherService.getTogetherResultDetailList(taskParam);
totalCount = trackTogetherService.getTogetherResultDetailListTotalCount(taskParam);
if (null != detailList && detailList.size() > 0) {
for (RegionalTaskResultDetail tsaf : detailList) {
if(tsaf.getRyzp() != null){
tsaf.setRyzpStr(new String(tsaf.getRyzp()));
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
resultMap.put("total",totalCount);
resultMap.put("rows",taskResults);
resultMap.put("rows",detailList);
return resultMap;
}
......
src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
......@@ -2,6 +2,7 @@ package com.founder.interservice.tracktraveltogether.service;
import com.founder.interservice.exception.InterServiceException;
import com.founder.interservice.regionalanalysis.model.RegionalTask;
import com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail;
import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
import org.springframework.data.domain.Page;
......@@ -29,4 +30,12 @@ public interface TrackTogetherService {
public List<TogetherTaskResult> getTogetherTaskResultList(TogetherTaskResult taskParam);
int getTogetherTaskResultListTotalCount(TogetherTaskResult taskParam);
public boolean togetherDetailIsExist(RegionalTaskResultDetail param) throws Exception;
public void saveTogetherDetail(RegionalTaskResultDetail detail) throws Exception;
public void updateTogetherDetail(RegionalTaskResultDetail detail) throws Exception;
public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail taskParam) throws Exception;
public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail taskParam) throws Exception;
}
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TogetherScheduledService.java
......@@ -2,13 +2,15 @@ package com.founder.interservice.tracktraveltogether.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.founder.interservice.model.AutoTbStRy;
import com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail;
import com.founder.interservice.service.IphoneTrackService;
import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
import com.founder.interservice.tracktraveltogether.repository.TogetherTaskResultRepository;
import com.founder.interservice.tracktraveltogether.repository.TrackTogetherTaskRepository;
import com.founder.interservice.util.HttpUtil;
import com.founder.interservice.util.KeyUtil;
import com.founder.interservice.util.StringUtil;
import com.founder.interservice.tracktraveltogether.service.TrackTogetherService;
import com.founder.interservice.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Example;
......@@ -41,6 +43,11 @@ public class TogetherScheduledService {
private TrackTogetherTaskRepository taskRepository;
@Autowired
private TogetherTaskResultRepository taskResultRepository;
@Autowired
private IphoneTrackService iphoneTrackService; //调取网安数据接口
@Autowired
private TrackTogetherService togetherService; //调取网安数据接口
/**
*
* @Description: 查取任务结果的定时方法
......@@ -110,6 +117,7 @@ public class TogetherScheduledService {
List<TogetherTaskResult> results = taskResultRepository.findAll(example);
if(results == null || results.isEmpty()){
taskResultRepository.save(taskResults);
getAndSaveRydetail(taskResults);
}
}
}
......@@ -119,6 +127,85 @@ public class TogetherScheduledService {
}
/**
* 拿取到伴随的结果后 使用第四个接口调取关联数据
*/
public void getAndSaveRydetail(List<TogetherTaskResult> resultsList) throws Exception {
if (resultsList != null && !resultsList.isEmpty()) {
for (TogetherTaskResult result : resultsList) {
String objType = result.getObjectType();
String objValue = result.getObjectValue();
String objName = result.getObjectTypeName();
if (objValue != null && !"".equals(objValue)) {
//MAC地址、用户名、淘宝旺旺号不去调取关联数据，其它类型都使用第四个接口调取
if (!Arrays.asList("4329", "4342","45282").contains(objType)) {
JSONObject jsonObj = iphoneTrackService.getObjectRelationAll(objValue);//使用网安第三个接口调取关联数据
if (jsonObj != null && !jsonObj.isEmpty()) { //说明根节点是身份证号
RegionalTaskResultDetail detail = new RegionalTaskResultDetail();
detail.setTaskResultId(result.getXXZJBH());
detail.setXXZJBH(KeyUtil.getUniqueKey("EDZ"));
detail.setObjectType(objType);
detail.setObjectValue(objValue);
detail.setObjectTypeName(objName);
String objType2 = jsonObj.getString("objType");
String objValue2 = jsonObj.getString("objValue");
if("1".equals(objType2) && !objValue2.isEmpty()){
detail.setZjlxCode("004");
detail.setZjlx("身份证号");
detail.setZjhm(objValue2);
detail = getEdzxxForSfzh(detail); //获取二代证信息
//根据身份证判断是否存在 如果存在更新 不存在新增
RegionalTaskResultDetail param = new RegionalTaskResultDetail();
param.setObjectType(objType);
param.setObjectValue(objValue);
boolean isExist = togetherService.togetherDetailIsExist(param);
if (!isExist) {
togetherService.saveTogetherDetail(detail);
} else {
togetherService.updateTogetherDetail(detail);
}
}else if(Arrays.asList("20","4394","3996","6003").contains(objType2)){
//手机号码
detail.setSjhm(objValue2);
RegionalTaskResultDetail param = new RegionalTaskResultDetail();
param.setObjectType(objType);
param.setObjectValue(objValue);
boolean isExist = togetherService.togetherDetailIsExist(param);
if (!isExist) {
togetherService.saveTogetherDetail(detail);
} else {
togetherService.updateTogetherDetail(detail);
}
}
}
}
}
}
}
}
/**
* 通过身份证号获取二代证信息
*
* @param regionalTaskResultDetail
* @return
*/
private RegionalTaskResultDetail getEdzxxForSfzh(RegionalTaskResultDetail regionalTaskResultDetail) {
AutoTbStRy tbStRy = new Qgckzp().getQgckAllxxXml(regionalTaskResultDetail.getZjhm());
regionalTaskResultDetail.setXzzDzmc(tbStRy.getXzzDzmc());//现住址
regionalTaskResultDetail.setCsdDzmc(tbStRy.getCsdDzmc());//出生地
if (tbStRy.getCsrqRqgzxx() != null) {
regionalTaskResultDetail.setBirthday(DateUtil.convertDateToChineseString(tbStRy.getCsrqRqgzxx()));//出生日期
regionalTaskResultDetail.setAge(String.valueOf(DateUtil.getAge(tbStRy.getCsrqRqgzxx()))); //age
}
regionalTaskResultDetail.setName(tbStRy.getXm());//姓名
regionalTaskResultDetail.setSex(tbStRy.getXbdm());//性别
if (tbStRy.getEdzzplj() != null) {
regionalTaskResultDetail.setRyzp(tbStRy.getEdzzplj().getBytes());//人员照片
}
return regionalTaskResultDetail;
}
/**
* 修改任务状态
* @param taskId
* @param progress
......
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
......@@ -2,8 +2,11 @@ package com.founder.interservice.tracktraveltogether.service.impl;
import com.founder.interservice.exception.InterServiceException;
import com.founder.interservice.enums.ResultEnum;
import com.founder.interservice.mapper.xzxt.RegionalTaskResultDetailMapper;
import com.founder.interservice.mapper.xzxt.RegionalTaskResultMapper;
import com.founder.interservice.mapper.xzxt.TogetherTaskResultMapper;
import com.founder.interservice.mapper.xzxt.TrackTogetherMapper;
import com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail;
import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
import com.founder.interservice.tracktraveltogether.repository.TogetherTaskResultRepository;
......@@ -47,7 +50,10 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
private TrackTogetherMapper trackTogetherMapper;
@Autowired
private TogetherTaskResultMapper togetherTaskResultMapper;
@Autowired
private RegionalTaskResultMapper regionalTaskResultMapper;
@Autowired
private RegionalTaskResultDetailMapper regionalTaskResultDetailMapper;
/**
*
* @Description: 发送伴随任务 并且返回任务编号
......@@ -164,4 +170,48 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
public int getTogetherTaskResultListTotalCount(TogetherTaskResult taskParam) {
return togetherTaskResultMapper.getTogetherTaskResultListTotalCount(taskParam);
}
@Override
public boolean togetherDetailIsExist(RegionalTaskResultDetail param) throws Exception{
boolean bol = false;
try{
int i = regionalTaskResultMapper.togetherDetailIsExist(param);
if(i > 0){
bol = true;
}
}catch (Exception e){
e.printStackTrace();
}
return bol;
}
@Override
public void saveTogetherDetail(RegionalTaskResultDetail detail) throws Exception {
regionalTaskResultMapper.saveTogetherDetail(detail);
}
@Override
public void updateTogetherDetail(RegionalTaskResultDetail detail) throws Exception {
regionalTaskResultMapper.updateTogetherDetail(detail);
}
/**
* 查询伴随任务结果的详情LIst
* @param taskParam
* @return
*/
@Override
public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail taskParam) throws Exception {
return regionalTaskResultDetailMapper.getTogetherResultDetailList(taskParam);
}
/**
* 查询伴随任务结果的详情总数 用语分页
* @param taskParam
* @return
*/
@Override
public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail taskParam) throws Exception {
return regionalTaskResultDetailMapper.getTogetherResultDetailListTotalCount(taskParam);
}
}
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml
......@@ -103,4 +103,74 @@
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
</select>
<!-- 伴随 -->
<select id = "getTogetherResultDetailListTotalCount" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
select count(*)
from TB_ST_TOGETHERTASKRESULT t
left join TB_ST_TOGETHERRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
where t.TASK_ID = #{taskId}
<if test="objectType!= null and objectType!= ''">
<choose>
<when test="objectType.indexOf(',') > 0">
and t.OBJECT_TYPE in (${objectType})
</when>
<otherwise>
and t.OBJECT_TYPE in (#{objectType})
</otherwise>
</choose>
</if>
<if test="objectValue!= null and objectValue!= ''">and t.OBJECT_VALUE LIKE '%'|| #{objectValue} || '%'</if>
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
</select>
<select id="getTogetherResultDetailList" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
select t2.*
from (
select t1.*,
rownum as rn
from (
select
t.TASK_ID as taskId,
t.OBJECT_TYPE as objectType,
t.OBJECT_TYPE_NAME as objectTypeName,
t.OBJECT_VALUE as objectValue,
t.COUNT AS count,
t.DJSJ AS djsj,
td.TASK_RESULT_ID as taskResultId,
td.BIRTHDAY as birthday,
td.NAME as name,
td.RYZP as ryzp,
td.XZZDZMC as xzzDzmc,
td.CSDDZMC as csdDzmc,
td.ZJLX as zjlx,
td.ZJLX_CODE as zjlxCode,
td.AGE as age,
td.SEX as sex,
td.ZJHM as zjhm,
td.SJHM as sjhm
from TB_ST_TOGETHERTASKRESULT t
left join TB_ST_TOGETHERRESULTDETAIL td on t.OBJECT_VALUE = td.OBJECT_VALUE AND t.OBJECT_TYPE = td.OBJECT_TYPE
where t.TASK_ID = #{taskId}
<if test="objectType!= null and objectType!= ''">
<choose>
<when test="objectType.indexOf(',') > 0">
and t.OBJECT_TYPE in (${objectType})
</when>
<otherwise>
and t.OBJECT_TYPE in (#{objectType})
</otherwise>
</choose>
</if>
<if test="objectValue!= null and objectValue!= ''">and t.OBJECT_VALUE LIKE '%'|| #{objectValue} || '%'</if>
<if test="csrqStart!=null and csrqStart!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[>=]]> to_date(#{csrqStart},'yyyy-MM-dd') </if>
<if test="csrqEnd!=null and csrqEnd!=''"> and to_date(td.BIRTHDAY,'yyyy-MM-dd') <![CDATA[<=]]> to_date(#{csrqEnd},'yyyy-MM-dd') </if>
order by t.DJSJ desc
) t1
where rownum <![CDATA[ <= ]]> #{endNum}
) t2
where rn <![CDATA[ > ]]> #{startNum}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultMapper.xml
......@@ -91,8 +91,96 @@
SJHM,
AGE,
SEX,
ZJLX,
ZJLX_CODE
ZJLX,
ZJLX_CODE,
DJSJ
)
VALUES(
<if test="XXZJBH != null and XXZJBH !=''">#{XXZJBH},</if>
<if test="XXZJBH == null or XXZJBH ==''">NULL,</if>
<if test="taskResultId != null and taskResultId !='' ">#{taskResultId},</if>
<if test="taskResultId == null or taskResultId ==''">NULL,</if>
<if test="objectType != null and objectType !=''">#{objectType},</if>
<if test="objectType == null or objectType ==''">NULL,</if>
<if test="objectTypeName != null and objectTypeName !=''">#{objectTypeName},</if>
<if test="objectTypeName == null or objectTypeName ==''">NULL,</if>
<if test="objectValue != null and objectValue !=''">#{objectValue},</if>
<if test="objectValue == null or objectValue ==''">NULL,</if>
<if test="birthday != null and birthday !=''">#{birthday},</if>
<if test="birthday == null or birthday ==''">NULL,</if>
<if test="name != null and name !=''">#{name},</if>
<if test="name == null or name ==''">NULL,</if>
<if test="ryzp != null and ryzp !=''">#{ryzp},</if>
<if test="ryzp == null or ryzp ==''">NULL,</if>
<if test="xzzDzmc != null and xzzDzmc !=''">#{xzzDzmc},</if>
<if test="xzzDzmc == null or xzzDzmc ==''">NULL,</if>
<if test="csdDzmc != null and csdDzmc !=''">#{csdDzmc},</if>
<if test="csdDzmc == null or csdDzmc ==''">NULL,</if>
<if test="zjhm != null and zjhm !=''">#{zjhm},</if>
<if test="zjhm == null or zjhm ==''">NULL,</if>
<if test="sjhm != null and sjhm !=''">#{sjhm},</if>
<if test="sjhm == null or sjhm ==''">NULL,</if>
<if test="age != null and age !=''">#{age},</if>
<if test="age == null or age ==''">NULL,</if>
<if test="sex != null and sex !=''">#{sex},</if>
<if test="sex == null or sex ==''">NULL,</if>
<if test="zjlx != null and zjlx !=''">#{zjlx},</if>
<if test="zjlx == null or zjlx ==''">NULL,</if>
<if test="zjlxCode != null and zjlxCode !=''">#{zjlxCode},</if>
<if test="zjlxCode == null or zjlxCode ==''">NULL,</if>
SYSDATE
)
</insert>
<update id="updateRegionalTaskResultDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
UPDATE REGIONALTASKRESULTDETAIL t
<set>
<if test="objectType != null and objectType !=''">t.OBJECT_TYPE = #{objectType},</if>
<if test="objectTypeName != null and objectTypeName !=''">t.OBJECT_TYPE_NAME = #{objectTypeName},</if>
<if test="objectValue != null and objectValue !=''">t.OBJECT_VALUE = #{objectValue},</if>
<if test="birthday != null and birthday !=''">t.BIRTHDAY = #{birthday},</if>
<if test="name != null and name !=''">t.NAME = #{name},</if>
<if test="ryzp != null and ryzp !=''">t.RYZP = #{ryzp},</if>
<if test="xzzDzmc != null and xzzDzmc !=''">t.XZZDZMC = #{xzzDzmc},</if>
<if test="csdDzmc != null and csdDzmc !=''">t.CSDDZMC = #{csdDzmc},</if>
<if test="zjhm != null and zjhm !=''">t.ZJHM = #{zjhm},</if>
<if test="sjhm != null and sjhm !=''">t.SJHM = #{sjhm},</if>
<if test="age != null and age !=''">t.AGE = #{age},</if>
<if test="sex != null and sex !=''">t.SEX = #{sex},</if>
<if test="zjlx != null and zjlx !=''">t.ZJLX = #{zjlx},</if>
<if test="zjlxCode != null and zjlxCode !=''">t.ZJLX_CODE = #{zjlxCode},</if>
</set>
WHERE
t.OBJECT_TYPE = #{objectType}
and t.OBJECT_VALUE = #{objectValue}
</update>
<!--查看伴随表中任务翻译结果表 -->
<select id = "togetherDetailIsExist" parameterType = "com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="int" >
select count(*)
from TB_ST_TOGETHERRESULTDETAIL t
where
t.OBJECT_TYPE = #{objectType}
and t.OBJECT_VALUE = #{objectValue}
</select>
<insert id="saveTogetherDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
INSERT INTO TB_ST_TOGETHERRESULTDETAIL(
XXZJBH,
TASK_RESULT_ID,
OBJECT_TYPE,
OBJECT_TYPE_NAME,
OBJECT_VALUE,
BIRTHDAY,
NAME,
RYZP,
XZZDZMC,
CSDDZMC,
ZJHM,
SJHM,
AGE,
SEX,
ZJLX,
ZJLX_CODE,
DJSJ
)
VALUES(
<if test="XXZJBH != null and XXZJBH !=''">#{XXZJBH},</if>
......@@ -125,12 +213,13 @@
<if test="sex == null or sex ==''">NULL,</if>
<if test="zjlx != null and zjlx !=''">#{zjlx},</if>
<if test="zjlx == null or zjlx ==''">NULL,</if>
<if test="zjlxCode != null and zjlxCode !=''">#{zjlxCode}</if>
<if test="zjlxCode == null or zjlxCode ==''">NULL</if>
<if test="zjlxCode != null and zjlxCode !=''">#{zjlxCode},</if>
<if test="zjlxCode == null or zjlxCode ==''">NULL,</if>
SYSDATE
)
</insert>
<update id="updateRegionalTaskResultDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
UPDATE REGIONALTASKRESULTDETAIL t
<update id="updateTogetherDetail" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
UPDATE TB_ST_TOGETHERRESULTDETAIL t
<set>
<if test="objectType != null and objectType !=''">t.OBJECT_TYPE = #{objectType},</if>
<if test="objectTypeName != null and objectTypeName !=''">t.OBJECT_TYPE_NAME = #{objectTypeName},</if>
......@@ -146,9 +235,10 @@
<if test="sex != null and sex !=''">t.SEX = #{sex},</if>
<if test="zjlx != null and zjlx !=''">t.ZJLX = #{zjlx},</if>
<if test="zjlxCode != null and zjlxCode !=''">t.ZJLX_CODE = #{zjlxCode},</if>
t.DJSJ = SYSDATE
</set>
WHERE
t.OBJECT_TYPE = #{objectType}
and t.OBJECT_VALUE = #{objectValue}
t.OBJECT_TYPE = #{objectType}
and t.OBJECT_VALUE = #{objectValue}
</update>
</mapper>
\ No newline at end of file
src/main/resources/static/js/skgjbasjgzs.js
......@@ -25,17 +25,20 @@ function doClear(){
});
}
var table_title =[
{title:"标识号",field:"objectValue",align:'center',width:'22%'},
{title:"标识号类型",field:"objectTypeName",align:'center',width:'20%'},
{title:"伴随次数",field:"count",align:'center',width:'22%'},
{title:"入库时间",field:"djsj",align:'center',width:'20%'},
{title:"操作",field:"cz",align:'center',width:'20%',formatter:function(val,row,index){
{title:"标识号",field:"objectValue",align:'center',width:'10%'},
{title:"标识号类型",field:"objectTypeName",align:'center',width:'10%'},
{title:"伴随次数",field:"count",align:'center',width:'10%'},
{title:"姓名",field:"name",align:'center',width:'10%'},
{title:"证件类型",field:"zjlx",align:'center',width:'15%'},
{title:"证件号码",field:"zjhm",align:'center',width:'15%'},
{title:"入库时间",field:"djsj",align:'center',width:'15%'},
{title:"操作",field:"cz",align:'center',width:'15%',formatter:function(val,row,index){
return getCzColumn(row);
}},
];
function doQuery(){
$('#skgjbsjgzsTable').datagrid({
url: "/getTogetherTaskResultList",
url: "/getTogetherResultDetailList",
columns : [table_title],
queryParams:serializeObject($("form[name='skgjbsjgzsForm']")),
striped: true,
......@@ -72,61 +75,46 @@ function serializeObject(form){
}
function getCzColumn(row){
var str="<a href=\"javascript:;\" onclick=\"toSkgjbsjgzsDetail('"+row.taskId+"','"+row.objectType+"','"+row.objectValue+"');\" class=\"cz\"><span>结果显示</span></a>";
var str="<a href=\"javascript:;\" onclick=\"toZstp('"+row.xzzDzmc+"','"+row.sjhm+"','"+row.age+"','"+row.objectValue+"','"+row.objectTypeName+"','"+row.objectType+"','"+row.ryzpStr+"','"+row.name+"','"+row.birthday+"','"+row.zjlx+"','"+row.zjhm+"');\" class=\"cz\"><span>结果显示</span></a>";
return str;
}
function toSkgjbsjgzsDetail(taskId,objType,objValue){
var param = {
"imsi":objValue,
"yhCate":"00",
"projectName":"刑专智慧侦查脑图"
function toZstp(xzzDzmc,sjhm,age,objectValue,objectTypeName,objectType,ryzpStrs,name,birthday,zjlx,zjhm){
var cllxArr = ["6424","6422","6423","7888"];
var ryzpStr = "";
if(ryzpStrs != "null" && ryzpStrs !=''){
ryzpStr = "<img src=\"data:image/gif;base64," + ryzpStrs + "\"/>";
}else {
ryzpStr = "<img src=\"/images/timg.jpg\" style = \"height:121px;width:100px;\"/>";
}
var objValue = objectValue== "null"?"":objectValue;
var objTypeName = objectTypeName=="null"?"":objectTypeName;
var zjlxx = zjlx=="null"?"":zjlx;
var zjhmm = zjhm=="null"?"":zjhm;
var agee = age=="null"?"":age;
var namee = name=="null"?"":name;
var birth = birthday=="null"?"":birthday;
var sj = sjhm=="null"?"":sjhm;
var xzz = xzzDzmc=="null"?"":xzzDzmc;
if(cllxArr.indexOf(objectType) > -1){
//车辆
$("#clRyzp").html(ryzpStr);
$("#cph").text(objValue);
$("#cllx").text(objTypeName);
$("#clZjlx").text(zjlxx);
$("#clZjhm").text(zjhmm);
openClxx();
}else {
//人员
$("#ryzp").html(ryzpStr);
$("#ryName").text(namee);
$("#ryAge").text(agee);
$("#rySfzh").text(zjhmm);
$("#ryCsrq").text(birth);
$("#ryDhhm").text(sj);
$("#imsi").text(objValue);
$("#ryAddress").text(xzz);
openRyxx();
}
var index = layer.load(1, {
content: '加载中',
shade: [0.35,'#fff'],
success: function(layero) {
layero.find('.layui-layer-content').css({
'padding-top': '40px',
'width': '70px',
'background-position-x': '2px'
});
}
});
$.ajax({
type:"POST",
data:param,
url:"/queryTogetherTaskDetail",
success:function(result) {
layer.close(index);
if(result){
var data = result.data;
var ryzpStr = "";
if(data.ryzp){
ryzpStr = "<img src=\"data:image/gif;base64," + data.ryzp + "\"/>";
}else {
ryzpStr = "<img src=\"/images/timg.jpg\" style = \"height:121px;width:100px;\"/>";
}
var name = data.name==null?"":data.name;
var age = data.age==null?"":data.age;
var zjhm = data.zjhm==null?"":data.zjhm;
var csrq = data.csrq==null?"":data.csrq;
var sjhm = data.sjhm==null?"":data.sjhm;
var xzzDzmc = data.xzzDzmc==null?"":data.xzzDzmc;
$("#ryzp").html(ryzpStr);
$("#ryName").text(name);
$("#ryAge").text(age);
$("#rySfzh").text(zjhm);
$("#ryCsrq").text(csrq);
$("#ryDhhm").text(sjhm);
$("#imsi").text(objValue);
$("#ryAddress").text(xzzDzmc);
openRyxx();
}
},
error:function () {
}
});
}
function openRyxx(){
$('#ryjgzs').dialog({
......
src/main/resources/static/sql/S024.20190304_caopeng_新增时空班队结果显示二代证信息存储表.txt 0 → 100644
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S024',0);
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S024',0);
COMMIT;
-------------------------------------------------------------------------------------------
ALTER TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL
DROP PRIMARY KEY CASCADE;
DROP TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL CASCADE CONSTRAINTS;
CREATE TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL
(
XXZJBH VARCHAR2(23 BYTE),
TASK_RESULT_ID VARCHAR2(100 BYTE),
OBJECT_TYPE VARCHAR2(10 BYTE),
OBJECT_TYPE_NAME VARCHAR2(100 BYTE),
OBJECT_VALUE VARCHAR2(50 BYTE),
BIRTHDAY VARCHAR2(50 BYTE),
NAME VARCHAR2(50 BYTE),
RYZP BLOB,
XZZDZMC VARCHAR2(100 BYTE),
CSDDZMC VARCHAR2(100 BYTE),
ZJLX VARCHAR2(50 BYTE),
ZJLX_CODE VARCHAR2(50 BYTE),
ZJHM VARCHAR2(50 BYTE),
SJHM VARCHAR2(50 BYTE),
AGE VARCHAR2(10 BYTE),
SEX VARCHAR2(10 BYTE),
DJSJ DATE DEFAULT sysdate
)
TABLESPACE TBS_BIGDATA
PCTUSED 0
PCTFREE 10
INITRANS 1
MAXTRANS 255
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
)
LOGGING
NOCOMPRESS
LOB (RYZP) STORE AS SECUREFILE
( TABLESPACE TBS_BIGDATA
ENABLE STORAGE IN ROW
CHUNK 8192
NOCACHE
INDEX (
TABLESPACE TBS_BIGDATA
STORAGE (
INITIAL 64K
NEXT 1
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
))
STORAGE (
INITIAL 104K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
)
)
NOCACHE
NOPARALLEL
MONITORING;
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.XXZJBH IS '主键编号';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.TASK_RESULT_ID IS '所属任务结果主键';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.OBJECT_TYPE IS '对象类型';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.OBJECT_TYPE_NAME IS '对象类型名称';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.OBJECT_VALUE IS '对象值';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.BIRTHDAY IS '出生日期';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.NAME IS '姓名';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.RYZP IS '人员照片';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.XZZDZMC IS '现住址地点名称';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.CSDDZMC IS '出生地地点名称';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.ZJLX IS '证件类型';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.ZJLX_CODE IS '证件类型编码';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.ZJHM IS '证件号码';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.SJHM IS '手机号码';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.AGE IS '年龄';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.SEX IS '性别';
COMMENT ON COLUMN XZXT.TB_ST_TOGETHERRESULTDETAIL.DJSJ IS '登记时间';
CREATE UNIQUE INDEX XZXT.PK_TOGETHERDETAIL_XXZJBH ON XZXT.TB_ST_TOGETHERRESULTDETAIL
(XXZJBH)
LOGGING
TABLESPACE TBS_BIGDATA
PCTFREE 10
INITRANS 2
MAXTRANS 255
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
BUFFER_POOL DEFAULT
)
NOPARALLEL;
ALTER TABLE XZXT.TB_ST_TOGETHERRESULTDETAIL ADD (
CONSTRAINT PK_TOGETHERDETAIL_XXZJBH
PRIMARY KEY
(XXZJBH)
USING INDEX
TABLESPACE TBS_BIGDATA
PCTFREE 10
INITRANS 2
MAXTRANS 255
STORAGE (
INITIAL 64K
NEXT 1M
MINEXTENTS 1
MAXEXTENTS UNLIMITED
PCTINCREASE 0
));
-------------------------------------------------------------------------------------------
UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S024';
COMMIT;
\ No newline at end of file
src/main/resources/static/sql/S025.20190304_caopeng_给REGIONALTASKRESULTDETAIL表添加登记时间字段.txt 0 → 100644
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S025',0);
INSERT INTO XZXT.SYS_DBLOG(SID,STATUS)VALUES('S025',0);
COMMIT;
-------------------------------------------------------------------------------------------
ALTER TABLE XZXT.REGIONALTASKRESULTDETAIL
ADD (DJSJ DATE DEFAULT SYSDATE);
COMMENT ON COLUMN XZXT.REGIONALTASKRESULTDETAIL.DJSJ IS '登记时间';
-------------------------------------------------------------------------------------------
UPDATE XZXT.SYS_DBLOG SET STATUS=1 WHERE SID='S025';
COMMIT;
\ No newline at end of file
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