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

liukangdong

2024-10-16 611e8f7f1986e96980712a083d06b7cfe45f928c

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

 admin/src/api/business/position.js

@@ -2,12 +2,16 @@

// 查询

export function fetchList (data) {
export function allList (data) {
  return request.post('/visitsAdmin/cloudService/business/position/list', data, {
    trim: true
  })
}

export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/position/page', data, {
    trim: true
  })
}
// 创建
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/position/create', data)

 admin/src/components/business/OperaMemberWindow.vue

@@ -67,7 +67,7 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import UploadFaceImg from '@/components/common/UploadFaceImg'
import { checkMobile, validIdCardNo, validIdCardNoNew } from '@/utils/form'
import { fetchList as positionList } from '@/api/business/position'
import { allList   } from '@/api/business/position'
export default {
  name: 'OperaCompanyWindow',
  extends: BaseOpera,
@@ -166,7 +166,7 @@
      })
    },
    getPositionList () {
      positionList({})
      allList({})
        .then(res => {
          this.positionList = res
        })

 admin/src/components/business/OperaPositionWindow.vue

@@ -47,7 +47,7 @@
  },
  created () {
    this.config({
      api: '/business/',
      api: '/business/position',
      'field.id': 'id'
    })
  },

 admin/src/views/business/internalMember.vue

