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

liukangdong

2024-09-18 6ef869b1adcf3a5bb8e4c3117dc507d173f13fd8

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

 admin/src/views/vehicle/visitPark.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,146 @@
<template>
    <TableLayout :permissions="['business:member:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item title="车牌号" prop="carCode">
                <el-input v-model="searchForm.carCode" placeholder="车牌号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item title="车主姓名/手机号" prop="memberName">
                <el-input v-model="searchForm.memberName" placeholder="员工姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item title="车主组织" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="车主组织名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item title="停车库名称" prop="parksName">
                <el-input v-model="searchForm.parksName" placeholder="停车库名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
<!--
                <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:cars:delete']">删除</el-button></li>
-->
            </ul>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
                @selection-change="handleSelectionChange"
            >
                <el-table-column type="selection" width="55"></el-table-column>
                <el-table-column prop="carCode" label="车牌号" fixed min-width="100px"></el-table-column>
                <el-table-column prop="parksName" label="停车场" fixed min-width="100px"></el-table-column>
              <el-table-column prop="startTime" label="有效期"  align="center" fixed min-width="150px">
                <template slot-scope="{row}">
                  <div v-if="!row.startTime || !row.endTime">长期有效</div>
                  <div v-else>
                    <span style="color: green">起：{{row.startTime}}</span><br/>
                    <span style="color: red">止：{{row.endTime}}</span>
                  </div>
                </template>
              </el-table-column>
              <el-table-column prop="startTime" label="状态" fixed min-width="100px">
                <template slot-scope="{row}">
                  <div v-if="row.isdeleted==1"  style="color: red">已删除</div>
                  <div v-else style="color: green">
                    <span v-if="row.hkStatus==0"  style="color: #435EBE">待下发</span>
                    <span v-if="row.hkStatus==1"  style="color: green">下发成功</span>
                    <span v-if="row.hkStatus==2"  style="color: red">下发失败</span>
                  </div>
                </template>
              </el-table-column>
                <el-table-column label="用户类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.memberType === 0">劳务访客</span>
                        <span v-if="row.memberType === 1">普通访客</span>
                        <span v-if="row.memberType === 2">内部人员</span>
                    </template>
                </el-table-column>
                <el-table-column prop="memberName" label="姓名" min-width="100px"></el-table-column>
                <el-table-column prop="memberPhone" label="手机号" min-width="100px"></el-table-column>
                <el-table-column prop="companyName" label="组织" min-width="100px"></el-table-column>
              <el-table-column prop="remark" label="备注" min-width="100px">
                <template slot-scope="{row}">
                  <span v-if="row.isdeleted !=2">{{row.remark}}</span>
                </template>
              </el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="140px"></el-table-column>
<!--                <el-table-column-->
<!--                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
<!--                    label="操作"-->
<!--                    min-width="120"-->
<!--                    fixed="right"-->
<!--                >-->
<!--                    <template slot-scope="{row}">-->
<!--&lt;!&ndash;                        <el-button type="text" @click="$refs.operaCarsWindow.open('编辑车辆信息表', row)" icon="el-icon-edit" v-permissions="['business:member:update']">编辑</el-button>&ndash;&gt;-->
<!--                        <el-button type="text" @click="deleteById(row)" v-if="row.isdeleted !=1" icon="el-icon-delete" v-permissions="['business:parkbook:delete']">删除</el-button>-->
<!--&lt;!&ndash;-->
<!--                        <el-button type="text" @click="reUpdate(row)" v-if="row.isdeleted !=1 && row.hkStatus ==0" icon="el-icon-edit" v-permissions="['business:parkbook:update']">立刻下发</el-button>-->
<!--&ndash;&gt;-->
<!--                    </template>-->
<!--                </el-table-column>-->
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
        <!-- æ–°å»º/修改 -->
        <OperaCarsWindow ref="operaCarsWindow" @success="handlePageChange"/>
    </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCarsWindow from '@/components/business/OperaCarsWindow'
