Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2025-03-06 b92ca63c89b74404c3684f18c734d83531a9dd3f

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -726,7 +726,7 @@
                "meeting_user_rel ur\n" +
                "LEFT JOIN `SYSTEM_USER` su ON ur.USER_ID = su.id \n" +
                "LEFT JOIN meeting_book b ON ur.OBJ_ID = b.id \n" +
                "WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS = 0" +
                "WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS in(0,2) and b.isdeleted=0" +
                "<if test='userId != null'>"+
                "and ur.USER_ID = #{userId}\n" +
                "</if>"+

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java

@@ -6,6 +6,7 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.vo.HiddenDangerDataVO;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
@@ -120,10 +121,9 @@

    @ApiOperation("隐患数据统计")
    @PostMapping("/hiddenDangerData")
    public ApiResponse hiddenDangerData (@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
    public ApiResponse<HiddenDangerDataVO> hiddenDangerData (@RequestBody HiddenDanger hiddenDanger, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        hiddenDanger.setLoginUserInfo(getLoginUser(token));
        hiddenDangerService.hiddenDangerData(hiddenDanger);
        return ApiResponse.success("操作成功");
        return ApiResponse.success("操作成功",hiddenDangerService.hiddenDangerData(hiddenDanger));
    }



 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/HiddenDanger.java

@@ -58,7 +58,7 @@
    private Integer areaId;

    @ApiModelProperty(value = "状态 0待处理 1已处理 2不处理", example = "1")
    @ExcelColumn(name="处理结果" ,valueMapping ="0=0待处理;1=已处理;2=不处理;",index = 6,width = 6)
    @ExcelColumn(name="处理结果" ,valueMapping ="0=待处理;1=已处理;2=不处理;",index = 6,width = 6)
    private Integer status;

    @ApiModelProperty(value = "申请处理人编码(关联member)", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -801,6 +801,9 @@
                List<HiddenDangerParam> hiddenDangerParamList = hiddenDangerParamMapper.selectList(new QueryWrapper<HiddenDangerParam>()
                        .lambda().eq(HiddenDangerParam::getIsdeleted,Constants.ZERO).eq(HiddenDangerParam::getType,Constants.ONE));
                for (Integer cateId:cateSetList) {
                    if(Objects.isNull(cateId)){
                        continue;
                    }
                    Optional<HiddenDangerParam> optionalHiddenDanger = hiddenDangerParamList.stream().filter(i->Constants.equalsInteger(i.getId(),cateId)).findAny();
                    if(optionalHiddenDanger.isPresent()){
                        GeneralDataVO generalDataVO = new GeneralDataVO();
@@ -810,7 +813,8 @@
                        generalDataVO.setTotal(total);
                        generalDataVO.setRata(
                                    Constants.equalsInteger(total,Constants.ZERO)?
                                        BigDecimal.ZERO:new BigDecimal(total.toString()).divide(new BigDecimal(hiddenDangerDataVO.getTotal().toString()),2).multiply(new BigDecimal("100"))
                                        BigDecimal.ZERO:new BigDecimal(total.toString())
                                            .divide(new BigDecimal(hiddenDangerDataVO.getTotal().toString()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"))
                                );
                        cateGeneralDataList.add(generalDataVO);
                    }
@@ -825,6 +829,9 @@
                List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
                        .lambda().eq(Company::getIsdeleted,Constants.ZERO));
                for (Integer companyId:companyIdSetList) {
                    if(Objects.isNull(companyId)){
                        continue;
                    }
                    Optional<Company> optionalCompany = companyList.stream().filter(i->Constants.equalsInteger(i.getId(),companyId)).findAny();
                    if(optionalCompany.isPresent()){
                        GeneralDataVO generalDataVO = new GeneralDataVO();

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java

@@ -258,17 +258,18 @@
        if(count!=null){
            data.setEventNum(count);
        }
        Long count1 = visitEventJoinMapper.selectCount(new QueryWrapper<VisitEvent>().lambda()
        VisitEvent count1 = visitEventJoinMapper.selectOne(new QueryWrapper<VisitEvent>()
                 .select("count(distinct(visitor_id)) as num")
                        .lambda()
                .ge(StringUtils.isNotBlank(model.getStartTime()),VisitEvent::getCreateDate, model.getStartTime())
                .le(StringUtils.isNotBlank(model.getEndTime()), VisitEvent::getCreateDate,model.getEndTime())
                .eq( VisitEvent::getIsdeleted,Constants.ZERO)
                .eq( VisitEvent::getInOrOut,Constants.ZERO)
                .isNotNull(VisitEvent::getVisitorId)
                .eq(VisitEvent::getEventType,HKConstants.EventTypes.VISIT_SIGN_ICCM_PASS.getKey())
                .groupBy(VisitEvent::getVisitorId)
                );
        if(count1!=null){
            data.setVisitorNum(count);
            data.setVisitorNum((long)Constants.formatIntegerNum(count1.getNum()));
        }
        return data;
    }
@@ -322,13 +323,11 @@
        return visitEventDTOIPage;
    }


    private List<VisitEvent> newVisitEvent(List<VisitEvent> VisitEventDTOList) {
        List<String> codes = Arrays.asList(Constants.FTP_RESOURCE_PATH,Constants.MEMBER_IMG);
        List<SystemDictData> list = systemDictDataMapper.list(codes);
        Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
        VisitEventDTOList.stream().forEach(obj->{

            if(StringUtils.isNotBlank( obj.getCaptureUrl())
                    && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX)
                    && !obj.getCaptureUrl().startsWith(HKConstants.IMG_INDEX_ERROR)) {
@@ -338,7 +337,7 @@
                            +obj.getCaptureUrl());
                }
            }
            obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType())); ;
            obj.setEventTypeName(HKConstants.EventTypes.getName(obj.getEventType()));
        });
        return  VisitEventDTOList;
    }