Skip to content

D
data_management_system
Commit 38753bcf authored by 王琮's avatar 王琮
Browse files
Options

首页统计

parent 284126b6
Hide whitespace changes
Inline Side-by-side
Showing with 263 additions and 32 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YxryController.java
View file @ 38753bcf
......@@ -46,6 +46,16 @@ public class YxryController extends BaseController
@Autowired
private IYxryService yxryService;
/**
* 获取首页数据
*/
@GetMapping(value = "/statistics")
public AjaxResult statistics()
{
return success(yxryService.statistics());
}
/**
* 查询阳性人员列表
*/
......
ruoyi-common/src/main/java/com/ruoyi/common/utils/TimeUtils.java 0 → 100644
View file @ 38753bcf
package com.ruoyi.common.utils;
import java.util.Calendar;
import java.util.Date;
public class TimeUtils {
public static Date getStartTime() {
Calendar todayStart = Calendar.getInstance();
todayStart.set(Calendar.SECOND, 0);
todayStart.set(Calendar.MINUTE, 0);
todayStart.set(Calendar.HOUR_OF_DAY, 0);
todayStart.set(Calendar.MILLISECOND, 0);
return todayStart.getTime();
}
public static Date getEndTime() {
Calendar todayEnd = Calendar.getInstance();
todayEnd.set(Calendar.SECOND, 59);
todayEnd.set(Calendar.MINUTE, 59);
todayEnd.set(Calendar.HOUR_OF_DAY, 23);
todayEnd.set(Calendar.MILLISECOND, 999);
return todayEnd.getTime();
}
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/FcryMapper.java
View file @ 38753bcf
package com.ruoyi.system.mapper;
import java.time.LocalDate;
import java.util.List;
import com.ruoyi.system.domain.Fcry;
import com.ruoyi.system.domain.Gldry;
......@@ -7,15 +8,15 @@ import org.apache.ibatis.annotations.Param;
/**
* 方舱人员Mapper接口
*
*
* @author ruoyi
* @date 2022-11-28
*/
public interface FcryMapper
public interface FcryMapper
{
/**
* 查询方舱人员
*
*
* @param id 方舱人员主键
* @return 方舱人员
*/
......@@ -23,7 +24,7 @@ public interface FcryMapper
/**
* 查询方舱人员列表
*
*
* @param fcry 方舱人员
* @return 方舱人员集合
*/
......@@ -31,7 +32,7 @@ public interface FcryMapper
/**
* 新增方舱人员
*
*
* @param fcry 方舱人员
* @return 结果
*/
......@@ -39,7 +40,7 @@ public interface FcryMapper
/**
* 修改方舱人员
*
*
* @param fcry 方舱人员
* @return 结果
*/
......@@ -47,7 +48,7 @@ public interface FcryMapper
/**
* 删除方舱人员
*
*
* @param id 方舱人员主键
* @return 结果
*/
......@@ -55,7 +56,7 @@ public interface FcryMapper
/**
* 批量删除方舱人员
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
......@@ -68,4 +69,8 @@ public interface FcryMapper
void updateBatchFcry(@Param("list")List<Fcry> updateList);
List<Gldry> selectGldryByCard(@Param("cardNo")String cardNo, @Param("id")Long id);
int selectToday(@Param("date") LocalDate date);
int selectCurrent();
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/FkqkMapper.java
View file @ 38753bcf
package com.ruoyi.system.mapper;
import java.time.LocalDate;
import java.util.List;
import com.ruoyi.system.domain.Fkqk;
import org.apache.ibatis.annotations.Param;
/**
* 小区封控情况Mapper接口
*
*
* @author ruoyi
* @date 2022-11-28
*/
public interface FkqkMapper
public interface FkqkMapper
{
/**
* 查询小区封控情况
*
*
* @param id 小区封控情况主键
* @return 小区封控情况
*/
......@@ -22,7 +23,7 @@ public interface FkqkMapper
/**
* 查询小区封控情况列表
*
*
* @param fkqk 小区封控情况
* @return 小区封控情况集合
*/
......@@ -30,7 +31,7 @@ public interface FkqkMapper
/**
* 新增小区封控情况
*
*
* @param fkqk 小区封控情况
* @return 结果
*/
......@@ -38,7 +39,7 @@ public interface FkqkMapper
/**
* 修改小区封控情况
*
*
* @param fkqk 小区封控情况
* @return 结果
*/
......@@ -46,7 +47,7 @@ public interface FkqkMapper
/**
* 删除小区封控情况
*
*
* @param id 小区封控情况主键
* @return 结果
*/
......@@ -54,7 +55,7 @@ public interface FkqkMapper
/**
* 批量删除小区封控情况
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
......@@ -65,4 +66,24 @@ public interface FkqkMapper
List<String> selectStreet();
List<String> selectArea();
List<String> selectFc();
/**
* 查询小区封控情况列表
*
* @param today 当天日期
* @return 小区封控情况集合
*/
public List<Fkqk> selectFkToday(@Param("today") LocalDate today);
/**
* 查询小区封控情况列表
*
* @return 小区封控情况集合
*/
public List<Fkqk> selectCurrent();
// 根据小区分组
List<Fkqk> selectCumulativeData();
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/GldryMapper.java
View file @ 38753bcf
package com.ruoyi.system.mapper;
import java.time.LocalDate;
import java.util.List;
import com.ruoyi.system.domain.Gldry;
import org.apache.ibatis.annotations.Param;
/**
* 隔离点人员Mapper接口
*
*
* @author ruoyi
* @date 2022-11-28
*/
public interface GldryMapper
public interface GldryMapper
{
/**
* 查询隔离点人员
*
*
* @param id 隔离点人员主键
* @return 隔离点人员
*/
......@@ -22,7 +23,7 @@ public interface GldryMapper
/**
* 查询隔离点人员列表
*
*
* @param gldry 隔离点人员
* @return 隔离点人员集合
*/
......@@ -30,7 +31,7 @@ public interface GldryMapper
/**
* 新增隔离点人员
*
*
* @param gldry 隔离点人员
* @return 结果
*/
......@@ -38,7 +39,7 @@ public interface GldryMapper
/**
* 修改隔离点人员
*
*
* @param gldry 隔离点人员
* @return 结果
*/
......@@ -46,7 +47,7 @@ public interface GldryMapper
/**
* 删除隔离点人员
*
*
* @param id 隔离点人员主键
* @return 结果
*/
......@@ -54,7 +55,7 @@ public interface GldryMapper
/**
* 批量删除隔离点人员
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
......@@ -67,4 +68,8 @@ public interface GldryMapper
* @return
*/
List<Gldry> selectGldryByCard(@Param("cardNo") String cardNo, @Param("id") Long id);
int selectToday(@Param("date") LocalDate date);
int selectCurrent();
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/HscjMapper.java
View file @ 38753bcf
......@@ -62,6 +62,8 @@ public interface HscjMapper
List<Hscj> checkCard(Hscj hscj);
List<Hscj> selectToday(@Param("begin") String begin, @Param("end") String end);
List<Hscj> checkCardBatch(List<Hscj> hscjList);
int insertBatch(@Param("list")List<Hscj> list);
......
ruoyi-system/src/main/java/com/ruoyi/system/mapper/YxryMapper.java
View file @ 38753bcf
......@@ -7,15 +7,15 @@ import org.apache.ibatis.annotations.Param;
/**
* 阳性人员Mapper接口
*
*
* @author ruoyi
* @date 2022-11-28
*/
public interface YxryMapper
public interface YxryMapper
{
/**
* 查询阳性人员
*
*
* @param id 阳性人员主键
* @return 阳性人员
*/
......@@ -23,7 +23,7 @@ public interface YxryMapper
/**
* 查询阳性人员列表
*
*
* @param yxry 阳性人员
* @return 阳性人员集合
*/
......@@ -31,7 +31,7 @@ public interface YxryMapper
/**
* 新增阳性人员
*
*
* @param yxry 阳性人员
* @return 结果
*/
......@@ -39,7 +39,7 @@ public interface YxryMapper
/**
* 修改阳性人员
*
*
* @param yxry 阳性人员
* @return 结果
*/
......@@ -47,7 +47,7 @@ public interface YxryMapper
/**
* 删除阳性人员
*
*
* @param id 阳性人员主键
* @return 结果
*/
......@@ -55,7 +55,7 @@ public interface YxryMapper
/**
* 批量删除阳性人员
*
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
......@@ -66,4 +66,8 @@ public interface YxryMapper
int insertBatchYxry(@Param("list")List<Yxry> list);
int updateBatchYxry(@Param("list")List<Yxry> list);
List<Yxry> statistics(@Param("begin") String begin,@Param("end") String end);
int selectNum();
}
ruoyi-system/src/main/java/com/ruoyi/system/service/IYxryService.java
View file @ 38753bcf
......@@ -67,4 +67,6 @@ public interface IYxryService
void importList(List<Yxry> list, HttpServletResponse response);
Map selectByCard(String card);
Map statistics();
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YxryServiceImpl.java
View file @ 38753bcf
package com.ruoyi.system.service.impl;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -12,9 +15,12 @@ import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.FcryMapper;
import com.ruoyi.system.mapper.FkqkMapper;
import com.ruoyi.system.mapper.GldryMapper;
import com.ruoyi.system.mapper.HscjMapper;
import io.netty.util.internal.ObjectUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.math3.stat.descriptive.summary.Product;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataScope;
......@@ -41,6 +47,12 @@ public class YxryServiceImpl implements IYxryService {
@Autowired
private GldryMapper gldryMapper;
@Autowired
private HscjMapper hscjMapper;
@Autowired
private FkqkMapper fkqkMapper;
/**
* 查询阳性人员
*
......@@ -284,4 +296,69 @@ public class YxryServiceImpl implements IYxryService {
map.put("card", zlqks.isEmpty());
return map;
}
@Override
public Map statistics() {
Map map = new HashMap();
List<Object> todayData = new ArrayList<>();
Map today = new HashMap();
// 查询当天阳性人员数量
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String begin = sdf.format(TimeUtils.getStartTime());
String end = sdf.format(TimeUtils.getEndTime());
List<Yxry> yxryList = yxryMapper.statistics(begin, end);
today.put("positiveNum", yxryList.size());
// 涉及小区数量
today.put("PositiveAreaNum", yxryList.stream().filter(y -> ObjectUtils.isNotEmpty(y.getCommunity()))
.distinct().map(Yxry::getCommunity).collect(Collectors.toList()).size());
// 涉及单元数量
Map<String, List<Yxry>> prodMap = yxryList.stream()
.collect(Collectors.groupingBy(item -> item.getCommunity() + "_" + item.getBuilding() + "_" + item.getUnit()));
today.put("unitBuildingInvolvedNum", prodMap.keySet().size());
// 查询当天采集异常数据(身份证不为空)
List<Hscj> hscjList = hscjMapper.selectToday(begin, end);
today.put("abnormalMixingNum", hscjList.stream().distinct().map(Hscj::getCjgh).collect(Collectors.toList()).size());
today.put("abnormalMixingOfPipesNum", hscjList.stream().distinct().map(Hscj::getCardNo).collect(Collectors.toList()).size());
// 查询封控数据
LocalDate date = LocalDate.now();
List<Fkqk> fkqkList = fkqkMapper.selectFkToday(date);
// 获取真实时间是空的
today.put("cellBlockingControlNum", fkqkList.stream().filter(f -> ObjectUtils.isEmpty(f.getRealTime())).distinct().map(Fkqk::getCommunity).collect(Collectors.toList()).size());
Map<String, List<Fkqk>> fkMap = fkqkList.stream().filter(f -> ObjectUtils.isEmpty(f.getRealTime()))
.collect(Collectors.groupingBy(item -> item.getCommunity() + "_" + item.getFloor() + "_" + item.getUnit()));
today.put("unitSealingControlNum", fkMap.keySet().size());
Map<String, List<Fkqk>> jfMap = fkqkList.stream().filter(f -> ObjectUtils.isNotEmpty(f.getRealTime()))
.collect(Collectors.groupingBy(item -> item.getCommunity() + "_" + item.getFloor() + "_" + item.getUnit()));
today.put("unpackingUnitNum", jfMap.keySet().size());
today.put("transferToShelterNum", fcryMapper.selectToday(date));
today.put("transferToIsolationPointNum", gldryMapper.selectToday(date));
todayData.add(today);
map.put("todayData", todayData);
List<Object> currentData = new ArrayList<>();
Map curr = new HashMap();
curr.put("isolationPointNum", gldryMapper.selectCurrent());
curr.put("sheltersNum", fcryMapper.selectCurrent());
List<Fkqk> fkqks = fkqkMapper.selectCurrent();
curr.put("BlockedControlCellNum", fkqks.stream().distinct().map(Fkqk::getCommunity).collect(Collectors.toList()).size());
Map<String, List<Fkqk>> fk = fkqks.stream()
.collect(Collectors.groupingBy(item -> item.getCommunity() + "_" + item.getFloor() + "_" + item.getUnit()));
curr.put("sealingControlUnitNum", fk.keySet().size());
List<Yxry> yxries = yxryMapper.statistics(null, null);
curr.put("positivePersonnelNum", yxries.size());
currentData.add(curr);
map.put("currentData", currentData);
List<Object> CumulativeData = new ArrayList<>();
Map cum = new HashMap();
cum.put("CumulativePositivePerNum", yxryMapper.selectNum());
List<Fkqk> fks = fkqkMapper.selectCumulativeData();
cum.put("CumulativeSealingControlUnitNum", fks.size());
cum.put("CumulativeBlockedControlCellNum", fks.stream().distinct().map(Fkqk::getCommunity)
.collect(Collectors.toList()).size());
cum.put("CumulativeUnpackingUnitNum", fks.stream().filter(f -> ObjectUtils.isNotEmpty(f.getJfTime()))
.distinct().map(Fkqk::getCommunity)
.collect(Collectors.toList()).size());
CumulativeData.add(cum);
map.put("CumulativeData",CumulativeData);
return map;
}
}
ruoyi-system/src/main/resources/mapper/system/FcryMapper.xml
View file @ 38753bcf
......@@ -142,6 +142,20 @@
where card_no = #{cardNo} and del_flag = '0'
<if test="id != null">and id != #{id}</if>
</select>
<select id="selectToday" resultType="java.lang.Integer">
select count(DISTINCT card_no)
from fcry
where zr_time = #{date}
and del_flag = '0'
and card_no is not null
</select>
<select id="selectCurrent" resultType="java.lang.Integer">
select count(DISTINCT card_no)
from fcry
where zc_time is null
and del_flag = '0'
and card_no is not null
</select>
<insert id="insertFcry" parameterType="Fcry" useGeneratedKeys="true" keyProperty="id">
insert into fcry
......
ruoyi-system/src/main/resources/mapper/system/FkqkMapper.xml
View file @ 38753bcf
......@@ -72,6 +72,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM sys_dict_data
WHERE dict_type = 'shelter_name' AND status = '0'
</select>
<select id="selectFkToday" resultType="com.ruoyi.system.domain.Fkqk">
select community, floor, unit, fk_time, real_time
from fkqk
where del_flag = '0' and (fk_time = #{today}
or real_time = #{today} )
</select>
<select id="selectCurrent" resultType="com.ruoyi.system.domain.Fkqk">
select community, floor, unit, fk_time, real_time
from fkqk
where del_flag = '0'
and real_time is null
</select>
<select id="selectCumulativeData" resultType="com.ruoyi.system.domain.Fkqk">
<include refid="selectFkqkVo"/>
where del_flag = '0'
and community is not null
and floor is not null
and unit is not null
group by community,floor, unit
</select>
<insert id="insertFkqk" parameterType="Fkqk" useGeneratedKeys="true" keyProperty="id">
insert into fkqk
<trim prefix="(" suffix=")" suffixOverrides=",">
......
ruoyi-system/src/main/resources/mapper/system/GldryMapper.xml
View file @ 38753bcf
......@@ -76,6 +76,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where card_no = #{cardNo} and del_flag = '0'
<if test="id != null">and id != #{id}</if>
</select>
<select id="selectToday" resultType="java.lang.Integer">
select count(DISTINCT card_no)
from gldry
where zr_time = #{date}
and del_flag = '0'
and card_no is not null
</select>
<select id="selectCurrent" resultType="java.lang.Integer">
select count(DISTINCT card_no)
from gldry
where zc_time is null
and del_flag = '0'
and card_no is not null
</select>
<insert id="insertGldry" parameterType="Gldry" useGeneratedKeys="true" keyProperty="id">
insert into gldry
......
ruoyi-system/src/main/resources/mapper/system/HscjMapper.xml
View file @ 38753bcf
......@@ -132,6 +132,16 @@
</foreach>
</select>
<select id="selectToday" resultType="com.ruoyi.system.domain.Hscj">
select card_no, cjgh
from hscj
where cj_result = '0'
and del_flag = '0'
and is_hun = '1'
and cj_time BETWEEN #{begin} and #{end}
and card_no is not null
</select>
<insert id="insertHscj" parameterType="Hscj" useGeneratedKeys="true" keyProperty="id">
insert into hscj
......
ruoyi-system/src/main/resources/mapper/system/YxryMapper.xml
View file @ 38753bcf
......@@ -132,6 +132,27 @@
where del_flag = '0' and card_no = #{cardNo}
</select>
<select id="statistics" resultType="com.ruoyi.system.domain.Yxry">
SELECT y.card_no,
y.community,
y.building,
y.unit
FROM yxry y
LEFT JOIN jcglry j ON y.card_no = j.card_no and j.del_flag = '0'
WHERE y.del_flag = '0'
<if test="begin!=null and end!=null">
AND y.sb_date BETWEEN #{begin} and #{end}
</if>
AND y.card_no IS NOT NULL
AND (j.card_no IS NULL OR y.sb_date > j.jc_time)
GROUP BY y.card_no
</select>
<select id="selectNum" resultType="java.lang.Integer">
select count(DISTINCT card_no) from yxry
where del_flag='0'
and card_no is not null
</select>
<insert id="insertYxry" parameterType="Yxry" useGeneratedKeys="true" keyProperty="id">
insert into yxry
<trim prefix="(" suffix=")" suffixOverrides=",">
......
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