import { validity } from '@/utils/util'
import { sync } from '@/api/business/cars'
import { batchLoss } from '@/api/business/memberCard'
import {reUpdate} from "@/api/business/parkBook";
export default {
  name: 'parkBook',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaCarsWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        carCode: '',
        memberName: '',
        parksName: '',
        companyName: ''
      }
    }
  },
  created () {
    this.config({
      module: '车辆信息表',
      api: '/business/visitPark',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
  },
  methods: {
    validity (startTime, endTime) {
      return validity(startTime, endTime)
    },
    reUpdate (row) {
      reUpdate({ id: row.id })
        .then(res => {
          this.$message.success('操作成功')
          this.search()
        })
    }
  }
}
</script>

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java

@@ -52,7 +52,7 @@
    private WmsService wmsService;

    @PreventRepeat
    @ApiOperation("【CMS】推送入库单通知任务")
    @ApiOperation("【WMS】推送入库单通知任务")
    @PostMapping("/push/inboundNotice")
    public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {

@@ -61,22 +61,21 @@
        try {
             result = wmsService.inboundNotice(param);
        }catch (BusinessException e){
            log.error("【CMS】推送入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/inboundNotice", "推送入库单通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }

        return result;
    }

    @PreventRepeat
    @ApiOperation("【CMS】推送出库单通知任务")
    @ApiOperation("【WMS】推送出库单通知任务")
    @PostMapping("/push/outboundNotice")
    public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -84,10 +83,10 @@
        try {
              result = wmsService.outboundNotice(param);
        }catch (BusinessException e){
            log.error("【CMS】推送出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
@@ -98,7 +97,7 @@
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送取消入库单通知任务")
    @ApiOperation("【WMS】推送取消入库单通知任务")
    @PostMapping("/push/cancelInbound")
    public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -106,10 +105,10 @@
        try {
            result = wmsService.cancelInbound(param);
        }catch (BusinessException e){
            log.error("【CMS】推送取消入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送取消入库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
@@ -119,7 +118,7 @@
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送取消出库单通知任务")
    @ApiOperation("【WMS】推送取消出库单通知任务")
    @PostMapping("/push/cancelOutbound")
    public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -127,10 +126,10 @@
        try {
            result = wmsService.cancelOutbound(param);
        }catch (BusinessException e){
            log.error("【CMS】推送取消出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送取消出库单通知任务===失败："+e.getMessage());
            log.error("【WMS】推送取消出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
@@ -140,7 +139,7 @@
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送出入库作业完成通知任务")
    @ApiOperation("【WMS】推送出入库作业完成通知任务")
    @PostMapping("/push/doneTask")
    public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
@@ -148,10 +147,10 @@
        try {
            result = wmsService.doneTask(param);
        }catch (BusinessException e){
            log.error("【CMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            log.error("【WMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
package com.doumee.cloud.admin;

import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
@Api(tags = "WMS平台数据推送接口")
@RestController
@Slf4j
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/wms/bak")
public class WmsPushCloudBakController extends BaseController {

    @Autowired
    private WmsService wmsService;

    @ApiOperation("【WMS】推送入库单通知任务")
    @PostMapping("/push/inboundNotice")
    @LoginNoRequired
    public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {

        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.inboundNotice(param);
        }catch (BusinessException e){
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【WMS】推送入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/inboundNotice", "推送入库单通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }

        return result;
    }

    @ApiOperation("【WMS】推送出库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/outboundNotice")
    public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.outboundNotice(param);
        }catch (BusinessException e){
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【WMS】推送出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/outboundNotice", "推送出库单通知任务",JSONObject.toJSONString(param),success
                    , JSONObject.toJSONString(result),Constants.ONE);
        }

        return result;
    }
    @ApiOperation("【WMS】推送取消入库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/cancelInbound")
    public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.cancelInbound(param);
        }catch (BusinessException e){
            log.error("【WMS】推送取消入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【WMS】推送取消入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelInbound", "推送取消入库单通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;
    }
    @ApiOperation("【WMS】推送取消出库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/cancelOutbound")
    public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.cancelOutbound(param);
        }catch (BusinessException e){
            log.error("【WMS】推送取消出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【WMS】推送取消出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "推送取消出库单通知任务",
                    JSONObject.toJSONString(param),  success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;
    }
    @ApiOperation("【WMS】推送出入库作业完成通知任务")
    @LoginNoRequired
    @PostMapping("/push/doneTask")
    public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result = null;
        try {
            result = wmsService.doneTask(param);
        }catch (BusinessException e){
            log.error("【WMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【WMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/doneTask", "推送出入库作业完成通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;
    }

}

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

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

import com.alibaba.cloud.commons.io.IOUtils;
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
@@ -15,12 +16,18 @@
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;

/**
@@ -30,119 +37,68 @@
@Api(tags = "WMS平台数据推送接口")
@RestController
@Slf4j
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/wms")
public class WmsPushCloudController extends BaseController {

    @Autowired
    private WmsService wmsService;

    @PreventRepeat
    @ApiOperation("【CMS】推送入库单通知任务")
    @ApiOperation("【WMS】推送入库单通知任务")
    @PostMapping("/push/inboundNotice")
    public WmsBaseResponse inboundNotice(@RequestBody WmsBaseRequest<WmsInboundNoticeRequest> param) {

        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.inboundNotice(param);
        }catch (BusinessException e){
            log.error("【CMS】推送入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/inboundNotice", "推送入库单通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
    @LoginNoRequired
    public WmsBaseResponse inboundNotice(HttpServletRequest request, HttpServletResponse response)   {
        doPringParam(request,"【WMS】推送入库单通知任务");
        return new WmsBaseResponse();
        }

        return result;
    }

    @PreventRepeat
    @ApiOperation("【CMS】推送出库单通知任务")
    @ApiOperation("【WMS】推送出库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/outboundNotice")
    public WmsBaseResponse outboundNotice(@RequestBody WmsBaseRequest<WmsOutboundNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.outboundNotice(param);
        }catch (BusinessException e){
            log.error("【CMS】推送出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/outboundNotice", "推送出库单通知任务",JSONObject.toJSONString(param),success
                    , JSONObject.toJSONString(result),Constants.ONE);
    public WmsBaseResponse outboundNotice(HttpServletRequest request, HttpServletResponse response)   {
        doPringParam(request,"【WMS】推送出库单通知任务");
        return new WmsBaseResponse();
    }
    @ApiOperation("【WMS】推送取消入库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/cancelInbound")
    public WmsBaseResponse cancelInbound(HttpServletRequest request, HttpServletResponse response)   {
        doPringParam(request,"【WMS】推送取消入库单通知任务");
        return new WmsBaseResponse();
    }
    @ApiOperation("【WMS】推送取消出库单通知任务")
    @LoginNoRequired
    @PostMapping("/push/cancelOutbound")
    public WmsBaseResponse cancelOutbound(HttpServletRequest request, HttpServletResponse response)   {
        doPringParam(request,"【WMS】推送取消出库单通知任务");
        return new WmsBaseResponse();
        }

        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送取消入库单通知任务")
    @PostMapping("/push/cancelInbound")
    public WmsBaseResponse cancelInbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.cancelInbound(param);
        }catch (BusinessException e){
            log.error("【CMS】推送取消入库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送取消入库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelInbound", "推送取消入库单通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送取消出库单通知任务")
    @PostMapping("/push/cancelOutbound")
    public WmsBaseResponse cancelOutbound(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
        try {
            result = wmsService.cancelOutbound(param);
        }catch (BusinessException e){
            log.error("【CMS】推送取消出库单通知任务===失败："+e.getMessage());
            success = Constants.ONE;
        }catch (Exception e){
            log.error("【CMS】推送取消出库单通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/cancelOutbound", "推送取消出库单通知任务",
                    JSONObject.toJSONString(param),  success, JSONObject.toJSONString(result),Constants.ONE);
        }
        return result;
    }
    @PreventRepeat
    @ApiOperation("【CMS】推送出入库作业完成通知任务")
    @ApiOperation("【WMS】推送出入库作业完成通知任务")
    @LoginNoRequired
    @PostMapping("/push/doneTask")
    public WmsBaseResponse doneTask(@RequestBody WmsBaseRequest<WmsActionNoticeRequest> param) {
        int success = Constants.ZERO;
        WmsBaseResponse result =null;
    public WmsBaseResponse doneTask(HttpServletRequest request, HttpServletResponse response)   {
        doPringParam(request,"【WMS】推送出入库作业完成通知任务");
        return new WmsBaseResponse();
    }

    private void doPringParam(HttpServletRequest request,String name) {
        try {
            result = wmsService.doneTask(param);
        }catch (BusinessException e){
            log.error("【CMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            success = Constants.ONE;
            StringBuilder data =new StringBuilder();
            String line;
            BufferedReader reader =request.getReader();
            while(null !=(line = reader.readLine())) {
                data.append(line);
            }
            if(StringUtils.isNotBlank( data.toString())){
                log.info(name+"=================参数："+ data.toString());
            }else {
                log.info(name+"=================：参数为空");
            }
        }catch (Exception e){
            log.error("【CMS】推送出入库作业完成通知任务===失败："+e.getMessage());
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            wmsService.saveInterfaceLog("/wms/push/doneTask", "推送出入库作业完成通知任务",JSONObject.toJSONString(param),
                    success, JSONObject.toJSONString(result),Constants.ONE);

            log.info(name+"================= å‚数异常："+e.getMessage());
        }
        return result;
    }

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseResponse.java

@@ -18,4 +18,16 @@
    public static final String CODE_SUCCESS = "1";
    @ApiModelProperty(value = "返回参数"  )
    private List<T> data;

    @ApiModelProperty(value = "响应码")
    private int code;

    @ApiModelProperty(value = "请求是否成功")
    private boolean success;

    @ApiModelProperty(value = "错误消息")
    private String message;

    @ApiModelProperty(value = "异常消息")
    private String exception;
}

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

@@ -83,6 +83,7 @@

    @ApiModelProperty(value = "海康门禁名称")
    @ExcelColumn(name="进厂门禁" ,index = 6,width = 12)
    @TableField(exist = false)
    private String deviceName;

    @ApiModelProperty(value = "海康门禁编码")

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

@@ -875,7 +875,7 @@
                    waitModel.setStatus(level.getStatus());
                    waitModel.setType(Constants.ONE);
                    waitModel.setCheckDate(level.getCheckDate());
                    waitModel.setTitle("审批人（抄送或签审批人）");
                    waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"审批人"));
                }else{
                    waitModel.setStatus(level.getStatus());
                    waitModel.setType(Constants.ZERO);

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

@@ -1456,7 +1456,7 @@
        queryWrapper.selectAll(Member.class)
                .selectAs(Company::getName,Member::getCompanyName)
                .selectAs(Member::getLastVisitDate,Member::getLastVisitDate)
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitsCount");
                .select(" (select count(v.id) from visits v where v.MEMBER_ID=t.id and v.ISDELETED=0 and v.status  in (7,8) ) as visitTimes");
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Member::getName,pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getPhone()),Member::getPhone,pageWrap.getModel().getPhone())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ms->ms.like(Member::getVisitCompanyName,pageWrap.getModel().getCompanyName())

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

@@ -354,7 +354,8 @@
                    continue;
                }
                //海康访客记录编码
                dealVisitDataByRequstIccm(request,delRetentionLis,retentionList,list);
                dealVisitDataByRequstIccm(request,delRetentionLis,retentionList);
                list.add(getVisitEventModelByRequestIccm(request,request.getData().getVisitorInformationList().get(0)));
            }
            if(list.size()>0){
                //插入门禁记录
@@ -382,14 +383,14 @@
    /**
     *  æ ¹æ®è®¿å®¢æŽ¨é€è®¿å®¢è®°å½•ç¼–码，处理访客记录、在场人员等信息
     */
    private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList,List<VisitEvent> list) {
    private void dealVisitDataByRequstIccm(EventVisitIccmInfoRequest request, List<Integer> delRetentionLis, List<Retention> retentionList ) {

        EventVisitIccmDataRequest model = request.getData();
        EventVisitIccmInvoiceParamRequest data =  request.getData().getVisitorInvoices();
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Visits.class);
        queryWrapper.selectAs(Member::getType,Visits::getMemberType);
        queryWrapper.eq(Visits::getHkId,model.getVisitorInvoices().getInvoicesId() );//访客单号
        queryWrapper.eq(Visits::getHkId,model.getVisitorInvoices().getInvoicesNo() );//访客单号
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getMemberId );
        queryWrapper.last("limit 1");
        Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
@@ -427,6 +428,7 @@
            updateVistis.setEditDate(new Date());
            //更新访客来访或者签离时间信息
            visitsMapper.updateById(updateVistis) ;

        }
    }
    private Retention getRetentionModelByVisitRequest(Visits visits, String happentTime,String srcType) {
@@ -453,13 +455,16 @@

        return retention;
    }
    private VisitEvent getVisitEventModelByRequest(EventVisitIccmInfoRequest request,EventVisitIccmDetailParamRequest detail) {
    private VisitEvent getVisitEventModelByRequestIccm(EventVisitIccmInfoRequest request,EventVisitIccmDetailParamRequest detail) {
        if(request.getData().getTargetPerson() ==null){
            request.getData().setTargetPerson(new EventVisitIccmTargetParamRequest());
        }
        VisitEvent event = new VisitEvent();
        event.setIsdeleted(Constants.ZERO);
        event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
        event.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
        if(event.getCreateDate() == null){
            event.setCreateDate(new Date());
        }
        event.setVisitorWorkUint(detail.getUnit());
        event.setVisitorId(detail.getVisitorId());
        event.setVisitorCode(detail.getAppointmentCode());

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

@@ -192,6 +192,7 @@
    @Override
    @Transactional
    public WmsBaseResponse<WmsBaseDataResponse> inboundNotice(WmsBaseRequest<WmsInboundNoticeRequest> list) {
        try{
        if(list ==null || list.getData()==null|| list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
@@ -245,12 +246,12 @@
                    iocodeList.add(d.getIoCode());
                    details.add(entity);
                }
                if(job.getIsNew() == 1&& iocodeList.size()>0){
                    if(job.getIsNew() != 1&& iocodeList.size()>0){
                    //先清理同一个承运单号下重复推送的iocode数据，以最后一次推送为主
                    platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                            .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
                            .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsDetail::getJobId,job.getJobId())
                                .eq(PlatformWmsDetail::getWmsJobId,job.getId())
                            .in(PlatformWmsDetail::getIocode,iocodeList)
                    );
                }
@@ -261,6 +262,10 @@
        }
        if(jobList.size()>0){
            startEndNoticeToDriver(jobList);
            }
        }catch (Exception e){
            log.error("【WMS】处理入库取消通知业务===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
@@ -331,8 +336,6 @@
        platformJobMapper.insert(job);
        return job;
    }


    /**
     * å‡ºåº“通知任务业务处理
     * @param list å‚æ•°
@@ -340,6 +343,8 @@
     */
    @Override
    public WmsBaseResponse outboundNotice(WmsBaseRequest<WmsOutboundNoticeRequest> list) {

        try{
        if(list ==null ||list.getData()==null ||  list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
@@ -385,18 +390,19 @@
                    entity.setJobId(job.getJobId());
                    entity.setWmsJobId(job.getId());
                    entity.setIoQty(d.getIoQty());
                        entity.setWmsJobId(job.getId());
                    entity.setStatus(Constants.ZERO);
                    entity.setRate(d.getRate());
                    entity.setMaterialName(d.getMaterialName());
                    iocodeList.add(d.getIoCode());
                    details.add(entity);
                }
                if(job.getIsNew() == 1&& iocodeList.size()>0){
                    if(job.getIsNew() != 1 && iocodeList.size()>0){
                    //先清理同一个承运单号下重复推送的iocode数据，以最后一次推送为主
                    platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                            .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
                            .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
                            .eq(PlatformWmsDetail::getJobId,job.getJobId())
                                .eq(PlatformWmsDetail::getWmsJobId,job.getId())
                            .in(PlatformWmsDetail::getIocode,iocodeList)
                    );
                }
@@ -408,6 +414,10 @@
        if(jobList.size()>0){
            startEndNoticeToDriver(jobList);
        }
        }catch (Exception e){
            log.error("【WMS】处理入库取消通知业务===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
    /**
@@ -417,9 +427,28 @@
     */
    @Override
    public WmsBaseResponse cancelInbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
        //TODO-------------------处理入库取消通知业务--------------------
        if(list ==null||list.getData()==null || list.getData().size() ==0){
        //-----------------处理入库取消通知业务--------------------
        try {
            if(list ==null||list.getData()==null || list.getData().size() ==0 || list.getData().get(0).getIoCode() == null){
            return returnFailReuslt("请求参数不正确，参数不能为空");
            }
            List<String> iocodeList = new ArrayList<>();
            for(WmsActionNoticeRequest param :list.getData()){
                if(StringUtils.isNotBlank(param.getIoCode())){
                    iocodeList.add(param.getIoCode());
                }
            }
            if(iocodeList.size() ==0 ){
                return returnFailReuslt("请求参数iocode不正确，参数不能为空");
            }
            //取消全部数据状态为 ã€å·²å–消】
            platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                    .set(PlatformWmsDetail::getStatus,Constants.TWO)
                    .in(PlatformWmsDetail::getIocode,iocodeList)
                    .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
        }catch (Exception e){
            log.error("【WMS】处理入库取消通知业务===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
@@ -430,18 +459,28 @@
     */
    @Override
    public WmsBaseResponse cancelOutbound(WmsBaseRequest<WmsActionNoticeRequest> list) {
        try {
        if(list ==null||list.getData()==null || list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
        List<String> iocodeList = new ArrayList<>();
        for(WmsActionNoticeRequest param :list.getData()){
                if(StringUtils.isNotBlank(param.getIoCode())){
            iocodeList.add(param.getIoCode());
                }
            }
            if(iocodeList.size() ==0 ){
                return returnFailReuslt("请求参数iocode不正确，参数不能为空");
        }
        //取消全部数据状态为 ã€å·²å–消】
         platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                .set(PlatformWmsDetail::getStatus,Constants.TWO)
                .in(PlatformWmsDetail::getIocode,iocodeList)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
        }catch (Exception e){
            log.error("【WMS】出库取消通知任务业务处理===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }
    /**
@@ -451,19 +490,28 @@
     */
    @Override
    public WmsBaseResponse doneTask(WmsBaseRequest<WmsActionNoticeRequest> list) {
        try {
        if(list ==null||list.getData()==null || list.getData().size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
        List<String> iocodeList = new ArrayList<>();
        for(WmsActionNoticeRequest param :list.getData()){
                if(StringUtils.isNotBlank(param.getIoCode())){
            iocodeList.add(param.getIoCode());
                }
            }
            if(iocodeList.size() ==0 ){
                return returnFailReuslt("请求参数iocode不正确，参数不能为空");
        }
        //取消全部数据状态为 ã€å·²å®Œæˆã€‘
        platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                .set(PlatformWmsDetail::getStatus,Constants.ONE)
                .in(PlatformWmsDetail::getIocode,iocodeList)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));

        }catch (Exception e){
            log.error("【WMS】作业完成通知任务业务处理===============业务处理异常"+e.getMessage());
            return returnFailReuslt("业务处理异常");
        }
        return returnSuccessReuslt(null);
    }

@@ -475,6 +523,7 @@

    private WmsBaseResponse returnFailReuslt(String msg) {
        WmsBaseResponse response = new WmsBaseResponse();
        response.setCode(-1);
        response.setData(new ArrayList<>());
        WmsBaseDataResponse rData = new WmsBaseDataResponse();
        rData.setMsgDescr(msg);
@@ -491,6 +540,7 @@

    private WmsBaseResponse returnSuccessReuslt(String msg) {
        WmsBaseResponse response = new WmsBaseResponse();
        response.setCode(1);
        response.setData(new ArrayList<>());
        WmsBaseDataResponse rData = new WmsBaseDataResponse();
        rData.setMsgDescr(StringUtils.defaultString(msg,"操作成功"));