Skip to content

M
map-parent
Commit c76c0410 by 宋珺琪
Options

Hn可视化接口管理修改bug

parent ddfc047a
Showing with 98 additions and 70 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Hnkshresult.java 0 → 100644
package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@Accessors(chain = true)
public class Hnkshresult implements Serializable {
private kshdata kshdata;
}
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/kshdata.java 0 → 100644
package com.founder.commonutils.model.newPublicEntity.hnkshEntity;
import lombok.Data;
import java.util.List;
@Data
public class kshdata {
private List<HnTbStRygxDTO> nodes;
private List<HnTbStRygxDTO> links;
}
service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java
......@@ -9,13 +9,10 @@ import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.URLUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.hnkshEntity.*;
import com.founder.commonutils.model.newPublicEntity.result.ApiException;
import com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnRygxExport;
import com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx;
import com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygxDTO;
import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRw;
import com.founder.commonutils.util.ExcelUtil;
import com.founder.publicapi.controller.SkDataUpload.FtpUtil;
import com.founder.publicapi.service.HnTbStRygxRwService;
import com.founder.publicapi.service.HnTbStRygxService;
import io.swagger.annotations.Api;
......@@ -61,9 +58,9 @@ public class HnTbStRygxController {
public static final String TEAM_KEY = "teamNum:"; //创建人+任务id+团伙数量
public static final String IMG_TASK_KEY = "imgKey";
public static final String HNKSH_FILE_PATH = "/excel/kshExcel/";
//上传的路径
public static final String HNKSH_FILE_PATH = "/data/excel/kshExcel/";
//下载的路径
public static final String HNKSH_DOWNLOAD_FILE_PATH = "http://47.92.48.137:1009/excel/kshExcel/";
//下载模板的路径
public static final String HNKSH_DOWNLOAD_EXCEL_TEMPLATE_PATH = "http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls";
......@@ -94,10 +91,10 @@ public class HnTbStRygxController {
@RequestParam(name = "username") String username,
@RequestParam(name = "currentPage", defaultValue = "1") Integer currentPage,
@RequestParam(name = "pageSize", defaultValue = "5") Integer pageSize,
@RequestParam(name = "bq", required = false) String lxrxm,
@RequestParam(name = "bs", required = false) String lxrsfz,
@RequestParam(name = "lxrXm", required = false) String blxrxm,
@RequestParam(name = "lxrSfz", required = false) String blxrsfz,
@RequestParam(name = "lxrxm", required = false) String lxrxm,
@RequestParam(name = "lxrsfz", required = false) String lxrsfz,
@RequestParam(name = "blxrXm", required = false) String blxrxm,
@RequestParam(name = "blxrSfz", required = false) String blxrsfz,
@RequestParam(name = "rygx", required = false) String rygx) {
//计算分页
int start = PageUtil.getStart(currentPage - 1, pageSize);
......@@ -293,12 +290,13 @@ public class HnTbStRygxController {
@RequestParam("username") String username,
@RequestParam("taskId") String taskId,
@RequestParam(name = "rygx", required = false) String rygx,
@RequestParam(name = "bq", required = false) String lxrXm,
@RequestParam(name = "bs", required = false) String lxrSfz,
@RequestParam(name = "lxrXm", required = false) String bLxrXm,
@RequestParam(name = "lxrSfz", required = false) String bLxrSfz) {
@RequestParam(name = "lxrXm", required = false) String lxrXm,
@RequestParam(name = "lxrSfz", required = false) String lxrSfz,
@RequestParam(name = "bLxrXm", required = false) String bLxrXm,
@RequestParam(name = "bLxrSfz", required = false) String bLxrSfz) {
//团伙信息集合
List<Map<String, Object>> rythInfoList = (List<Map<String, Object>>) redisTemplate.opsForValue().get(username + ":" + taskId + ":" + TEAM_KEY + teamNum);
//指定团伙集合
List<Map<String, Object>> rythInfoByIdList = new ArrayList<>();
for (Map<String, Object> map : rythInfoList) {
......@@ -321,8 +319,11 @@ public class HnTbStRygxController {
}
//查询出所有联系人的身份证
List<String> nameList = hnKshService.getGroupNameByRwid(taskId);
List<HnTbStRygxDTO> hnTbStRygxDTOS = packingData(rythInfoByIdList, nameList, lxrXm, lxrSfz, bLxrXm, bLxrSfz);
return new MapRestResult(200,"ok",hnTbStRygxDTOS.size(),hnTbStRygxDTOS);
Hnkshresult hnkshresult = packingData(rythInfoByIdList, nameList, lxrXm, lxrSfz, bLxrXm, bLxrSfz);
ArrayList<Object> re = new ArrayList<>();
re.add(hnkshresult);
// List<Hnkshresult> hnTbStRygxDTOS = packingData(rythInfoByIdList, nameList, lxrXm, lxrSfz, bLxrXm, bLxrSfz);
return new MapRestResult(200,"ok",re.size(),re);
// return Result.ok().data("rows", hnTbStRygxDTOS);
}
......@@ -337,7 +338,9 @@ public class HnTbStRygxController {
* @param bLxrSfz 被联系人身份证
* @return
*/
public List<HnTbStRygxDTO> packingData(List<Map<String, Object>> data, List<String> nameList, String lxrXm, String lxrSfz, String bLxrXm, String bLxrSfz) {
public Hnkshresult packingData(List<Map<String, Object>> data, List<String> nameList, String lxrXm, String lxrSfz, String bLxrXm, String bLxrSfz) {
Hnkshresult hnkshresult = new Hnkshresult();
kshdata kshdata = new kshdata();
List<HnTbStRygxDTO> resultList = new ArrayList<>();
for (Map<String, Object> team : data) {
//拿出name（被联系人）
......@@ -350,6 +353,7 @@ public class HnTbStRygxController {
String bimg = null;
//去children找出被联系人所有的联系人
List<HnTbStRygxDTO> singlePersonOfChildrenList = new ArrayList<>();
//children
for (HnTbStRygx rygx : childrenList) {
if (sfzh.equals(rygx.getSfzh())) {
//联系人和被联系人的姓名和身份证互换
......@@ -400,9 +404,11 @@ public class HnTbStRygxController {
}
mergeDTO.setChildren(singlePersonOfChildrenList);
resultList.add(mergeDTO);
kshdata.setNodes(resultList);kshdata.setLinks(resultList);
hnkshresult.setKshdata(kshdata);
}
}
return resultList;
return hnkshresult;
}
/**
......@@ -486,6 +492,7 @@ public class HnTbStRygxController {
String createName = excelInfo.getCreateName();
String excelName = excelInfo.getExcelName();
String postfix = excelInfo.getExcelPostfix();
System.out.println(createName);
//下载的路径
String path = HNKSH_DOWNLOAD_FILE_PATH + createName + "/" + rwid + "/" + excelId + "." + postfix;
//防止url中出现中文
......@@ -674,9 +681,9 @@ public class HnTbStRygxController {
throw new ApiException(201, "上传失败，请选择xls或xlsx文件");
}
String postfix = originalName.substring(originalName.lastIndexOf("."));
String path = HNKSH_FILE_PATH + username + "/" + taskId;
String path = HNKSH_FILE_PATH + username + "/" + taskId + "/" + fileName + postfix;
try {
FileUtil.writeBytes(file.getBytes(), path + "/" + fileName + postfix);
FileUtil.writeBytes(file.getBytes(), path);
// FtpUtil.uploadFile(fileName,file.getInputStream());
} catch (IOException e) {
e.printStackTrace();
......@@ -730,7 +737,7 @@ public class HnTbStRygxController {
* @param rygx
* @throws IOException
*/
@GetMapping("export")
@PostMapping("export")
public void export(HttpServletResponse response,
@RequestParam("id") String id,
@RequestParam("teamNum") Integer teamNum,
......
service/publicapi/src/main/java/com/founder/publicapi/controller/hnkshrw/HnTbStRygxRwController.java
......@@ -2,6 +2,7 @@ package com.founder.publicapi.controller.hnkshrw;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -9,12 +10,16 @@ import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRwD
import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO;
import com.founder.commonutils.model.newPublicEntity.result.Result;
import com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.HnTbStRygxRw;
import com.founder.commonutils.util.StringUtil;
import com.founder.publicapi.service.HnTbStRygxRwService;
import io.swagger.annotations.Api;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -66,8 +71,8 @@ public class HnTbStRygxRwController {
*/
@PostMapping("getTaskInfo")
public Result getTaskInfo(@RequestParam(name = "taskName", required = false) String taskName,
@RequestParam(name = "startTime", required = false) String startTime,
@RequestParam(name = "endTime", required = false) String endTime,
@RequestParam(name = "startTime", required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime,
@RequestParam(name = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")LocalDateTime endTime,
@RequestParam(name = "currentPage", defaultValue = "1") Integer currentPage,
@RequestParam(name = "pageSize", defaultValue = "5") Integer pageSize,
@RequestParam(name = "username",required = false) String username) {
......@@ -75,14 +80,14 @@ public class HnTbStRygxRwController {
if (StringUtils.isNotBlank(taskName)) {
wrapper.like("RWMC", taskName);
}
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
wrapper.apply("TASK_CREATE_TIME between date_format('" + startTime + "','yyyy-MM-dd hh24:mi:ss') and date_format('" + endTime + "','yyyy-MM-dd hh24:mi:ss')");
} else if (StringUtils.isNotBlank(startTime)) {
wrapper.apply("TASK_CREATE_TIME >= date_format('" + startTime + "','yyyy-MM-dd hh24:mi:ss')");
} else if (StringUtils.isNotBlank(endTime)) {
wrapper.apply("TASK_CREATE_TIME <= date_format('" + endTime + "','yyyy-MM-dd hh24:mi:ss')");
if (ObjectUtil.isNotNull( startTime) && ObjectUtil.isNotNull(endTime)) {
wrapper.apply("TASK_CREATE_TIME between'" + startTime.toString() + "' and '" + endTime.toString() +"'" );
} else if (ObjectUtil.isNotNull( startTime)) {
wrapper.apply("TASK_CREATE_TIME >= '" + startTime.toString() +"'" );
} else if (ObjectUtil.isNotNull(endTime)) {
wrapper.apply("TASK_CREATE_TIME <= '" + endTime.toString() +"'" );
}
wrapper.eq("CREATE_NAME", username);
wrapper.eq(!StringUtil.isEmpty(username),"CREATE_NAME", username);
wrapper.eq("PARENT_ID","0");
wrapper.orderByDesc("TASK_CREATE_TIME");
Page page = new Page(currentPage,pageSize);
......@@ -91,7 +96,7 @@ public class HnTbStRygxRwController {
List<HnTbStRygxRwDTO> resultList = new ArrayList<>();
for (HnTbStRygxRw record : records) {
String rwid = record.getRwid();
List<RygxExcelDTO> list = hnKshRwService.queryTaskChildren(rwid,startTime,endTime);
List<RygxExcelDTO> list = hnKshRwService.queryTaskChildren(rwid, ObjectUtil.isNull(startTime)? null:startTime.toString(),ObjectUtil.isNull(endTime)? null:endTime.toString());
HnTbStRygxRwDTO dto = new HnTbStRygxRwDTO();
dto.setRwid(rwid);
dto.setRwmc(record.getRwmc());
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/HnTbStRygxMapper.xml
......@@ -25,40 +25,23 @@
<select id="getInfoBySfzh" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
select
name,
description,
xm,
sfzh,
type,
img,
bimg,
nl,
xb,
mz,
csrq,
fwcs,
csdgj,
zhpf,
csd,
jg,
zy,
hjdjdz,
xmpy,
rtrim(
case when tzz != '0' then '同住址,' end ||
case when lj != '0' then '邻居,' end ||
case when tjg != '0' then '同机构,' end ||
case when mhtdp != '0' then '民航同订票,' end ||
case when mhthp != '0' then '民航同订票,' end ||
case when tltcc != '0' then '铁路同乘车,' end ||
case when tzj != '0' then '同值机,' end ||
case when tcrj != '0' then '同出入境,' end ||
case when tcwz != '0' then '同车违章,' end ||
case when tary != '0' then '同案人员,' end||
case when hy != '0' then '婚姻,' end ||
case when tzs != '0' then '同住宿,' end ||
case when thh != '0' then '同户号,' end ||
case when zttary != '0' then '在逃同案人员' when zttcx != '0' then '在逃同撤销' end , ',') as value
name,description,xm,sfzh,type,img,bimg,nl,xb,mz,csrq,fwcs,csdgj,zhpf,csd,jg,zy,hjdjdz,xmpy,
trim( TRAILING ',' FROM RTRIM( CONCAT (
case when tzz != '0' then '同住址,' else '' end ,
case when lj != '0' then '邻居,' else '' end ,
case when tjg != '0' then '同机构,' else '' end ,
case when mhtdp != '0' then '民航同订票,' else '' end ,
case when mhthp != '0' then '民航同订票,' else ''end ,
case when tltcc != '0' then '铁路同乘车,' else '' end ,
case when tzj != '0' then '同值机,' else '' end ,
case when tcrj != '0' then '同出入境,' else ''end ,
case when tcwz != '0' then '同车违章,' else ''end ,
case when tary != '0' then '同案人员,' else ''end ,
case when hy != '0' then '婚姻,' else '' end ,
case when tzs != '0' then '同住宿,' else ''end ,
case when thh != '0' then '同户号,' else ''end ,
case when zttary != '0' then '在逃同案人员' when zttcx != '0' then '在逃同撤销' else ''end
))) as value
from hn_tb_st_rygx where rwid = #{taskId} and sfzh = #{sfzh} and name in
<foreach collection="nameList" open="(" close=")" separator="," item="item">
#{item}
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/HnTbStRygxRwMapper.xml
......@@ -5,12 +5,15 @@
<select id="queryTaskChildren" resultType="com.founder.commonutils.model.newPublicEntity.hnkshrwEntity.RygxExcelDTO">
SELECT
EXCEL_NAME,
EXCEL_ID,
EXCEL_CREATE_TIME,
DATA_COUNT
EXCEL_NAME,
EXCEL_ID,
EXCEL_CREATE_TIME,
DATA_COUNT
FROM hn_tb_st_rygx_rw
WHERE PARENT_ID = #{rwid}
WHERE 1=1
<if test="rwid != null and rwid != ''">
and PARENT_ID = #{rwid , jdbcType=VARCHAR}
</if>
ORDER BY EXCEL_CREATE_TIME DESC
</select>
</mapper>
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