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

liukangdong

2024-12-30 a6f9e7d4faf7c1c536111e0db7f3317cbda9ddb1

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

 admin/src/api/business/smsEmail.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
import request from '../../utils/request'

// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/smsEmail/page', data, {
    trim: true
  })
}

 admin/src/views/business/smsEmail.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
<template>
  <TableLayout :permissions="['business:carevent:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="" prop="phone">
        <el-input v-model="searchForm.phone" placeholder="请输入手机号/邮箱地址" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="" prop="type">
        <el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="类型">
          <el-option label="短信" value="0"></el-option>
          <el-option label="邮箱" value="1"></el-option>
          <el-option label="微信公众号通知" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="objType">
        <el-select v-model="searchForm.objType" @keypress.enter.native="search" clearable placeholder="业务类型">
          <el-option label="验证码" value="0"></el-option>
          <el-option label="访客申请" value="1"></el-option>
          <el-option label="访客报备" value="2"></el-option>
          <el-option label="隐患随手拍" value="3"></el-option>
          <el-option label="用车申请" value="4"></el-option>
          <el-option label="会议室信息" value="5"></el-option>
          <el-option label="物流车预约" value="6"></el-option>
          <el-option label="物流车作业" value="7"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="起始时间" prop="eventType">
        <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="phone" label="手机号/邮箱" min-width="150px">
            <template slot-scope="{ row }">
              <span v-if="row.type == 0">{{ row.phone }}</span>
              <span v-if="row.type == 1">{{ row.email }}</span>
            </template>
        </el-table-column>
        <el-table-column prop="title" label="标题" min-width="100px"></el-table-column>
        <el-table-column prop="content" label="内容" min-width="300px"></el-table-column>
        <el-table-column label="类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.type == 0">短信</span>
            <span v-if="row.type == 1">邮件</span>
            <span v-if="row.type == 2">微信公众号通知</span>
          </template>
        </el-table-column>
        <el-table-column label="状态" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.status == 0">未使用</span>
            <span v-if="row.status == 1">已使用</span>
            <span v-if="row.status == 2">等待发送</span>
          </template>
        </el-table-column>
        <el-table-column label="业务类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.objType == 0">验证码</span>
            <span v-if="row.objType == 1">访客</span>
            <span v-if="row.objType == 2">访客报备</span>
            <span v-if="row.objType == 3">隐患随手拍</span>
            <span v-if="row.objType == 4">用车申请</span>
            <span v-if="row.objType == 5">会议室信息</span>
            <span v-if="row.objType == 6">物流车预约</span>
            <span v-if="row.objType == 7">物流车作业</span>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="发送时间" min-width="100px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { timeForMat } from '@/utils/util'
export default {
  name: 'CarEvent',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data() {
    return {
      // æœç´¢
      searchForm: {
        phone: '',
        type: null,
        objType: null,
        startTime: '',
        endTime: '',
        radio: '0'
      },
      time: []
    }
  },
  created() {
    this.config({
      module: '短信邮箱发送记录',
      api: '/business/smsEmail',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.changeRadio('0')
    this.search()
  },
  methods: {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = '0'
      this.changeRadio('0')
      this.time = []
      this.search()
    },
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
      this.search()
    },
    seleTime(e) {
      this.searchForm.startTime = e[0]
      this.searchForm.endTime = e[1]
      this.searchForm.radio = null
      this.search()
    }
  }
}
</script>

 server/system_gateway/src/main/java/com/doumee/api/gateway/JwtAuthController.java

