diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java index c184bfb74..01b2535b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java @@ -155,12 +155,13 @@ public class OperationLogController { @ApiOperation(value = "导出excel操作日志表信息", notes = "导出excel操作日志表信息", httpMethod = "POST") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(@RequestBody Map map) { + map.put("pageSize", -1); IPage p = operationLogService.selectOperationLogPage(map); List 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; } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java index c0963b207..68bc97b51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarInfoMapper.java @@ -20,19 +20,61 @@ import java.util.Map; @Mapper @DataScope(includeTable = "car_info") public interface CarInfoMapper extends BaseMapper { - + /** + * 分页列表查询项目下车辆黑白名单 + * + * @param page + * @param map + * @return + */ @DataScope(includeTable = "car_info") Page selectCarList(Page page, @Param("param") Map map); + /** + * 列表查询项目下车辆黑白名单 + * + * @param map + * @return + */ List selectCarList(@Param("param") Map map); + /** + * 查询项目下各种车辆类型的车辆数、黑名单和白名单数 + * + * @param map + * @return + */ List> selectCarTypeCount(Map map); + /** + * 获取isc的车辆类型 + * + * @param carInfo + * @return + */ String getCarTypeName(CarInfo carInfo); + /** + * 统计项目下各车辆类型情况 + * + * @param map + * @return + */ CountCarModuleTypeVo countCarModuleType(@Param("param") Map map); + /** + * 通过id查询车辆黑白名单管理信息 + * + * @param id + * @return + */ CarInfo queryById(String id); + /** + * 根据车牌号查询车辆信息 + * + * @param carNumber + * @return + */ CarInfo queryByCarNumber(String carNumber); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java index c65cc688c..dc24e935d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java @@ -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 { + /** + * 车辆通行记录统计 + * + * @param map + * @return + */ Map getCurrentDayCarPassRecordOutAndInNum(Map map); + /** + * 查询当日出记录 + * + * @param map + * @return + */ List getCarPassRecordListByType(Map map); + /** + * 统计车辆通行几辆 + * + * @param map + * @return + */ int getTotalCarNumByCameraId(Map map); + /** + * 统计车辆通行几辆 + * + * @param map + * @return + */ int getLsCarNumTotalByCameraId(Map map); + /** + * 24小时进出时间段统计 + * + * @param map + * @return + */ List selectCarPassRecordInOutCount(Map map); + /** + * 根据车辆相机统计数据 + * + * @param map + * @return + */ Map selectCarStatistics(Map map); + /** + * 分页列表查询车辆通行记录 + * + * @param page + * @param map + * @return + */ List selectCarPassPage(Page page, @Param("param") Map map); + /** + * 分页列表查询车辆通行记录信息 + * + * @param page + * @param map + * @return + */ List selectProjectCarPassPageList(Page page, @Param("param") Map map); + + /** + * 查询当日车辆通行记录列表 + * + * @param map + * @return + */ List selectProjectCarPassPageList(@Param("param") Map 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 param); + /** + * 查询最新一条车辆通行记录信息 + * + * @param map + * @return + */ CarPassRecord queryNewestCarPassRecord(Map map); /** diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java index b66d75a15..37a8ba618 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarTypeMapper.java @@ -16,6 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ @Mapper public interface CarTypeMapper extends BaseMapper { - - List selectCarTypeToaltByCameraId(Map map); + /** + * 根据相机id获取车辆列表 + * @param map + * @return + */ + List selectCarTypeTotalByCameraId(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarTypeMapper.xml index 7dc0a51cc..e927faacc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarTypeMapper.xml @@ -2,7 +2,7 @@ - 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} - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java index 4489d12a0..c0e477b98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarInfoService.java @@ -18,27 +18,27 @@ import java.util.Map; */ public interface ICarInfoService extends IService { /** - * + *分页列表查询项目下车辆黑白名单 * @param map * @return */ IPage selectCarListPage(Map map); /** - * + *列表查询项目下车辆黑白名单 * @param map * @return */ List selectCarList(Map map); - /** + /**添加车辆黑白名单管理信息 * * @param carInfo */ void addCarInfo(CarInfo carInfo); /** - * + *删除或更新车辆 * @param project * @param car * @param mustUpdate @@ -46,38 +46,38 @@ public interface ICarInfoService extends IService { void deleteOrUpdateCar(Project project, CarInfo car, boolean mustUpdate); /** - * + *编辑车辆黑白名单管理信息 * @param carInfo */ void editCarInfo(CarInfo carInfo); /** - * + *删除车辆数据 * @param projectSn */ void deleteProjectCarData(String projectSn); /** - * + *统计项目下各车辆黑白名单情况 * @param map * @return */ Map selectCarTypeCount(Map map); - /** + /**删除车辆黑白名单管理信息 * * @param map */ void delete(Map map); /** - * + *统计项目下各车辆类型情况 * @param map * @return */ CountCarModuleTypeVo countCarModuleType(Map map); - /** + /**通过id查询车辆黑白名单管理信息 * * @param id * @return @@ -85,41 +85,41 @@ public interface ICarInfoService extends IService { 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 param); /** - * + *批量更新车辆信息 * @param param */ void editAllCar(Map param); diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java index cfc4faef0..b11baf2b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java @@ -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 { /** + * 车辆通行记录统计 * * @param map * @return @@ -26,6 +26,7 @@ public interface ICarPassRecordService extends IService { Map getCarPassRecordStatistics(Map map); /** + * 接收车辆摄像头传过来的车辆通行记录 * * @param plateNum * @param carLogo @@ -40,6 +41,7 @@ public interface ICarPassRecordService extends IService { Map 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 { void saveDriverPassData(CarPassRecord carPassRecord, CarInfo carInfo); /** + * 查询当日车辆通行记录列表 * * @param map * @return @@ -54,6 +57,7 @@ public interface ICarPassRecordService extends IService { List getCarPassRecordList(Map map); /** + * 24小时进出时间段统计 * * @param map * @return @@ -61,6 +65,7 @@ public interface ICarPassRecordService extends IService { List selectCarPassRecordInOutCount(Map map); /** + * 根据车辆相机统计数据 * * @param map * @return @@ -68,6 +73,7 @@ public interface ICarPassRecordService extends IService { Map selectCarStatistics(Map map); /** + * 分页列表查询车辆通行记录 * * @param map * @return @@ -75,6 +81,7 @@ public interface ICarPassRecordService extends IService { IPage selectCarPassPage(Map map); /** + * 分页列表查询车辆通行记录信息 * * @param map * @return @@ -82,6 +89,7 @@ public interface ICarPassRecordService extends IService { IPage selectProjectCarPassPageList(Map map); /** + * 今日出入车辆数 * * @param projectSn * @param isOpen @@ -90,6 +98,7 @@ public interface ICarPassRecordService extends IService { TodayOutInNumber getTodayOutInNumber(String projectSn, Integer isOpen); /** + * 查询最新一条车辆通行记录信息 * * @param map * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarTypeService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarTypeService.java index 5418dc937..38d648fd5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarTypeService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarTypeService.java @@ -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 { /** + * 添加车辆类型表信息 * * @param carType */ void addCarType(CarType carType); /** + * 编辑车辆类型表信息 * * @param carType */ diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/IProjectCarCameraConfigService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/IProjectCarCameraConfigService.java index 394053e87..82dd08e6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/IProjectCarCameraConfigService.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/IProjectCarCameraConfigService.java @@ -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 { /** + * 分页列表查询项目对应的车辆相机设备配置信息 * * @param param * @return @@ -22,6 +23,7 @@ public interface IProjectCarCameraConfigService extends IService queryPageList(HashMap param); /** + * 列表查询项目对应的车辆相机设备配置信息 * * @param param * @return @@ -29,24 +31,28 @@ public interface IProjectCarCameraConfigService extends IService queryList(HashMap 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 carTypeList=carTypeMapper.selectCarTypeToaltByCameraId(map); + List carTypeList=carTypeMapper.selectCarTypeTotalByCameraId(map); data.put("carTypeList",carTypeList); data.put("totalnum",totalnum); return data; diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java index c64cca7f9..f3449bd58 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringRecordMapper.java @@ -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 { + /** + * 分页列表查询现场危大工程信息 + * + * @param page + * @param map + * @return + */ + List queryDangerousEngineeringPageList(Page page, @Param("param") Map map); - List queryDangerousEngineeringPageList(Page page, @Param("param")Map map); - + /** + * 根据id查询现场危大工程信息 + * + * @param map + * @return + */ EntityMap queryDangerousEngineeringPageList(@Param("param") Map map); + /** + * 统计危大类别情况 + * + * @param param + * @return + */ List countDangerEngineerByFinalStatus(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java index 49d10d578..bf48ad348 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringSideStationMapper.java @@ -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 { - + /** + * 列表查询危大工程-旁站记录信息 + * + * @param map + * @return + */ List selectSideStationList(@Param("param") Map map); + /** + * 分页列表查询危大工程-旁站记录信息 + * + * @param map + * @param page + * @return + */ Page selectSideStationList(@Param("param") Map map, Page page); + /** + * 分页列表查询特种作业的危大工程-旁站记录信息 + * + * @param map + * @param page + * @return + */ Page specialPage(@Param("param") Map map, Page page); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringTypeControlContentMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringTypeControlContentMapper.java index 2d37530ee..8503c6830 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringTypeControlContentMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringTypeControlContentMapper.java @@ -17,14 +17,38 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ @Mapper public interface DangerousEngineeringTypeControlContentMapper extends BaseMapper { - + /** + * 根据sn查询危大工程类别-管控要点列表 + * @param map + * @return + */ List selectTypeControlContentListBySn(Map map); + /** + * 列表查询危大工程类别-管控要点信息 + * @param map + * @return + */ List selectTypeControlContentList(Map map); + /** + * 列表查询描述下危大工程类别-管控要点信息 + * @param map + * @return + */ List selectControlContentListByDescribe(Map map); + /** + * 根据ids查询危大工程类别-管控要点列表 + * @param param + * @return + */ List selectUserCheckControlContentList(Map param); + /** + * + * @param describeId + * @return + */ List selectTypeControlContentListByDescribe(@Param("describeId") Long describeId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java index bcd753503..74d3c2b8c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java @@ -19,23 +19,31 @@ import java.util.Map; */ public interface IDangerousEngineeringRecordService extends IService { /** + * 分页列表查询现场危大工程信息 + * * @param map * @return */ IPage queryDangerousEngineeringPageList(Map map); /** + * 通过id查询现场危大工程信息 + * * @param map * @return */ EntityMap getDangerousEngineeringById(Map map); /** + * 添加现场危大工程信息 + * * @param dangerousEngineeringRecord */ void saveDangerousEngineeringRecord(DangerousEngineeringRecord dangerousEngineeringRecord); /** + * 通知大屏 + * * @param projectSn * @param time * @param isSuperDanger @@ -51,11 +59,15 @@ public interface IDangerousEngineeringRecordService extends IService paramMap); /** + * 计算危大大屏得分 + * * @param projectSn * @param time * @return @@ -70,6 +82,7 @@ public interface IDangerousEngineeringRecordService extends IService { - + /** + * 列表查询危大工程-旁站记录信息 + * @param map + * @return + */ List selectSideStationList(Map map); + /** + * 分页列表查询危大工程-旁站记录信息 + * @param map + * @return + */ Page selectSideStationPage(Map map); + /** + * 分页列表查询特种作业的危大工程-旁站记录信息 + * @param map + * @return + */ Page specialPage(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringTypeControlContentService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringTypeControlContentService.java index 910003812..7e82ca6e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringTypeControlContentService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringTypeControlContentService.java @@ -13,8 +13,17 @@ import java.util.Map; * @version： V1.0 */ public interface IDangerousEngineeringTypeControlContentService extends IService { - + /** + * 列表查询危大工程类别-管控要点信息 + * @param map + * @return + */ List selectTypeControlContentList(Map map); + /** + * 列表查询描述下危大工程类别-管控要点信息 + * @param map + * @return + */ List> selectControlContentListByDescribe(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/mapper/SafeEducationQuestionMapper.java b/src/main/java/com/zhgd/xmgl/modules/edu/mapper/SafeEducationQuestionMapper.java index 39a105477..e01914482 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/mapper/SafeEducationQuestionMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/edu/mapper/SafeEducationQuestionMapper.java @@ -19,14 +19,41 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ @Mapper public interface SafeEducationQuestionMapper extends BaseMapper { - + /** + * 分页列表查询安全教育-试题课程信息 + * @param page + * @param map + * @return + */ List selectSafeEducationCoursePage(Page page, @Param("param")Map map); + /** + * 分页列表查询人员安全教育记录 + * @param page + * @param map + * @return + */ List selectWorkerEducationPage(Page page, @Param("param")Map map); + /** + * 课程ID查询安全教育-人员回答试题详情 + * @param map + * @return + */ List selectSafeEducationQuestionList(Map map); + /** + * 企业分页列表查询安全教育-试题课程信息 + * @param page + * @param map + * @return + */ List selectCompanyEducationCoursePage(Page page, @Param("param")Map map); + /** + * 培训记录数据下载 + * @param workerSafeEducation + * @return + */ List exportExcelWorkerEducation(@Param("param") WorkerSafeEducation workerSafeEducation); } diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/service/IEducationClassifyService.java b/src/main/java/com/zhgd/xmgl/modules/edu/service/IEducationClassifyService.java index 5d4fb0e7d..7c5d971b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/service/IEducationClassifyService.java +++ b/src/main/java/com/zhgd/xmgl/modules/edu/service/IEducationClassifyService.java @@ -10,10 +10,21 @@ import com.baomidou.mybatisplus.extension.service.IService; * @version： V1.0 */ public interface IEducationClassifyService extends IService { - + /** + * 添加安全教育-分类信息 + * @param educationClassify + */ void addEducationClassify(EducationClassify educationClassify); + /** + * 编辑安全教育-分类信息 + * @param educationClassify + */ void editEducationClassify(EducationClassify educationClassify); + /** + * 删除安全教育-分类信息 + * @param id + */ void removeEducationClassify(String id); } diff --git a/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java b/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java index aa89d0268..3ee078cc8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java +++ b/src/main/java/com/zhgd/xmgl/modules/edu/service/ISafeEducationQuestionService.java @@ -16,18 +16,51 @@ import java.util.Map; * @version： V1.0 */ public interface ISafeEducationQuestionService extends IService { - + /** + * 添加试题培训课程 + * @param workerSafeEducation + */ void addQuestionCourse(WorkerSafeEducation workerSafeEducation); + /** + * 分页列表查询安全教育-试题课程信息 + * @param map + * @return + */ IPage selectSafeEducationCoursePage(Map map); + /** + * 课程ID查询安全教育-试题详情 + * @param map + * @return + */ Map selectSafeEducationQuestionInfo(Map map); + /** + * 分页列表查询人员安全教育记录 + * @param map + * @return + */ IPage selectWorkerEducationPage(Map map); + /** + * 课程ID查询安全教育-人员回答试题详情 + * @param map + * @return + */ Map getPersonSafeEducationQuestionInfo(Map map); + /** + * 企业分页列表查询安全教育-试题课程信息 + * @param map + * @return + */ IPage selectCompanyEducationCoursePage(Map map); + /** + * 培训记录数据下载 + * @param response + * @param workerSafeEducation + */ void exportExcelWorkerEducation(HttpServletResponse response, WorkerSafeEducation workerSafeEducation); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java index 1d2cc9bde..a08af4349 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectConfigMapper.java @@ -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 { - + /** + * 外部调用修改项目状态 + * + * @param map + */ void updateProjectAuditStatus(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java index d070ee737..b6e601078 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectFineRecordMapper.java @@ -20,6 +20,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper @DataScope public interface ProjectFineRecordMapper extends BaseMapper { - + /** + * 分页列表查询项目罚款记录 + * @param page + * @param map + * @return + */ List selectProjectFineRecordPageList(Page page, @Param("param") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectConfigService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectConfigService.java index 38ac786dd..47c85de4d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectConfigService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectConfigService.java @@ -12,8 +12,15 @@ import java.util.Map; * @version： V1.0 */ public interface IProjectConfigService extends IService { - + /** + * 编辑项目配置信息 + * @param projectConfig + */ void editProjectConfig(ProjectConfig projectConfig); + /** + * 外部调用修改项目状态 + * @param map + */ void updateProjectAuditStatus(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java index cb040643d..543df619d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/IProjectFineRecordService.java @@ -14,6 +14,10 @@ import java.util.Map; * @version： V1.0 */ public interface IProjectFineRecordService extends IService { - + /** + * 分页列表查询项目罚款记录 + * @param map + * @return + */ IPage selectProjectFineRecordPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoCallbackController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoCallbackController.java index 60a05825c..a2f9eb3c2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoCallbackController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoCallbackController.java @@ -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"); //查询事件类型 diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java index 71d1de0d5..6c9ea3059 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java @@ -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>> selectAIVideoTypeCountList(@RequestBody Map map) { - return Result.success(videoItemService.selectAIVideoTypeCountList(map)); + return Result.success(videoItemService.selectAiVideoTypeCountList(map)); } @ApiOperation(value = "向外部接口下发视频列表数据", notes = "向外部接口下发视频列表数据", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java index 789c6a24d..fe532947c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java @@ -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 { - + /** + * 查询指定类型的视频列表 + * + * @param map + * @return + */ List selectVideoItemListByVideoId(Map map); + /** + * 统计每个项目的设备数量 + * + * @return + */ List> selectAllDevCount(); + /** + * 各企业下项目视频统计 + * + * @param map + * @return + */ List> selectCompanyVideoCountStatistics(Map map); + /** + * 各企业下项目视频统计 + * + * @param map + * @return + */ Map selectVideoTypeCountStatistics(Map map); - VideoItem getVideoItemByserialNumber(@Param("serialNumber") String serialNumber); + /** + * 根据视频设备序列号查询设备 + * + * @param serialNumber + * @return + */ + VideoItem getVideoItemBySerialNumber(@Param("serialNumber") String serialNumber); + /** + * 查询项目视频列表 + * + * @param map + * @return + */ List selectProjectVideoList(Map map); + /** + * 查询用户能看的项目视频列表 + * + * @param map + * @return + */ List selectUserVideoList(Map map); - List> selectAIVideoTypeCountList(Map map); + /** + * 按照摄像头类型查询具有AI功能的摄像头数量 + * + * @param map + * @return + */ + List> selectAiVideoTypeCountList(Map map); + /** + * 视频接入情况统计 + * + * @param map + * @return + */ List> selectVideoDevAccessCountList(Map map); + /** + * 根据视频设备监控点编号查询海康视频播放url + * + * @param serialNumber + * @return + */ EntityMap selectVideoInfoByserialNumber(@Param("serialNumber") String serialNumber); + /** + * 通过项目编号查询项目视频列表 + * + * @param map + * @return + */ List getVideoSerialNumber(Map map); + /** + * 查询设备列表 + * + * @param userItemId + * @param projectSn + * @return + */ List selectVideoItemISCPlayConfigList(@Param("userItemId") String userItemId, @Param("projectSn") String projectSn); + /** + * 统计项目视频设备 + * + * @param map + * @return + */ Map selectProjectVideoDevCount(Map map); + /** + * 根据项目sn查询设备列表 + * + * @param projectSn + * @return + */ List 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 getAiVideoList(String projectSn); + /** + * 获取所有监控点位 + * + * @return + */ List selectDeviceDetailAndProjectSnList(); + /** + * 根据id查询视频设备列表信息 + * + * @param id + * @return + */ VideoItem queryById(String id); + /** + * 统计监控点在线率 + * + * @param param + * @return + */ CountStatusVo countStatus(Map param); + /** + * 监控点运行趋势 + * + * @param param + * @return + */ List countStatusTrend(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml index 3d75b2d8b..dd442bfd1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/VideoItemMapper.xml @@ -156,7 +156,7 @@ WHERE cp.company_sn=#{sn} - 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 t1.device_type deviceType, video_name videoName FROM video_item t1 INNER JOIN project_video_config t2 ON t2.id = t1.video_id diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java b/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java index 890d3c85d..7d1b1585c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/IVideoItemService.java @@ -18,152 +18,212 @@ import java.util.concurrent.ExecutionException; */ public interface IVideoItemService extends IService { /** + * 添加视频设备列表信息 + * * @param videoItem */ void saveVideoItem(VideoItem videoItem); /** + * 编辑视频设备列表信息 + * * @param videoItem */ void updateVideoItem(VideoItem videoItem); /** + * 删除视频设备列表信息 + * * @param itemId */ void deleteVideoItem(String itemId); /** + * 查询指定类型的视频列表 + * * @param map * @return */ List selectVideoItemListByType(Map map); /** + * 根据项目sn查询启用的的视频列表 + * * @param map * @return */ Map selectEnableVideoItemList(Map map); /** + * 根据itemId视频Id查询视频播放url + * * @param map * @return */ Map getVideoItemInfo(Map map); /** + * 海康视频根据itemId控球 + * * @param map */ void getHikPtzControl(Map map); /** + * 修改视频设备地图坐标 + * * @param list */ void updateVideoItemCoordinate(List list); /** + * 各企业下项目视频统计 + * * @param map * @return */ Map selectVideoItemStatisticsCount(Map map); /** + * 设置海康视频订阅事件 + * * @param map */ void setHikSubscriptionByEvent(Map map); /** + * 根据视频设备序列号查询设备 + * * @param serialNumber * @return */ - VideoItem getVideoItemByserialNumber(String serialNumber); + VideoItem getVideoItemBySerialNumber(String serialNumber); /** + * 海康视频根据itemId控球 + * * @param map */ void setHikPtzControl(Map map); /** + * 查询海康视频组织区域 + * * @param map * @return */ String getHikVideoRegions(Map map); /** + * 同步海康视频监控点列表 + * * @param map */ void saveHikVideoCamerasInfoList(Map map); /** + * 查询项目视频列表 + * * @param map * @return */ Map selectProjectVideoList(Map map); /** + * 查询项目视频tree列表 + * * @param map * @return */ Map selectProjectVideoTreeList(Map map); /** + * 查询项目下所有视频列表 + * * @param map * @return */ List selecAllVideoList(Map map); /** + * 查询用户能看的项目视频列表 + * * @param map * @return */ Map selectUserVideoList(Map map); /** + * 按照摄像头类型查询具有AI功能的摄像头数量 + * * @param map * @return */ - List> selectAIVideoTypeCountList(Map map); + List> selectAiVideoTypeCountList(Map map); /** + * 根据视频设备监控点编号查询海康视频播放url + * * @param map * @return */ Map getHikVideoUrl(Map map); /** + * 保存视频分析结果 + * * @param json */ void saveVideoSatae(JSONObject json); /** + * 统计项目视频设备 + * * @param map * @return */ Map selectProjectVideoDevCount(Map map); /** + * 查询项目视频设备在线情况 + * * @param map * @return */ Map selectVideoCountList(Map map); /** + * 根据项目sn查询设备列表 + * * @param projectSn * @return */ List getListByProjectSn(String projectSn); /** + * 根据nvrId更新设备 + * * @param id * @param status */ void updateByProjectAndNvrId(Long id, int status); /** + * 获取ai摄像头以及最近十次的报警数据 + * * @param projectSn * @return */ List viListAndTenAlarm(String projectSn); + /** + * 根据项目sn查询监控点预览取流URL列表 + * + * @param projectSn + * @return + * @throws ExecutionException + * @throws InterruptedException + */ Map getPlayUrlFromHikvision(String projectSn) throws ExecutionException, InterruptedException; /** @@ -175,18 +235,24 @@ public interface IVideoItemService extends IService { VideoItem queryById(String id); /** + * 海康获取监控点回放取流URLv2 + * * @param map * @return */ JSONObject callPostPlaybackURLsV2(Map map); /** + * 统计监控点在线率 + * * @param param * @return */ CountStatusVo countStatus(Map param); /** + * 监控点运行趋势 + * * @param param * @return */ diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java index d59d1f8c2..50ed95cdf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java @@ -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> selectAIVideoTypeCountList(Map map) { - return videoItemMapper.selectAIVideoTypeCountList(map); + public List> selectAiVideoTypeCountList(Map map) { + return videoItemMapper.selectAiVideoTypeCountList(map); } @Override @@ -605,8 +599,8 @@ public class VideoItemServiceImpl extends ServiceImpl { - + /** + * 查询个人具体某一天的考勤情况 + * + * @param map + * @return + */ List viewDayAttendanceList(Map map); + /** + * 查询某天是否有考勤 + * + * @param param + * @return + */ List selectOneWorkerAttendance(Map param); + /** + * 分页列表查询人员考勤信息 + * + * @param page + * @param map + * @return + */ List selectWorkerAttendancePage(Page page, @Param("param") Map map); + /** + * 列表查询人员考勤信息 + * + * @param map + * @return + */ List selectWorkerAttendancePage(@Param("param") Map map); + /** + * 列表查询项目下最新人员考勤信息 + * + * @param param + * @return + */ List selectWorkerAttendanceNewestList(Map param); - Map getWorkerCurrentTotalCount(Map param); + /** + * 统计人员出勤数量 + * + * @param param + * @return + */ + Map getWorkerCurrentTotalCount(Map param); - List> getWorkerDayAttendanceTotalCount(Map param); + /** + * 人员管理人员统计 + * + * @param param + * @return + */ + List> getWorkerDayAttendanceTotalCount(Map param); + /** + * 人员考勤列表下载 + * + * @param map + * @return + */ List selectExportExcelWorkerAttendanceList(Map map); - int getProjectAttendancePersonToltal(Map map); + /** + * 统计出勤人员数量 + * + * @param map + * @return + */ + int getProjectAttendancePersonTotal(Map map); + /** + * 查询人脸设备通行记录 + * + * @param map + * @return + */ List selectWorkerAttendanceListByDev(Map map); + /** + * 统计人脸设备进出数量 + * + * @param map + * @return + */ Map selectWorkerAttendanceCountByDev(Map map); + /** + * 统计某人的出勤时间 + * + * @param map + * @return + */ int getWorkerAttendanceCountDay(Map map); + /** + * 昨日出勤统计 + * + * @param map + * @return + */ Map getWorkerYesterdayTotalCount(Map 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> selectAttendancePersonTotalCount(Map param); + /** + * 统计某日出勤人数统计 + * + * @param param + * @return + */ + List> selectAttendancePersonTotalCount(Map param); - List> selectTeamAttendanceTotalCount(Map param); + /** + * 统计班组出勤统计 + * + * @param param + * @return + */ + List> selectTeamAttendanceTotalCount(Map param); - List> selectDepartmentAttendanceTotalCount(Map param); + /** + * 统计部门出勤统计 + * + * @param param + * @return + */ + List> selectDepartmentAttendanceTotalCount(Map param); + /** + * 查询最新人员出勤记录 + * + * @param map + * @return + */ List selectWorkNewAttendanceList(Map map); - List selectWorkerAttendanceListByCarNumber(Map map); - + /** + * 查询监理和项目经理本月出勤天数 + * + * @param map + * @return + */ Map selectManagerAttendanceDayCount(Map map); + /** + * 统计设备的进出考勤数量 + * + * @param map + * @return + */ List> selectUfaceDevWorkerAttendanceCount(Map map); + /** + * 统计最近10天每天人员出勤数量 + * + * @param map + * @return + */ List> selectTenDaysWorkerAttendanceCountList(Map map); + /** + * 查询工地区、工作区的进记录 + * + * @param map + * @return + */ List> selectDepartmentEnterpriseAttendanceAnalysisList(Map map); + /** + * 查询项目部的进出统计记录 + * + * @param map + * @return + */ List> selectManageDepartmentEnterpriseAttendanceList(Map map); + /** + * 查询进入记录数 + * + * @param map + * @return + */ List> selectDepartmentEnterpriseAttendanceWorkerInfoList(Map map); + /** + * 统计企业出勤人数 + * + * @param map + * @return + */ List> selectEnterpriseAttendanceWorkerInfoCount(Map map); + /** + * 查询今日出勤人员列表 + * + * @param map + * @return + */ List selectDayAttendanceWorkerInfoList(Map map); + /** + * 出勤人数统计 + * + * @param projectSn + * @return + */ EntityMap selectTodayAttendanceWorkerCount(@Param("projectSn") String projectSn); + /** + * 分页列表查询通行记录 + * + * @param dto + * @param page + * @return + */ Page getPassRecord(@Param("q") GetPassRecordDto dto, Page page); + /** + * 查询一段时间的出勤人数趋势 + * + * @param map + * @return + */ List queryAttendanceTrend(Map map); + /** + * 查询在场人数列表 + * + * @param map + * @return + */ List queryPresenceList(Map map); - List queryTodayAttendanceTrend(Map map); - + /** + * 安全履职分析（列表包含所有企业，其中总包包含分包的数据） + * + * @param paramMap + * @return + */ List safetyPerformanceAnalysis(@Param("param") Map paramMap); + /** + * 查询总公司每个公司的出勤人数和统计人数 + * + * @param map + * @return + */ List queryAttendanceOfEachCompanyForMain(@Param("param") Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java index 098d738df..769f502be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java @@ -20,14 +20,29 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper @DataScope public interface WorkerInfoAuditRecordMapper extends BaseMapper { - + /** + * 分页列表查询劳务人员-审核表信息 + * @param page + * @param map + * @return + */ @DataScope(includeTable = "worker_info_audit_record") List selectWorkerInfoAuditList(Page page, @Param("param")Map map); + /** + * 列表查询劳务人员-审核表信息 + * @param page + * @param map + * @return + */ @DataScope(includeTable = "worker_info_audit_record") List selectWorkerInfoAuditList1(Page page, @Param("param")Map map); - + /** + * 查询某个人员所有相关数据 + * @param map + * @return + */ @DataScope(includeTable = "worker_info_audit_record") EntityMap viewWorkerInfoDetail(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java index d26b4b506..d6d349efa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerMonthAttendanceStatisticsMapper.java @@ -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 { - + /** + * 分页人员考勤统计列表 + * + * @param page + * @param map + * @return + */ List selectMonthAttendanceByPage(Page page, @Param("param") Map map); + /** + * 更新人员考勤统计 + * + * @param param + * @return + */ int updateMonthAttendanceStatistics(Map param); + /** + * 新增人员考勤统计 + * + * @param param + * @return + */ int insertMonthAttendanceStatistics(Map param); + /** + * 查询某月的某人员的考勤情况 + * + * @param map + * @return + */ EntityMap selectWorkerMonthAttendanceTotal(Map map); + /** + * 人员月考勤统计列表下载 + * + * @param map + * @return + */ List getMonthWorkerAttendanceList(Map map); + /** + * 查询某个月员工考勤情况 + * + * @param param + * @return + */ List selectProjectMonthAttendanceList(HashMap param); + /** + * 获取项目每个员工的考勤情况 + * + * @param projectSn + * @return + */ List getListByProjectSn(String projectSn); + /** + * 查询某月的某人员的考勤情况 + * + * @param param + * @return + */ WorkerMonthAttendanceStatistics selectByCondition(Map param); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java index 74b4bf4f9..b5c4cf6c0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerSafeEducationMapper.java @@ -22,23 +22,62 @@ import java.util.Set; */ @Mapper public interface WorkerSafeEducationMapper extends BaseMapper { - + /** + * 分页列表查询安全教育记录信息 + * + * @param page + * @param map + * @return + */ List selectWorkerSafeEducationPage(Page> page, @Param("param") Map map); - + /** + * 统计当月的安全教育人员数量 + * + * @param map + * @return + */ int getCurrentMonthSafeEducationPersonToltal(Map map); + /** + * 安全教育统计 + * + * @param map + * @return + */ List getComapnySafeEducationStatistics(Map map); + /** + * 安全教育统计 + * + * @param map + * @return + */ List getProjectSafeEducationStatistics(Map map); - List selectWorkerSafeEducationByWorkIdList(Map map); - + /** + * 根据人员id查询安全教育信息列表 + * + * @param map + * @return + */ List selectWorkerSafeEducationByIDCardList(Map map); + /** + * 安全教育人数统计 + * + * @param map + * @return + */ @DataScope(includeTable = "worker_info") - int getProjectSafeEducationPersonToltal(Map map); + int getProjectSafeEducationPersonTotal(Map map); + /** + * 培训记录数据下载 + * + * @param workerSafeEducation + * @return + */ List exportExcelWorkerEducation(WorkerSafeEducation workerSafeEducation); /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml index 33c7324e2..bff932deb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerAttendanceMapper.xml @@ -232,7 +232,7 @@ AND DATE_FORMAT(p.create_time, "%Y-%m") = #{monthTime} - 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 - - - - SELECT COUNT(DISTINCT w2.worker_id) from worker_safe_education w1 INNER JOIN worker_safe_education_worker w2 ON w1.id = w2.edu_id diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceRuleService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceRuleService.java index ec1195590..d1b116090 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceRuleService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceRuleService.java @@ -10,6 +10,9 @@ import com.baomidou.mybatisplus.extension.service.IService; * @version： V1.0 */ public interface IWorkerAttendanceRuleService extends IService { - + /** + * 添加考勤规则信息 + * @param workerAttendanceRule + */ void add(WorkerAttendanceRule workerAttendanceRule); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java index 230cd9c3d..fcbf85700 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java @@ -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 { - + /** + * 查询个人具体某一天的考勤情况 + * + * @param map + * @return + */ List viewDayAttendanceList(Map map); + /** + * 考勤补卡 + * + * @param map + */ void reissueAttendanceCard(Map map); + /** + * 宇泛人脸识别回调 + * + * @param idCardInfo + * @param showTime + * @param deviceKey + * @param photoUrl + */ void ufaceYFCallbackUrl(String idCardInfo, String showTime, String deviceKey, String photoUrl); + /** + * 分页列表查询人员考勤信息 + * + * @param map + * @return + */ IPage selectWorkerAttendancePage(Map map); + /** + * 列表查询人员考勤信息 + * + * @param map + * @return + */ List selectWorkerAttendanceList(Map map); + /** + * 列表查询项目下最新人员考勤信息 + * + * @param param + * @return + */ List selectWorkerAttendanceNewestList(Map param); + /** + * 人员管理人员统计 + * + * @param param + * @return + */ List> getWorkerDayAttendanceTotalCount(Map param); + /** + * 芊熠人脸识别回调 + * + * @param body + */ void ufaceQYCallbackUrl(JSONObject body); + /** + * 人员考勤列表下载 + * + * @param response + * @param map + */ void exportExcelWorkerAttendance(HttpServletResponse response, Map map); + /** + * 海清人脸识别回调 + * + * @param projectSn + * @param json + */ void ufaceHQCallbackUrl(String projectSn, String json); - Map selectWorkerAttendanceByDev(Map map); + /** + * 查询人脸设备通行记录 + * + * @param map + * @return + */ + Map selectWorkerAttendanceByDev(Map map); + /** + * 佳信捷人脸识别回调 + * + * @param map + */ void ufaceJXJCallbackUrl(Map map); - Map getPersonAttendanceTime(Map map); + /** + * 查询人员最早的进和最晚的出 + * + * @param map + * @return + */ + Map getPersonAttendanceTime(Map map); + /** + * @param map + */ void addPhoneAttendance(Map map); + /** + * 手机打卡 + * + * @param projectSn + */ void deleteProjectAttendanceData(String projectSn); + /** + * 佳信捷新人脸设备识别回调 + * + * @param map + */ void ufaceNewJXJCallbackUrl(Map map); - List> selectAttendancePersonTotalCount(Map map); + /** + * 列表查询某个时间段内每天人员出勤情况 + * + * @param map + * @return + */ + List> selectAttendancePersonTotalCount(Map map); - void addAttendanceData(Map map); + /** + * 接收外部考勤数据 + * + * @param map + */ + void addAttendanceData(Map map); - Map selectEnterpriseAttendanceCount(Map map); + /** + * 查询企业下各班组部门出勤人数统计 + * + * @param map + * @return + */ + Map selectEnterpriseAttendanceCount(Map map); + /** + * 查询最新人员出勤记录 + * + * @param map + * @return + */ List selectWorkNewAttendanceList(Map map); + /** + * 保存考勤数据 + * + * @param map + * @return + */ Result saveAttendance(Map map); + /** + * 异步保存人员通行数据 + * + * @param map + * @return + */ Map saveExternalPassRecord(Map map); + /** + * 查询近10天考勤统计 + * + * @param map + * @return + */ List> selectTenDaysWorkerAttendanceCountList(Map map); + /** + * 海康考勤回调 + * + * @param map + */ void ufaceHikCallbackUrl(Map map); + /** + * 分页列表查询通行记录 + * + * @param dto + * @return + */ Map getPassRecord(GetPassRecordDto dto); + /** + * 查询今天的出勤人数趋势 + * + * @param map + * @return + */ List queryTodayAttendanceTrend(Map map); + /** + * 查询一段时间的出勤人数趋势 + * + * @param map + * @return + */ List queryAttendanceTrend(Map map); + /** + * 查询每个公司的出勤人数和统计人数 + * + * @param map + * @return + */ AttendanceOfEachCompanyVo queryAttendanceOfEachCompany(Map map); + /** + * 考勤照片上传 + * + * @param dto + * @return + */ String uploadAttendanceByDev(UploadAttendanceByDevDto dto); + /** + * 安全履职分析（列表包含所有企业，其中总包包含分包的数据） + * + * @param paramMap + * @return + */ SafetyPerformanceAnalysisVo safetyPerformanceAnalysis(Map paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java index 48e542fc4..e15792edc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java @@ -16,18 +16,49 @@ import java.util.Map; * @version： V1.0 */ public interface IWorkerInfoAuditRecordService extends IService { - + /** + * 分页列表查询劳务人员-审核表信息 + * @param map + * @return + */ IPage selectWorkerInfoAuditList(Map map); + /** + * 列表查询劳务人员-审核表信息 + * @param map + * @return + */ List getPassList(Map map); + /** + * 添加劳务人员-审核表信息 + * @param workerInfoAuditRecord + */ void saveWorkerInfoAuditRecord(WorkerInfoAuditRecord workerInfoAuditRecord); + /** + * 编辑劳务人员-审核表信息 + * @param workerInfoAuditRecord + */ void editWorkerInfoAuditRecord(WorkerInfoAuditRecord workerInfoAuditRecord); + /** + * 审核通过 + * @param map + * @return + */ String adoptWorkerInfo(Map map); + /** + * 审核驳回 + * @param map + */ void rejectWorkerInfo(Map map); + /** + * 查询某个人员所有相关数据 + * @param map + * @return + */ Map viewWorkerInfoDetail(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerMonthAttendanceStatisticsService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerMonthAttendanceStatisticsService.java index 09e2a95d2..03e7b7b03 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerMonthAttendanceStatisticsService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerMonthAttendanceStatisticsService.java @@ -18,22 +18,73 @@ import java.util.Map; * @version： V1.0 */ public interface IWorkerMonthAttendanceStatisticsService extends IService { - + /** + * 分页人员考勤统计列表 + * + * @param map + * @return + */ IPage selectMonthAttendanceByPage(Map map); + /** + * 统计前一天的考勤状况 + * + * @param inputTime + */ void getMonthAttendanceStatistics(String inputTime); + /** + * 修改人员指定日期的考勤统计 + * + * @param info + * @param inputTime + */ void updatePersonMonthAttendance(WorkerInfo info, String inputTime); + /** + * 查询人员指定月份考勤统计 + * + * @param map + * @return + */ Map selectWorkerMonthAttendanceTotal(Map map); + /** + * 人员月考勤统计列表下载 + * + * @param response + * @param map + */ void exportExcelMonthWorkerAttendanceStatistics(HttpServletResponse response, Map map); + /** + * 重新统计考勤 + * + * @param map + */ void getAfreshMonthAttendanceStatistics(Map map); + /** + * 查询人员指定日期的出勤状况 + * + * @param map + * @return + */ Map selectWorkerMonthAttendanceType(Map map); + /** + * 查询某个月员工考勤情况 + * + * @param param + * @return + */ List selectProjectMonthAttendanceList(HashMap param); + /** + * 获取项目每个员工的考勤情况 + * + * @param projectSn + * @return + */ List getListByProjectSn(String projectSn); - } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerSafeEducationService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerSafeEducationService.java index 2ce78fd2d..b84325264 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerSafeEducationService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerSafeEducationService.java @@ -18,25 +18,80 @@ import java.util.Map; * @version： V1.0 */ public interface IWorkerSafeEducationService extends IService { - + /** + * 分页列表查询安全教育记录信息 + * + * @param map + * @return + */ IPage> selectWorkerSafeEducationPage(Map map); + /** + * 添加安全教育记录信息 + * + * @param workerSafeEducation + */ void saveWorkerSafeEducation(WorkerSafeEducation workerSafeEducation); + /** + * 编辑安全教育信息 + * + * @param workerSafeEducation + */ void editWorkerSafeEducation(WorkerSafeEducation workerSafeEducation); + /** + * 删除安全教育记录信息 + * + * @param id + */ void deleteWorkerSafeEducation(String id); + /** + * 通过id查询安全教育记录信息 + * + * @param map + * @return + */ Map getWorkerSafeEducationInfo(Map map); + /** + * 安全教育统计 + * + * @param map + * @return + */ WorkerSafeEducationStatisticsVo selectWorkerSafeEducationStatistics(Map map); + /** + * 复制总企业安全教育记录 + * + * @param map + */ void copySafeEducation(Map map); + /** + * 分页列表查询回答人员信息 + * + * @param map + * @return + */ IPage selectAnswerWorkerPage(Map map); + /** + * 培训记录数据下载 + * + * @param response + * @param workerSafeEducation + */ void exportExcelWorkerEducation(HttpServletResponse response, WorkerSafeEducation workerSafeEducation); + /** + * 获取项目下的安全教育类型为入场三级交底的对应20条数据 + * + * @param projectSn + * @return + */ ThreeLevelDataVO getThreeLevelDataByProjectSn(String projectSn); /** diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerTypeService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerTypeService.java index ebd22ff19..940fb5167 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerTypeService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerTypeService.java @@ -25,25 +25,25 @@ public interface IWorkerTypeService extends IService { 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 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 120e43743..b81ae848d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -638,7 +638,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl personType = selectWorkerPersonTypeStatistics(map); List 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 xzTaskProgresses = taskProgressService.importData(mppFile, projectSn, type); + public Result importData(@RequestParam(value = "mppFile") MultipartFile mppFile, String projectSn, Integer type,@RequestParam String enterpriseId) { + Collection xzTaskProgresses = taskProgressService.importData(mppFile, projectSn, type,enterpriseId); StringBuilder pName = new StringBuilder(); for (XzTaskProgress xzTaskProgress : xzTaskProgresses) { pName.append(xzTaskProgress.getTaskName()); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml index 9524b1d7c..28c02aa01 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml @@ -57,9 +57,6 @@ update xz_task_progress - - id = #{id}, - project_sn = #{projectSn,jdbcType=VARCHAR}, @@ -106,6 +103,9 @@ begin_warning = #{beginWarning,jdbcType=INTEGER}, + + quality_region_id = #{qualityRegionId,jdbcType=BIGINT}, + level = #{level,jdbcType=INTEGER} where project_sn = #{projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressService.java index 9628577df..6c5c66fdf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressService.java @@ -50,9 +50,10 @@ public interface IXzTaskProgressService extends IService { * @param mppFile * @param projectSn * @param type + * @param enterpriseId * @return */ - Collection importData(MultipartFile mppFile, String projectSn, Integer type); + Collection importData(MultipartFile mppFile, String projectSn, Integer type, String enterpriseId); /** * 导出excel任务进度甘特图 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java index 8536936e8..da03904dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java @@ -255,28 +255,32 @@ public class XzTaskProgressServiceImpl extends ServiceImpl importData(MultipartFile mppFile, String projectSn, Integer type) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(XzTaskProgress.class).eq(XzTaskProgress::getProjectSn, projectSn); + public Collection importData(MultipartFile mppFile, String projectSn, Integer type, String enterpriseId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(XzTaskProgress.class).eq(XzTaskProgress::getProjectSn, projectSn).eq(XzTaskProgress::getEnterpriseId, enterpriseId); List progressTasks = taskProgressMapper.selectList(queryWrapper); log.info("原progressTasks：{}", JSON.toJSONString(progressTasks)); Long createUserId = SecurityUtils.getUser().getUserId(); - Collection progressTaskList = analysisMpp(mppFile, projectSn, createUserId); + Collection progressTaskList = analysisMpp(mppFile, projectSn, createUserId, enterpriseId); log.info("importData的新增数据：{}", progressTaskList); int deleteAndReplace = 1; int replace = 2; + List 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 oldSet = progressTasks.stream().map(taskProgress -> taskProgress.getTaskName()).collect(Collectors.toSet()); + Set oldSet = progressTasks.stream().map(XzTaskProgress::getTaskName).collect(Collectors.toSet()); List 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 analysisMpp(MultipartFile mppFile, String projectSn, Long createUserId) { + private Collection analysisMpp(MultipartFile mppFile, String projectSn, Long createUserId, String enterpriseId) { List projectTaskList = new LinkedList<>(); Set userNameSet = new LinkedHashSet<>(); Set regionSet = new LinkedHashSet<>(); Set enterpriseSet = new LinkedHashSet<>(); + EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectById(enterpriseId); try { // 读取文件 MPPReader mppRead = new MPPReader(); @@ -317,9 +323,9 @@ public class XzTaskProgressServiceImpl extends ServiceImpl 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 enterpriseInfos = enterpriseInfoMapper.selectBySnAndNumberOneList(projectSn, enterpriseSet); - if (CollUtil.isEmpty(enterpriseInfos)) { - throw new OpenPromptException("未导入数据，未找到对应的承包商"); - } - Map enterpriseMap = enterpriseInfos.stream().collect(Collectors.toMap(EnterpriseInfo::getEnterpriseName, EnterpriseInfo::getId)); +// List enterpriseInfos = enterpriseInfoMapper.selectBySnAndNumberOneList(projectSn, enterpriseSet); +// if (CollUtil.isEmpty(enterpriseInfos)) { +// throw new OpenPromptException("未导入数据，未找到对应的承包商"); +// } +// List 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 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