@@ -207,7 +207,7 @@
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
import { fetchList as alllist } from '@/api/business/position'
import { allList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
  name: 'internalMember',
@@ -267,7 +267,7 @@
      this.$refs.OperaMemberRoleWindow.open('内部员工下发权限', ids, names, this.searchForm.companyType)
    },
    getPositionList () {
      alllist({})
      allList({})
        .then(res => {
          this.positionList = res
        })

 admin/src/views/business/position.vue

@@ -1,5 +1,5 @@
<template>
  <TableLayout :permissions="['business:member:query']">
  <TableLayout :permissions="['business:position:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
      <el-form-item label="" prop="name">
@@ -56,14 +56,14 @@
import Pagination from '@/components/common/Pagination'
import OperaPositionWindow from '@/components/business/OperaPositionWindow'
export default {
  name: 'areaSet',
  name: 'userPosition',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaPositionWindow },
  data () {
    return {
      // 搜索
      searchForm: {
        title: ''
        name: ''
      }
    }
  },

 admin/src/views/business/relativeMember.vue

@@ -214,7 +214,7 @@
import OperaTrainTimeImportWindow from '@/components/business/OperaTrainTimeImportWindow'
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import { fetchList } from '@/api/business/company'
import { fetchList as positionList } from '@/api/business/position'
import { allList as positionList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
  name: 'internalMember',

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

@@ -122,7 +122,7 @@
    public static final String HK_NGINX_URL = "HK_NGINX_URL";
    public static final String PLATFORM_BOOKING_TIPS = "PLATFORM_BOOKING_TIPS";
    public static final String PLATFORM_GUIDEMAP = "PLATFORM_GUIDEMAP";
    public static final String WSM_PARAM ="WSM_PARAM" ;
    public static final String WMS_PARAM ="WMS_PARAM" ;
    public static final String WMS_INBOUND_PLATFROM_URL ="WMS_INBOUND_PLATFROM_URL" ;
    public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ;
    public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ;

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

@@ -75,7 +75,7 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    //@CloudRequiredPermission("business:carevent:query")
    @CloudRequiredPermission("business:carevent:query")
    public ApiResponse<PageData<CarEventDTO>> findPage (@RequestBody PageWrap<CarEvent> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(carEventService.findVisitCarPage(pageWrap));
    }

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

@@ -70,14 +70,14 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    //@CloudRequiredPermission("business:deviceevent:query")
    @CloudRequiredPermission("business:deviceevent:query")
    public ApiResponse<PageData<DeviceEventDTO>> findPage (@RequestBody PageWrap<DeviceEvent> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(deviceEventService.findDeviceEventDTOPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    //@CloudRequiredPermission("business:deviceevent:exportExcel")
    @CloudRequiredPermission("business:deviceevent:exportExcel")
    public void exportExcel (@RequestBody PageWrap<DeviceEvent> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        ExcelExporter.build(DeviceEventDTO.class).export(deviceEventService.findDeviceEventDTOPage(pageWrap).getRecords(), "门禁事件推送记录表", response);
    }

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

@@ -69,14 +69,14 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    //@CloudRequiredPermission("business:retention:query")
    @CloudRequiredPermission("business:retention:query")
    public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    //@CloudRequiredPermission("business:retention:exportExcel")
    @CloudRequiredPermission("business:retention:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Retention> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        ExcelExporter.build(Retention.class).export(retentionService.findTrainTimePage(pageWrap).getRecords(), "实时在场人员", response);
    }

 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java

@@ -43,7 +43,7 @@
        String xkzx = "xkzx";//消控中心
        String ngzx = "ngzx";//能管中心
        String jsc = "jsc";//物业后勤
        String kqgl = "kqgl";//考勤管理
        String kqgzt = "kqgzt";//考勤管理

    }


 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java

@@ -1093,7 +1093,7 @@
        }else  if(Constants.equalsInteger(type,Constants.THREE)){
            menuId = HKConstants.MenuPageId.jsc;
        }else  if(Constants.equalsInteger(type,Constants.FOUR)){
            menuId = HKConstants.MenuPageId.kqgl;
            menuId = HKConstants.MenuPageId.kqgzt;
        }
        log.info("【海康获取工作台菜单免密登陆调整地址】================开始====menuId:"+menuId+"==token:"+token);
        try {

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/request/MemberQuery.java

@@ -59,6 +59,8 @@

    @ApiModelProperty(value = "操作人员 ")
    private Integer createrId;
    @ApiModelProperty(value = "岗位ID")
    private Integer positionId;




 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/CarEventDTO.java

@@ -91,9 +91,13 @@
    @ApiModelProperty(value = "人员组织公司")
    @ExcelColumn(name="公司/部门",index = 9,width = 16)
    private String personCompanyName;

    @ApiModelProperty(value = "访客公司1")
    private String visitCompanyName;

    @ApiModelProperty(value = "组织类型：0=相关方；1=内部")
    private String companyType;

    @ApiModelProperty(value = "姓名")
    @ExcelColumn(name="姓名",index = 7,width = 16)
    private String personName;

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java

@@ -107,6 +107,9 @@
    @ExcelColumn(name="公司/组织",index = 4,width = 16)
    private String personCompanyName;

    @ApiModelProperty(value = "组织类型：0=相关方；1=内部")
    private String companyType;

    @ApiModelProperty(value = "手机号")
    @ExcelColumn(name="手机号",index = 3,width = 10)
    private String personPhone;

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

@@ -250,10 +250,13 @@
    @ApiModelProperty(value = "小时 ")
    @TableField(exist = false)
    private Integer hour  ;
    @ApiModelProperty(value = "人员类型 0劳务访客 1普通访客  2员工")
    @ApiModelProperty(value = "人员类型 0相关方 1普通访客  2员工")
    @TableField(exist = false)
    private Integer memberType  ;

    @ApiModelProperty(value = "人员类型 0=相关方；1=访客人员；2=内部人员")
    @TableField(exist = false)
    private Integer  queryUserType;

    @ApiModelProperty(value = "访客公司名称")
    @TableField(exist = false)

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

@@ -269,9 +269,15 @@
    @TableField(exist = false)
    private String companyName;

    @ApiModelProperty(value = "人员类型")
//    @ApiModelProperty(value = "人员类型 0=相关方；1=访客人员；2=内部人员")
//    @TableField(exist = false)
//    private Integer  personType;



    @ApiModelProperty(value = "人员类型 0=相关方；1=访客人员；2=内部人员")
    @TableField(exist = false)
    private String  personType;
    private Integer  queryUserType;

    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)

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

@@ -388,6 +388,16 @@
    @TableField(exist = false)
    private Date beginWorkDateEnd;

    @ApiModelProperty(value = "完成作业时间起")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false)
    private Date beginDoneDateStart;

    @ApiModelProperty(value = "完成作业时间止")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @TableField(exist = false)
    private Date beginDoneDateEnd;


    @ApiModelProperty(value = "创建时间起")
    @TableField(exist = false)

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

@@ -143,4 +143,11 @@
    @TableField(exist = false)
    private Integer num;


    @ApiModelProperty(value = "查询人员类型")
    @TableField(exist = false)
    private Integer queryUserType;



}

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

