Skip to content

A
AmosBankPatrolRoot
Commit 24df0c3d authored by xinglei's avatar xinglei
Browse files
Options

修改bug

parent 41234d0f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 102 deletions
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/bo/patrol/CheckInputBo.java
View file @ 24df0c3d
......@@ -21,6 +21,7 @@ public class CheckInputBo {
private String orgCode;
private String checkDate;
private String planTaskId;
private String beginTime;
/**
* 开始时间字符串
......@@ -235,6 +236,14 @@ public class CheckInputBo {
this.checkDate = checkDate;
}
public String getPlanTaskId() {
return planTaskId;
}
public void setPlanTaskId(String planTaskId) {
this.planTaskId = planTaskId;
}
public String getBeginTime() {
return beginTime;
}
......
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/controller/CheckController.java
View file @ 24df0c3d
package com.yeejoin.amos.patrol.service.business.controller;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
//import com.yeejoin.amos.op.core.common.query.DaoCriteria;
//import com.yeejoin.amos.op.core.common.response.CommonResponse;
//import com.yeejoin.amos.op.core.util.CommonResponseUtil;
import com.yeejoin.amos.patrol.common.core.request.CommonPageable;
import com.yeejoin.amos.patrol.common.core.request.CommonRequest;
import com.yeejoin.amos.patrol.common.core.response.AppPointCheckRespone;
import com.yeejoin.amos.patrol.common.core.response.GraphInitDataResponse;
import com.yeejoin.amos.patrol.common.entity.CheckShot;
import com.yeejoin.amos.patrol.common.entity.CommonResponse;
import com.yeejoin.amos.patrol.common.entity.CommonResponseUtil;
import com.yeejoin.amos.patrol.common.entity.DaoCriteria;
import com.yeejoin.amos.patrol.common.entity.PlanTask;
import com.yeejoin.amos.patrol.common.entity.Point;
import com.yeejoin.amos.patrol.common.enums.ExcelEnum;
import com.yeejoin.amos.patrol.common.entity.*;
import com.yeejoin.amos.patrol.common.enums.PlanTaskFinishStatusEnum;
import com.yeejoin.amos.patrol.service.business.dto.CheckDto;
import com.yeejoin.amos.patrol.service.business.param.CheckImgParam;
import com.yeejoin.amos.patrol.service.business.param.CheckInfoPageParam;
import com.yeejoin.amos.patrol.service.business.param.CheckInputParam;
import com.yeejoin.amos.patrol.service.business.param.CheckRecordParam;
import com.yeejoin.amos.patrol.service.business.param.CheckStatisticalParam;
import com.yeejoin.amos.patrol.service.business.param.*;
import com.yeejoin.amos.patrol.service.business.service.impl.TaskReportServiceImpl;
import com.yeejoin.amos.patrol.service.business.service.intfc.ICheckService;
import com.yeejoin.amos.patrol.service.business.service.intfc.IPlanTaskService;
......@@ -43,61 +28,36 @@ import com.yeejoin.amos.patrol.service.core.util.DateUtil;
import com.yeejoin.amos.patrol.service.framework.ReginParams;
import com.yeejoin.amos.patrol.service.remote.RemoteWebSocketServer;
import com.yeejoin.amos.patrol.service.remote.feign.AmosBankFeign;
//import com.yeejoin.amos.security.common.authorization.Authorization;
//import com.yeejoin.amos.security.common.model.UserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
//import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.util.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.*;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.ContentType;
import org.apache.http.util.EntityUtils;
//import com.yeejoin.amos.op.core.common.query.DaoCriteria;
//import com.yeejoin.amos.op.core.common.response.CommonResponse;
//import com.yeejoin.amos.op.core.util.CommonResponseUtil;
//import com.yeejoin.amos.security.common.authorization.Authorization;
//import com.yeejoin.amos.security.common.model.UserModel;
//import org.apache.commons.httpclient.NameValuePair;
@RestController
@RequestMapping(value = "/api/check")
......
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/service/impl/PlanTaskServiceImpl.java
View file @ 24df0c3d
......@@ -71,6 +71,8 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import static com.yeejoin.amos.patrol.service.constants.XJConstant.*;
@Service("planTaskService")
public class PlanTaskServiceImpl implements IPlanTaskService {
private final Logger log = LoggerFactory.getLogger(PlanTaskServiceImpl.class);
......@@ -556,6 +558,15 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
return new PageImpl<>(content, pageParam, total);
}
content = planTaskMapper.getPlanTasks(params);
content.forEach(
x -> {
List list = new ArrayList();
if (Integer.valueOf(String.valueOf(x.get("finishStatus"))) == 2) {
list = planTaskMapper.getPlanTaskPoints(Long.valueOf(String.valueOf(x.get("planTaskId"))));
}
setColor(x, list);
}
);
if (!CollectionUtils.isEmpty(content)) {
Set<String> userIds = Sets.newHashSet();
content.forEach(e -> {
......@@ -839,4 +850,32 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
}
return date;
}
/**
* 设置显示颜色
*
* @return
*/
public static Map setColor(Map task, List<Map> points) {
Integer finishStatus = Integer.valueOf(String.valueOf(task.get("finishStatus")));
task.put(TASK_FIELD, STATUS_NORMAL);
switch (finishStatus) {
case 0:
task.put(TASK_FIELD, STATUS_NOTSTART);
break;
case 1:
task.put(TASK_FIELD, STATUS_UNDERWAY);
break;
case 2:
List<Map> list = points.stream().filter(x -> !ObjectUtils.isEmpty(x) && "2".equals(x.get("status"))).collect(Collectors.toList());
if (list.size() > 0) {
task.put(TASK_FIELD, STATUS_UNNORMAL);
}
break;
case 3:
task.put(TASK_FIELD, STATUS_OVERTIME);
break;
}
return task;
}
}
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/constants/XJConstant.java
View file @ 24df0c3d
......@@ -410,4 +410,13 @@ public class XJConstant {
public static final String CHECK_COUNT = "checkCount";
public static final String MISSED = "missed";
public static final String FAILD = "faild";
public static final String JOINT = "-";
public static final String TASK_FIELD = "showColor";
public static final String STATUS_NORMAL = "normal"; //正常
public static final String STATUS_UNNORMAL = "unnormal"; //异常
public static final String STATUS_NOTSTART = "notstart"; //未开始
public static final String STATUS_UNDERWAY = "underway"; //进行中
public static final String STATUS_OVERTIME = "overtime"; //超时
}
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/core/util/StringUtil.java
View file @ 24df0c3d
package com.yeejoin.amos.patrol.service.core.util;
import org.springframework.util.Assert;
import java.math.BigDecimal;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.springframework.util.Assert;
import static com.yeejoin.amos.patrol.service.constants.XJConstant.JOINT;
/**
* 字符串工具类
......@@ -155,7 +157,8 @@ public class StringUtil {
}
}
public static String toString(Object str){
return str + "";
public static String setStr(String str1, String str2) {
String str = str1 + JOINT + str2;
return str;
}
}
AmosBankPatrolStart/src/main/resources/db/mapper/dbTemplate_check.xml
View file @ 24df0c3d
......@@ -166,16 +166,19 @@
'%Y-%m-%d %H:%i:%s'
) AS `checkDate`,
pt.id planTaskId,
pt.begin_time beginTime,
date_format(
pt.begin_time,
'%Y-%m-%d %H:%i:%s'
) AS `beginTime`,
ci.id checkInputId,
ci.input_id inputId,
ci.input_value AS InputValue,
(
CASE ci.is_ok
WHEN 1 THEN
'合格'
'正常'
WHEN 2 THEN
'不合格'
'异常'
WHEN 3 THEN
'漏检'
END
......@@ -233,9 +236,9 @@
(
CASE ci.is_ok
WHEN 1 THEN
'合格'
'正常'
WHEN 2 THEN
'不合格'
'异常'
WHEN 3 THEN
'漏检'
END
......@@ -264,7 +267,7 @@
<select id="getCheckInfoGroupCheckDate" resultMap="checkInputResultMap">
SELECT
GROUP_CONCAT(DISTINCT a.begin_Time order by a.begin_Time desc) as beginTimeStr
GROUP_CONCAT(DISTINCT a.begin_Time order by a.begin_Time asc) as beginTimeStr
FROM
p_plan_task_detail b
LEFT JOIN p_plan_task a ON a.id = b.task_no
......@@ -928,6 +931,7 @@
<result property="pointName" column="pointName"/>
<result property="orgCode" column="orgCode"/>
<result property="checkDate" column="checkDate"/>
<result property="planTaskId" column="planTaskId"/>
<result property="beginTime" column="beginTime"/>
<result property="beginTimeStr" column="beginTimeStr"/>
<result property="idStateStr" column="idStateStr"/>
......@@ -1897,9 +1901,9 @@
p_plan_task_detail ptd
LEFT JOIN p_plan_task pnt ON pnt.id = ptd.task_no
LEFT JOIN p_plan p ON p.id = pnt.plan_id
LEFT JOIN p_point pt ON pt.id = ptd.id
LEFT JOIN p_point pt ON pt.id = ptd.point_id
LEFT JOIN p_route r ON r.id = pnt.route_id
LEFT JOIN p_check c ON c.plan_task_id = pnt.id
LEFT JOIN p_check c ON c.plan_task_detail_id = ptd.id
WHERE pnt.org_code LIKE CONCAT(#{orgCode}, '%')
<if test="startTime !=null and startTime!= '' "> <![CDATA[ AND pnt.check_date >= #{startTime} ]]> </if>
<if test="endTime !=null and endTime!='' "><![CDATA[AND pnt.check_date <= #{endTime} ]]></if>
......@@ -1955,7 +1959,7 @@
0
END missed,
CASE
WHEN (pnt.finish_status = 1 or pnt.finish_status = 2) THEN
WHEN pnt.finish_status = 2 THEN
1
ELSE
0
......
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