Skip to content

B
bigdatainterservice
Commit 882fb716 by wangling
Options

20190617---wangling---时空伴随结果分类展示功能

parent 555c3f38
Showing with 149 additions and 16 deletions
src/main/java/com/founder/interservice/mapper/xzxt/TogetherTaskResultMapper.java
package com.founder.interservice.mapper.xzxt;
import com.founder.interservice.tracktraveltogether.model.TogetherTaskResult;
import com.founder.interservice.tracktraveltogether.model.TrackTogetherTask;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -28,4 +27,8 @@ public interface TogetherTaskResultMapper {
* @return
*/
int getTogetherTaskResultListTotalCount(TogetherTaskResult taskParam);
//获取分类总数
List<Object[]> getSkbsFldhCountList(TogetherTaskResult vo);
List<Object[]> getSkbsFldhBzhCountList(TogetherTaskResult vo);
}
src/main/java/com/founder/interservice/regionalanalysis/controller/RegionalAnalysisController.java
......@@ -380,7 +380,7 @@ public class RegionalAnalysisController {
zp64bite = new String(tsaf.getRyzp());
}
String zp = "data:image/gif;base64," + zp64bite;
tsaf.setZp(zp);
tsaf.setRyzpStr(zp);
}
/**
......@@ -460,28 +460,28 @@ public class RegionalAnalysisController {
}
switch (taskVO.getState()){
case "QUEUEING":
taskVO.setState("任务等待中");
taskVO.setState("等候中");
break;
case "STARTING":
taskVO.setState("任务开始");
taskVO.setState("开始运行");
break;
case "RUNNING":
taskVO.setState("任务进行中");
taskVO.setState("运行中");
break;
case "FINISHED":
taskVO.setState("任务已完成");
taskVO.setState("标识号调取完成");
break;
case "TIMEOUT":
taskVO.setState("任务超时");
taskVO.setState("计算超时");
break;
case "END":
taskVO.setState("任务比对完成");
taskVO.setState("比对碰撞已完成");
break;
case "ERROR":
taskVO.setState("任务异常");
taskVO.setState("执行错误");
break;
case "default":
taskVO.setState("任务等待中");
taskVO.setState("运行中");
break;
}
taskVO.setQyCount(regionalAnalysisService.quertRegionalCountByTaskId(taskVO.getTaskId()));
......@@ -594,8 +594,6 @@ public class RegionalAnalysisController {
if (null == zjhm || "".equals(zjhm)) {
tsaf.setName("--");
tsaf.setZjlx("--");
tsaf.setSex("--");
tsaf.setBirthday("--");
tsaf.setZjhm("非本市户籍人员");
}
if (tsaf.getAge() == null || "".equals(tsaf.getAge())) {
......
src/main/java/com/founder/interservice/regionalanalysis/model/RegionalTaskResultDetail.java
......@@ -18,6 +18,7 @@ public class RegionalTaskResultDetail {
private String objectTypeName;
private String objectValue;
private int count; //伴随次数
private String bscscount;
private String birthday;
private String name;
private byte[] ryzp;
......@@ -40,6 +41,5 @@ public class RegionalTaskResultDetail {
private String regionlist;//所属区域
private int rqLength;//出生日期长度
private String sfbs;//是否本市
private String zp;
}
src/main/java/com/founder/interservice/tracktraveltogether/controller/TrackTogetherContoller.java
......@@ -6,6 +6,7 @@ import com.founder.interservice.enums.ResultEnum;
import com.founder.interservice.exception.InterServiceException;
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.service.TrackTogetherService;
import com.founder.interservice.tracktraveltogether.vo.TrackTogetherTaskVO;
......@@ -402,8 +403,18 @@ public class TrackTogetherContoller {
if (null == zjhm || "".equals(zjhm)) {
tsaf.setName("--");
tsaf.setZjlx("--");
tsaf.setSjhm("--");
tsaf.setZjhm("非本市户籍人员");
}
if (tsaf.getAge() == null || "".equals(tsaf.getAge())) {
tsaf.setAge("--");
}
if (tsaf.getXzzDzmc() == null || "".equals(tsaf.getXzzDzmc())) {
tsaf.setXzzDzmc("--");
}
if (tsaf.getCsdDzmc() == null || "".equals(tsaf.getCsdDzmc())) {
tsaf.setCsdDzmc("--");
}
if(tsaf.getRyzp() != null){
tsaf.setRyzpStr(new String(tsaf.getRyzp()));
}
......@@ -416,4 +427,20 @@ public class TrackTogetherContoller {
resultMap.put("rows",detailList);
return resultMap;
}
/**
* 时空伴随分类导航点击查询，查出分类导航count
* @return
*/
@RequestMapping("/getSkbsFlCountList")
@ResponseBody
public Map<String,Object> getSkbsFlCountList(String checkVal,TogetherTaskResult vo){
Map<String, Object> resultMap = new HashMap<>();
//循环checkVal，获取总数
String[] checkVals=checkVal.split(",");
for(int i=0;i<checkVals.length;i++){
List<Object[]> list= trackTogetherService.getSkbsFlCountList(checkVals[i],vo);
resultMap.put(checkVals[i],list);
}
return resultMap;
}
}
src/main/java/com/founder/interservice/tracktraveltogether/model/TogetherTaskResult.java
......@@ -37,4 +37,9 @@ public class TogetherTaskResult {
@Transient
private int endNum;
private String checkVal;
private String sqlStr;
private String isNullField;
private String groupByField;
}
src/main/java/com/founder/interservice/tracktraveltogether/service/TrackTogetherService.java
......@@ -40,4 +40,6 @@ public interface TrackTogetherService {
public List<RegionalTaskResultDetail> getTogetherResultDetailList(RegionalTaskResultDetail taskParam) throws Exception;
public int getTogetherResultDetailListTotalCount(RegionalTaskResultDetail taskParam) throws Exception;
List<Object[]> getSkbsFlCountList(String checkVal, TogetherTaskResult vo);
}
src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TrackTogetherServiceImpl.java
......@@ -221,4 +221,56 @@ public class TrackTogetherServiceImpl implements TrackTogetherService {
return regionalTaskResultDetailMapper.getTogetherResultDetailListTotalCount(taskParam);
}
@Override
public List<Object[]> getSkbsFlCountList(String checkVal, TogetherTaskResult vo) {
//读取json文件，获取分类配置信息
List<Object[]> list=new ArrayList<>();
if("XB".equals(checkVal)){
vo.setSqlStr("count(b.sex) counts," +
" CASE WHEN b.sex =1 THEN '男'" +
" WHEN b.sex =2 THEN '女'" +
" WHEN b.sex =9 THEN '未说明的性别'" +
" WHEN b.sex =0 THEN '未知的性别'" +
" END as names ,b.sex vals");
vo.setIsNullField(" b.sex is not null ");
vo.setGroupByField(" b.sex ");
list=togetherTaskResultMapper.getSkbsFldhCountList(vo);
}else if("SFBS".equals(checkVal)){
//本市非两种情况，本市，和非本市
vo.setSqlStr(" count(*) counts,'本市人员' names,1 vals ");
vo.setIsNullField(" b.zjhm is not null ");
vo.setGroupByField("");
list=togetherTaskResultMapper.getSkbsFldhBzhCountList(vo);
vo.setSqlStr(" count(*) counts,'非本市人员' names,0 vals ");
vo.setIsNullField(" b.zjhm is null ");
vo.setGroupByField("");
list.addAll(togetherTaskResultMapper.getSkbsFldhBzhCountList(vo));
if(list.contains("0")){
System.out.println("");
}
}else if("BZHLX".equals(checkVal)){
vo.setSqlStr(" count(a.object_type) counts,max(a.object_type_name) names,a.object_type vals ");
vo.setIsNullField("");
vo.setGroupByField(" a.object_type ");
list=togetherTaskResultMapper.getSkbsFldhBzhCountList(vo);
}else if("CSRQ".equals(checkVal)){
int[] subStr=new int[3];
subStr[0]=4;
subStr[1]=7;
subStr[2]=10;
for(int i=0;i<subStr.length;i++){
vo.setSqlStr(" count(substr(birthday,1,"+subStr[i]+")) counts,substr(birthday,1,"+subStr[i]+") names,substr(birthday,1,"+subStr[i]+") vals ");
vo.setIsNullField(" b.birthday is not null ");
vo.setGroupByField(" substr(birthday,1,"+subStr[i]+") ");
list.addAll(togetherTaskResultMapper.getSkbsFldhCountList(vo));
}
}else if("BSCS".equals(checkVal)){
vo.setSqlStr(" count ( * ) counts, count||'次' names, a.count vals ");
vo.setIsNullField("");
vo.setGroupByField(" a.count ");
list=togetherTaskResultMapper.getSkbsFldhBzhCountList(vo);
}
return list;
}
}
src/main/resources/mybatis/mapper/xzxt/RegionalTaskResultDetailMapper.xml
......@@ -239,7 +239,11 @@
<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>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and td.ZJHM is null </if>
<if test='sfbs =="1"'>and td.ZJHM is not null </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
<if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
</select>
<select id="getTogetherResultDetailList" parameterType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail" resultType="com.founder.interservice.regionalanalysis.model.RegionalTaskResultDetail">
......@@ -283,6 +287,11 @@
<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>
<if test="birthday!=null and birthday!=''"> and substr(td.BIRTHDAY,0,${rqLength}) =#{birthday} </if>
<if test='sfbs =="0"'>and td.ZJHM is null </if>
<if test='sfbs =="1"'>and td.ZJHM is not null </if>
<if test="sex!=null and sex!=''"> and td.SEX =#{sex} </if>
<if test="bscscount!=null and bscscount!=''"> and t.COUNT =#{bscscount} </if>
order by t.COUNT desc
) t1
where rownum <![CDATA[ <= ]]> #{endNum}
......
src/main/resources/mybatis/mapper/xzxt/TogetkerTaskResultMapper.xml
......@@ -35,4 +35,40 @@
<if test="djsjStart!=null and djsjStart!=''"> and t.DJSJ <![CDATA[>=]]> to_date(#{djsjStart},'yyyy-MM-dd') </if>
<if test="djsjEnd!=null and djsjEnd!=''"> and t.DJSJ <![CDATA[<=]]> to_date(#{djsjEnd},'yyyy-MM-dd') </if>
</select>
<select id="getSkbsFlCountList" resultType="java.util.Map">
${sqlStr}
</select>
<select id="getSkbsFldhCountList" parameterType="com.founder.interservice.tracktraveltogether.model.TogetherTaskResult" resultType="java.util.Map" >
select ${sqlStr} from TB_ST_TOGETHERRESULTDETAIL b
left join TB_ST_TOGETHERTASKRESULT a on a.object_type=b.object_type and a.OBJECT_VALUE = b.OBJECT_VALUE
where a.task_id=#{taskId}
<if test="isNullField!= null and isNullField!= ''">
and ${isNullField}
</if>
<if test="objectValue!= null and objectValue!= ''">
AND a.object_value LIKE '%'|| #{objectValue} || '%'
</if>
<if test="groupByField!= null and groupByField!= ''">
group by ${groupByField}
</if>
</select>
<select id="getSkbsFldhBzhCountList" parameterType="com.founder.interservice.tracktraveltogether.model.TogetherTaskResult" resultType="java.util.Map" >
select ${sqlStr} from TB_ST_TOGETHERTASKRESULT a
left join TB_ST_TOGETHERRESULTDETAIL b on a.object_type=b.object_type and a.OBJECT_VALUE = b.OBJECT_VALUE
where a.task_id=#{taskId}
<if test="isNullField!= null and isNullField!= ''">
and ${isNullField}
</if>
<if test="objectValue!= null and objectValue!= ''">
AND a.object_value LIKE '%'|| #{objectValue} || '%'
</if>
<if test="groupByField!= null and groupByField!= ''">
group by ${groupByField}
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/static/js/qypzjgxsNew.js
......@@ -266,10 +266,10 @@ function doQueryqk(){
var html="";
$.each(rows, function(k,v) {//这里的函数参数是键值对的形式，k代表键名，v代表值
var srcurl = "";
if(rows[k].zp == "data:image/gif;base64,"){
if(rows[k].ryzpStr == "data:image/gif;base64,"){
srcurl = "/images/no_data.jpg"
} else {
srcurl = rows[k].zp;
srcurl = rows[k].ryzpStr;
}
//处理性别
var sexValue = getXbmc(rows[k]);
......
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