@@ -1561,6 +1561,7 @@
            platformBooks.setStatus(approveDTO.getStatus());
            platformBooks.setEditDate(new Date());
            platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
            platformBooksMapper.updateById(platformBooks);
            if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
                PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
                if(Objects.isNull(platformReason)){

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

@@ -328,8 +328,8 @@
                .selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
                .selectAs(Member::getName,CarEventDTO::getPersonName)
                .selectAs(Member::getVisitCompanyName,CarEventDTO::getVisitCompanyName)
                .selectAs(Company::getName,CarEventDTO::getPersonCompanyName);

                .selectAs(Company::getName,CarEventDTO::getPersonCompanyName)
                .selectAs(Company::getType,CarEventDTO::getCompanyType);
        queryWrapper
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
                CarEvent::getPlateNos,
@@ -340,9 +340,18 @@
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
                        Company::getName,
                        pageWrap.getModel().getCompanyName())
                .eq( pageWrap.getModel().getMemberType()!=null,
                        Member::getType,
                        pageWrap.getModel().getMemberType())


                .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
                        Company::getType, Constants.ZERO)

                .isNull( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
                        Member::getCompanyId)

                .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
                        Company::getType, Constants.ONE)


                .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                        CarEvent::getEventType,
                        pageWrap.getModel().getEventType())

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

@@ -107,7 +107,7 @@
        carUseBook.setCreateDate(new Date());
        carUseBook.setIsdeleted(Constants.ZERO);
        Cars cars = carsMapper.selectById(carUseBook.getCarId());
        if(Objects.isNull(cars)||!cars.getType().equals(Constants.ONE)){
        if(Objects.isNull(cars)||!cars.getType().equals(Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"车辆信息异常");
        }
        carUseBook.setCarCode(cars.getCode());

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

@@ -368,12 +368,24 @@
                .selectAs(Member::getPhone,DeviceEventDTO::getPersonPhone)
                .selectAs(Member::getIdcardDecode,DeviceEventDTO::getPersonIdcardDecode)
                .selectAs(Device::getName,DeviceEventDTO::getDevName)
                .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName);
                .selectAs(Company::getName,DeviceEventDTO::getPersonCompanyName)
                .selectAs(Company::getType,DeviceEventDTO::getCompanyType);

        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),w->
                        w.like(Member::getName,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,pageWrap.getModel().getKeyWords()))
                .eq(StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),
                        Member::getType,
                        pageWrap.getModel().getPersonType())


                .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
                        Company::getType, Constants.ZERO)

                .isNull( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
                        Member::getCompanyId)

                .eq( pageWrap.getModel().getQueryUserType()!=null&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
                        Company::getType, Constants.ONE)

                .eq(Member::getIsdeleted,Constants.ZERO)

                .eq(Objects.nonNull(pageWrap.getModel().getEventType()),
                        DeviceEvent::getEventType,
                        pageWrap.getModel().getEventType())