@@ -151,6 +151,23 @@
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }
    @PreventRepeat(limit = 10, lockTime = 10000)
    @ApiOperation("司机验证码登录")
    @PostMapping("/loginDriverWithCode")
    @LoginNoRequired
    public ApiResponse<String> loginDriverWithCode (@Validated @RequestBody LoginPhoneDTO dto, ServerWebExchange serverWebExchange) {
        try {
            ServerHttpRequest request = serverWebExchange.getRequest();
            LoginUserInfo user = systemLoginService.loginDriverWithCode(dto,request);
            String token = jwtTokenUtil.generateToken(user);
            return ApiResponse.success(token);
        }catch (BusinessException e){
            return ApiResponse.failed(e.getCode(),e.getMessage());
        }catch (Exception e){
            e.printStackTrace();
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }
    }

    /**
     * åˆ·æ–°JWT令牌,用旧的令牌换新的令牌

 server/system_service/src/main/java/com/doumee/dao/business/dao/MemberMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business.dao;

import com.doumee.dao.business.model.Member;
import com.github.yulichang.base.MPJBaseMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
public interface MemberMapper extends MPJBaseMapper<Member> {

}

 server/system_service/src/main/java/com/doumee/dao/business/model/Member.java

 server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java

@@ -93,5 +93,11 @@
    @ApiModelProperty(value = "附件集合")
    @TableField(exist = false)
    private   List<Map<String,Object>> fileList;
    @ApiModelProperty(value = "开始时间")
    @TableField(exist = false)
    private Date startTime;

    @ApiModelProperty(value = "结束时间")
    @TableField(exist = false)
    private Date endTime;
}

 server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java

@@ -29,4 +29,6 @@
    @ApiModelProperty(value = "手机号", example = "1")
    private String phone;

    @ApiModelProperty(value = "openid", example = "1")
    private String openId;
}

 server/system_service/src/main/java/com/doumee/dao/system/dto/LoginPhoneDTO.java

@@ -21,4 +21,6 @@
    @NotBlank(message = "验证码不能为空")
    @ApiModelProperty(value = "验证码")
    private String code;
    @ApiModelProperty(value = "openid")
    private String openid;
}

 server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java

@@ -30,10 +30,10 @@


    LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request);
    LoginUserInfo loginDriverWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
    /**
     * æ ¹æ® openId登录
     * @param userId
     * @param request
     * @return
     */
    String loginByUserId(Integer userId);

 server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java

@@ -2,6 +2,7 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -9,8 +10,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.LoginByOpenidDTO;
@@ -21,6 +24,7 @@
import com.doumee.service.system.*;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
@@ -49,6 +53,11 @@
    @Lazy
    @Autowired
    private SystemUserService systemUserService;
    @Lazy
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private SystemUserMapper systemUserMapper;

