Skip to content

M
map-parent
Commit 48478c81 by yangyang
Options

任务调整提交

parent 28e7dd90
Showing with 68 additions and 57 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java
......@@ -92,4 +92,7 @@ public class SkRegionalsResultAll implements Serializable {
@ApiModelProperty(value = "人像id")
private String faceid;
@ApiModelProperty(value = "0非套牌 1套牌")
private String tpFlag;
}
\ No newline at end of file
common/common_utils/src/main/java/com/founder/commonutils/model/vo/param/SkRegionalsTaskParam.java
......@@ -42,5 +42,6 @@ public class SkRegionalsTaskParam {
@ApiModelProperty(value = "任务编号（RW开头）")
private String taskId;
@ApiModelProperty(value = "登录者身份证")
private String fsridentity;
}
common/common_utils/src/main/java/com/founder/commonutils/util/SysUtils.java 0 → 100644
package com.founder.commonutils.util;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 系统工具类
*
* @author admin
* @date 2022/03/01
*/
public class SysUtils {
public static SysUser getReqUser(){
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
SysUser user = (SysUser)request.getAttribute("user");
return user;
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java
......@@ -11,6 +11,7 @@ import com.founder.commonutils.model.vo.param.*;
import com.founder.commonutils.util.ExportExcelUtil;
import com.founder.commonutils.util.KeyUtil;
import com.founder.commonutils.model.newPublicEntity.SkRegionalsTask;
import com.founder.commonutils.util.SysUtils;
import com.founder.servicebase.controller.ExcelControllerInterface;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
......@@ -170,6 +171,7 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
@ApiOperation(value = "以图研判_获取任务列表")
@OperLog(message = "以图研判_获取任务列表", operation = OperationType.QUERY)
public MapRestResult query(@RequestBody SkRegionalsTaskParam skRegionalsDetailParam) {
skRegionalsDetailParam.setFsridentity(SysUtils.getReqUser().getIdentitycard());
// 分页
skRegionalsDetailParam.setPage((skRegionalsDetailParam.getPage() - 1) * skRegionalsDetailParam.getPageSize());
List<SkRegionalsTask> list = skRegionalsTaskService.queryTaskInfoList(skRegionalsDetailParam);
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml
......@@ -19,6 +19,7 @@
r.address as address,
r.count as count,
r.bsobjectvaluetype as bsobjectvaluetype,
r.tpflag as tpFlag,
p.xm as xm,
p.mz as mz,
p.img as img,
......@@ -67,6 +68,7 @@
DATE_FORMAT(r.time,'%Y-%m-%d %H:%i:%S') as time,
r.deviceid as deviceId,
r.bsobjectvaluetype as bsobjectvaluetype,
r.tpflag as tpFlag,
(select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName,
p.xm as xm,
p.mz as mz,
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.founder.publicapi.mapper.mysqlMapper.SkRegionalsTaskMapper">
<!-- 任务查询条件 -->
<sql id = "taskquery_where_sql">
and (taskCaseId != 'test'or taskCaseId IS NULL)
and a.fsridentity = #{fsridentity}
<if test="taskname != null and taskname != ''">
and a.taskName like concat('%', #{taskname , jdbcType=VARCHAR }, '%')
</if>
<if test="tasktypeList!=null">
and a.taskType in
<foreach item="item" index="index" collection="tasktypeList" open="(" separator="," close=" )">
#{item}
</foreach>
</if>
<if test="kssj!= null and kssj!=''">
AND a.fssj <![CDATA[>=]]> DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="jssj!= null and jssj!=''">
AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="state == 1">
AND (a.state = '1' or a.state = '2')
</if>
<if test="state == 2">
AND a.state = '3'
</if>
<if test="state == 3">
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if test="taskId != null and taskId != ''">
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
</sql>
<!--发送任务 保存-->
<insert id="saveRegTask" parameterType="com.founder.commonutils.model.vo.param.RegionalsTaskParams">
INSERT INTO sk_regionals_task (
......@@ -98,34 +130,8 @@
( SELECT count(*) FROM sk_regionals_result t WHERE t.taskId = a.taskId)end AS resultCount
FROM
sk_regionals_task a
WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
<if test="taskname != null and taskname != ''">
and a.taskName like concat('%', #{taskname , jdbcType=VARCHAR }, '%')
</if>
<if test="tasktypeList!=null">
and a.taskType in
<foreach item="item" index="index" collection="tasktypeList" open="(" separator="," close=" )">
#{item}
</foreach>
</if>
<if test="kssj!= null and kssj!=''">
AND a.fssj <![CDATA[>=]]> DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="jssj!= null and jssj!=''">
AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="state == 1">
AND (a.state = '1' or a.state = '2')
</if>
<if test="state == 2">
AND a.state = '3'
</if>
<if test="state == 3">
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if test="taskId != null and taskId != ''">
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
WHERE isDeleted = '0'
<include refid = "taskquery_where_sql" />
ORDER BY
fssj DESC
LIMIT #{page},#{pageSize}
......@@ -136,34 +142,8 @@
count(*)
FROM
sk_regionals_task a
WHERE isDeleted = '0' and (taskCaseId != 'test'or taskCaseId IS NULL)
<if test="taskname != null and taskname != ''">
and a.taskName like concat('%', #{taskname , jdbcType=VARCHAR }, '%')
</if>
<if test="tasktypeList!=null">
and a.taskType in
<foreach item="item" index="index" collection="tasktypeList" open="(" separator="," close=" )">
#{item}
</foreach>
</if>
<if test="kssj!= null and kssj!=''">
AND a.fssj <![CDATA[>=]]> DATE_FORMAT(#{kssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="jssj!= null and jssj!=''">
AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="state == 1">
AND (a.state = '1' or a.state = '2')
</if>
<if test="state == 2">
AND a.state = '3'
</if>
<if test="state == 3">
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if test="taskId != null and taskId != ''">
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
WHERE isDeleted = '0'
<include refid = "taskquery_where_sql" />
</select>
<!--根据任务id查询区域信息-->
<select id="queryRegionalsList" parameterType="String" resultType="com.founder.commonutils.model.vo.param.RegionalsParam">
......
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