@@ -385,7 +397,7 @@
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        DeviceEvent::getCreateDate,
                        pageWrap.getModel().getEndTime())
                .isNull(StringUtils.isNotBlank(pageWrap.getModel().getPersonType()) && !StringUtils.equals(pageWrap.getModel().getPersonType(),Constants.TWO+""),Member::getId)//除了内部人员都是外来访客

                .orderByDesc(DeviceEvent::getCreateDate);
        queryWrapper.orderByDesc(DeviceEvent::getHappenTime);
        IPage<DeviceEventDTO> deviceEventDTOIPage = deviceEventJoinMapper.selectJoinPage(page, DeviceEventDTO.class, queryWrapper);

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

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

@@ -108,6 +108,7 @@
        wrapper.select(Device::getId, Device::getName, Device::getDoorName,Device::getRegionPathName, Device::getRegionName);
        wrapper.eq(null != param.getType(),Device::getType,param.getType())
               .eq(null !=param.getIsdeleted(),Device::getIsdeleted,param.getIsdeleted())
               .eq(Objects.isNull(param.getIsdeleted()),Device::getIsdeleted,Constants.ZERO)
               .eq(null != param.getHkStatus(),Device::getHkStatus,param.getHkStatus());
        return deviceMapper.selectList(wrapper);
    }

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

@@ -150,8 +150,10 @@
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();

            for (HiddenDangerLog bean:hiddenDangerLogList) {
                if(StringUtils.isNotBlank(bean.getAvatar())){
                if(StringUtils.isNotBlank(bean.getAvatar() ) && bean.getAvatar().indexOf("HKIMG")<0 ){
                    bean.setAvatar(path + bean.getAvatar());
                }else{
                    bean.setAvatar(null);
                }
            }
        }

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

@@ -209,10 +209,12 @@
        insert.setHkId(UUID.randomUUID().toString().replace("-",""));
        insert.setHkStatus(Constants.ONE);
        insert.setSex(Constants.getSexByCardNo( member.getIdcardNo()));//根据身份证号获取性别
        if(StringUtils.isNotBlank(member.getIdcardNo())){
        insert.setBirthday( DateUtil.fromStringToDate("yyyyMMdd",IdcardUtil.getBirthByIdCard(member.getIdcardNo())));
        insert.setPhone(member.getPhone());
        insert.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()));//身份证号加密
        insert.setIdcardDecode( Constants.getTuominStr(member.getIdcardNo()));
        }
        insert.setPhone(member.getPhone());
        insert.setStatus(Constants.ZERO);
        return  insert;
    }
@@ -330,11 +332,13 @@
        if (StringUtils.isNotBlank(member.getIdcardNo()) && !IdcardUtil.isValidCard(member.getIdcardNo())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }
        if(StringUtils.isNotBlank(member.getIdcardNo())){
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .in(Member::getType,new Integer[]{Constants.ZERO,Constants.TWO})
                .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, member.getIdcardNo()))
                .eq(Member::getIsdeleted,Constants.ZERO)) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "身份证号【"+member.getIdcardNo()+"】已被使用，不能重复");
            }
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .eq(Member::getPhone,  member.getPhone())
@@ -502,16 +506,7 @@
        if (PhoneUtil.isPhone(member.getPhone())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"电话号码格式有误");
        }
        if (IdcardUtil.isValidCard(member.getIdcardNo())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
        }
        if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"性别有误");
        }
        //获取出生日期
        String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
        //脱敏操作
        String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
//
        //转换日期
        Member insert = new Member();
        insert.setCreator(loginUserInfo.getId());
@@ -524,11 +519,23 @@
        insert.setImgurl(member.getImgurl());
        insert.setType(Constants.ZERO);
        insert.setName(member.getName());
        insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
        insert.setPhone(member.getPhone());
        if(StringUtils.isNotBlank(member.getIdcardNo())){
            if (IdcardUtil.isValidCard(member.getIdcardNo())){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"身份证号格式有误");
            }
            if (IdcardUtil.getGenderByIdCard(member.getIdcardNo()) == member.getSex()){
                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"性别有误");
            }
            //获取出生日期
            String birthByIdCard = IdcardUtil.getBirthByIdCard(member.getIdcardNo());
            insert.setBirthday(DateUtil.fromStringToDate("yyyyMMdd",birthByIdCard));
        insert.setIdcardNo(Utils.Secure.encryptString(member.getIdcardNo()));
        IdcardUtil.isValidCard(member.getIdcardNo());
            //脱敏操作
            String hide = IdcardUtil.hide(member.getIdcardNo(), 5, 14);
        insert.setIdcardDecode(hide);
        }
        insert.setStatus(Constants.ZERO);
        insert.setParentId(member.getParentId());
        memberMapper.insert(insert);
