Skip to content

A
AmosBankRoot
Commit 5e51d05d authored by tangwei's avatar tangwei
Browse files
Options

点状态确认

parent 692e83aa
Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 273 deletions
AmosBankService/src/main/java/com/yeejoin/amos/bank/controller/InspectionController.java
View file @ 5e51d05d
...@@ -89,9 +89,9 @@ public class InspectionController extends BaseController{ ...@@ -89,9 +89,9 @@ public class InspectionController extends BaseController{
java.util.HashMap<String, Object> map1 =new java.util.HashMap<>(); java.util.HashMap<String, Object> map1 =new java.util.HashMap<>();
if(map!=null){ if(map!=null){
int status= Integer.valueOf(map.get("status").toString()); boolean status= (boolean) map.get("status");
String code= map.get("code").toString(); String code= map.get("code").toString();
if(status==1){ if(status){
map1.put("pointtype", true); map1.put("pointtype", true);
}else{ }else{
map1.put("pointtype",false ); map1.put("pointtype",false );
...@@ -103,6 +103,26 @@ public class InspectionController extends BaseController{ ...@@ -103,6 +103,26 @@ public class InspectionController extends BaseController{
if (code.indexOf(xianyang)!=-1){ if (code.indexOf(xianyang)!=-1){
map1.put("cstype","xianyang" ); map1.put("cstype","xianyang" );
} }
}else{
java.util.HashMap<String, Object> mapp=inspectionService.getporintdate(pointid);
if(mapp!=null){
String code= mapp.get("code").toString();
map1.put("pointtype",false );
if (code.indexOf(xian)!=-1){
map1.put("cstype","xian" );
}else if (code.indexOf(xianyang)!=-1){
map1.put("cstype","xianyang" );
}
}
} }
return CommonResponseUtil.success(map1); return CommonResponseUtil.success(map1);
......
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/InspectionService.java
View file @ 5e51d05d
package com.yeejoin.amos.bank.service; package com.yeejoin.amos.bank.service;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.yeejoin.amos.bank.entity.planTaskReturn; import com.yeejoin.amos.bank.entity.planTaskReturn;
/* /*
* 巡检service * 巡检service
*/ */
public interface InspectionService { public interface InspectionService {
List<HashMap<String, Object>> queryRightTopChart(String companyId); List<HashMap<String, Object>> queryRightTopChart(String companyId);
HashMap<String, Object> queryBottomTableData(); HashMap<String, Object> queryBottomTableData();
Map<String, Object> queryRightTopChartlist(Integer pageIndex, Integer pageSize, String deptId,String deptName); Map<String, Object> queryRightTopChartlist(Integer pageIndex, Integer pageSize, String deptId,String deptName);
HashMap<String, Object> getporint(String pointid); HashMap<String, Object> getporint(String pointid);
} HashMap<String, Object> getporintdate(String pointid);
}
AmosBankService/src/main/java/com/yeejoin/amos/bank/service/impl/InspectionServiceImpl.java
View file @ 5e51d05d
package com.yeejoin.amos.bank.service.impl; package com.yeejoin.amos.bank.service.impl;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.yeejoin.amos.bank.common.enums.PaymentEnum; import com.yeejoin.amos.bank.common.enums.PaymentEnum;
import com.yeejoin.amos.bank.entity.planTaskReturn; import com.yeejoin.amos.bank.entity.planTaskReturn;
import com.yeejoin.amos.bank.entity.pointReturn; import com.yeejoin.amos.bank.entity.pointReturn;
import com.yeejoin.amos.bank.service.InspectionService; import com.yeejoin.amos.bank.service.InspectionService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel; import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.spc.business.dao.mapper.InputItemMapper; import com.yeejoin.amos.spc.business.dao.mapper.InputItemMapper;
import com.yeejoin.amos.spc.business.dao.mapper.StatisticsMapper; import com.yeejoin.amos.spc.business.dao.mapper.StatisticsMapper;
import com.yeejoin.amos.spc.business.remote.RemoteSecurityService; import com.yeejoin.amos.spc.business.remote.RemoteSecurityService;
import com.yeejoin.amos.spc.business.service.impl.SpcSecurityServiceImpl; import com.yeejoin.amos.spc.business.service.impl.SpcSecurityServiceImpl;
import com.yeejoin.amos.spc.core.util.StringUtil; import com.yeejoin.amos.spc.core.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.*; import java.util.*;
@Service @Service
public class InspectionServiceImpl implements InspectionService { public class InspectionServiceImpl implements InspectionService {
@Autowired @Autowired
private StatisticsMapper statisticsMapper; private StatisticsMapper statisticsMapper;
@Autowired @Autowired
private SpcSecurityServiceImpl securityService; private SpcSecurityServiceImpl securityService;
@Autowired @Autowired
private InputItemMapper inputMapper; private InputItemMapper inputMapper;
@Autowired @Autowired
private RemoteSecurityService remoteSecurityService; private RemoteSecurityService remoteSecurityService;
@Override @Override
public List<HashMap<String, Object>> queryRightTopChart(String companyId) { public List<HashMap<String, Object>> queryRightTopChart(String companyId) {
List<DepartmentModel> com=securityService.listDepartmentTree(companyId); List<DepartmentModel> com=securityService.listDepartmentTree(companyId);
// String departmentid=null; // String departmentid=null;
// if(com!=null){ // if(com!=null){
// //
// Map<String, Object> json=(Map<String, Object>) com; // Map<String, Object> json=(Map<String, Object>) com;
// Map<String, Object> department=(Map<String, Object>)json.get("department"); // Map<String, Object> department=(Map<String, Object>)json.get("department");
// departmentid=department.get("sequenceNbr")+""; // departmentid=department.get("sequenceNbr")+"";
// } // }
// //
//// List<DepartmentModel> listDepartments = securityService.listDepartmentTree(companyID); //// List<DepartmentModel> listDepartments = securityService.listDepartmentTree(companyID);
// List<DepartmentModel> listDepartments = securityService.querySubAgencyTree(departmentid); // List<DepartmentModel> listDepartments = securityService.querySubAgencyTree(departmentid);
List<LinkedHashMap> listDepartments =new ArrayList<LinkedHashMap>(); List<LinkedHashMap> listDepartments =new ArrayList<LinkedHashMap>();
if(com!=null&&com.size()>0){ if(com!=null&&com.size()>0){
//获取二级部门 //获取二级部门
com.forEach(e -> { com.forEach(e -> {
List<LinkedHashMap> ch= (List<LinkedHashMap>) e.getChildren(); List<LinkedHashMap> ch= (List<LinkedHashMap>) e.getChildren();
if(ch!=null&&ch.size()>0){ if(ch!=null&&ch.size()>0){
ch.forEach(a -> { ch.forEach(a -> {
listDepartments.add(a); listDepartments.add(a);
}); });
} }
}); });
} }
HashMap<String, Object> depMap = new HashMap<String, Object>(); HashMap<String, Object> depMap = new HashMap<String, Object>();
List<HashMap<String, Object>> list = new ArrayList<HashMap<String, Object>>(); List<HashMap<String, Object>> list = new ArrayList<HashMap<String, Object>>();
//未开始 //未开始
List wks=new ArrayList(); List wks=new ArrayList();
//运行中 //运行中
List yxz=new ArrayList(); List yxz=new ArrayList();
//已结束 //已结束
List yjs=new ArrayList(); List yjs=new ArrayList();
//已超时 //已超时
List ycs=new ArrayList(); List ycs=new ArrayList();
//x //x
List x=new ArrayList(); List x=new ArrayList();
if(listDepartments!=null&&listDepartments.size()>0){ if(listDepartments!=null&&listDepartments.size()>0){
listDepartments.forEach( listDepartments.forEach(
e -> { e -> {
int num=0; int num=0;
HashMap<String, Object> rightTopChartData = statisticsMapper.queryRightTopChartDataByDepId(e.get("orgCode").toString()); HashMap<String, Object> rightTopChartData = statisticsMapper.queryRightTopChartDataByDepId(e.get("orgCode").toString());
if (rightTopChartData == null) { if (rightTopChartData == null) {
wks.add(0); wks.add(0);
yxz.add(0); yxz.add(0);
yjs.add(0); yjs.add(0);
ycs.add(0); ycs.add(0);
}else{ }else{
wks.add(rightTopChartData.get("noStartNum" )); wks.add(rightTopChartData.get("noStartNum" ));
yxz.add( rightTopChartData.get("noPassNum")); yxz.add( rightTopChartData.get("noPassNum"));
yjs.add(rightTopChartData.get("passNum")); yjs.add(rightTopChartData.get("passNum"));
ycs.add(rightTopChartData.get("overTimeNum")); ycs.add(rightTopChartData.get("overTimeNum"));
num=Integer.valueOf(rightTopChartData.get("noStartNum" ).toString())+ num=Integer.valueOf(rightTopChartData.get("noStartNum" ).toString())+
Integer.valueOf(rightTopChartData.get("noPassNum" ).toString())+ Integer.valueOf(rightTopChartData.get("noPassNum" ).toString())+
Integer.valueOf(rightTopChartData.get("passNum" ).toString())+ Integer.valueOf(rightTopChartData.get("passNum" ).toString())+
Integer.valueOf(rightTopChartData.get("overTimeNum" ).toString()); Integer.valueOf(rightTopChartData.get("overTimeNum" ).toString());
} }
x.add(e.get("departmentName")); x.add(e.get("departmentName"));
depMap.put(e.get("departmentName").toString(), e.get("orgCode").toString()); depMap.put(e.get("departmentName").toString(), e.get("orgCode").toString());
depMap.put(e.get("orgCode").toString(), num); depMap.put(e.get("orgCode").toString(), num);
} }
); );
} }
depMap.put("wks", wks); depMap.put("wks", wks);
depMap.put("yxz", yxz); depMap.put("yxz", yxz);
depMap.put("yjs", yjs); depMap.put("yjs", yjs);
depMap.put("ycs", ycs); depMap.put("ycs", ycs);
depMap.put("x", x); depMap.put("x", x);
list.add(depMap); list.add(depMap);
return list; return list;
} }
@Override @Override
public HashMap<String, Object> queryBottomTableData() { public HashMap<String, Object> queryBottomTableData() {
List<String> enumCodesList = PaymentEnum.getEnumCodesList(); List<String> enumCodesList = PaymentEnum.getEnumCodesList();
List<HashMap<String, Object>> list = inputMapper.queryPaymentByCodes(enumCodesList); List<HashMap<String, Object>> list = inputMapper.queryPaymentByCodes(enumCodesList);
List<HashMap<String, Object>> ljlrjy = new ArrayList<>(); List<HashMap<String, Object>> ljlrjy = new ArrayList<>();
List<HashMap<String, Object>> ljlcjy = new ArrayList<>(); List<HashMap<String, Object>> ljlcjy = new ArrayList<>();
List<HashMap<String, Object>> ljlrjyje = new ArrayList<>(); List<HashMap<String, Object>> ljlrjyje = new ArrayList<>();
List<HashMap<String, Object>> ljlcjyje = new ArrayList<>(); List<HashMap<String, Object>> ljlcjyje = new ArrayList<>();
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
for (HashMap<String, Object> m : list) { for (HashMap<String, Object> m : list) {
String itemNo = (String) m.get("item_no"); String itemNo = (String) m.get("item_no");
if (PaymentEnum.流入笔数.getCode().equals(itemNo)) { if (PaymentEnum.流入笔数.getCode().equals(itemNo)) {
ljlrjy.add(m); ljlrjy.add(m);
} else if (PaymentEnum.流出笔数.getCode().equals(itemNo)) { } else if (PaymentEnum.流出笔数.getCode().equals(itemNo)) {
ljlcjy.add(m); ljlcjy.add(m);
} else if (PaymentEnum.流入金额.getCode().equals(itemNo)) { } else if (PaymentEnum.流入金额.getCode().equals(itemNo)) {
Double score = StringUtil.getNumToDouble(m.get("score").toString()); Double score = StringUtil.getNumToDouble(m.get("score").toString());
m.put("score", score); m.put("score", score);
ljlrjyje.add(m); ljlrjyje.add(m);
} else { } else {
Double score = StringUtil.getNumToDouble(m.get("score").toString()); Double score = StringUtil.getNumToDouble(m.get("score").toString());
m.put("score", score); m.put("score", score);
ljlcjyje.add(m); ljlcjyje.add(m);
} }
} }
} }
HashMap<String, Object> data = new HashMap<>(); HashMap<String, Object> data = new HashMap<>();
data.put(PaymentEnum.流入笔数.getCode(), ljlrjy); data.put(PaymentEnum.流入笔数.getCode(), ljlrjy);
data.put(PaymentEnum.流出笔数.getCode(), ljlcjy); data.put(PaymentEnum.流出笔数.getCode(), ljlcjy);
data.put(PaymentEnum.流入金额.getCode(), ljlrjyje); data.put(PaymentEnum.流入金额.getCode(), ljlrjyje);
data.put(PaymentEnum.流出金额.getCode(), ljlcjyje); data.put(PaymentEnum.流出金额.getCode(), ljlcjyje);
return data; return data;
} }
@Override @Override
public Map<String, Object> queryRightTopChartlist(Integer pageIndex, Integer pageSize, String deptId, String deptName) { public Map<String, Object> queryRightTopChartlist(Integer pageIndex, Integer pageSize, String deptId, String deptName) {
List<planTaskReturn> list = statisticsMapper.planTaskReturnliat(pageIndex, pageSize, deptId); List<planTaskReturn> list = statisticsMapper.planTaskReturnliat(pageIndex, pageSize, deptId);
List<planTaskReturn> listnum = statisticsMapper.planTaskReturnliat(null, null, deptId); List<planTaskReturn> listnum = statisticsMapper.planTaskReturnliat(null, null, deptId);
int num = 0; int num = 0;
if (listnum != null) { if (listnum != null) {
num = listnum.size(); num = listnum.size();
} }
Map<String, Object> map2 = new HashMap<>(); Map<String, Object> map2 = new HashMap<>();
Set<String> userIds = Sets.newHashSet(); Set<String> userIds = Sets.newHashSet();
Map<String, AgencyUserModel> AgencyUserModelMap = null; Map<String, AgencyUserModel> AgencyUserModelMap = null;
list.forEach(m -> { list.forEach(m -> {
if (m.getUserId() != null) { if (m.getUserId() != null) {
String[] staffs = m.getUserId().split(","); String[] staffs = m.getUserId().split(",");
List staffsList = Arrays.asList(staffs); List staffsList = Arrays.asList(staffs);
userIds.addAll(staffsList); userIds.addAll(staffsList);
} }
}); });
if (userIds.size() > 0) { if (userIds.size() > 0) {
List<AgencyUserModel> AgencyUserModels = remoteSecurityService.listUserByUserIds(Joiner.on(",").join(userIds)); List<AgencyUserModel> AgencyUserModels = remoteSecurityService.listUserByUserIds(Joiner.on(",").join(userIds));
AgencyUserModelMap = Maps.uniqueIndex(AgencyUserModels, AgencyUserModel::getUserId); AgencyUserModelMap = Maps.uniqueIndex(AgencyUserModels, AgencyUserModel::getUserId);
} }
for (planTaskReturn map : list) { for (planTaskReturn map : list) {
if (AgencyUserModelMap != null) { if (AgencyUserModelMap != null) {
String[] staffs = map.getUserId().split(","); String[] staffs = map.getUserId().split(",");
String nameu = ""; String nameu = "";
if (staffs != null) { if (staffs != null) {
for (int i = 0; i < staffs.length; i++) { for (int i = 0; i < staffs.length; i++) {
AgencyUserModel AgencyUserModel = AgencyUserModelMap.get(staffs[i]); AgencyUserModel AgencyUserModel = AgencyUserModelMap.get(staffs[i]);
if (!ObjectUtils.isEmpty(AgencyUserModel)){ if (!ObjectUtils.isEmpty(AgencyUserModel)){
if (i == 0) { if (i == 0) {
nameu = nameu + AgencyUserModel.getRealName(); nameu = nameu + AgencyUserModel.getRealName();
} else { } else {
nameu = nameu + "," + AgencyUserModel.getRealName(); nameu = nameu + "," + AgencyUserModel.getRealName();
} }
} }
} }
} }
map.setUserId(nameu); map.setUserId(nameu);
map.setDeptName(deptName); map.setDeptName(deptName);
} }
//查询点状态 //查询点状态
String planTaskId = map.getPlanTaskId(); String planTaskId = map.getPlanTaskId();
List<pointReturn> listd = statisticsMapper.pointReturnlist(planTaskId); List<pointReturn> listd = statisticsMapper.pointReturnlist(planTaskId);
map.setPointReturn(listd); map.setPointReturn(listd);
} }
map2.put("date", list); map2.put("date", list);
map2.put("num", num); map2.put("num", num);
return map2; return map2;
} }
@Override @Override
public HashMap<String, Object> getporint(String pointid) { public HashMap<String, Object> getporint(String pointid) {
HashMap<String, Object> listd = statisticsMapper.getporint(pointid); HashMap<String, Object> listd = statisticsMapper.getporint(pointid);
return listd; return listd;
} }
}
@Override
public HashMap<String, Object> getporintdate(String pointid) {
HashMap<String, Object> listd = statisticsMapper.getporintdate(pointid);
return listd;
}
}
AmosBankService/src/main/java/com/yeejoin/amos/spc/business/dao/mapper/StatisticsMapper.java
View file @ 5e51d05d
package com.yeejoin.amos.spc.business.dao.mapper; package com.yeejoin.amos.spc.business.dao.mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.yeejoin.amos.bank.entity.planTaskReturn; import com.yeejoin.amos.bank.entity.planTaskReturn;
import com.yeejoin.amos.bank.entity.pointReturn; import com.yeejoin.amos.bank.entity.pointReturn;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public interface StatisticsMapper { public interface StatisticsMapper {
Map<String, Object> queryForRiseUp(@Param("startTime") String startTime, @Param("endTime") String endTime); Map<String, Object> queryForRiseUp(@Param("startTime") String startTime, @Param("endTime") String endTime);
List<Map<String, Object>> riskSourceBroupByDepartment(); List<Map<String, Object>> riskSourceBroupByDepartment();
List<Map<String, Object>> latentDangerBroupByDepartment(); List<Map<String, Object>> latentDangerBroupByDepartment();
List<Map<String, Object>> latentDangerRateGroupByDepartment(); List<Map<String, Object>> latentDangerRateGroupByDepartment();
List<Map<String, Object>> listPatrolPlan(@Param("offset") Integer offset, @Param("limit") Integer limit, @Param("deptId") String deptId); List<Map<String, Object>> listPatrolPlan(@Param("offset") Integer offset, @Param("limit") Integer limit, @Param("deptId") String deptId);
Long countPatrolPlan(@Param("deptId") String deptId); Long countPatrolPlan(@Param("deptId") String deptId);
List<Map<String, Object>> listByTaskNo(List<Long> taskNos); List<Map<String, Object>> listByTaskNo(List<Long> taskNos);
HashMap<String, Object> getporint(@Param("pointid")String pointid); HashMap<String, Object> getporint(@Param("pointid")String pointid);
HashMap<String, Object> queryRightTopChartDataByDepId(@Param("deptId")String deptId); HashMap<String, Object> queryRightTopChartDataByDepId(@Param("deptId")String deptId);
HashMap<String, Object> getporintdate(@Param("pointid")String pointid);
List<pointReturn> pointReturnlist(@Param("planTaskId")String planTaskId);
List<planTaskReturn> planTaskReturnliat(@Param("offset") Integer offset, @Param("limit") Integer limit,@Param("deptId")String deptId); List<pointReturn> pointReturnlist(@Param("planTaskId")String planTaskId);
} List<planTaskReturn> planTaskReturnliat(@Param("offset") Integer offset, @Param("limit") Integer limit,@Param("deptId")String deptId);
}
AmosBankStart/src/main/resources/db/mapper/dbTemplate_risk_statistics.xml
View file @ 5e51d05d
...@@ -313,11 +313,22 @@ ...@@ -313,11 +313,22 @@
<select id="getporint" resultType="java.util.Map"> <select id="getporint" resultType="java.util.Map">
SELECT SELECT
p_alarm_point.`code` code , p_alarm_point.`code` code ,
p_alarm_point.is_alarm status p_alarm_point.is_alarm status
from p_alarm_point where p_alarm_point.point_type=3 and p_alarm_point.is_alarm=1 and p_alarm_point.point_id=#{pointid} from p_alarm_point where p_alarm_point.point_type=3 and p_alarm_point.is_alarm=1 and p_alarm_point.point_id=#{pointid}
</select> </select>
<select id="getporintdate" resultType="java.util.Map">
SELECT
p_point.org_code code
from p_point WHERE p_point.id=#{pointid}
</select>
</mapper> </mapper>
\ 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