@@ -376,6 +385,89 @@
        LoginUserInfo userInfo = LoginUserInfo.from(user, null, null,company,null);
        return  userInfo;
    }
    public   void isCaptcheValide(  String phone, String captche) {
        SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
                .eq(SmsEmail::getType, Constants.ZERO)
                .eq(SmsEmail::getPhone, phone)
                .eq(SmsEmail::getRemark, captche)
                .eq(SmsEmail::getIsdeleted, Constants.ZERO)
        );
        if(model == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，验证码不正确，请重新发送再试！");
        }
        if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，验证码已失效，请重新发送再试！");
        }
        if(model.getCreateDate() !=null &&
                System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
            model.setStatus(Constants.ONE);
            model.setEditDate(new Date());
            smsEmailMapper.updateById(model);
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，验证码已失效，请重新发送再试~");
        }
        model.setStatus(Constants.ONE);
        model.setEditDate(new Date());
        smsEmailMapper.updateById(model);
    }

    @Override
    public LoginUserInfo loginDriverWithCode(LoginPhoneDTO param, ServerHttpRequest request) {
        isCaptcheValide(param.getPhone(),param.getCode());//检查验证码

        SystemLoginLog loginLog = new SystemLoginLog();
        loginLog.setLoginUsername(param.getPhone());
        loginLog.setLoginTime(new Date());
        loginLog.setReason("【公众号】司机端验证码登陆：openid="+param.getOpenid());
        loginLog.setSystemVersion(systemVersion);
//        loginLog.setLocation(Utils.Location.getLocationString(loginLog.getIp()));
        if(request!=null&&request.getHeaders()!=null && request.getHeaders().size()>0){
            loginLog.setIp(Utils.User_Client.getIP(request));
            loginLog.setPlatform(Utils.User_Client.getPlatform(request));
            loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
            loginLog.setOsInfo(Utils.User_Client.getOS(request));
        }
        loginLog.setServerIp(Utils.Server.getIP());
        // æ ¹æ®ç”¨æˆ·åæŸ¥è¯¢ç”¨æˆ·å¯¹è±¡
        SystemUser queryDto = new SystemUser();
        queryDto.setUsername(param.getPhone());
        queryDto.setDeleted(Boolean.FALSE);
        SystemUser systemUser = systemUserService.findOne(queryDto);
        if (systemUser == null) {
            String salt = RandomStringUtils.randomAlphabetic(6);
            Member member = new Member();
            member.setCreateDate(new Date());
            member.setIsdeleted(Constants.ZERO);
            member.setType(Constants.memberType.driver);
            member.setPhone(param.getPhone());
            member.setStatus(Constants.ZERO);
            member.setOpenid(param.getOpenid());
            member.setPassward(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
            memberMapper.insert(member);

            systemUser = new SystemUser();
            systemUser.setCreateTime(new Date());
            systemUser.setDeleted(Boolean.FALSE);
            systemUser.setUsername(param.getPhone());
            systemUser.setRealname(null);
            systemUser.setMemberId(member.getId());
            systemUser.setMobile(param.getPhone());
            systemUser.setSalt(salt);
            systemUser.setPassword(member.getPassward());
            systemUser.setStatus(Constants.ZERO);
            systemUser.setType(Constants.memberType.driver);
            systemUser.setSource(Constants.TWO);
            systemUser.setOpenid(param.getOpenid());
            systemUserMapper.insert(systemUser);
        }

        dealOpenIdBiz(systemUser,param.getOpenid());
        Company company = new Company();
        if(Objects.nonNull(systemUser.getCompanyId())){
            company = companyMapper.selectById(systemUser.getCompanyId());
        }
        LoginUserInfo userInfo = LoginUserInfo.from(systemUser, null, null,null,null);
        return  userInfo;
    }


    /**

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -8,6 +8,8 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;

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

@@ -8,7 +8,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.model.HiddenDangerParam;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;

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

@@ -31,6 +31,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;

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

@@ -13,20 +13,15 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

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

@@ -1,6 +1,7 @@
package com.doumee.cloud.admin;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
@@ -8,10 +9,13 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.SmsConfig;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -55,8 +59,19 @@
        smsEmailService.validPhoneCaptcha(param);
        return ApiResponse.success("请求成功");
    }
    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("根据手机号和验证码校验，并完成司机注册和返回司机信息")
    @PostMapping("/validDriverPhone")
    public ApiResponse<SystemUser> validDriverPhone(@RequestBody ValidPhoneCodeVO param) {
        return ApiResponse.success(smsEmailService.validDriverPhone(param));
    }


    @ApiOperation("分页查询")
    @PostMapping("/page")
    public ApiResponse<PageData<SmsEmail>> findPage (@RequestBody PageWrap<SmsEmail> pageWrap) {
        return ApiResponse.success(smsEmailService.findPage(pageWrap));
    }
    @LoginNoRequired
    @PreventRepeat
    @ApiOperation("自定义短信内容")

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

@@ -3,25 +3,18 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.util.List;

/**
@@ -54,7 +47,7 @@
            param.setParameters( new TmsOrderListParamRequest());
        }
        if(param.getPager() == null){
            param.setPager( new TmsOrderListPagerRequest());
            param.setPager( new TmsPagerRequest());
        }
        if(param.getPager().getPage() == null){
            param.getPager().setPage(1);
@@ -74,9 +67,49 @@
    @LoginNoRequired
    @PostMapping("/orderInfo")
    public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request )   {

        return ApiResponse.success(tmsService.orderInfo(request));
    }

    @ApiOperation("【TMS】司机待办任务列表接口")
    @PostMapping("/taskList")
    public ApiResponse<TmsBasePageResponse<TmsDriveTaskListResponse>> taskList(@RequestBody TmsDriverTaskListRequest param ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        if(param == null){
            param = new TmsDriverTaskListRequest();
        }
        if(param.getParameters() == null){
            param.setParameters( new TmsDriverTaskParameterRequest());
        }
        if(param.getPager() == null){
            param.setPager( new TmsPagerRequest());
        }
        if(param.getPager().getPage() == null){
            param.getPager().setPage(1);
        }
        if(param.getPager().getRows() == null){
            param.getPager().setRows(10);
        }
      /*  if(StringUtils.isBlank(param.getParameters().getDriverTel())){
            param.getParameters().setDriverTel("00000000000");//手机号必填
        }*/
        LoginUserInfo user = this.getLoginUser(token);
        param.getParameters().setDriverTel(user.getUsername());
        return  ApiResponse.success(tmsService.getDriverTaskList(param));
    }
    @ApiOperation("【TMS】待办任务详情接口")
    @PostMapping("/taskDetail")
    public ApiResponse<TmsDriveTaskInfoResponse> getDriverTaskDetail(@RequestBody TmsDriverTaskInfoRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token)   {
        return ApiResponse.success(tmsService.getDriverTaskDetail(request));
    }
    @ApiOperation("【TMS】司机任务启动")
    @PostMapping("/driverStart")
    public ApiResponse driverStart(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token)   {
        tmsService.driverStart(request);
        return ApiResponse.success(null);
    }
    @ApiOperation("【TMS】司机任务到货提交")
    @PostMapping("/driverArrival")
    public ApiResponse driverArrival(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token)   {
        tmsService.driverArrival(request);
        return ApiResponse.success(null);
    }

}

 server/visits/dmvisit_screen/src/main/java/com/doumee/service/impl/ScreenServiceImpl.java

@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.model.*;
import com.doumee.service.ScreenService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java