@@ -1222,6 +1229,9 @@
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getPositionId() != null) {
            queryWrapper.lambda().eq(Member::getPositionId, pageWrap.getModel().getPositionId());
        }
        if (pageWrap.getModel().getBirthday() != null) {
            queryWrapper.lambda().ge(Member::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
            queryWrapper.lambda().le(Member::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
@@ -1376,6 +1386,7 @@
                .eq(Objects.isNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getIsdeleted()),Member::getIsdeleted,pageWrap.getModel().getIsdeleted())
                .eq(Objects.nonNull(pageWrap.getModel().getCompanyType()),Company::getType,pageWrap.getModel().getCompanyType())
                .eq(Objects.nonNull(pageWrap.getModel().getPositionId()),Member::getPositionId,pageWrap.getModel().getPositionId())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName())
//                .eq(Member::getStatus,Constants.Status.ENABLE.getValue())
//                .eq(Member::getType,Constants.memberType.internal)

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

@@ -191,10 +191,12 @@
                .selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
                .selectAs(PlatformWmsJob::getIoCreatedate,PlatformJob::getIoCreatedate)
                .selectAs(SystemUser::getRealname,PlatformJob::getOutUserName)
                .selectAs(PlatformBooks::getId,PlatformJob::getBookId)
                .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
                .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId)
                .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
                .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)
                .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
                .eq(pageWrap.getModel().getId() != null, PlatformJob::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformJob::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -275,11 +277,13 @@
                .apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')")
                .ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
                .le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))
                .ge(pageWrap.getModel().getBeginDoneDateStart() != null, PlatformJob::getDoneDate, Utils.Date.getStart(pageWrap.getModel().getBeginDoneDateStart()))
                .le(pageWrap.getModel().getBeginDoneDateEnd() != null, PlatformJob::getDoneDate, Utils.Date.getEnd(pageWrap.getModel().getBeginDoneDateEnd()))

                .ge(pageWrap.getModel().getCreateDateStart() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
                .le(pageWrap.getModel().getCreateDateEnd() != null, PlatformWmsJob::getIoCreatedate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()))
                .eq(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh)
                .ne(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getType, Constants.platformJobType.sgscxh)
                .isNotNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ONE,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
                .isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
        ;

        for(PageWrap.SortData sortData: pageWrap.getSorts()) {

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

@@ -116,6 +116,7 @@
                .eq(PlatformWaterGas::getIsdeleted, Constants.ZERO)
                .ne(PlatformWaterGas::getId,platformWaterGas.getId())
                .apply("to_days(time_info) = to_days('"+ DateUtil.getPlusTime2(platformWaterGas.getTimeInfo()) +"')")
                .eq(PlatformWaterGas::getType, platformWaterGas.getType())
                .eq(Constants.equalsInteger(platformWaterGas.getType(),Constants.TWO),PlatformWaterGas::getCarCode,platformWaterGas.getCarCode()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该年月数据已存在，请勿重新录入，可以尝试搜索后进行数据修改！");
        }

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

@@ -108,7 +108,8 @@
                wmsJobContractVO.setPlatformWmsDetailList(
                        platformWmsDetailList.stream().filter(i->i.getIocode().equals(ioCode)).collect(Collectors.toList())
                );
                if(Objects.isNull(wmsJobContractVO.getLockStatus())&& com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){
                if(Objects.isNull(wmsJobContractVO.getLockStatus())&&
                        com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(wmsJobContractVO.getPlatformWmsDetailList())){
                    wmsJobContractVO.setLockStatus(
                            wmsJobContractVO.getPlatformWmsDetailList().get(Constants.ZERO).getLockStatus()
                    );

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

@@ -262,6 +262,7 @@
        queryWrapper.leftJoin(Company.class,Company::getId,Retention::getCompanyId);
        queryWrapper.selectAll(Retention.class)
                .selectAs(Company::getName,Retention::getCompanyName)
                .selectAs(Company::getType,Retention::getCompanyType)
                .select(" ( SELECT v.company_name FROM visits v WHERE v.member_id = t.member_id and v.status = "+Constants.VisitStatus.signin+" ORDER BY create_date DESC limit 1 ) as visitCompanyName ");
        queryWrapper.eq(Retention::getIsdeleted,Constants.ZERO)
                .like(number,Retention::getPhone,pageWrap.getModel().getKeyWords())
@@ -269,6 +270,12 @@
                .eq(Objects.nonNull(pageWrap.getModel().getType()),
                        Retention::getType,
                        pageWrap.getModel().getType())
                .isNull(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ZERO),
                       Retention::getCompanyId)
                .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.ONE),
                        Company::getType,Constants.ZERO)
                .eq(Objects.nonNull(pageWrap.getModel().getQueryUserType())&&Constants.equalsInteger(pageWrap.getModel().getQueryUserType(),Constants.TWO),
                        Company::getType,Constants.ONE)
                //过滤车辆数据
                .ne(Retention::getType,3)
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),

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

