server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,90 @@ package com.doumee.api.business; import com.doumee.api.BaseController; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageWrap; import com.doumee.core.model.PageData; import com.doumee.dao.business.model.InoutDayCount; import com.doumee.service.business.InoutDayCountService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; /** * @author æ±è¹è¹ * @date 2024/10/12 16:19 */ @Api(tags = "åºå ¥åºäººæ¬¡è½¦æ¬¡æ¯æ¥ç»è®¡è¡¨") @RestController @RequestMapping("/business/inoutDayCount") public class InoutDayCountController extends BaseController { @Autowired private InoutDayCountService inoutDayCountService; @PreventRepeat @ApiOperation("æ°å»º") @PostMapping("/create") @RequiresPermissions("business:inoutdaycount:create") public ApiResponse create(@RequestBody InoutDayCount inoutDayCount) { return ApiResponse.success(inoutDayCountService.create(inoutDayCount)); } @ApiOperation("æ ¹æ®IDå é¤") @GetMapping("/delete/{id}") @RequiresPermissions("business:inoutdaycount:delete") public ApiResponse deleteById(@PathVariable Integer id) { inoutDayCountService.deleteById(id); return ApiResponse.success(null); } @ApiOperation("æ¹éå é¤") @GetMapping("/delete/batch") @RequiresPermissions("business:inoutdaycount:delete") public ApiResponse deleteByIdInBatch(@RequestParam String ids) { String [] idArray = ids.split(","); List<Integer> idList = new ArrayList<>(); for (String id : idArray) { idList.add(Integer.valueOf(id)); } inoutDayCountService.deleteByIdInBatch(idList); return ApiResponse.success(null); } @ApiOperation("æ ¹æ®IDä¿®æ¹") @PostMapping("/updateById") @RequiresPermissions("business:inoutdaycount:update") public ApiResponse updateById(@RequestBody InoutDayCount inoutDayCount) { inoutDayCountService.updateById(inoutDayCount); return ApiResponse.success(null); } @ApiOperation("å页æ¥è¯¢") @PostMapping("/page") @RequiresPermissions("business:inoutdaycount:query") public ApiResponse<PageData<InoutDayCount>> findPage (@RequestBody PageWrap<InoutDayCount> pageWrap) { return ApiResponse.success(inoutDayCountService.findPage(pageWrap)); } @ApiOperation("导åºExcel") @PostMapping("/exportExcel") @RequiresPermissions("business:inoutdaycount:exportExcel") public void exportExcel (@RequestBody PageWrap<InoutDayCount> pageWrap, HttpServletResponse response) { ExcelExporter.build(InoutDayCount.class).export(inoutDayCountService.findPage(pageWrap).getRecords(), "åºå ¥åºäººæ¬¡è½¦æ¬¡æ¯æ¥ç»è®¡è¡¨", response); } @ApiOperation("æ ¹æ®IDæ¥è¯¢") @GetMapping("/{id}") @RequiresPermissions("business:inoutdaycount:query") public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(inoutDayCountService.findById(id)); } } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/StagingCloudController.java
@@ -8,6 +8,7 @@ import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.admin.response.PCWorkPlatformDataVO; import com.doumee.dao.admin.response.StagingDataVO; import com.doumee.dao.business.model.Visits; import com.doumee.dao.system.dto.NoticesDTO; @@ -100,6 +101,7 @@ return ApiResponse.success("æ¥è¯¢æå",approveService.getHomeDataPC(noticesDTO)); } @ApiOperation("ä»»å¡ä¸å¿å页") @PostMapping("/taskPage") public ApiResponse<PageData<Notices>> taskPage (@RequestBody PageWrap<NoticesDTO> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { @@ -107,6 +109,8 @@ pageWrap.getModel().setMemberId(loginUserInfo.getMemberId()); return ApiResponse.success(noticesService.taskCanterPage(pageWrap)); } @ApiOperation("æ 记已读") @GetMapping("/signRead") @@ -123,4 +127,15 @@ } return ApiResponse.success("æä½æå"); } @ApiOperation("PCå·¥ä½å°") @GetMapping("/pCWorkPlatformData") @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "queryType", value = "æ¥è¯¢ç±»åï¼1=å¨å人æ°ï¼2=æ¥è¡¨æ°æ®ï¼3=å¾ åäºé¡¹ï¼4=è¶ æ¶é¢è¦", required = true), }) public ApiResponse<PCWorkPlatformDataVO> pCWorkPlatformData (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { PCWorkPlatformDataVO pcWorkPlatformDataVO = visitsService.getPcWorkPlatformData(queryType,getLoginUser(token)); return ApiResponse.success("æ¥è¯¢æå",pcWorkPlatformDataVO); } } server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/InterestedListVO.java
@@ -17,10 +17,10 @@ @ApiModel("å·¥ä½å°ç¸å ³æ¹æ°æ®") public class InterestedListVO { @ApiModelProperty(value = "人æ°") private Long userNum; @ApiModelProperty(value = "æ°é") private Long num; @ApiModelProperty(value = "åç§°") private String interestedName; private String name; } server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/PCWorkPlatformDataVO.java
@@ -1,5 +1,7 @@ package com.doumee.dao.admin.response; import com.doumee.dao.business.model.Visits; import com.doumee.dao.system.model.Notices; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,12 +22,11 @@ @ApiModelProperty(value = "仿¥å¨å人æ°") private Long todayInParkUserNum; @ApiModelProperty(value = "仿¥å ¥å人æ°") @ApiModelProperty(value = "仿¥å ¥å人次") private Long todayInUserNum; @ApiModelProperty(value = "仿¥ç¦»å人æ°") @ApiModelProperty(value = "仿¥ç¦»å人次") private Long todayOutUserNum; @ApiModelProperty(value = "å¨å访客人æ°") private Long inParkVisitUserNum; @@ -36,16 +37,14 @@ @ApiModelProperty(value = "ç¾ç¦»äººæ¬¡") private Long signLevelNum; @ApiModelProperty(value = "å¨åé¿æç¸å ³æ¹äººæ°") private Long inParkLwUserNum; @ApiModelProperty(value = "å ¥å人次") @ApiModelProperty(value = "ç¸å ³æ¹å ¥å人次") private Long lwUserInNum; @ApiModelProperty(value = "åºå人次") @ApiModelProperty(value = "ç¸å ³æ¹åºå人次") private Long lwUserOutNum; @ApiModelProperty(value = "仿¥å¨å车è¾") private Long todayInParkCarNum; @@ -56,33 +55,25 @@ @ApiModelProperty(value = "åºå车次") private Long todayOutCarNum; @ApiModelProperty(value = "ç¸å ³æ¹æ°æ®") private List<InterestedListVO> interestedListVOList; @ApiModelProperty(value = "é¿æç¸å ³æ¹ç¸å ³æ¹åå¸ top 5") private List<InterestedListVO> lwList; @ApiModelProperty(value = "è¿ä¸æ¥è®¿å®¢ç»è®¡") private List<InterestedListVO> weekVisitList; @ApiModelProperty(value = "è¿ä¸æ¥è½¦è¾ç»è®¡") private List<InterestedListVO> weekCarList; @ApiModelProperty(value = "访客人å") private Long visitorCount; @ApiModelProperty(value = "å¾ åäºé¡¹æ°é") private Integer noticesNum; @ApiModelProperty(value = "å³å¡äººå") private Long lwCount; @ApiModelProperty(value = "å¾ åäºé¡¹") private List<Notices> noticesList; @ApiModelProperty(value = "å¨åºè½¦è¾") private Long presenceCarCount; @ApiModelProperty(value = "è¶ æ¶é¢è¦æ°é") private Integer timeOutVisitNum; @ApiModelProperty(value = "é¢çº¦è½¦è¾") private Long visitorCarCount; @ApiModelProperty(value = "é¿æè½¦è¾") private Long longCarCount; @ApiModelProperty(value = "ä¾åºåæ°é") private Long supplierCount; @ApiModelProperty(value = "å³å¡å ¬å¸äººåæ°") private List<Map<String,Object>> companyUsers; @ApiModelProperty(value = "æ»çäººåæ°æ®") private List<Map<String,Object>> retentionUsers; @ApiModelProperty(value = "è®¿å®¢è¶ æ¶æ°æ®") private List<Visits> timeOutVisitList; } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/InoutDayCountMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,12 @@ package com.doumee.dao.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.doumee.dao.business.model.InoutDayCount; /** * @author æ±è¹è¹ * @date 2024/10/12 16:19 */ public interface InoutDayCountMapper extends BaseMapper<InoutDayCount> { } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/RetentionMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.doumee.dao.business.model.Retention; import com.github.yulichang.base.MPJBaseMapper; import java.util.List; @@ -9,5 +10,5 @@ * @author æ±è¹è¹ * @date 2023/11/30 15:33 */ public interface RetentionMapper extends BaseMapper<Retention> { public interface RetentionMapper extends MPJBaseMapper<Retention> { } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutDayCount.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,107 @@ package com.doumee.dao.business.model; import com.doumee.core.annotation.excel.ExcelColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; /** * åºå ¥åºäººæ¬¡è½¦æ¬¡æ¯æ¥ç»è®¡è¡¨ * @author æ±è¹è¹ * @date 2024/10/12 16:19 */ @Data @ApiModel("åºå ¥åºäººæ¬¡è½¦æ¬¡æ¯æ¥ç»è®¡è¡¨") @TableName("`inout_day_count`") public class InoutDayCount { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "主é®", example = "1") @ExcelColumn(name="主é®") private Integer id; @ApiModelProperty(value = "å建人ç¼ç ", example = "1") @ExcelColumn(name="å建人ç¼ç ") private Integer creator; @ApiModelProperty(value = "å建æ¶é´") @ExcelColumn(name="å建æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "æ´æ°äººç¼ç ", example = "1") @ExcelColumn(name="æ´æ°äººç¼ç ") private Integer editor; @ApiModelProperty(value = "æ´æ°æ¶é´") @ExcelColumn(name="æ´æ°æ¶é´") @JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "æ¯å¦å é¤0å¦ 1æ¯", example = "1") @ExcelColumn(name="æ¯å¦å é¤0å¦ 1æ¯") private Integer isdeleted; @ApiModelProperty(value = "ç»è®¡æ¥æï¼2024-10-12 00:00:00ï¼") @ExcelColumn(name="ç»è®¡æ¥æï¼2024-10-12 00:00:00ï¼") @JsonFormat(pattern = "yyyy-MM-dd") private Date timeInfo; @ApiModelProperty(value = "夿³¨") @ExcelColumn(name="夿³¨") private String remark; @ApiModelProperty(value = "å ¥åæ»äººæ¬¡", example = "1") @ExcelColumn(name="å ¥åæ»äººæ¬¡") private Integer inMemberNum; @ApiModelProperty(value = "åºåæ»äººæ¬¡", example = "1") @ExcelColumn(name="åºåæ»äººæ¬¡") private Integer outMemberNum; @ApiModelProperty(value = "è®¿å®¢å ¥å人次", example = "1") @ExcelColumn(name="è®¿å®¢å ¥å人次") private Integer inVisitorNum; @ApiModelProperty(value = "访客åºå人次", example = "1") @ExcelColumn(name="访客åºå人次") private Integer outVisitorNum; @ApiModelProperty(value = "访客ç»è®°äººæ¬¡", example = "1") @ExcelColumn(name="访客ç»è®°äººæ¬¡") private Integer singinVisitorNum; @ApiModelProperty(value = "访客ç¾ç¦»äººæ¬¡", example = "1") @ExcelColumn(name="访客ç¾ç¦»äººæ¬¡") private Integer leaveVisitorNum; @ApiModelProperty(value = "ç¸å ³æ¹å ¥å人次", example = "1") @ExcelColumn(name="ç¸å ³æ¹å ¥å人次") private Integer inOrtherMemberNum; @ApiModelProperty(value = "ç¸å ³æ¹åºå人次", example = "1") @ExcelColumn(name="ç¸å ³æ¹åºå人次") private Integer outOrtherMemberNum; @ApiModelProperty(value = "å é¨äººåå ¥å人次", example = "1") @ExcelColumn(name="å é¨äººåå ¥å人次") private Integer inSelfMemberNum; @ApiModelProperty(value = "å é¨äººååºå人次", example = "1") @ExcelColumn(name="å é¨äººååºå人次") private Integer outSelfMemberNum; @ApiModelProperty(value = "å ¥å车次", example = "1") @ExcelColumn(name="å ¥å车次") private Integer inCarNum; @ApiModelProperty(value = "åºå车次", example = "1") @ExcelColumn(name="åºå车次") private Integer outCarNum; } server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -137,7 +137,6 @@ @ApiModelProperty(value = "éç¥å ¥åçå¾ æ¶é´") @ExcelColumn(name="éç¥å ¥åçå¾ æ¶é´") private Date inwaitDate; @ApiModelProperty(value = "éç¥å ¥åçå¾ æä½äººç¼ç ", example = "1") @@ -147,8 +146,6 @@ @ApiModelProperty(value = "å«å·æ¶é´") @ExcelColumn(name="å«å·æ¶é´") private Date callDate; @ApiModelProperty(value = "å«å·äººç¼ç ", example = "1") @@ -197,7 +194,6 @@ @ApiModelProperty(value = "车è¾ç¦»åæ¶é´") @ExcelColumn(name="车è¾ç¦»åæ¶é´") private Date outDate; @ApiModelProperty(value = "ç¦»åæ¹å¼ 0èªå¨ç¦»å 1æå¨ç¦»åº", example = "1") server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -116,6 +116,10 @@ @TableField(exist = false) private String keyWords; @ApiModelProperty(value = "ç±»å 0å³å¡å ¬å¸ 1å é¨ç»ç»") @TableField(exist = false) private Integer companyType; @ApiModelProperty(value = "å¼å§æ¶é´") @TableField(exist = false) private Date startTime; server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutDayCountService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,97 @@ package com.doumee.service.business; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.business.model.InoutDayCount; import java.util.List; /** * åºå ¥åºäººæ¬¡è½¦æ¬¡æ¯æ¥ç»è®¡è¡¨Serviceå®ä¹ * @author æ±è¹è¹ * @date 2024/10/12 16:19 */ public interface InoutDayCountService { /** * å建 * * @param inoutDayCount å®ä½å¯¹è±¡ * @return Integer */ Integer create(InoutDayCount inoutDayCount); /** * 主é®å é¤ * * @param id ä¸»é® */ void deleteById(Integer id); /** * å é¤ * * @param inoutDayCount å®ä½å¯¹è±¡ */ void delete(InoutDayCount inoutDayCount); /** * æ¹é主é®å é¤ * * @param ids 主é®é */ void deleteByIdInBatch(List<Integer> ids); /** * 䏻鮿´æ° * * @param inoutDayCount å®ä½å¯¹è±¡ */ void updateById(InoutDayCount inoutDayCount); /** * æ¹é䏻鮿´æ° * * @param inoutDayCounts å®ä½é */ void updateByIdInBatch(List<InoutDayCount> inoutDayCounts); /** * 䏻鮿¥è¯¢ * * @param id ä¸»é® * @return InoutDayCount */ InoutDayCount findById(Integer id); /** * æ¡ä»¶æ¥è¯¢åæ¡è®°å½ * * @param inoutDayCount å®ä½å¯¹è±¡ * @return InoutDayCount */ InoutDayCount findOne(InoutDayCount inoutDayCount); /** * æ¡ä»¶æ¥è¯¢ * * @param inoutDayCount å®ä½å¯¹è±¡ * @return List<InoutDayCount> */ List<InoutDayCount> findList(InoutDayCount inoutDayCount); /** * å页æ¥è¯¢ * * @param pageWrap å页对象 * @return PageData<InoutDayCount> */ PageData<InoutDayCount> findPage(PageWrap<InoutDayCount> pageWrap); /** * æ¡ä»¶ç»è®¡ * * @param inoutDayCount å®ä½å¯¹è±¡ * @return long */ long count(InoutDayCount inoutDayCount); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/VisitsService.java
@@ -1,7 +1,9 @@ package com.doumee.service.business; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.dao.admin.response.PCWorkPlatformDataVO; import com.doumee.dao.business.dto.ResetPasswordDTO; import com.doumee.dao.business.model.Visits; import com.doumee.dao.web.reqeust.AuditApproveDTO; @@ -143,4 +145,6 @@ void resetPassword(ResetPasswordDTO resetPasswordDTO); void visitResend(Integer visitId); PCWorkPlatformDataVO getPcWorkPlatformData(Integer queryType ,LoginUserInfo loginUserInfo); } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutDayCountServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,170 @@ package com.doumee.service.business.impl; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; import com.doumee.dao.business.InoutDayCountMapper; import com.doumee.dao.business.model.InoutDayCount; import com.doumee.service.business.InoutDayCountService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; /** * åºå ¥åºäººæ¬¡è½¦æ¬¡æ¯æ¥ç»è®¡è¡¨Serviceå®ç° * @author æ±è¹è¹ * @date 2024/10/12 16:19 */ @Service public class InoutDayCountServiceImpl implements InoutDayCountService { @Autowired private InoutDayCountMapper inoutDayCountMapper; @Override public Integer create(InoutDayCount inoutDayCount) { inoutDayCountMapper.insert(inoutDayCount); return inoutDayCount.getId(); } @Override public void deleteById(Integer id) { inoutDayCountMapper.deleteById(id); } @Override public void delete(InoutDayCount inoutDayCount) { UpdateWrapper<InoutDayCount> deleteWrapper = new UpdateWrapper<>(inoutDayCount); inoutDayCountMapper.delete(deleteWrapper); } @Override public void deleteByIdInBatch(List<Integer> ids) { if (CollectionUtils.isEmpty(ids)) { return; } inoutDayCountMapper.deleteBatchIds(ids); } @Override public void updateById(InoutDayCount inoutDayCount) { inoutDayCountMapper.updateById(inoutDayCount); } @Override public void updateByIdInBatch(List<InoutDayCount> inoutDayCounts) { if (CollectionUtils.isEmpty(inoutDayCounts)) { return; } for (InoutDayCount inoutDayCount: inoutDayCounts) { this.updateById(inoutDayCount); } } @Override public InoutDayCount findById(Integer id) { return inoutDayCountMapper.selectById(id); } @Override public InoutDayCount findOne(InoutDayCount inoutDayCount) { QueryWrapper<InoutDayCount> wrapper = new QueryWrapper<>(inoutDayCount); return inoutDayCountMapper.selectOne(wrapper); } @Override public List<InoutDayCount> findList(InoutDayCount inoutDayCount) { QueryWrapper<InoutDayCount> wrapper = new QueryWrapper<>(inoutDayCount); return inoutDayCountMapper.selectList(wrapper); } @Override public PageData<InoutDayCount> findPage(PageWrap<InoutDayCount> pageWrap) { IPage<InoutDayCount> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); QueryWrapper<InoutDayCount> queryWrapper = new QueryWrapper<>(); Utils.MP.blankToNull(pageWrap.getModel()); if (pageWrap.getModel().getId() != null) { queryWrapper.lambda().eq(InoutDayCount::getId, pageWrap.getModel().getId()); } if (pageWrap.getModel().getCreator() != null) { queryWrapper.lambda().eq(InoutDayCount::getCreator, pageWrap.getModel().getCreator()); } if (pageWrap.getModel().getCreateDate() != null) { queryWrapper.lambda().ge(InoutDayCount::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate())); queryWrapper.lambda().le(InoutDayCount::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate())); } if (pageWrap.getModel().getEditor() != null) { queryWrapper.lambda().eq(InoutDayCount::getEditor, pageWrap.getModel().getEditor()); } if (pageWrap.getModel().getEditDate() != null) { queryWrapper.lambda().ge(InoutDayCount::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate())); queryWrapper.lambda().le(InoutDayCount::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate())); } if (pageWrap.getModel().getIsdeleted() != null) { queryWrapper.lambda().eq(InoutDayCount::getIsdeleted, pageWrap.getModel().getIsdeleted()); } if (pageWrap.getModel().getTimeInfo() != null) { queryWrapper.lambda().ge(InoutDayCount::getTimeInfo, Utils.Date.getStart(pageWrap.getModel().getTimeInfo())); queryWrapper.lambda().le(InoutDayCount::getTimeInfo, Utils.Date.getEnd(pageWrap.getModel().getTimeInfo())); } if (pageWrap.getModel().getRemark() != null) { queryWrapper.lambda().eq(InoutDayCount::getRemark, pageWrap.getModel().getRemark()); } if (pageWrap.getModel().getInMemberNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getInMemberNum, pageWrap.getModel().getInMemberNum()); } if (pageWrap.getModel().getOutMemberNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getOutMemberNum, pageWrap.getModel().getOutMemberNum()); } if (pageWrap.getModel().getInVisitorNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getInVisitorNum, pageWrap.getModel().getInVisitorNum()); } if (pageWrap.getModel().getOutVisitorNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getOutVisitorNum, pageWrap.getModel().getOutVisitorNum()); } if (pageWrap.getModel().getSinginVisitorNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getSinginVisitorNum, pageWrap.getModel().getSinginVisitorNum()); } if (pageWrap.getModel().getLeaveVisitorNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getLeaveVisitorNum, pageWrap.getModel().getLeaveVisitorNum()); } if (pageWrap.getModel().getInOrtherMemberNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getInOrtherMemberNum, pageWrap.getModel().getInOrtherMemberNum()); } if (pageWrap.getModel().getOutOrtherMemberNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getOutOrtherMemberNum, pageWrap.getModel().getOutOrtherMemberNum()); } if (pageWrap.getModel().getInSelfMemberNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getInSelfMemberNum, pageWrap.getModel().getInSelfMemberNum()); } if (pageWrap.getModel().getOutSelfMemberNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getOutSelfMemberNum, pageWrap.getModel().getOutSelfMemberNum()); } if (pageWrap.getModel().getInCarNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getInCarNum, pageWrap.getModel().getInCarNum()); } if (pageWrap.getModel().getOutCarNum() != null) { queryWrapper.lambda().eq(InoutDayCount::getOutCarNum, pageWrap.getModel().getOutCarNum()); } for(PageWrap.SortData sortData: pageWrap.getSorts()) { if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { queryWrapper.orderByDesc(sortData.getProperty()); } else { queryWrapper.orderByAsc(sortData.getProperty()); } } return PageData.from(inoutDayCountMapper.selectPage(page, queryWrapper)); } @Override public long count(InoutDayCount inoutDayCount) { QueryWrapper<InoutDayCount> wrapper = new QueryWrapper<>(inoutDayCount); return inoutDayCountMapper.selectCount(wrapper); } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -17,6 +17,7 @@ import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest; import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse; import com.doumee.core.haikang.service.HKService; import com.doumee.core.model.LoginUserInfo; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; @@ -24,6 +25,7 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.core.wx.wxPlat.WxPlatNotice; import com.doumee.dao.admin.response.PCWorkPlatformDataVO; import com.doumee.dao.business.*; import com.doumee.dao.business.dao.CompanyMapper; import com.doumee.dao.business.dto.ResetPasswordDTO; @@ -31,7 +33,10 @@ import com.doumee.dao.business.join.VisitsJoinMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.system.SystemUserMapper; import com.doumee.dao.system.dto.NoticesDTO; import com.doumee.dao.system.dto.ResetSystemUserPwdDTO; import com.doumee.dao.system.join.NoticesJoinMapper; import com.doumee.dao.system.model.Notices; import com.doumee.dao.system.model.SystemUser; import com.doumee.dao.web.reqeust.AuditApproveDTO; import com.doumee.dao.web.reqeust.ErpVisitDTO; @@ -108,6 +113,8 @@ private SystemUserMapper systemUserMapper; @Autowired private ApproveService approveService; @Autowired private NoticesJoinMapper noticesJoinMapper; @Override @@ -1463,4 +1470,104 @@ systemUserBiz.resetPwd(dto); } /** * * @param queryType æ¥è¯¢ç±»åï¼1=å¨å人æ°ï¼2=æ¥è¡¨æ°æ®ï¼3=å¾ åäºé¡¹ï¼4=è¶ æ¶é¢è¦ * @param loginUserInfo * @return */ @Override public PCWorkPlatformDataVO getPcWorkPlatformData(Integer queryType ,LoginUserInfo loginUserInfo){ PCWorkPlatformDataVO pcWorkPlatformDataVO = new PCWorkPlatformDataVO(); if(Constants.equalsInteger(queryType,Constants.ONE)){ List<Retention> retentionList = retentionMapper.selectJoinList(Retention.class, new MPJLambdaWrapper<Retention>() .selectAll(Retention.class) .selectAs(Company::getType,Retention::getCompanyType) .leftJoin(Company.class,Company::getId,Retention::getCompanyId) ); //仿¥å¨åäººæ° pcWorkPlatformDataVO.setTodayInParkUserNum( retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)).count() ); pcWorkPlatformDataVO.setTodayInUserNum(0L); pcWorkPlatformDataVO.setTodayOutUserNum(0L); //å¨åé¿æç¸å ³æ¹äººæ° pcWorkPlatformDataVO.setInParkLwUserNum( retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyType(),Constants.ONE)).count() ); pcWorkPlatformDataVO.setLwUserInNum(0L); pcWorkPlatformDataVO.setLwUserOutNum(0L); //å¨å访客æ°é pcWorkPlatformDataVO.setInParkVisitUserNum( retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO)&&Objects.isNull(i.getCompanyType())).count() ); pcWorkPlatformDataVO.setVisitUserNum(0L); pcWorkPlatformDataVO.setSignLevelNum(0L); //å¨åè½¦è¾ pcWorkPlatformDataVO.setTodayInParkCarNum( retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)).count() ); pcWorkPlatformDataVO.setTodayInCarNum(0L); pcWorkPlatformDataVO.setTodayOutCarNum(0L); }else if(Constants.equalsInteger(queryType,Constants.TWO)){ }else if(Constants.equalsInteger(queryType,Constants.THREE)) { MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(Notices.class); if (Objects.isNull(loginUserInfo.getMemberId())) { queryWrapper.eq("1", "2"); } else { queryWrapper.eq(Notices::getStatus, Constants.ZERO); queryWrapper.eq(Notices::getSendacopy, Constants.ZERO); queryWrapper.eq(Notices::getParam2, Constants.ZERO); queryWrapper.eq(Notices::getUserId, loginUserInfo.getMemberId()); } queryWrapper.orderByDesc(Notices::getCreateDate); List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper); pcWorkPlatformDataVO.setNoticesList(noticesList); pcWorkPlatformDataVO.setNoticesNum(noticesList.size()); }else{ String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode(); MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(Visits.class); queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName); queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut"); queryWrapper.selectAs(Member::getType,Visits::getMemberType); queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment); queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID"); queryWrapper.eq(Visits::getStatus,Constants.VisitStatus.signin); queryWrapper.apply(" TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+" "); queryWrapper.ne("m.type ",Constants.TWO); queryWrapper.eq(Visits::getIsdeleted,Constants.ZERO); queryWrapper.orderByDesc(Visits::getEditDate); List<Visits> result = visitsJoinMapper.selectList(queryWrapper); if(result!=null&&result!=null){ result.stream().forEach(s ->{ if(s.getStatus().equals(Constants.VisitStatus.signin)){ if(s.getTimeOut()<=Integer.valueOf(code)&&s.getTimeOut()>=0){ s.setOutStatus(Constants.TWO); }else if(s.getTimeOut()>Constants.ZERO){ s.setOutStatus(Constants.ZERO); }else{ s.setOutStatus(Constants.ONE); } } }); } pcWorkPlatformDataVO.setTimeOutVisitList(result); pcWorkPlatformDataVO.setTimeOutVisitNum(result.size()); } return pcWorkPlatformDataVO; } }