@@ -24,6 +24,10 @@
        String[] getSevenArrivalStatusAndDetails = new String[]{"/tms/zhyt/getSevenArrivalStatusAndDetails",  "【TMS】近7日到货情况(含明细)"};//3.13近7日到货情况(含明细)
        String[] getNotFinishOrderList = new String[]{"/tms/zhyt/getNotFinishOrderList",  "【TMS】未完成订单"};//3.13未完成订单
        String[] getOutboundCapability = new String[]{"/tms/zhyt/getOutboundCapability",  "【TMS】出库能力统计"};//3.14出库能力统计
        String[] getDriverTaskList = new String[]{"/tms/zhyt/getDriverTaskList",  "【TMS】查询司机所有代办任务。"};//3.15查询司机所有代办任务。
        String[] getDriverTaskDetail = new String[]{"/tms/zhyt/getDriverTaskDetail",  "【TMS】司机待办任务详情。"};//3.16司机待办任务详情。
        String[] driverStart = new String[]{"/tms/zhyt/driverStartAndArrival",  "【TMS】司机启运。"};//3.17司机启运
        String[] driverArrival = new String[]{"/tms/zhyt/driverStartAndArrival",  "【TMS】司机到货。"};//3.18司机到货
    }

    public  enum TopStatusLevel {

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverStartAndArrivalRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机任务启动到货请求参数")
public class TmsDriverStartAndArrivalRequest {
    @ApiModelProperty(value = "代办任务id" )
    private String id    ;//是    å­—符串    ä»£åŠžä»»åŠ¡id
    @ApiModelProperty(value = "业务类型 0：启运   1：到货" )
    private String   optType    ;//是    å­—符串    ä¸šåŠ¡ç±»åž‹    0：启运   1：到货
    @ApiModelProperty(value = "停靠站点" )
    private Integer   stopNumber;//    æ˜¯    æ•°å­—    åœé ç«™ç‚¹
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskInfoRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机任务详情请求参数")
public class TmsDriverTaskInfoRequest {
    @ApiModelProperty(value = "代办任务id" )
    private String id    ;//是    å­—符串    ä»£åŠžä»»åŠ¡id

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskListRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机所有代办任务请求参数")
public class TmsDriverTaskListRequest {

    @ApiModelProperty(value = "司机电话参数" )
    private TmsDriverTaskParameterRequest parameters; //是    é›†åˆ    åŒºåŸŸID集合
    @ApiModelProperty(value = "分页参数" )
    private TmsPagerRequest pager; //    å¦    é›†åˆ    åˆåŒå·é›†åˆ
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsDriverTaskParameterRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.doumee.core.tms.model.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机所有代办任务请求明细参数")
public class TmsDriverTaskParameterRequest {
    @ApiModelProperty(value = "司机电话" )
    private String driverTel; // æ˜¯ å¸æœºç”µè¯
    @ApiModelProperty(value = "运单号" )
    private String transportCode; // æ˜¯ è¿å•å·
}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java

@@ -3,8 +3,6 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
@@ -15,6 +13,6 @@


    private TmsOrderListParamRequest parameters; //是    é›†åˆ    åŒºåŸŸID集合
    private TmsOrderListPagerRequest pager; //    å¦    é›†åˆ    åˆåŒå·é›†åˆ
    private TmsPagerRequest pager; //    å¦    é›†åˆ    åˆåŒå·é›†åˆ

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderNoFinishListRequest.java

@@ -13,6 +13,6 @@


    private TmsOrderNoFinishListParamRequest parameters; //是    é›†åˆ    åŒºåŸŸID集合
    private TmsOrderListPagerRequest pager; //    å¦    é›†åˆ    åˆåŒå·é›†åˆ
    private TmsPagerRequest pager; //    å¦    é›†åˆ    åˆåŒå·é›†åˆ

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsPagerRequest.java

ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java ÐÞ¸Ä
@@ -3,15 +3,13 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms合同列表页码请求参数")
public class TmsOrderListPagerRequest {
@ApiModel("tms分页列表页码请求参数")
public class TmsPagerRequest {


    private Integer   page    ;//是    æ•°å­—    å½“前页

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskInfoResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机任务详情返回参数")
public class TmsDriveTaskInfoResponse {
    @ApiModelProperty(value = "任务id" )
    private String     id    ; //字符串    ä»»åŠ¡id

    @ApiModelProperty(value = "运输单号" )
    private String   transportCode    ; //字符串    è¿è¾“单号
    @ApiModelProperty(value = "车牌号" )
    private String    plateNumber; //    å­—符串    è½¦ç‰Œå·
    @ApiModelProperty(value = "司机手机号码" )
    private String driverTel  ; //     å­—符串    å¸æœºæ‰‹æœºå·ç 
    @ApiModelProperty(value = "物料类型 1：成品,  2:托盘" )
    private String   materialType    ; //字符串    ç‰©æ–™ç±»åž‹    1：成品,  2:托盘
    @ApiModelProperty(value = "业务类型 1: æˆå“é”€å”®, 2: æˆå“ç§»åº“, 3: ç©ºæ‰˜ç›˜-工业调剂, 4: ç©ºæ‰˜ç›˜-商业回收, 5: ç©ºæ‰˜ç›˜-托盘带回" )
    private String  businessType; //    å­—符串
    @ApiModelProperty(value = "任务状态 0: å¾…执行, 1: æ‰§è¡Œä¸­ï¼ˆåœ¨é€”）, 2:完成（到货）" )
    private String  logisticsStatus    ; //字符串
    @ApiModelProperty(value = "承运商" )
    private String   carrierName    ; //字符串
    @ApiModelProperty(value = "发货点" )
    private String  startCity; //    å­—符串    å‘货点
    @ApiModelProperty(value = "卸货点" )
    private String  endCity ; //字符串
    @ApiModelProperty(value = "任务下达时间" )
    private String   receiveDate    ; //字符串
    @ApiModelProperty(value = "司机姓名" )
    private String   driverName; //    å­—符串
    @ApiModelProperty(value = "是否托盘联运 1：是   0：否" )
    private String  isPalletTransport; //    å­—符串
    @ApiModelProperty(value = "品规明细" )
    private List<TmsDriveTaskProductDetailsResponse> productDetails;//品规明细
    @ApiModelProperty(value = "托盘明细" )
    private List<TmsDriveTaskPalletDetailsResponse> palletDetails;//托盘明细
    @ApiModelProperty(value = "任务流程" )
    private List<TmsDriveTaskTransportStopsResponse> transportStops;//任务流程




}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机任务列列表返回参数")
public class TmsDriveTaskListResponse {
    @ApiModelProperty(value = "任务id" )
    private String     id    ; //字符串    ä»»åŠ¡id

    @ApiModelProperty(value = "运输单号" )
    private String   transportCode    ; //字符串    è¿è¾“单号

    @ApiModelProperty(value = "车牌号" )
    private String    plateNumber; //    å­—符串    è½¦ç‰Œå·

    @ApiModelProperty(value = "司机手机号码" )
    private String   driverTel; //    å­—符串    å¸æœºæ‰‹æœºå·ç 

    @ApiModelProperty(value = "物料类型 1：成品,  2:托盘" )
    private String    materialType; //    å­—符串

    @ApiModelProperty(value = "业务类型1: æˆå“é”€å”®,  2: æˆå“ç§»åº“,  3: ç©ºæ‰˜ç›˜-工业调剂, 4: ç©ºæ‰˜ç›˜-商业回收,  5: ç©ºæ‰˜ç›˜-托盘带回" )
    private String    businessType; //    å­—符串

    @ApiModelProperty(value = "任务状态 0: å¾…执行,1: æ‰§è¡Œä¸­ï¼ˆåœ¨é€”）,  2:完成（到货）" )
    private String      logisticsStatus    ; //字符串
    @ApiModelProperty(value = "承运商" )
    private String    carrierName; //    å­—符串    æ‰¿è¿å•†

    @ApiModelProperty(value = "发货点" )
    private String    startCityName; //    å­—符串    å‘货点

    @ApiModelProperty(value = "卸货点" )
    private String    endCityName; //    å­—符串    å¸è´§ç‚¹

    @ApiModelProperty(value = "任务下达时间" )
    private String     receiveDate; //    å­—符串    ä»»åŠ¡ä¸‹è¾¾æ—¶é—´




}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskPalletDetailsResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机任务托盘明细返回参数")
public class TmsDriveTaskPalletDetailsResponse {
    @ApiModelProperty(value = "规格" )
    private String    standardsCode;//    å­—符串    è§„æ ¼
    @ApiModelProperty(value = "数量" )
    private BigDecimal palletNum    ;//数字    æ•°é‡
    @ApiModelProperty(value = "材料" )
    private String    palletType;//    å­—符串    ææ–™


}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskProductDetailsResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms产品规格明细返回参数")
public class TmsDriveTaskProductDetailsResponse {
    @ApiModelProperty(value = "品规名称" )
    private String     productName;//    å­—符串    å“è§„名称
    @ApiModelProperty(value = "数量" )
    private BigDecimal packageSize;//    æ•°å­—    æ•°é‡
    @ApiModelProperty(value = "最早到货日期" )
    private String     earliestReachDate    ;//字符串    æœ€æ—©åˆ°è´§æ—¥æœŸ
    @ApiModelProperty(value = "最晚到货日期" )
    private String    latestReachDate    ;//字符串    æœ€æ™šåˆ°è´§æ—¥æœŸ
    @ApiModelProperty(value = "合同号" )
    private String    contractNumber    ;//字符串    åˆåŒå·


}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsDriveTaskTransportStopsResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms司机任务任务流程返回参数")
public class TmsDriveTaskTransportStopsResponse {
    @ApiModelProperty(value = "运输单id" )
    private String     tmId;//    å­—符串    è¿è¾“单id
    @ApiModelProperty(value = "停靠点" )
    private String    stopNumber;//    æ•°å­—    åœé ç‚¹
    @ApiModelProperty(value = "到货地" )
    private String     receiveLocation    ;//字符串    åˆ°è´§åœ°
    @ApiModelProperty(value = "到达时间 æœ‰å€¼åˆ™å·²ç»åˆ°è¾¾" )
    private String     actualArrivedDate;//    å­—符串    åˆ°è¾¾æ—¶é—´    æœ‰å€¼åˆ™å·²ç»åˆ°è¾¾


}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java

@@ -1,26 +1,16 @@
package com.doumee.core.wx.wxPlat;

import cn.emay.sdk.util.json.gson.JsonObject;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Http;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.WxNoticeConfigMapper;
import com.doumee.dao.business.model.*;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpService;
import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.util.*;

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

@@ -2,9 +2,6 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Approve;
import com.doumee.dao.business.model.Member;

import java.util.List;

/**
 * @author æ±Ÿè¹„蹄

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

ÎļþÒÑɾ³ý

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberJoinMapper.java

@@ -2,7 +2,6 @@

import com.doumee.dao.business.model.Member;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/join/MemberRoleJoinMapper.java

@@ -1,6 +1,5 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
import com.github.yulichang.base.mapper.MPJJoinMapper;


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

@@ -9,7 +9,7 @@
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;
import java.util.List;


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

@@ -10,7 +10,7 @@
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;
import java.util.List;


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

@@ -9,7 +9,7 @@
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;
import java.util.List;


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

@@ -1,7 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.LoginUserModel;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.HiddenDangerParam;

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

@@ -8,15 +8,11 @@
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

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

@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.system.model.SystemUser;

import java.util.List;

@@ -101,4 +102,6 @@
    void sendWaitingSmsNotice();

    void validPhoneCaptcha(ValidPhoneCodeVO param);

    SystemUser validDriverPhone(ValidPhoneCodeVO param);
}

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

@@ -19,6 +19,7 @@
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ApproveDTO;
@@ -27,6 +28,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;

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

@@ -12,6 +12,7 @@
import com.doumee.dao.business.PlatformReasonMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;

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

@@ -8,22 +8,21 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarDriverMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.CarDriverService;
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 com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.smartcardio.Card;
import java.util.Date;
import java.util.List;


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

@@ -10,6 +10,7 @@
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.CarEventVo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.CarEventService;

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

@@ -10,6 +10,7 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
@@ -18,6 +19,7 @@
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.business.vo.DateIntervalVO;

import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;

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

@@ -1,7 +1,5 @@
package com.doumee.service.business.impl;

import cn.hutool.core.util.IdcardUtil;
import cn.hutool.core.util.PhoneUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,18 +11,17 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.CarsImport;
import com.doumee.dao.admin.request.CarsQuery;
import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.response.CarsDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.CarJoinMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CarsService;
import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl;

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

@@ -24,7 +24,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;

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

@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.DeviceEventVo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemDictDataMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.DeviceEventService;

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

@@ -13,6 +13,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberRoleJoinMapper;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.business.model.Empower;

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

@@ -12,7 +12,6 @@
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerLogService;

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

@@ -8,8 +8,9 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerParamMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;

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

@@ -18,9 +18,11 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.MultifileMapper;

import com.doumee.dao.system.SystemUserMapper;

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

@@ -19,6 +19,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;

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

@@ -31,11 +31,13 @@
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.join.UserActionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.dao.system.model.SystemUser;

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

@@ -6,12 +6,12 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CarsMapper;
import com.doumee.dao.business.ParkBookMapper;
import com.doumee.dao.business.ParksMapper;
import com.doumee.dao.business.join.ParkBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ParkBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -22,7 +22,6 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -30,7 +29,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * è½¦è¾†é¢„约记录信息表Service实现

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

@@ -13,12 +13,14 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;

import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;

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

@@ -20,6 +20,7 @@
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
@@ -35,7 +36,6 @@
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.dao.web.response.platformReport.WholeProvinceBoardVO;
import com.doumee.service.business.PlatformJobService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -58,7 +58,6 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.*;
import java.util.Date;
import java.util.concurrent.TimeUnit;

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

@@ -4,19 +4,13 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.LoginUserModel;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ScientificNotationTUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.PlatformGasImport;
import com.doumee.dao.business.PlatformWaterGasMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.PlatformReason;
import com.doumee.dao.business.model.PlatformWaterGas;
import com.doumee.dao.openapi.request.GasByMonthRequest;
import com.doumee.dao.openapi.request.WaterByMonthRequest;
@@ -28,15 +22,12 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;

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

@@ -7,7 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.ProblemLogJoinMapper;

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

@@ -1,6 +1,5 @@
package com.doumee.service.business.impl;

import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.model.LoginUserInfo;
@@ -11,7 +10,6 @@
import com.doumee.dao.admin.request.OptionsObject;
import com.doumee.dao.admin.response.ProblemDTO;
import com.doumee.dao.business.ProblemsMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Problems;
import com.doumee.dao.web.response.ProblemsVO;
import com.doumee.service.business.ProblemsService;
@@ -22,7 +20,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

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

@@ -13,15 +13,19 @@
import com.doumee.core.utils.*;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -42,6 +46,10 @@

    @Autowired
    private SmsEmailMapper smsEmailMapper;
    @Autowired
    private SystemUserMapper systemUserMapper;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
@@ -84,6 +92,45 @@
    public     void validPhoneCaptcha(ValidPhoneCodeVO param){
       isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());
    }
    @Override
    public   SystemUser validDriverPhone(ValidPhoneCodeVO param){
          isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());

        SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Constants.ZERO)
                .and(i->i.eq(SystemUser::getMobile,param.getPhone()).or().eq(SystemUser::getUsername,param.getPhone()))
                .last("limit 1"));
       if(systemUser !=null){
           return  systemUser;
       }
        String salt = RandomStringUtils.randomAlphabetic(6);
        Member member = new Member();
        member.setCreateDate(new Date());
        member.setIsdeleted(Constants.ZERO);
        member.setType(Constants.memberType.driver);
        member.setPhone(param.getPhone());
        member.setStatus(Constants.ZERO);
        member.setOpenid(param.getOpenId());
        member.setPassward(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.INITIAL_PASSWORD).getCode(), salt));
        memberMapper.insert(member);

        systemUser = new SystemUser();
        systemUser.setCreateTime(new Date());
        systemUser.setDeleted(Boolean.FALSE);
        systemUser.setUsername(param.getPhone());
        systemUser.setRealname(null);
        systemUser.setMemberId(member.getId());
        systemUser.setMobile(param.getPhone());
        systemUser.setSalt(salt);
        systemUser.setPassword(member.getPassward());
        systemUser.setStatus(Constants.ZERO);
        systemUser.setType(Constants.memberType.driver);
        systemUser.setSource(Constants.TWO);
        systemUser.setOpenid(param.getOpenId());
        systemUserMapper.insert(systemUser);
        return systemUser;
    }

    @Override
    public Integer create(SmsEmail smsEmail) {
        smsEmailMapper.insert(smsEmail);
@@ -228,7 +275,10 @@
            queryWrapper.lambda().eq(SmsEmail::getContent, pageWrap.getModel().getContent());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(SmsEmail::getPhone, pageWrap.getModel().getPhone());
            queryWrapper.lambda().and(wr ->{
                wr.like(SmsEmail::getPhone, pageWrap.getModel().getPhone())
                        .or().like(SmsEmail::getEmail, pageWrap.getModel().getPhone());
            });
        }
        if (pageWrap.getModel().getEmail() != null) {
            queryWrapper.lambda().eq(SmsEmail::getEmail, pageWrap.getModel().getEmail());
@@ -245,13 +295,11 @@
        if (pageWrap.getModel().getObjType() != null) {
            queryWrapper.lambda().eq(SmsEmail::getObjType, pageWrap.getModel().getObjType());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().ge(Objects.nonNull(pageWrap.getModel().getStartTime()),
                SmsEmail::getCreateDate, pageWrap.getModel().getStartTime())
                .le(Objects.nonNull(pageWrap.getModel().getEndTime()),
                        SmsEmail::getCreateDate, pageWrap.getModel().getEndTime())
                .orderByDesc(SmsEmail::getCreateDate);
        return PageData.from(smsEmailMapper.selectPage(page, queryWrapper));
    }


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

@@ -13,7 +13,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.TrainTimeImport;
import com.doumee.dao.business.EmpowerMapper;
import com.doumee.dao.business.MemberRoleMapper;

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

@@ -16,7 +16,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -2,10 +2,10 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.VisitParkMapper;
import com.doumee.dao.business.join.VisitParkJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.VisitParkService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;

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

@@ -13,23 +13,21 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest;
import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest;
import com.doumee.core.haikang.model.param.respose.FacePictureCheckResponse;
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.*;
import com.doumee.core.wx.WXConstant;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.InterestedListVO;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
@@ -37,6 +35,7 @@
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;

import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;

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

@@ -27,10 +27,12 @@
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.CarEventJoinMapper;
import com.doumee.dao.business.join.DeviceEventJoinMapper;
import com.doumee.dao.business.join.VisitEventJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.impl.MemberServiceImpl;

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

@@ -16,9 +16,10 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.MemberCardMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

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

@@ -8,9 +8,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;

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

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
@@ -13,24 +12,11 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.DeviceRoleMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.RetentionMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Retention;
import com.doumee.dao.business.model.Visits;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.system.NoticesService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -19,28 +19,21 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;


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

@@ -17,8 +17,10 @@
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ext.ERPSyncService;
@@ -28,7 +30,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

@@ -16,9 +16,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

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

@@ -17,7 +17,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;

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

@@ -19,6 +19,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.Cars;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;

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

@@ -16,7 +16,7 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.VisitsMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Member;

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

@@ -1,7 +1,5 @@
package com.doumee.service.business.impl.thrid;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
@@ -16,7 +14,6 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
@@ -32,6 +29,7 @@
import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
import com.doumee.dao.web.response.platformReport.*;
import com.doumee.service.business.impl.PlatformJobServiceImpl;

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

@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
@@ -10,6 +12,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.third.TmsService;
@@ -208,6 +211,87 @@

    }
    /**
     * æŸ¥è¯¢å¸æœºæ‰€æœ‰ä»£åŠžä»»åŠ¡
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public    TmsBasePageResponse<TmsDriveTaskListResponse> getDriverTaskList(TmsDriverTaskListRequest param){
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getDriverTaskList[0];

        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
        TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
        if(response ==null || response.getData() == null){
            return  new TmsBasePageResponse<>();
        }
        return  response.getData();
    }
    /**
     * å¸æœºå¾…办任务详情
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public    TmsDriveTaskInfoResponse getDriverTaskDetail(TmsDriverTaskInfoRequest param){
        if(StringUtils.isBlank(param.getId()) ){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.getDriverTaskDetail[0];

        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
        TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
        if(response ==null || response.getData() == null){
            return  new TmsDriveTaskInfoResponse();
        }
        return  response.getData();
    }
    /**
     * å¸æœºå¯è¿
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public   boolean  driverStart(TmsDriverStartAndArrivalRequest param){
        if(StringUtils.isBlank(param.getId()) || StringUtils.isBlank(param.getOptType())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.driverStart[0];
        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
        TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
        if(response ==null || response.getData() == null || !StringUtils.equals(response.getCode(),"0")){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，任务到货提交失败，请稍后重试！");
        }
        return  true;
    }
    /**
     * å¸æœºåˆ°è´§
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    @Override
    public   boolean  driverArrival(TmsDriverStartAndArrivalRequest param){
        if(StringUtils.isBlank(param.getId())
                || StringUtils.isBlank(param.getOptType())
                || param.getStopNumber() == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +TMSContants.InterfacePath.driverArrival[0];
        url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
        TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
                ,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
        if(response ==null || response.getData() == null ||!StringUtils.equals(response.getCode(),"0")){
          throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，任务到货提交失败，请稍后重试！");
        }
        return  true;
    }
    /**
     * å‡ºåº“能力统计
     * æŸ¥è¯¢æŸä¸ªåŽ‚/全部厂的今日计划量、今日出库量、今日未出库量数据。
     * @param param å‚æ•°

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

@@ -11,14 +11,15 @@
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.WmsBaseDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;

import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.impl.SmsEmailServiceImpl;

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java

@@ -1,7 +1,12 @@
package com.doumee.service.business.third;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.doumee.core.tms.model.TMSContants;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import org.apache.commons.lang3.StringUtils;

import java.util.List;

@@ -70,5 +75,28 @@
     */

    List<TmsOutQtyAndVehicleQtyResponse>   getOutQtyAndVehicleQty(TmsOutQtyAndVehicleQtyRequest param );

    /**
     * æŸ¥è¯¢å¸æœºæ‰€æœ‰ä»£åŠžä»»åŠ¡
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
     TmsBasePageResponse<TmsDriveTaskListResponse> getDriverTaskList(TmsDriverTaskListRequest param);
    /**
     * å¸æœºå¾…办任务详情
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    TmsDriveTaskInfoResponse getDriverTaskDetail(TmsDriverTaskInfoRequest param);
    /**
     * å¸æœºå¯è¿
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    boolean driverStart(TmsDriverStartAndArrivalRequest param);
    /**
     * å¸æœºåˆ°è´§
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */
    boolean  driverArrival(TmsDriverStartAndArrivalRequest param);
}