@@ -1506,7 +1506,7 @@

            //在园长期相关方人数
            pcWorkPlatformDataVO.setInParkLwUserNum(
                    retentionList.stream().filter(i->Constants.equalsInteger(i.getCompanyType(),Constants.ONE)).count()
                    retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.TWO) && Constants.equalsInteger(i.getCompanyType(),Constants.ZERO)).count()
            );
            pcWorkPlatformDataVO.setLwUserInNum(Constants.ZERO);
            pcWorkPlatformDataVO.setLwUserOutNum(Constants.ZERO);
@@ -1569,17 +1569,6 @@
            pcWorkPlatformDataVO.setWeekVisitList(weekVisitList );
            pcWorkPlatformDataVO.setWeekCarList(weekCarList);

//            List<Retention> retentionList = retentionMapper.selectJoinList(Retention.class,
//                    new MPJLambdaWrapper<Retention>()
//                            .selectAll(Retention.class)
//                            .selectAs(Company::getType,Retention::getCompanyType)
//                            .selectAs(Company::getName,Retention::getCompanyName)
//                            .leftJoin(Company.class,Company::getId,Retention::getCompanyId)
//                            .eq(Company::getType,Constants.ZERO)
//                            .groupBy(Company::getId,Company::getName)
//                            .orderByDesc(Retention::getNum)
//            );

            List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>().lambda()
                    .eq(Company::getType,Constants.ZERO)
                    .eq(Company::getIsdeleted,Constants.ZERO)
@@ -1616,6 +1605,11 @@
            List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
            pcWorkPlatformDataVO.setNoticesList(noticesList);
            pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
            if(noticesList.size() > 5 ){
                pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
            }else{
                pcWorkPlatformDataVO.setNoticesList(noticesList);
            }
        }else{
            String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
            MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -1646,8 +1640,14 @@
                    }
                });
            }
            pcWorkPlatformDataVO.setTimeOutVisitList(result);
            pcWorkPlatformDataVO.setTimeOutVisitNum(result.size());
            if(result.size() > 3 ){
                pcWorkPlatformDataVO.setTimeOutVisitList(result.subList(0,3));
            }else{
                pcWorkPlatformDataVO.setTimeOutVisitList(result);
            }


        }



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

