admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改和代码规范

Browse Source
This commit is contained in:
guoshengxiong 2024-07-08 19:06:04 +08:00
parent a02b582806
commit 8a827ecd50
47 changed files with 1302 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java
View File

@ -155,12 +155,13 @@ public class OperationLogController {
@ApiOperation(value = "导出excel操作日志表信息", notes = "导出excel操作日志表信息", httpMethod = "POST")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(@RequestBody Map<String, Object> map) {
map.put("pageSize", -1);
IPage<OperationLog> p = operationLogService.selectOperationLogPage(map);
List<OperationLog> pageList = p.getRecords();
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
mv.addObject(NormalExcelConstants.FILE_NAME, "宣传视频列表");
mv.addObject(NormalExcelConstants.FILE_NAME, "操作日志列表");
mv.addObject(NormalExcelConstants.CLASS, OperationLog.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("宣传视频列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams());
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}

44
src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java
View File

@ -20,19 +20,61 @@ import java.util.Map;
@Mapper
@DataScope(includeTable = "car_info")
public interface CarInfoMapper extends BaseMapper<CarInfo> {
/**
* 分页列表查询项目下车辆黑白名单
*
* @param page
* @param map
* @return
*/
@DataScope(includeTable = "car_info")
Page<CarInfo> selectCarList(Page<CarInfo> page, @Param("param") Map<String, Object> map);
/**
* 列表查询项目下车辆黑白名单
*
* @param map
* @return
*/
List<CarInfo> selectCarList(@Param("param") Map<String, Object> map);
/**
* 查询项目下各种车辆类型的车辆数、黑名单和白名单数
*
* @param map
* @return
*/
List<Map<String, Object>> selectCarTypeCount(Map<String, Object> map);
/**
* 获取isc的车辆类型
*
* @param carInfo
* @return
*/
String getCarTypeName(CarInfo carInfo);
/**
* 统计项目下各车辆类型情况
*
* @param map
* @return
*/
CountCarModuleTypeVo countCarModuleType(@Param("param") Map<String, Object> map);
/**
* 通过id查询车辆黑白名单管理信息
*
* @param id
* @return
*/
CarInfo queryById(String id);
/**
* 根据车牌号查询车辆信息
*
* @param carNumber
* @return
*/
CarInfo queryByCarNumber(String carNumber);
}

80
src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java
View File

@ -16,33 +16,111 @@ import java.util.Map;
/**
* @Description: 车辆通行记录
* @author： pds
* @date： 2020-09-29
* @date： 2020-09-29
* @version： V1.0
*/
@Mapper
@DataScope(includeTable = "car_info")
public interface CarPassRecordMapper extends BaseMapper<CarPassRecord> {
/**
* 车辆通行记录统计
*
* @param map
* @return
*/
Map<String, Object> getCurrentDayCarPassRecordOutAndInNum(Map<String, Object> map);
/**
* 查询当日出记录
*
* @param map
* @return
*/
List<EntityMap> getCarPassRecordListByType(Map<String, Object> map);
/**
* 统计车辆通行几辆
*
* @param map
* @return
*/
int getTotalCarNumByCameraId(Map<String, Object> map);
/**
* 统计车辆通行几辆
*
* @param map
* @return
*/
int getLsCarNumTotalByCameraId(Map<String, Object> map);
/**
* 24小时进出时间段统计
*
* @param map
* @return
*/
List<TodayOutInNumber> selectCarPassRecordInOutCount(Map<String, Object> map);
/**
* 根据车辆相机统计数据
*
* @param map
* @return
*/
Map<String, Object> selectCarStatistics(Map<String, Object> map);
/**
* 分页列表查询车辆通行记录
*
* @param page
* @param map
* @return
*/
List<EntityMap> selectCarPassPage(Page<EntityMap> page, @Param("param") Map<String, Object> map);
/**
* 分页列表查询车辆通行记录信息
*
* @param page
* @param map
* @return
*/
List<CarPassRecord> selectProjectCarPassPageList(Page<CarPassRecord> page, @Param("param") Map<String, Object> map);
/**
* 查询当日车辆通行记录列表
*
* @param map
* @return
*/
List<CarPassRecord> selectProjectCarPassPageList(@Param("param") Map<String, Object> map);
/**
* 获取最后的车辆进入时间
*
* @param projectSn
* @param carNumber
* @return
*/
String selectCarEnterTime(@Param("projectSn") String projectSn, @Param("carNumber") String carNumber);
/**
* 今日出入车辆数
*
* @param projectSn
* @param isOpen
* @param param
* @return
*/
TodayOutInNumber getTodayOutInNumber(@Param("projectSn") String projectSn, @Param("isOpen") Integer isOpen, @Param("param") HashMap<String, Object> param);
/**
* 查询最新一条车辆通行记录信息
*
* @param map
* @return
*/
CarPassRecord queryNewestCarPassRecord(Map<String, Object> map);
/**

8
src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java
View File

@ -16,6 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
@Mapper
public interface CarTypeMapper extends BaseMapper<CarType> {
List<EntityMap> selectCarTypeToaltByCameraId(Map<String, Object> map);
/**
* 根据相机id获取车辆列表
* @param map
* @return
*/
List<EntityMap> selectCarTypeTotalByCameraId(Map<String, Object> map);
}

4
src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarTypeMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.car.mapper.CarTypeMapper">
<select id="selectCarTypeToaltByCameraId" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
<select id="selectCarTypeTotalByCameraId" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT t1.*,IFNULL(t2.innum,0) innum,IFNULL(t2.outnum,0) outnum
from car_type t1 LEFT JOIN
@ -18,4 +18,4 @@
) t2 ON t1.id=t2.car_type
WHERE t1.project_sn=#{projectSn}
</select>
</mapper>
</mapper>

32
src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java
View File

@ -18,27 +18,27 @@ import java.util.Map;
*/
public interface ICarInfoService extends IService<CarInfo> {
/**
*
*分页列表查询项目下车辆黑白名单
* @param map
* @return
*/
IPage<CarInfo> selectCarListPage(Map<String, Object> map);
/**
*
*列表查询项目下车辆黑白名单
* @param map
* @return
*/
List<CarInfo> selectCarList(Map<String, Object> map);
/**
/**添加车辆黑白名单管理信息
*
* @param carInfo
*/
void addCarInfo(CarInfo carInfo);
/**
*
*删除或更新车辆
* @param project
* @param car
* @param mustUpdate
@ -46,38 +46,38 @@ public interface ICarInfoService extends IService<CarInfo> {
void deleteOrUpdateCar(Project project, CarInfo car, boolean mustUpdate);
/**
*
*编辑车辆黑白名单管理信息
* @param carInfo
*/
void editCarInfo(CarInfo carInfo);
/**
*
*删除车辆数据
* @param projectSn
*/
void deleteProjectCarData(String projectSn);
/**
*
*统计项目下各车辆黑白名单情况
* @param map
* @return
*/
Map<String, Object> selectCarTypeCount(Map<String, Object> map);
/**
/**删除车辆黑白名单管理信息
*
* @param map
*/
void delete(Map<String, Object> map);
/**
*
*统计项目下各车辆类型情况
* @param map
* @return
*/
CountCarModuleTypeVo countCarModuleType(Map<String, Object> map);
/**
/**通过id查询车辆黑白名单管理信息
*
* @param id
* @return
@ -85,41 +85,41 @@ public interface ICarInfoService extends IService<CarInfo> {
CarInfo queryById(String id);
/**
*
*根据车牌号查询车辆信息
* @param carNumber
* @return
*/
CarInfo queryByCarNumber(String carNumber);
/**
*
*添加车辆到海康isc
* @param carInfo
* @param asyncHikvision
*/
void addCarInfoForHikvision(CarInfo carInfo, AsyncHikvision asyncHikvision);
/**
*
*删除车辆到海康isc
* @param carInfo
* @param isSetBlack
*/
void deleteCarInfoForHikvision(CarInfo carInfo, boolean isSetBlack);
/**
/**编辑车辆到海康isc
*
* @param carInfo
* @param old
*/
void editCarInfoForHikvision(CarInfo carInfo, CarInfo old);
/**
/**更新车辆二维码，如果为空
*
* @param param
*/
void updateCarQrCode(Map<String, Object> param);
/**
*
*批量更新车辆信息
* @param param
*/
void editAllCar(Map<String, Object> param);

11
src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.car.entity.CarInfo;
import com.zhgd.xmgl.modules.car.entity.CarPassRecord;
import com.zhgd.xmgl.modules.car.entity.vo.EntryAndExitRecordsTodayVo;
import com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber;
import java.util.List;
@ -19,6 +18,7 @@ import java.util.Map;
*/
public interface ICarPassRecordService extends IService<CarPassRecord> {
/**
* 车辆通行记录统计
*
* @param map
* @return
@ -26,6 +26,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
Map<String, Object> getCarPassRecordStatistics(Map<String, Object> map);
/**
* 接收车辆摄像头传过来的车辆通行记录
*
* @param plateNum
* @param carLogo
@ -40,6 +41,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
Map<String, Object> saveCameraCarPassRecord(String plateNum, String carLogo, String carColor, String parkId, String camId, String vdcType, String picture, String closeupPic);
/**
* 有司机车辆通行需生成人员通行记录，还行核验人员健康码
*
* @param carPassRecord
* @param carInfo
@ -47,6 +49,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
void saveDriverPassData(CarPassRecord carPassRecord, CarInfo carInfo);
/**
* 查询当日车辆通行记录列表
*
* @param map
* @return
@ -54,6 +57,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
List<CarPassRecord> getCarPassRecordList(Map<String, Object> map);
/**
* 24小时进出时间段统计
*
* @param map
* @return
@ -61,6 +65,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
List<TodayOutInNumber> selectCarPassRecordInOutCount(Map<String, Object> map);
/**
* 根据车辆相机统计数据
*
* @param map
* @return
@ -68,6 +73,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
Map<String, Object> selectCarStatistics(Map<String, Object> map);
/**
* 分页列表查询车辆通行记录
*
* @param map
* @return
@ -75,6 +81,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
IPage<EntityMap> selectCarPassPage(Map<String, Object> map);
/**
* 分页列表查询车辆通行记录信息
*
* @param map
* @return
@ -82,6 +89,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
IPage<CarPassRecord> selectProjectCarPassPageList(Map<String, Object> map);
/**
* 今日出入车辆数
*
* @param projectSn
* @param isOpen
@ -90,6 +98,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
TodayOutInNumber getTodayOutInNumber(String projectSn, Integer isOpen);
/**
* 查询最新一条车辆通行记录信息
*
* @param map
* @return

6
src/main/java/com/zhgd/xmgl/modules/car/service/ICarTypeService.java
View File

@ -1,22 +1,24 @@
package com.zhgd.xmgl.modules.car.service;
import com.zhgd.xmgl.modules.car.entity.CarType;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.car.entity.CarType;
/**
* @Description: 车辆类型表
* @author： pds
* @date： 2021-01-11
* @date： 2021-01-11
* @version： V1.0
*/
public interface ICarTypeService extends IService<CarType> {
/**
* 添加车辆类型表信息
*
* @param carType
*/
void addCarType(CarType carType);
/**
* 编辑车辆类型表信息
*
* @param carType
*/

12
src/main/java/com/zhgd/xmgl/modules/car/service/IProjectCarCameraConfigService.java
View File

@ -1,8 +1,8 @@
package com.zhgd.xmgl.modules.car.service;
import com.zhgd.xmgl.modules.car.entity.ProjectCarCameraConfig;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.car.entity.ProjectCarCameraConfig;
import java.util.HashMap;
import java.util.List;
@ -15,6 +15,7 @@ import java.util.List;
*/
public interface IProjectCarCameraConfigService extends IService<ProjectCarCameraConfig> {
/**
* 分页列表查询项目对应的车辆相机设备配置信息
*
* @param param
* @return
@ -22,6 +23,7 @@ public interface IProjectCarCameraConfigService extends IService<ProjectCarCamer
IPage<ProjectCarCameraConfig> queryPageList(HashMap<String, Object> param);
/**
* 列表查询项目对应的车辆相机设备配置信息
*
* @param param
* @return
@ -29,24 +31,28 @@ public interface IProjectCarCameraConfigService extends IService<ProjectCarCamer
List<ProjectCarCameraConfig> queryList(HashMap<String, Object> param);
/**
* 添加项目对应的车辆相机设备配置信息
*
* @param projectCarCameraConfig
*/
void add(ProjectCarCameraConfig projectCarCameraConfig);
/**
* 编辑项目对应的车辆相机设备配置信息
*
* @param projectCarCameraConfig
*/
void edit(ProjectCarCameraConfig projectCarCameraConfig);
/**
* 删除项目对应的车辆相机设备配置信息
*
* @param id
*/
void delete(String id);
/**
* 通过id查询项目对应的车辆相机设备配置信息
*
* @param id
* @return
@ -54,12 +60,14 @@ public interface IProjectCarCameraConfigService extends IService<ProjectCarCamer
ProjectCarCameraConfig queryById(String id);
/**
* 添加项目对应的车辆相机设备配置信息
*
* @param projectCarCameraConfig
*/
void saveProjectCarCameraConfig(ProjectCarCameraConfig projectCarCameraConfig);
/**
* 是否海康配置
*
* @param projectSn
* @return

2
src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarCameraServiceImpl.java
View File

@ -76,7 +76,7 @@ public class CarCameraServiceImpl extends ServiceImpl<CarCameraMapper, CarCamera
int temporarynum=carPassRecordMapper.getLsCarNumTotalByCameraId(map);
totalnum.put("whitenum",whitenum);
totalnum.put("temporarynum",temporarynum);
List<EntityMap> carTypeList=carTypeMapper.selectCarTypeToaltByCameraId(map);
List<EntityMap> carTypeList=carTypeMapper.selectCarTypeTotalByCameraId(map);
data.put("carTypeList",carTypeList);
data.put("totalnum",totalnum);
return data;

42
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java
View File

@ -1,30 +1,48 @@
package com.zhgd.xmgl.modules.dangerous.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord;
import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 现场危大工程
* @author： pds
* @date： 2021-06-28
* @date： 2021-06-28
* @version： V1.0
*/
@Mapper
@DataScope(includeTable = "dangerous_engineering_record")
public interface DangerousEngineeringRecordMapper extends BaseMapper<DangerousEngineeringRecord> {
/**
* 分页列表查询现场危大工程信息
*
* @param page
* @param map
* @return
*/
List<EntityMap> queryDangerousEngineeringPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
List<EntityMap> queryDangerousEngineeringPageList(Page<EntityMap> page, @Param("param")Map<String, Object> map);
/**
* 根据id查询现场危大工程信息
*
* @param map
* @return
*/
EntityMap queryDangerousEngineeringPageList(@Param("param") Map<String, Object> map);
/**
* 统计危大类别情况
*
* @param param
* @return
*/
List<CountSpecialByFinalStatusVo.GroupByType> countDangerEngineerByFinalStatus(Map<String, Object> param);
}

34
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java
View File

@ -1,15 +1,14 @@
package com.zhgd.xmgl.modules.dangerous.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 危大工程-旁站记录
* @author： pds
@ -18,10 +17,29 @@ import org.apache.ibatis.annotations.Param;
*/
@Mapper
public interface DangerousEngineeringSideStationMapper extends BaseMapper<DangerousEngineeringSideStation> {
/**
* 列表查询危大工程-旁站记录信息
*
* @param map
* @return
*/
List<DangerousEngineeringSideStation> selectSideStationList(@Param("param") Map<String, Object> map);
/**
* 分页列表查询危大工程-旁站记录信息
*
* @param map
* @param page
* @return
*/
Page<DangerousEngineeringSideStation> selectSideStationList(@Param("param") Map<String, Object> map, Page page);
/**
* 分页列表查询特种作业的危大工程-旁站记录信息
*
* @param map
* @param page
* @return
*/
Page<DangerousEngineeringSideStation> specialPage(@Param("param") Map<String, Object> map, Page page);
}

26
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringTypeControlContentMapper.java
View File

@ -17,14 +17,38 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
@Mapper
public interface DangerousEngineeringTypeControlContentMapper extends BaseMapper<DangerousEngineeringTypeControlContent> {
/**
* 根据sn查询危大工程类别-管控要点列表
* @param map
* @return
*/
List<DangerousEngineeringTypeControlContent> selectTypeControlContentListBySn(Map<String,Object> map);
/**
* 列表查询危大工程类别-管控要点信息
* @param map
* @return
*/
List<DangerousEngineeringTypeControlContent> selectTypeControlContentList(Map<String,Object> map);
/**
* 列表查询描述下危大工程类别-管控要点信息
* @param map
* @return
*/
List<EntityMap> selectControlContentListByDescribe(Map<String, Object> map);
/**
* 根据ids查询危大工程类别-管控要点列表
* @param param
* @return
*/
List<DangerousEngineeringTypeControlContent> selectUserCheckControlContentList(Map<String, Object> param);
/**
*
* @param describeId
* @return
*/
List<DangerousEngineeringTypeControlContent> selectTypeControlContentListByDescribe(@Param("describeId") Long describeId);
}

14
src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java
View File

@ -19,23 +19,31 @@ import java.util.Map;
*/
public interface IDangerousEngineeringRecordService extends IService<DangerousEngineeringRecord> {
/**
* 分页列表查询现场危大工程信息
*
* @param map
* @return
*/
IPage<EntityMap> queryDangerousEngineeringPageList(Map<String, Object> map);
/**
* 通过id查询现场危大工程信息
*
* @param map
* @return
*/
EntityMap getDangerousEngineeringById(Map<String, Object> map);
/**
* 添加现场危大工程信息
*
* @param dangerousEngineeringRecord
*/
void saveDangerousEngineeringRecord(DangerousEngineeringRecord dangerousEngineeringRecord);
/**
* 通知大屏
*
* @param projectSn
* @param time
* @param isSuperDanger
@ -51,11 +59,15 @@ public interface IDangerousEngineeringRecordService extends IService<DangerousEn
void edit(DangerousEngineeringRecord dangerousEngineeringRecord);
/**
* 结束危大工程
*
* @param paramMap
*/
void endEngineer(Map<String, Object> paramMap);
/**
* 计算危大大屏得分
*
* @param projectSn
* @param time
* @return
@ -70,6 +82,7 @@ public interface IDangerousEngineeringRecordService extends IService<DangerousEn
void finish(Long engineeringId);
/**
* 删除现场危大工程信息
*
* @param map
*/
@ -77,6 +90,7 @@ public interface IDangerousEngineeringRecordService extends IService<DangerousEn
/**
* 统计危大类别情况
*
* @param param
* @return
*/

16
src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringSideStationService.java
View File

@ -15,10 +15,24 @@ import java.util.Map;
* @version： V1.0
*/
public interface IDangerousEngineeringSideStationService extends IService<DangerousEngineeringSideStation> {
/**
* 列表查询危大工程-旁站记录信息
* @param map
* @return
*/
List<DangerousEngineeringSideStation> selectSideStationList(Map<String, Object> map);
/**
* 分页列表查询危大工程-旁站记录信息
* @param map
* @return
*/
Page<DangerousEngineeringSideStation> selectSideStationPage(Map<String, Object> map);
/**
* 分页列表查询特种作业的危大工程-旁站记录信息
* @param map
* @return
*/
Page<DangerousEngineeringSideStation> specialPage(Map<String, Object> map);
}

11
src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringTypeControlContentService.java
View File

@ -13,8 +13,17 @@ import java.util.Map;
* @version： V1.0
*/
public interface IDangerousEngineeringTypeControlContentService extends IService<DangerousEngineeringTypeControlContent> {
/**
* 列表查询危大工程类别-管控要点信息
* @param map
* @return
*/
List<DangerousEngineeringTypeControlContent> selectTypeControlContentList(Map<String, Object> map);
/**
* 列表查询描述下危大工程类别-管控要点信息
* @param map
* @return
*/
List<Map<String,Object>> selectControlContentListByDescribe(Map<String, Object> map);
}

29
src/main/java/com/zhgd/xmgl/modules/edu/mapper/SafeEducationQuestionMapper.java
View File

@ -19,14 +19,41 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
@Mapper
public interface SafeEducationQuestionMapper extends BaseMapper<SafeEducationQuestion> {
/**
* 分页列表查询安全教育-试题课程信息
* @param page
* @param map
* @return
*/
List<EntityMap> selectSafeEducationCoursePage(Page<EntityMap> page, @Param("param")Map<String, Object> map);
/**
* 分页列表查询人员安全教育记录
* @param page
* @param map
* @return
*/
List<EntityMap> selectWorkerEducationPage(Page<EntityMap> page, @Param("param")Map<String, Object> map);
/**
* 课程ID查询安全教育-人员回答试题详情
* @param map
* @return
*/
List<EntityMap> selectSafeEducationQuestionList(Map<String, Object> map);
/**
* 企业分页列表查询安全教育-试题课程信息
* @param page
* @param map
* @return
*/
List<EntityMap> selectCompanyEducationCoursePage(Page<EntityMap> page, @Param("param")Map<String, Object> map);
/**
* 培训记录数据下载
* @param workerSafeEducation
* @return
*/
List<EntityMap> exportExcelWorkerEducation(@Param("param") WorkerSafeEducation workerSafeEducation);
}

13
src/main/java/com/zhgd/xmgl/modules/edu/service/IEducationClassifyService.java
View File

@ -10,10 +10,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @version： V1.0
*/
public interface IEducationClassifyService extends IService<EducationClassify> {
/**
* 添加安全教育-分类信息
* @param educationClassify
*/
void addEducationClassify(EducationClassify educationClassify);
/**
* 编辑安全教育-分类信息
* @param educationClassify
*/
void editEducationClassify(EducationClassify educationClassify);
/**
* 删除安全教育-分类信息
* @param id
*/
void removeEducationClassify(String id);
}

35
src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java
View File

@ -16,18 +16,51 @@ import java.util.Map;
* @version： V1.0
*/
public interface ISafeEducationQuestionService extends IService<SafeEducationQuestion> {
/**
* 添加试题培训课程
* @param workerSafeEducation
*/
void addQuestionCourse(WorkerSafeEducation workerSafeEducation);
/**
* 分页列表查询安全教育-试题课程信息
* @param map
* @return
*/
IPage<EntityMap> selectSafeEducationCoursePage(Map<String, Object> map);
/**
* 课程ID查询安全教育-试题详情
* @param map
* @return
*/
Map<String,Object> selectSafeEducationQuestionInfo(Map<String, Object> map);
/**
* 分页列表查询人员安全教育记录
* @param map
* @return
*/
IPage<EntityMap> selectWorkerEducationPage(Map<String, Object> map);
/**
* 课程ID查询安全教育-人员回答试题详情
* @param map
* @return
*/
Map<String,Object> getPersonSafeEducationQuestionInfo(Map<String, Object> map);
/**
* 企业分页列表查询安全教育-试题课程信息
* @param map
* @return
*/
IPage<EntityMap> selectCompanyEducationCoursePage(Map<String, Object> map);
/**
* 培训记录数据下载
* @param response
* @param workerSafeEducation
*/
void exportExcelWorkerEducation(HttpServletResponse response, WorkerSafeEducation workerSafeEducation);
}

12
src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java
View File

@ -1,19 +1,23 @@
package com.zhgd.xmgl.modules.project.mapper;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.project.entity.ProjectConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zhgd.xmgl.modules.project.entity.ProjectConfig;
import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
/**
* @Description: 项目配置
* @author： pds
* @date： 2020-08-17
* @date： 2020-08-17
* @version： V1.0
*/
@Mapper
public interface ProjectConfigMapper extends BaseMapper<ProjectConfig> {
/**
* 外部调用修改项目状态
*
* @param map
*/
void updateProjectAuditStatus(Map<String, Object> map);
}

7
src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java
View File

@ -20,6 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
@DataScope
public interface ProjectFineRecordMapper extends BaseMapper<ProjectFineRecord> {
/**
* 分页列表查询项目罚款记录
* @param page
* @param map
* @return
*/
List<ProjectFineRecord> selectProjectFineRecordPageList(Page<ProjectFineRecord> page, @Param("param") Map<String, Object> map);
}

9
src/main/java/com/zhgd/xmgl/modules/project/service/IProjectConfigService.java
View File

@ -12,8 +12,15 @@ import java.util.Map;
* @version： V1.0
*/
public interface IProjectConfigService extends IService<ProjectConfig> {
/**
* 编辑项目配置信息
* @param projectConfig
*/
void editProjectConfig(ProjectConfig projectConfig);
/**
* 外部调用修改项目状态
* @param map
*/
void updateProjectAuditStatus(Map<String, Object> map);
}

6
src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java
View File

@ -14,6 +14,10 @@ import java.util.Map;
* @version： V1.0
*/
public interface IProjectFineRecordService extends IService<ProjectFineRecord> {
/**
* 分页列表查询项目罚款记录
* @param map
* @return
*/
IPage<ProjectFineRecord> selectProjectFineRecordPageList(Map<String, Object> map);
}

2
src/main/java/com/zhgd/xmgl/modules/video/controller/VideoCallbackController.java
View File

@ -65,7 +65,7 @@ public class VideoCallbackController {
if (jsonArray != null && jsonArray.size() > 0) {
for (int a = 0; a < jsonArray.size(); a++) {
JSONObject events = jsonArray.getJSONObject(a);
VideoItem item=videoItemService.getVideoItemByserialNumber(events.getString("srcIndex"));
VideoItem item=videoItemService.getVideoItemBySerialNumber(events.getString("srcIndex"));
if(item!=null){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//查询事件类型

3
src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java
View File

@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@ -288,7 +287,7 @@ public class VideoItemController {
})
@PostMapping("/selectAIVideoTypeCountList")
public Result<List<Map<String, Object>>> selectAIVideoTypeCountList(@RequestBody Map<String, Object> map) {
return Result.success(videoItemService.selectAIVideoTypeCountList(map));
return Result.success(videoItemService.selectAiVideoTypeCountList(map));
}
@ApiOperation(value = "向外部接口下发视频列表数据", notes = "向外部接口下发视频列表数据", httpMethod = "POST")

126
src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java
View File

@ -9,7 +9,6 @@ import com.zhgd.xmgl.modules.yunlianwanwu.middle.entity.VideoItemConfigBo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -22,44 +21,163 @@ import java.util.Map;
@Mapper
@DataScope(includeTable = "video_item")
public interface VideoItemMapper extends BaseMapper<VideoItem> {
/**
* 查询指定类型的视频列表
*
* @param map
* @return
*/
List<EntityMap> selectVideoItemListByVideoId(Map<String, Object> map);
/**
* 统计每个项目的设备数量
*
* @return
*/
List<Map<String, Object>> selectAllDevCount();
/**
* 各企业下项目视频统计
*
* @param map
* @return
*/
List<Map<String, Object>> selectCompanyVideoCountStatistics(Map<String, Object> map);
/**
* 各企业下项目视频统计
*
* @param map
* @return
*/
Map<String, Object> selectVideoTypeCountStatistics(Map<String, Object> map);
VideoItem getVideoItemByserialNumber(@Param("serialNumber") String serialNumber);
/**
* 根据视频设备序列号查询设备
*
* @param serialNumber
* @return
*/
VideoItem getVideoItemBySerialNumber(@Param("serialNumber") String serialNumber);
/**
* 查询项目视频列表
*
* @param map
* @return
*/
List<EntityMap> selectProjectVideoList(Map<String, Object> map);
/**
* 查询用户能看的项目视频列表
*
* @param map
* @return
*/
List<EntityMap> selectUserVideoList(Map<String, Object> map);
List<Map<String, Object>> selectAIVideoTypeCountList(Map<String, Object> map);
/**
* 按照摄像头类型查询具有AI功能的摄像头数量
*
* @param map
* @return
*/
List<Map<String, Object>> selectAiVideoTypeCountList(Map<String, Object> map);
/**
* 视频接入情况统计
*
* @param map
* @return
*/
List<Map<String, Object>> selectVideoDevAccessCountList(Map<String, Object> map);
/**
* 根据视频设备监控点编号查询海康视频播放url
*
* @param serialNumber
* @return
*/
EntityMap selectVideoInfoByserialNumber(@Param("serialNumber") String serialNumber);
/**
* 通过项目编号查询项目视频列表
*
* @param map
* @return
*/
List<EntityMap> getVideoSerialNumber(Map<String, Object> map);
/**
* 查询设备列表
*
* @param userItemId
* @param projectSn
* @return
*/
List<EntityMap> selectVideoItemISCPlayConfigList(@Param("userItemId") String userItemId, @Param("projectSn") String projectSn);
/**
* 统计项目视频设备
*
* @param map
* @return
*/
Map<String, Object> selectProjectVideoDevCount(Map<String, Object> map);
/**
* 根据项目sn查询设备列表
*
* @param projectSn
* @return
*/
List<VideoItem> getListByProjectSn(@Param("projectSn") String projectSn);
/**
* 根据nvrId更新设备
*
* @param nvrId
* @param status
* @return
*/
int updateByNvrId(@Param("nvrId") Long nvrId, @Param("status") int status);
/**
* 获取ai摄像头以及最近十次的报警数据
*
* @param projectSn
* @return
*/
List<VideoItem> getAiVideoList(String projectSn);
/**
* 获取所有监控点位
*
* @return
*/
List<VideoItemConfigBo> selectDeviceDetailAndProjectSnList();
/**
* 根据id查询视频设备列表信息
*
* @param id
* @return
*/
VideoItem queryById(String id);
/**
* 统计监控点在线率
*
* @param param
* @return
*/
CountStatusVo countStatus(Map<String, Object> param);
/**
* 监控点运行趋势
*
* @param param
* @return
*/
List<CountStatusVo> countStatusTrend(Map<String, Object> param);
}

4
src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml
View File

@ -156,7 +156,7 @@
WHERE cp.company_sn=#{sn}
</if>
</select>
<select id="getVideoItemByserialNumber" resultType="com.zhgd.xmgl.modules.video.entity.VideoItem">
<select id="getVideoItemBySerialNumber" resultType="com.zhgd.xmgl.modules.video.entity.VideoItem">
SELECT t1.*, t2.project_sn
FROM video_item t1
INNER JOIN project_video_config t2 ON t2.id = t1.video_id
@ -182,7 +182,7 @@
</select>
<select id="selectAIVideoTypeCountList" resultType="java.util.Map">
<select id="selectAiVideoTypeCountList" resultType="java.util.Map">
SELECT t1.device_type deviceType, video_name videoName
FROM video_item t1
INNER JOIN project_video_config t2 ON t2.id = t1.video_id

70
src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java
View File

@ -18,152 +18,212 @@ import java.util.concurrent.ExecutionException;
*/
public interface IVideoItemService extends IService<VideoItem> {
/**
* 添加视频设备列表信息
*
* @param videoItem
*/
void saveVideoItem(VideoItem videoItem);
/**
* 编辑视频设备列表信息
*
* @param videoItem
*/
void updateVideoItem(VideoItem videoItem);
/**
* 删除视频设备列表信息
*
* @param itemId
*/
void deleteVideoItem(String itemId);
/**
* 查询指定类型的视频列表
*
* @param map
* @return
*/
List<EntityMap> selectVideoItemListByType(Map<String, Object> map);
/**
* 根据项目sn查询启用的的视频列表
*
* @param map
* @return
*/
Map<String, Object> selectEnableVideoItemList(Map<String, Object> map);
/**
* 根据itemId视频Id查询视频播放url
*
* @param map
* @return
*/
Map<String, Object> getVideoItemInfo(Map<String, Object> map);
/**
* 海康视频根据itemId控球
*
* @param map
*/
void getHikPtzControl(Map<String, Object> map);
/**
* 修改视频设备地图坐标
*
* @param list
*/
void updateVideoItemCoordinate(List<VideoItem> list);
/**
* 各企业下项目视频统计
*
* @param map
* @return
*/
Map<String, Object> selectVideoItemStatisticsCount(Map<String, Object> map);
/**
* 设置海康视频订阅事件
*
* @param map
*/
void setHikSubscriptionByEvent(Map<String, Object> map);
/**
* 根据视频设备序列号查询设备
*
* @param serialNumber
* @return
*/
VideoItem getVideoItemByserialNumber(String serialNumber);
VideoItem getVideoItemBySerialNumber(String serialNumber);
/**
* 海康视频根据itemId控球
*
* @param map
*/
void setHikPtzControl(Map<String, Object> map);
/**
* 查询海康视频组织区域
*
* @param map
* @return
*/
String getHikVideoRegions(Map<String, Object> map);
/**
* 同步海康视频监控点列表
*
* @param map
*/
void saveHikVideoCamerasInfoList(Map<String, Object> map);
/**
* 查询项目视频列表
*
* @param map
* @return
*/
Map<String, Object> selectProjectVideoList(Map<String, Object> map);
/**
* 查询项目视频tree列表
*
* @param map
* @return
*/
Map<String, Object> selectProjectVideoTreeList(Map<String, Object> map);
/**
* 查询项目下所有视频列表
*
* @param map
* @return
*/
List<EntityMap> selecAllVideoList(Map<String, Object> map);
/**
* 查询用户能看的项目视频列表
*
* @param map
* @return
*/
Map<String, Object> selectUserVideoList(Map<String, Object> map);
/**
* 按照摄像头类型查询具有AI功能的摄像头数量
*
* @param map
* @return
*/
List<Map<String, Object>> selectAIVideoTypeCountList(Map<String, Object> map);
List<Map<String, Object>> selectAiVideoTypeCountList(Map<String, Object> map);
/**
* 根据视频设备监控点编号查询海康视频播放url
*
* @param map
* @return
*/
Map<String, Object> getHikVideoUrl(Map<String, Object> map);
/**
* 保存视频分析结果
*
* @param json
*/
void saveVideoSatae(JSONObject json);
/**
* 统计项目视频设备
*
* @param map
* @return
*/
Map<String, Object> selectProjectVideoDevCount(Map<String, Object> map);
/**
* 查询项目视频设备在线情况
*
* @param map
* @return
*/
Map<String, Object> selectVideoCountList(Map<String, Object> map);
/**
* 根据项目sn查询设备列表
*
* @param projectSn
* @return
*/
List<VideoItem> getListByProjectSn(String projectSn);
/**
* 根据nvrId更新设备
*
* @param id
* @param status
*/
void updateByProjectAndNvrId(Long id, int status);
/**
* 获取ai摄像头以及最近十次的报警数据
*
* @param projectSn
* @return
*/
List<VideoItem> viListAndTenAlarm(String projectSn);
/**
* 根据项目sn查询监控点预览取流URL列表
*
* @param projectSn
* @return
* @throws ExecutionException
* @throws InterruptedException
*/
Map<String, Object> getPlayUrlFromHikvision(String projectSn) throws ExecutionException, InterruptedException;
/**
@ -175,18 +235,24 @@ public interface IVideoItemService extends IService<VideoItem> {
VideoItem queryById(String id);
/**
* 海康获取监控点回放取流URLv2
*
* @param map
* @return
*/
JSONObject callPostPlaybackURLsV2(Map<String, Object> map);
/**
* 统计监控点在线率
*
* @param param
* @return
*/
CountStatusVo countStatus(Map<String, Object> param);
/**
* 监控点运行趋势
*
* @param param
* @return
*/

14
src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.async.AsyncCommon;
import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
import com.zhgd.xmgl.modules.basicdata.entity.DictionariesRecord;
import com.zhgd.xmgl.modules.basicdata.mapper.DictionariesRecordMapper;
import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
@ -21,7 +20,6 @@ import com.zhgd.xmgl.modules.car.entity.CarCamera;
import com.zhgd.xmgl.modules.car.mapper.CarCameraMapper;
import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig;
import com.zhgd.xmgl.modules.project.mapper.ProjectVideoConfigMapper;
import com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd;
import com.zhgd.xmgl.modules.video.entity.VideoItem;
import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
import com.zhgd.xmgl.modules.video.mapper.ProjectVideoHkVqdMapper;
@ -87,10 +85,6 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
@Autowired
private AiAnalyseHardWareAlarmRecordMapper aiAnalyseHardWareAlarmRecordMapper;
public static void main(String[] args) {
String d = "";
}
@Override
public void saveVideoItem(VideoItem videoItem) {
ProjectVideoConfig projectVideoConfig = projectVideoConfigMapper.selectById(videoItem.getVideoId());
@ -509,8 +503,8 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
}
@Override
public List<Map<String, Object>> selectAIVideoTypeCountList(Map<String, Object> map) {
return videoItemMapper.selectAIVideoTypeCountList(map);
public List<Map<String, Object>> selectAiVideoTypeCountList(Map<String, Object> map) {
return videoItemMapper.selectAiVideoTypeCountList(map);
}
@Override
@ -605,8 +599,8 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
}
@Override
public VideoItem getVideoItemByserialNumber(String serialNumber) {
return videoItemMapper.getVideoItemByserialNumber(serialNumber);
public VideoItem getVideoItemBySerialNumber(String serialNumber) {
return videoItemMapper.getVideoItemBySerialNumber(serialNumber);
}
@Override

224
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerAttendanceMapper.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.entity.vo.NumberTimeTableVo;
import com.zhgd.xmgl.modules.worker.entity.WorkerAttendance;
import com.zhgd.xmgl.modules.worker.entity.bo.WorkerAttendanceBo;
@ -21,82 +20,277 @@ import java.util.Map;
/**
* @Description: 人员考勤
* @author： pds
* @date： 2020-09-23
* @date： 2020-09-23
* @version： V1.0
*/
@Mapper
@Repository
@DataScope(includeTable = {"worker_info", "enterprise_info"})
public interface WorkerAttendanceMapper extends BaseMapper<WorkerAttendance> {
/**
* 查询个人具体某一天的考勤情况
*
* @param map
* @return
*/
List<EntityMap> viewDayAttendanceList(Map<String, Object> map);
/**
* 查询某天是否有考勤
*
* @param param
* @return
*/
List<EntityMap> selectOneWorkerAttendance(Map<String, Object> param);
/**
* 分页列表查询人员考勤信息
*
* @param page
* @param map
* @return
*/
List<EntityMap> selectWorkerAttendancePage(Page<EntityMap> page, @Param("param") Map<String, Object> map);
/**
* 列表查询人员考勤信息
*
* @param map
* @return
*/
List<EntityMap> selectWorkerAttendancePage(@Param("param") Map<String, Object> map);
/**
* 列表查询项目下最新人员考勤信息
*
* @param param
* @return
*/
List<EntityMap> selectWorkerAttendanceNewestList(Map<String, Object> param);
Map<String,Object> getWorkerCurrentTotalCount(Map<String, Object> param);
/**
* 统计人员出勤数量
*
* @param param
* @return
*/
Map<String, Object> getWorkerCurrentTotalCount(Map<String, Object> param);
List<Map<String,Object>> getWorkerDayAttendanceTotalCount(Map<String, Object> param);
/**
* 人员管理人员统计
*
* @param param
* @return
*/
List<Map<String, Object>> getWorkerDayAttendanceTotalCount(Map<String, Object> param);
/**
* 人员考勤列表下载
*
* @param map
* @return
*/
List<EntityMap> selectExportExcelWorkerAttendanceList(Map<String, Object> map);
int getProjectAttendancePersonToltal(Map<String, Object> map);
/**
* 统计出勤人员数量
*
* @param map
* @return
*/
int getProjectAttendancePersonTotal(Map<String, Object> map);
/**
* 查询人脸设备通行记录
*
* @param map
* @return
*/
List<EntityMap> selectWorkerAttendanceListByDev(Map<String, Object> map);
/**
* 统计人脸设备进出数量
*
* @param map
* @return
*/
Map<String, Object> selectWorkerAttendanceCountByDev(Map<String, Object> map);
/**
* 统计某人的出勤时间
*
* @param map
* @return
*/
int getWorkerAttendanceCountDay(Map<String, Object> map);
/**
* 昨日出勤统计
*
* @param map
* @return
*/
Map<String, Object> getWorkerYesterdayTotalCount(Map<String, Object> map);
String getWorkerAttendanceMinTime(@Param("workerId")Integer workerId);
/**
* 查询今日最早通行的时间
*
* @param workerId
* @return
*/
String getWorkerAttendanceMinTime(@Param("workerId") Integer workerId);
String getWorkerAttendanceMaxTime(@Param("workerId")Integer workerId);
/**
* 查询今日最晚通行的时间
*
* @param workerId
* @return
*/
String getWorkerAttendanceMaxTime(@Param("workerId") Integer workerId);
List<Map<String,Object>> selectAttendancePersonTotalCount(Map<String, Object> param);
/**
* 统计某日出勤人数统计
*
* @param param
* @return
*/
List<Map<String, Object>> selectAttendancePersonTotalCount(Map<String, Object> param);
List<Map<String,Object>> selectTeamAttendanceTotalCount(Map<String, Object> param);
/**
* 统计班组出勤统计
*
* @param param
* @return
*/
List<Map<String, Object>> selectTeamAttendanceTotalCount(Map<String, Object> param);
List<Map<String,Object>> selectDepartmentAttendanceTotalCount(Map<String, Object> param);
/**
* 统计部门出勤统计
*
* @param param
* @return
*/
List<Map<String, Object>> selectDepartmentAttendanceTotalCount(Map<String, Object> param);
/**
* 查询最新人员出勤记录
*
* @param map
* @return
*/
List<EntityMap> selectWorkNewAttendanceList(Map<String, Object> map);
List<EntityMap> selectWorkerAttendanceListByCarNumber(Map<String, Object> map);
/**
* 查询监理和项目经理本月出勤天数
*
* @param map
* @return
*/
Map<String, Object> selectManagerAttendanceDayCount(Map<String, Object> map);
/**
* 统计设备的进出考勤数量
*
* @param map
* @return
*/
List<Map<String, Object>> selectUfaceDevWorkerAttendanceCount(Map<String, Object> map);
/**
* 统计最近10天每天人员出勤数量
*
* @param map
* @return
*/
List<Map<String, Object>> selectTenDaysWorkerAttendanceCountList(Map<String, Object> map);
/**
* 查询工地区、工作区的进记录
*
* @param map
* @return
*/
List<Map<String, Object>> selectDepartmentEnterpriseAttendanceAnalysisList(Map<String, Object> map);
/**
* 查询项目部的进出统计记录
*
* @param map
* @return
*/
List<Map<String, Object>> selectManageDepartmentEnterpriseAttendanceList(Map<String, Object> map);
/**
* 查询进入记录数
*
* @param map
* @return
*/
List<Map<String, Object>> selectDepartmentEnterpriseAttendanceWorkerInfoList(Map<String, Object> map);
/**
* 统计企业出勤人数
*
* @param map
* @return
*/
List<Map<String, Object>> selectEnterpriseAttendanceWorkerInfoCount(Map<String, Object> map);
/**
* 查询今日出勤人员列表
*
* @param map
* @return
*/
List<EntityMap> selectDayAttendanceWorkerInfoList(Map<String, Object> map);
/**
* 出勤人数统计
*
* @param projectSn
* @return
*/
EntityMap selectTodayAttendanceWorkerCount(@Param("projectSn") String projectSn);
/**
* 分页列表查询通行记录
*
* @param dto
* @param page
* @return
*/
Page<WorkerAttendanceBo> getPassRecord(@Param("q") GetPassRecordDto dto, Page<WorkerAttendanceBo> page);
/**
* 查询一段时间的出勤人数趋势
*
* @param map
* @return
*/
List<NumberTimeTableVo> queryAttendanceTrend(Map<String, Object> map);
/**
* 查询在场人数列表
*
* @param map
* @return
*/
List<WorkerAttendance> queryPresenceList(Map<String, Object> map);
List<TrendOneVo> queryTodayAttendanceTrend(Map<String, Object> map);
/**
* 安全履职分析（列表包含所有企业，其中总包包含分包的数据）
*
* @param paramMap
* @return
*/
List<SafetyPerformanceAnalysisVo> safetyPerformanceAnalysis(@Param("param") Map<String, Object> paramMap);
/**
* 查询总公司每个公司的出勤人数和统计人数
*
* @param map
* @return
*/
List<ProjectCompanyWorkTotal> queryAttendanceOfEachCompanyForMain(@Param("param") Map<String, Object> map);

19
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java
View File

@ -20,14 +20,29 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
@DataScope
public interface WorkerInfoAuditRecordMapper extends BaseMapper<WorkerInfoAuditRecord> {
/**
* 分页列表查询劳务人员-审核表信息
* @param page
* @param map
* @return
*/
@DataScope(includeTable = "worker_info_audit_record")
List<EntityMap> selectWorkerInfoAuditList(Page<EntityMap> page, @Param("param")Map<String, Object> map);
/**
* 列表查询劳务人员-审核表信息
* @param page
* @param map
* @return
*/
@DataScope(includeTable = "worker_info_audit_record")
List<EntityMap> selectWorkerInfoAuditList1(Page<EntityMap> page, @Param("param")Map<String, Object> map);
/**
* 查询某个人员所有相关数据
* @param map
* @return
*/
@DataScope(includeTable = "worker_info_audit_record")
EntityMap viewWorkerInfoDetail(Map<String, Object> map);
}

66
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java
View File

@ -1,38 +1,86 @@
package com.zhgd.xmgl.modules.worker.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.worker.entity.WorkerMonthAttendanceStatistics;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.worker.entity.WorkerMonthAttendanceStatistics;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 统计项目每个员工的考勤情况
* @author： pds
* @date： 2020-09-23
* @date： 2020-09-23
* @version： V1.0
*/
@Mapper
public interface WorkerMonthAttendanceStatisticsMapper extends BaseMapper<WorkerMonthAttendanceStatistics> {
/**
* 分页人员考勤统计列表
*
* @param page
* @param map
* @return
*/
List<EntityMap> selectMonthAttendanceByPage(Page<EntityMap> page, @Param("param") Map<String, Object> map);
/**
* 更新人员考勤统计
*
* @param param
* @return
*/
int updateMonthAttendanceStatistics(Map<String, Object> param);
/**
* 新增人员考勤统计
*
* @param param
* @return
*/
int insertMonthAttendanceStatistics(Map<String, Object> param);
/**
* 查询某月的某人员的考勤情况
*
* @param map
* @return
*/
EntityMap selectWorkerMonthAttendanceTotal(Map<String, Object> map);
/**
* 人员月考勤统计列表下载
*
* @param map
* @return
*/
List<EntityMap> getMonthWorkerAttendanceList(Map<String, Object> map);
/**
* 查询某个月员工考勤情况
*
* @param param
* @return
*/
List<EntityMap> selectProjectMonthAttendanceList(HashMap<String, Object> param);
/**
* 获取项目每个员工的考勤情况
*
* @param projectSn
* @return
*/
List<EntityMap> getListByProjectSn(String projectSn);
/**
* 查询某月的某人员的考勤情况
*
* @param param
* @return
*/
WorkerMonthAttendanceStatistics selectByCondition(Map<String, Object> param);
}

49
src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java
View File

@ -22,23 +22,62 @@ import java.util.Set;
*/
@Mapper
public interface WorkerSafeEducationMapper extends BaseMapper<WorkerSafeEducation> {
/**
* 分页列表查询安全教育记录信息
*
* @param page
* @param map
* @return
*/
List<WorkerSafeEducation> selectWorkerSafeEducationPage(Page<Map<String, Object>> page, @Param("param") Map<String, Object> map);
/**
* 统计当月的安全教育人员数量
*
* @param map
* @return
*/
int getCurrentMonthSafeEducationPersonToltal(Map<String, Object> map);
/**
* 安全教育统计
*
* @param map
* @return
*/
List<WorkerSafeEducationStatisticsVo.EducationCount> getComapnySafeEducationStatistics(Map<String, Object> map);
/**
* 安全教育统计
*
* @param map
* @return
*/
List<WorkerSafeEducationStatisticsVo.EducationCount> getProjectSafeEducationStatistics(Map<String, Object> map);
List<EntityMap> selectWorkerSafeEducationByWorkIdList(Map<String, Object> map);
/**
* 根据人员id查询安全教育信息列表
*
* @param map
* @return
*/
List<EntityMap> selectWorkerSafeEducationByIDCardList(Map<String, Object> map);
/**
* 安全教育人数统计
*
* @param map
* @return
*/
@DataScope(includeTable = "worker_info")
int getProjectSafeEducationPersonToltal(Map<String, Object> map);
int getProjectSafeEducationPersonTotal(Map<String, Object> map);
/**
* 培训记录数据下载
*
* @param workerSafeEducation
* @return
*/
List<EntityMap> exportExcelWorkerEducation(WorkerSafeEducation workerSafeEducation);
/**

35
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml
View File

@ -232,7 +232,7 @@
AND DATE_FORMAT(p.create_time, "%Y-%m") = #{monthTime}
</if>
</select>
<select id="getProjectAttendancePersonToltal" resultType="java.lang.Integer" parameterType="map">
<select id="getProjectAttendancePersonTotal" resultType="java.lang.Integer" parameterType="map">
SELECT COUNT(DISTINCT w1.person_sn)
from worker_info w1
INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn
@ -465,25 +465,6 @@
LIMIT 10
</if>
</select>
<select id="selectWorkerAttendanceListByCarNumber" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*,
IF(a.image_url IS NOT NULL, a.image_url, b.id_card_big_photo_url) image_url,
b.worker_name,
b.id_card,
c.team_name,
d.department_name,
b.field_acquisition_url
from worker_attendance a
LEFT JOIN worker_info b ON a.person_sn = b.person_sn
LEFT JOIN team_info c ON b.team_id = c.id
LEFT JOIN department_info d ON b.department_id = d.id
WHERE a.project_sn = #{projectSn}
and a.car_number = #{carNumber}
and a.create_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
and b.inService_type = 1
order by a.create_time desc
LIMIT 10
</select>
<select id="selectManagerAttendanceDayCount" resultType="java.util.Map">
SELECT IFNULL(SUM((case when dictionary_name = '管理工种-监理' then 1 else 0 end)), 0) supervisorDayNum,
IFNULL(SUM((case when dictionary_name = '理工种-项目经理' then 1 else 0 end)), 0) projectManagerDayNum
@ -815,20 +796,6 @@
AND a.pass_type = 1
</select>
<select id="queryTodayAttendanceTrend" resultType="com.zhgd.xmgl.base.entity.vo.TrendOneVo">
SELECT ifnull(round(sum(if(a.pass_type=1,1,-1)),2),0) y,DATE_FORMAT(a.create_time, '%Y-%m-%d %H:00') x
FROM worker_attendance a
INNER JOIN (
SELECT MAX(create_time) AS create_time,person_sn
FROM worker_attendance
WHERE project_sn = #{projectSn}
and create_time >= CURRENT_DATE
and create_time <![CDATA[<=]]> CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y-%m-%d'), ' 23:59:59')
group by person_sn,DATE_FORMAT(create_time, '%Y-%m-%d %H:00')
) t2 on t2.create_time=a.create_time and t2.person_sn=a.person_sn
WHERE project_sn = #{projectSn}
group by DATE_FORMAT(a.create_time, '%Y-%m-%d %H:00')
</select>
<select id="safetyPerformanceAnalysis"
resultType="com.zhgd.xmgl.modules.worker.entity.vo.SafetyPerformanceAnalysisVo">

10
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerSafeEducationMapper.xml
View File

@ -132,14 +132,6 @@
WHERE t1.project_sn = #{sn}
GROUP BY t1.id
</select>
<select id="selectWorkerSafeEducationByWorkIdList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"
parameterType="map">
SELECT w1.*, w2.is_qualified, w2.score
from worker_safe_education w1
INNER JOIN worker_safe_education_worker w2 ON w1.id = w2.edu_id
WHERE w2.worker_id = #{workerId}
ORDER BY w1.add_time DESC
</select>
<select id="selectWorkerSafeEducationByIDCardList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"
parameterType="map">
SELECT w2.id,
@ -166,7 +158,7 @@
LEFT JOIN worker_safe_education w1 ON w2.edu_id = w1.id
WHERE wk.id = #{workerId}
</select>
<select id="getProjectSafeEducationPersonToltal" resultType="int" parameterType="map">
<select id="getProjectSafeEducationPersonTotal" resultType="int" parameterType="map">
SELECT COUNT(DISTINCT w2.worker_id)
from worker_safe_education w1
INNER JOIN worker_safe_education_worker w2 ON w1.id = w2.edu_id

5
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceRuleService.java
View File

@ -10,6 +10,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @version： V1.0
*/
public interface IWorkerAttendanceRuleService extends IService<WorkerAttendanceRule> {
/**
* 添加考勤规则信息
* @param workerAttendanceRule
*/
void add(WorkerAttendanceRule workerAttendanceRule);
}

185
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
View File

@ -19,68 +19,239 @@ import java.util.Map;
/**
* @Description: 人员考勤
* @author： pds
* @date： 2020-09-23
* @date： 2020-09-23
* @version： V1.0
*/
public interface IWorkerAttendanceService extends IService<WorkerAttendance> {
/**
* 查询个人具体某一天的考勤情况
*
* @param map
* @return
*/
List<EntityMap> viewDayAttendanceList(Map<String, Object> map);
/**
* 考勤补卡
*
* @param map
*/
void reissueAttendanceCard(Map<String, Object> map);
/**
* 宇泛人脸识别回调
*
* @param idCardInfo
* @param showTime
* @param deviceKey
* @param photoUrl
*/
void ufaceYFCallbackUrl(String idCardInfo, String showTime, String deviceKey, String photoUrl);
/**
* 分页列表查询人员考勤信息
*
* @param map
* @return
*/
IPage<EntityMap> selectWorkerAttendancePage(Map<String, Object> map);
/**
* 列表查询人员考勤信息
*
* @param map
* @return
*/
List<WorkerAttendance> selectWorkerAttendanceList(Map<String, Object> map);
/**
* 列表查询项目下最新人员考勤信息
*
* @param param
* @return
*/
List<EntityMap> selectWorkerAttendanceNewestList(Map<String, Object> param);
/**
* 人员管理人员统计
*
* @param param
* @return
*/
List<Map<String, Object>> getWorkerDayAttendanceTotalCount(Map<String, Object> param);
/**
* 芊熠人脸识别回调
*
* @param body
*/
void ufaceQYCallbackUrl(JSONObject body);
/**
* 人员考勤列表下载
*
* @param response
* @param map
*/
void exportExcelWorkerAttendance(HttpServletResponse response, Map<String, Object> map);
/**
* 海清人脸识别回调
*
* @param projectSn
* @param json
*/
void ufaceHQCallbackUrl(String projectSn, String json);
Map<String,Object> selectWorkerAttendanceByDev(Map<String, Object> map);
/**
* 查询人脸设备通行记录
*
* @param map
* @return
*/
Map<String, Object> selectWorkerAttendanceByDev(Map<String, Object> map);
/**
* 佳信捷人脸识别回调
*
* @param map
*/
void ufaceJXJCallbackUrl(Map<String, Object> map);
Map<String,Object> getPersonAttendanceTime(Map<String, Object> map);
/**
* 查询人员最早的进和最晚的出
*
* @param map
* @return
*/
Map<String, Object> getPersonAttendanceTime(Map<String, Object> map);
/**
* @param map
*/
void addPhoneAttendance(Map<String, Object> map);
/**
* 手机打卡
*
* @param projectSn
*/
void deleteProjectAttendanceData(String projectSn);
/**
* 佳信捷新人脸设备识别回调
*
* @param map
*/
void ufaceNewJXJCallbackUrl(Map<String, Object> map);
List<Map<String,Object>> selectAttendancePersonTotalCount(Map<String, Object> map);
/**
* 列表查询某个时间段内每天人员出勤情况
*
* @param map
* @return
*/
List<Map<String, Object>> selectAttendancePersonTotalCount(Map<String, Object> map);
void addAttendanceData(Map<String,Object> map);
/**
* 接收外部考勤数据
*
* @param map
*/
void addAttendanceData(Map<String, Object> map);
Map<String,Object> selectEnterpriseAttendanceCount(Map<String, Object> map);
/**
* 查询企业下各班组部门出勤人数统计
*
* @param map
* @return
*/
Map<String, Object> selectEnterpriseAttendanceCount(Map<String, Object> map);
/**
* 查询最新人员出勤记录
*
* @param map
* @return
*/
List<EntityMap> selectWorkNewAttendanceList(Map<String, Object> map);
/**
* 保存考勤数据
*
* @param map
* @return
*/
Result saveAttendance(Map<String, Object> map);
/**
* 异步保存人员通行数据
*
* @param map
* @return
*/
Map<String, Object> saveExternalPassRecord(Map<String, Object> map);
/**
* 查询近10天考勤统计
*
* @param map
* @return
*/
List<Map<String, Object>> selectTenDaysWorkerAttendanceCountList(Map<String, Object> map);
/**
* 海康考勤回调
*
* @param map
*/
void ufaceHikCallbackUrl(Map<String, Object> map);
/**
* 分页列表查询通行记录
*
* @param dto
* @return
*/
Map<String, Object> getPassRecord(GetPassRecordDto dto);
/**
* 查询今天的出勤人数趋势
*
* @param map
* @return
*/
List<NumberTimeTableVo> queryTodayAttendanceTrend(Map<String, Object> map);
/**
* 查询一段时间的出勤人数趋势
*
* @param map
* @return
*/
List<NumberTimeTableVo> queryAttendanceTrend(Map<String, Object> map);
/**
* 查询每个公司的出勤人数和统计人数
*
* @param map
* @return
*/
AttendanceOfEachCompanyVo queryAttendanceOfEachCompany(Map<String, Object> map);
/**
* 考勤照片上传
*
* @param dto
* @return
*/
String uploadAttendanceByDev(UploadAttendanceByDevDto dto);
/**
* 安全履职分析（列表包含所有企业，其中总包包含分包的数据）
*
* @param paramMap
* @return
*/
SafetyPerformanceAnalysisVo safetyPerformanceAnalysis(Map<String, Object> paramMap);
}

33
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java
View File

@ -16,18 +16,49 @@ import java.util.Map;
* @version： V1.0
*/
public interface IWorkerInfoAuditRecordService extends IService<WorkerInfoAuditRecord> {
/**
* 分页列表查询劳务人员-审核表信息
* @param map
* @return
*/
IPage<EntityMap> selectWorkerInfoAuditList(Map<String, Object> map);
/**
* 列表查询劳务人员-审核表信息
* @param map
* @return
*/
List<EntityMap> getPassList(Map<String, Object> map);
/**
* 添加劳务人员-审核表信息
* @param workerInfoAuditRecord
*/
void saveWorkerInfoAuditRecord(WorkerInfoAuditRecord workerInfoAuditRecord);
/**
* 编辑劳务人员-审核表信息
* @param workerInfoAuditRecord
*/
void editWorkerInfoAuditRecord(WorkerInfoAuditRecord workerInfoAuditRecord);
/**
* 审核通过
* @param map
* @return
*/
String adoptWorkerInfo(Map<String, Object> map);
/**
* 审核驳回
* @param map
*/
void rejectWorkerInfo(Map<String, Object> map);
/**
* 查询某个人员所有相关数据
* @param map
* @return
*/
Map<String, Object> viewWorkerInfoDetail(Map<String, Object> map);
}

55
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerMonthAttendanceStatisticsService.java
View File

@ -18,22 +18,73 @@ import java.util.Map;
* @version： V1.0
*/
public interface IWorkerMonthAttendanceStatisticsService extends IService<WorkerMonthAttendanceStatistics> {
/**
* 分页人员考勤统计列表
*
* @param map
* @return
*/
IPage<EntityMap> selectMonthAttendanceByPage(Map<String, Object> map);
/**
* 统计前一天的考勤状况
*
* @param inputTime
*/
void getMonthAttendanceStatistics(String inputTime);
/**
* 修改人员指定日期的考勤统计
*
* @param info
* @param inputTime
*/
void updatePersonMonthAttendance(WorkerInfo info, String inputTime);
/**
* 查询人员指定月份考勤统计
*
* @param map
* @return
*/
Map<String, Object> selectWorkerMonthAttendanceTotal(Map<String, Object> map);
/**
* 人员月考勤统计列表下载
*
* @param response
* @param map
*/
void exportExcelMonthWorkerAttendanceStatistics(HttpServletResponse response, Map<String, Object> map);
/**
* 重新统计考勤
*
* @param map
*/
void getAfreshMonthAttendanceStatistics(Map<String, Object> map);
/**
* 查询人员指定日期的出勤状况
*
* @param map
* @return
*/
Map<String, Integer> selectWorkerMonthAttendanceType(Map<String, Object> map);
/**
* 查询某个月员工考勤情况
*
* @param param
* @return
*/
List<EntityMap> selectProjectMonthAttendanceList(HashMap<String, Object> param);
/**
* 获取项目每个员工的考勤情况
*
* @param projectSn
* @return
*/
List<EntityMap> getListByProjectSn(String projectSn);
}
}

57
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerSafeEducationService.java
View File

@ -18,25 +18,80 @@ import java.util.Map;
* @version： V1.0
*/
public interface IWorkerSafeEducationService extends IService<WorkerSafeEducation> {
/**
* 分页列表查询安全教育记录信息
*
* @param map
* @return
*/
IPage<Map<String, Object>> selectWorkerSafeEducationPage(Map<String, Object> map);
/**
* 添加安全教育记录信息
*
* @param workerSafeEducation
*/
void saveWorkerSafeEducation(WorkerSafeEducation workerSafeEducation);
/**
* 编辑安全教育信息
*
* @param workerSafeEducation
*/
void editWorkerSafeEducation(WorkerSafeEducation workerSafeEducation);
/**
* 删除安全教育记录信息
*
* @param id
*/
void deleteWorkerSafeEducation(String id);
/**
* 通过id查询安全教育记录信息
*
* @param map
* @return
*/
Map<String, Object> getWorkerSafeEducationInfo(Map<String, Object> map);
/**
* 安全教育统计
*
* @param map
* @return
*/
WorkerSafeEducationStatisticsVo selectWorkerSafeEducationStatistics(Map<String, Object> map);
/**
* 复制总企业安全教育记录
*
* @param map
*/
void copySafeEducation(Map<String, Object> map);
/**
* 分页列表查询回答人员信息
*
* @param map
* @return
*/
IPage<EntityMap> selectAnswerWorkerPage(Map<String, Object> map);
/**
* 培训记录数据下载
*
* @param response
* @param workerSafeEducation
*/
void exportExcelWorkerEducation(HttpServletResponse response, WorkerSafeEducation workerSafeEducation);
/**
* 获取项目下的安全教育类型为入场三级交底的对应20条数据
*
* @param projectSn
* @return
*/
ThreeLevelDataVO getThreeLevelDataByProjectSn(String projectSn);
/**

8
src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerTypeService.java
View File

@ -25,25 +25,25 @@ public interface IWorkerTypeService extends IService<WorkerType> {
void batchDeleteWorkerType(String projectSn);
/**
*
*添加工种信息
* @param workerType
*/
void addWorkerType(WorkerType workerType);
/**
*
*编辑工种信息
* @param workerType
*/
void editWorkerType(WorkerType workerType);
/**
*
*删除工种信息
* @param id
*/
void removeWorkerType(String id);
/**
*
*获取工种
* @param map
* @return
*/

6
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -638,7 +638,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
Map<String, Object> personType = selectWorkerPersonTypeStatistics(map);
List<WorkerTeamDepartmentStatisticsVo> teamList = selectWorkerTeamStatistics(map);
//map.put("sn",MapUtils.getString(map,"projectSn"));
int totalEducationPerson = workerSafeEducationMapper.getProjectSafeEducationPersonToltal(map);
int totalEducationPerson = workerSafeEducationMapper.getProjectSafeEducationPersonTotal(map);
data.put("totalEducationPerson", totalEducationPerson);
data.put("personType", personType);
data.put("teamList", teamList);
@ -655,7 +655,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
personType.put("toaltPerson", toaltPerson);
personType.put("presencePerson", presencePerson);
personType.put("attendancePerson", attendancePerson);
int totalEducationPerson = workerSafeEducationMapper.getProjectSafeEducationPersonToltal(map);
int totalEducationPerson = workerSafeEducationMapper.getProjectSafeEducationPersonTotal(map);
data.put("totalEducationPerson", totalEducationPerson);
data.put("personType", personType);
PersonTypeAndEduStatisticsVo vo = BeanUtil.toBeanIgnoreCase(data, PersonTypeAndEduStatisticsVo.class, true);
@ -984,7 +984,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
WorkerManageStatisticsVo.WorkerCount workercount = workerInfoMapper.getProjectWorkerStatistics(map);
WorkerManageStatisticsVo.PresenceCount presencecount = workerInfoMapper.getWorkerPresenceStatistics(map);
int educationPersonNum = workerSafeEducationMapper.getCurrentMonthSafeEducationPersonToltal(map);
int attendancePersonNum = workerAttendanceMapper.getProjectAttendancePersonToltal(map);
int attendancePersonNum = workerAttendanceMapper.getProjectAttendancePersonTotal(map);
data.put("devcount", devcount);
data.put("workercount", workercount);
data.put("presencecount", presencecount);

5
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java
View File

@ -236,9 +236,10 @@ public class XzTaskProgressController {
@ApiImplicitParam(name = "mppUrl", value = "mpp甘特图文件路径", dataType = "string", dataTypeClass = String.class, required = true, paramType = "form"),
@ApiImplicitParam(name = "projectSn", value = "项目sn", dataType = "string", dataTypeClass = String.class, required = true, paramType = "form"),
@ApiImplicitParam(name = "type", value = "导入方式：1覆盖更新（复制）2根据名称替换更新", dataType = "integer", required = true, paramType = "form"),
@ApiImplicitParam(name = "enterpriseId", value = "承包商id", dataType = "string", required = true, paramType = "form"),
})
public Result importData(@RequestParam(value = "mppFile") MultipartFile mppFile, String projectSn, Integer type) {
Collection<XzTaskProgress> xzTaskProgresses = taskProgressService.importData(mppFile, projectSn, type);
public Result importData(@RequestParam(value = "mppFile") MultipartFile mppFile, String projectSn, Integer type,@RequestParam String enterpriseId) {
Collection<XzTaskProgress> xzTaskProgresses = taskProgressService.importData(mppFile, projectSn, type,enterpriseId);
StringBuilder pName = new StringBuilder();
for (XzTaskProgress xzTaskProgress : xzTaskProgresses) {
pName.append(xzTaskProgress.getTaskName());

6
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
View File

@ -57,9 +57,6 @@
<update id="updateByTaskName" parameterType="com.zhgd.xmgl.modules.xz.entity.XzTaskProgress">
update xz_task_progress
<set>
<if test="id != null">
id = #{id},
</if>
<if test="projectSn != null">
project_sn = #{projectSn,jdbcType=VARCHAR},
</if>
@ -106,6 +103,9 @@
<if test="beginWarning != null">
begin_warning = #{beginWarning,jdbcType=INTEGER},
</if>
<if test="qualityRegionId != null">
quality_region_id = #{qualityRegionId,jdbcType=BIGINT},
</if>
level = #{level,jdbcType=INTEGER}
</set>
where project_sn = #{projectSn}

3
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressService.java
View File

@ -50,9 +50,10 @@ public interface IXzTaskProgressService extends IService<XzTaskProgress> {
* @param mppFile
* @param projectSn
* @param type
* @param enterpriseId
* @return
*/
Collection<XzTaskProgress> importData(MultipartFile mppFile, String projectSn, Integer type);
Collection<XzTaskProgress> importData(MultipartFile mppFile, String projectSn, Integer type, String enterpriseId);
/**
* 导出excel任务进度甘特图

70
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
View File

@ -255,28 +255,32 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
}
@Override
public Collection<XzTaskProgress> importData(MultipartFile mppFile, String projectSn, Integer type) {
LambdaQueryWrapper<XzTaskProgress> queryWrapper = Wrappers.lambdaQuery(XzTaskProgress.class).eq(XzTaskProgress::getProjectSn, projectSn);
public Collection<XzTaskProgress> importData(MultipartFile mppFile, String projectSn, Integer type, String enterpriseId) {
LambdaQueryWrapper<XzTaskProgress> queryWrapper = Wrappers.lambdaQuery(XzTaskProgress.class).eq(XzTaskProgress::getProjectSn, projectSn).eq(XzTaskProgress::getEnterpriseId, enterpriseId);
List<XzTaskProgress> progressTasks = taskProgressMapper.selectList(queryWrapper);
log.info("原progressTasks：{}", JSON.toJSONString(progressTasks));
Long createUserId = SecurityUtils.getUser().getUserId();
Collection<XzTaskProgress> progressTaskList = analysisMpp(mppFile, projectSn, createUserId);
Collection<XzTaskProgress> progressTaskList = analysisMpp(mppFile, projectSn, createUserId, enterpriseId);
log.info("importData的新增数据：{}", progressTaskList);
int deleteAndReplace = 1;
int replace = 2;
List<Long> progressIds = progressTasks.stream().map(XzTaskProgress::getId).collect(Collectors.toList());
if (CollUtil.isEmpty(progressIds)) {
progressIds.add(-100L);
}
if (Objects.equals(type, deleteAndReplace)) {
taskProgressMapper.delete(queryWrapper);
taskProgressContentMapper.delete(Wrappers.lambdaQuery(XzTaskProgressContent.class).eq(XzTaskProgressContent::getProjectSn, projectSn));
taskProgressAlarmMapper.delete(Wrappers.lambdaQuery(XzTaskProgressAlarm.class).eq(XzTaskProgressAlarm::getProjectSn, projectSn));
taskProgressContentMapper.delete(Wrappers.lambdaQuery(XzTaskProgressContent.class).eq(XzTaskProgressContent::getProjectSn, projectSn).in(XzTaskProgressContent::getTaskProgressId, progressIds));
taskProgressAlarmMapper.delete(Wrappers.lambdaQuery(XzTaskProgressAlarm.class).eq(XzTaskProgressAlarm::getProjectSn, projectSn).in(XzTaskProgressAlarm::getTaskProgressId, progressIds));
if (CollUtil.isNotEmpty(progressTaskList)) {
this.saveBatch(progressTaskList);
}
} else if (Objects.equals(type, replace)) {
taskProgressAlarmMapper.delete(Wrappers.lambdaQuery(XzTaskProgressAlarm.class).eq(XzTaskProgressAlarm::getProjectSn, projectSn));
taskProgressAlarmMapper.delete(Wrappers.lambdaQuery(XzTaskProgressAlarm.class).eq(XzTaskProgressAlarm::getProjectSn, projectSn).in(XzTaskProgressAlarm::getTaskProgressId, progressIds));
//新增
Set<String> oldSet = progressTasks.stream().map(taskProgress -> taskProgress.getTaskName()).collect(Collectors.toSet());
Set<String> oldSet = progressTasks.stream().map(XzTaskProgress::getTaskName).collect(Collectors.toSet());
List<XzTaskProgress> insertList = progressTaskList.stream().filter(taskProgress -> !oldSet.contains(taskProgress.getTaskName())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(insertList)) {
this.saveBatch(insertList);
@ -299,13 +303,15 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
* @param mppFile 文件
* @param projectSn 项目sn
* @param createUserId 上传用户
* @param enterpriseId
* @return
*/
private Collection<XzTaskProgress> analysisMpp(MultipartFile mppFile, String projectSn, Long createUserId) {
private Collection<XzTaskProgress> analysisMpp(MultipartFile mppFile, String projectSn, Long createUserId, String enterpriseId) {
List<XzTaskProgress> projectTaskList = new LinkedList<>();
Set<String> userNameSet = new LinkedHashSet<>();
Set<String> regionSet = new LinkedHashSet<>();
Set<String> enterpriseSet = new LinkedHashSet<>();
EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectById(enterpriseId);
try {
// 读取文件
MPPReader mppRead = new MPPReader();
@ -317,9 +323,9 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
throw new RuntimeException("mpp文件数据为空！");
}
structureTaskDataList(projectTaskList, userNameSet, childTasks.get(0).getChildTasks(), 0L, projectSn, createUserId, null, regionSet, enterpriseSet);
if (CollUtil.isEmpty(enterpriseSet)) {
throw new OpenPromptException("未导入数据，未找到对应的承包商");
}
// if (CollUtil.isEmpty(enterpriseSet)) {
// throw new OpenPromptException("未导入数据，未找到对应的承包商");
// }
if (CollUtil.isEmpty(regionSet)) {
throw new OpenPromptException("未导入数据，未找到对应的区域");
}
@ -332,23 +338,25 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
Map<String, QualityRegion> regionMap = regions.stream().collect(Collectors.toMap(QualityRegion::getRegionName, Function.identity(), (qualityRegion, qualityRegion2) -> qualityRegion));
for (XzTaskProgress progress : projectTaskList) {
QualityRegion region = regionMap.get(progress.getQualityRegionName());
if (region == null || region.getEnterpriseInfos() == null || !region.getEnterpriseInfos().stream().map(EnterpriseInfo::getEnterpriseName).collect(Collectors.toSet()).contains(progress.getEnterpriseName())) {
throw new OpenAlertException(progress.getQualityRegionName() + "和" + progress.getEnterpriseName() + "不对应");
if (region == null || region.getEnterpriseInfos() == null || !region.getEnterpriseInfos().stream().map(EnterpriseInfo::getEnterpriseName).collect(Collectors.toSet()).contains(enterpriseInfo.getEnterpriseName())) {
throw new OpenAlertException(progress.getQualityRegionName() + "和" + enterpriseInfo.getEnterpriseName() + "不对应");
}
progress.setQualityRegionId(regionMap.get(progress.getQualityRegionName()).getId());
}
//验证和导入承包商
List<EnterpriseInfo> enterpriseInfos = enterpriseInfoMapper.selectBySnAndNumberOneList(projectSn, enterpriseSet);
if (CollUtil.isEmpty(enterpriseInfos)) {
throw new OpenPromptException("未导入数据，未找到对应的承包商");
}
Map<String, Long> enterpriseMap = enterpriseInfos.stream().collect(Collectors.toMap(EnterpriseInfo::getEnterpriseName, EnterpriseInfo::getId));
// List<EnterpriseInfo> enterpriseInfos = enterpriseInfoMapper.selectBySnAndNumberOneList(projectSn, enterpriseSet);
// if (CollUtil.isEmpty(enterpriseInfos)) {
// throw new OpenPromptException("未导入数据，未找到对应的承包商");
// }
// List<String> notBelongTos = enterpriseInfos.stream().filter(enterpriseInfo -> !enterpriseInfo.getId().equals(Long.valueOf(enterpriseId))).map(EnterpriseInfo::getEnterpriseName).collect(Collectors.toList());
// if (CollUtil.isNotEmpty(notBelongTos)) {
// throw new OpenAlertException("导入的企业和选择的企业不对应，企业名称：" + StrUtil.join(",", notBelongTos));
// }
// Map<String, Long> enterpriseMap = enterpriseInfos.stream().collect(Collectors.toMap(EnterpriseInfo::getEnterpriseName, EnterpriseInfo::getId));
for (XzTaskProgress progressTask : projectTaskList) {
Long l = enterpriseMap.get(progressTask.getEnterpriseName());
if (l != null) {
progressTask.setEnterpriseId(l);
}
// Long l = enterpriseMap.get(progressTask.getEnterpriseName());
progressTask.setEnterpriseId(Long.valueOf(enterpriseId));
}
// 判断是否具有负责人
@ -414,11 +422,17 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
progressTask.setProgressRatio(progressRatio);
// 预计开始时间
progressTask.setStartDate(task.getStart());
if (progressTask.getStartDate() == null) {
throw new OpenAlertException("开始时间不能为空");
}
// 实际开始时间
Date actualStartDate = task.getActualStart();
progressTask.setActualStartDate(actualStartDate);
// 预计完成时间
progressTask.setFinishDate(task.getFinish());
if (progressTask.getFinishDate() == null) {
throw new OpenAlertException("结束时间不能为空");
}
// 实际完成时间
Date actualFinishDate = task.getActualFinish();
progressTask.setActualFinishDate(actualFinishDate);
@ -436,12 +450,12 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
}
progressTask.setQualityRegionName(regionName);
regionSet.add(regionName);
String enterpriseName = task.getText(6);
if (StrUtil.isBlank(enterpriseName)) {
throw new OpenAlertException("承包商不能为空");
}
progressTask.setEnterpriseName(enterpriseName);
enterpriseSet.add(enterpriseName);
// String enterpriseName = task.getText(6);
// if (StrUtil.isBlank(enterpriseName)) {
// throw new OpenAlertException("承包商不能为空");
// }
// progressTask.setEnterpriseName(enterpriseName);
// enterpriseSet.add(enterpriseName);
progressTask.setProjectSn(projectSn).setCreateUserId(createUserId);

BIN
src/main/resources/template/任务进度甘特图上传模板xz.mpp
View File

Binary file not shown.