@@ -199,7 +199,7 @@
                    .eq(Device::getDoorId,request.getSrcIndex())
                    .eq(Device::getIsdeleted,Constants.ZERO)
                    .last("limit 1" ));
            if(d!=null && !Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
            if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
                if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
                    //如果是进门，录入人员的在场数据记录
                    inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//入场人次
@@ -208,9 +208,9 @@
                }
            }
            if(member !=null){
                if(d!=null && !Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
                if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
                    delRetentionLis.add(member.getId());
                    if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
                    if( Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
                        //如果是进门，录入人员的在场数据记录
                        retentionList.add(getRetentionModelByRequest(member,request));
                        if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){

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

@@ -7,12 +7,15 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.business.third.EmayService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
@@ -47,7 +50,14 @@
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private WmsInterfaceLogMapper wmsInterfaceLogMapper;

    @Autowired
    private SmsConfigMapper smsConfigMapper;
    @Autowired
    private SmsEmailMapper smsEmailMapper;
    @Autowired
    private EmayService emayService;
    @Autowired
    private RetentionMapper retentionMapper;
    /**
     * 入库通知任务业务处理
     * @param job 参数
@@ -77,13 +87,18 @@
         o.setCarrierBillCode(job.getBillCode());
         o.setRailwayNo(job.getPlatformWmsCode());
         param.getData().add(o);
         String url = type == 0?systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
         String name = type ==0?"【WMS】入庫作业单分配月台":"【WMS】出库作业的分配月台";
         String url = type == 0?systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_INBOUND_PLATFROM_URL).getCode():
                 systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_OUTBOUND_PLATFROM_URL).getCode();;
         String name = type ==0?"【WMS】入库作业单分配月台":"【WMS】出库作业的分配月台";
         WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(param),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
         PlatformJob update = new PlatformJob();
         update.setId(job.getId());
         update.setWmsSendDate(new Date());
         if(Objects.isNull(job.getWmsSendNum())){
             job.setWmsSendNum(1);
         }else{
         update.setWmsSendNum(job.getWmsSendNum() + 1);
         }
         update.setWmsSendPlatformCode(job.getPlatformWmsCode());
         if(response!=null && response.getData() !=null
                && response.getData().size()>0 && StringUtils.equals(response.getData().get(0).getSuccess(),WmsBaseResponse.CODE_SUCCESS)){
@@ -105,7 +120,7 @@
     */
    @Override
    public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
         String url =  systemDictDataBiz.queryByCode(Constants.WSM_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
         String url =  systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
         String name = "【WMS】库存查询" ;
         WmsBaseResponse<WmsInventoryDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){});
        if(response!=null
@@ -274,9 +289,17 @@
        return returnSuccessReuslt(null);
    }


    private void startEndNoticeToDriver(List<PlatformJob> jobList) {
        for(PlatformJob job : jobList){
            //-----TODO-----------任康，发送司机公众号和短信通知
            //-----TODO-----------任康，发送司机公众号和
            //短信通知
            if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
                SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                        emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,job.getId(),
                        SmsConstants.platformJobContent.platformJobNewJob,null,null
                );
            }
        }
    }

@@ -310,9 +333,13 @@
            //如果是自有物流车
            job.setType(type==0?Constants.platformJobType.zycxh:Constants.platformJobType.zyczh);//自有车卸货/装货
            job.setCarCodeBack(job.getCarCodeFront());//自有车默认前后车牌一样
            if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
            if(retentionMapper.selectCount(new QueryWrapper<Retention>().lambda().eq(Retention::getType,Constants.THREE)
                    .eq(Retention::getCarNo,car.getCode()))>Constants.ZERO && car.getJobNum() == 0){
                //如果车辆在园
                job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//在园无作业状态，则自动【已签到】处理
                job.setArriveDate(new Date());
                job.setSingType(Constants.TWO);
                job.setSignDate(new Date());
            }
        }
        PlatformGroup group = platformGroupMapper.selectOne(new QueryWrapper<PlatformGroup>().lambda()