Merge remote-tracking branch 'origin/master'

jiangping

2024-10-10 a819ee6d472cda32ad335eb4cad0a9f7e4d0878e

Merge remote-tracking branch 'origin/master'

 screen/package-lock.json

ÎļþÌ«´ó

 screen/package.json

@@ -13,7 +13,10 @@
    "dayjs": "^1.11.11",
    "echarts": "^5.5.1",
    "pinia": "^2.1.7",
    "postcss-px2rem": "^0.3.0",
    "px2rem-loader": "^0.1.9",
    "uqrcodejs": "^4.0.7",
    "v-scale-screen": "^2.0.0",
    "vue": "^3.4.21",
    "vue-router": "^4.3.0"
  },

 screen/src/main.js

@@ -5,6 +5,7 @@

import App from './App.vue'
import router from './router'
import '@/utils/scale_screen'

const app = createApp(App)


 screen/src/utils/scale_screen.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@

// rem等比适配配置文件
// åŸºå‡†å¤§å°
const baseSize = 14
// è®¾ç½® rem å‡½æ•°
function setRem() {
  // å½“前页面宽度相对于 1920宽的缩放比例，可根据自己需要修改。
  const scale = document.documentElement.clientWidth / 1920
  // è®¾ç½®é¡µé¢æ ¹èŠ‚点字体大小（“Math.min(scale, 2)” æŒ‡æœ€é«˜æ”¾å¤§æ¯”例为2，可根据实际业务需求调整）
  document.documentElement.style.fontSize = baseSize * Math.min(scale, 2) + 'px'
}
// åˆå§‹åŒ–
setRem()
// æ”¹å˜çª—口大小时重新设置 rem
window.onresize = function () {
  setRem()
}


 screen/src/views/PlatformCall.vue

@@ -5,6 +5,7 @@
import { getLargeScreenData } from '@/utils/request'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import VScaleScreen from 'v-scale-screen'

const qrcode = ref('')
const contentList = ref([])
@@ -107,7 +108,7 @@
  var qr = new UQRCode()
  // è®¾ç½®äºŒç»´ç å†…容
  qr.data = qrcode.value
  qr.size = 210
  qr.size = 220
  // è°ƒç”¨åˆ¶ä½œäºŒç»´ç æ–¹æ³•
  qr.make()
  var canvas = document.getElementById("qrcode")
@@ -141,25 +142,22 @@
  newTime.value = dayjs().format('HH:mm')
}, 1000)

const isFullscreen = ref(false);
const isFullscreen = ref(false)
const handleFull = () => {
  if(!isFullscreen.value){
  if (!isFullscreen.value) {
    handleFullScreen()
  }else{
  } else {
    cancelFullscreen()
  }
}
setTimeout(() => {
  handleFull()
}, 1000)
const handler = () => {
  isFullscreen.value = document.fullscreenElement !== null;
  isFullscreen.value = document.fullscreenElement !== null
  if (!isFullscreen) {
    // é€€å‡ºå…¨å±æ—¶å€™è§£é™¤ç›‘听，不然每次监听都会添加一次绑定 
    document.removeEventListener("fullscreenchange", handler);
    document.removeEventListener("fullscreenchange", handler)
  }
};
document.addEventListener("fullscreenchange", handler);
}
document.addEventListener("fullscreenchange", handler)
const handleFullScreen = () => {
  let elem = document.documentElement
  // å°è¯•å¯ç”¨å…¨å±æ¨¡å¼
@@ -175,92 +173,95 @@
}
function cancelFullscreen() {
  if (document.exitFullscreen) {
    document.exitFullscreen();
    document.exitFullscreen()
  } else if (document.msExitFullscreen) {
    document.msExitFullscreen();
    document.msExitFullscreen()
  } else if (document.mozCancelFullScreen) {
    document.mozCancelFullScreen();
    document.mozCancelFullScreen()
  } else if (document.webkitExitFullscreen) {
    document.webkitExitFullscreen();
    document.webkitExitFullscreen()
  }
}

</script>
<template>
  <div class="main_app">
    <div class="main_header">
      <img class="bg" src="@/assets/images/call/title@2x.png" alt="">
      <div class="title">安泰智慧物流园区-车辆叫号大屏</div>
      <div class="time_wrap">
        <div class="left">
          <div class="week">{{ newWeek }}</div>
          <div class="date">{{ newDate }}</div>
        </div>
        <div class="time">{{ newTime }}</div>
      </div>
    </div>
    <div class="main_content">
      <div class="list">
        <div class="line header">
          <div class="item no">序号</div>
          <div class="item">车牌号</div>
          <div class="item status">状态</div>
          <div class="item">停靠月台</div>
          <div class="item">时间</div>
        </div>
        <div class="line" v-for="item in contentTempList" :key="item.id">
          <div class="item no">{{ item.signNum }}</div>
          <div class="item">{{ item.carCodeFront }}</div>
          <div class="item">
            <div :class="{
              call_ed: item.status == 4,
              underway: item.status == 5,
              padding: item.status == 2 || item.status == 3,
            }" class="status">{{ statusMap[item.status] }}</div>
  <v-scale-screen width="1920" height="1080" :fullScreen="true">
    <div class="main_app">
      <div class="main_header">
        <img class="bg" src="@/assets/images/call/title@2x.png" alt="">
        <div class="title">安泰智慧物流园区-车辆叫号大屏</div>
        <div class="time_wrap" @click="handleFull">
          <div class="left">
            <div class="week">{{ newWeek }}</div>
            <div class="date">{{ newDate }}</div>
          </div>
          <div class="item">{{ item.platformName || '-' }}</div>
          <div class="item">
            <div v-if="item.optTimeTemp" class="time_place">预计完成时间</div>
            <div>{{ item.optTimeTemp || '-' }}</div>
          </div>
          <div class="time">{{ newTime }}</div>
        </div>
      </div>
      <div class="current">
        <div class="tip_wrap">
          <img src="@/assets/images/call/ic_left@2x.png" class="icon icon_l" alt="">
          <img src="@/assets/images/call/ic_right@2x.png" class="icon icon_r" alt="">
          <div v-if="callList.length > 0" class="current_plat">
            <div class="id_card">{{ activeCall.carCodeFront }}</div>
            <div class="no">({{ activeCall.signNum }})</div>
            <div class="place">
              <span>前往</span>
              <span class="plat"> {{ activeCall.platformName }} </span>
              <span>作业</span>
      <div class="main_content">
        <div class="list">
          <div class="line header">
            <div class="item no">序号</div>
            <div class="item">车牌号</div>
            <div class="item status">状态</div>
            <div class="item">停靠月台</div>
            <div class="item">时间</div>
          </div>
          <div class="line" v-for="item in contentTempList" :key="item.id">
            <div class="item no">{{ item.signNum }}</div>
            <div class="item">{{ item.carCodeFront }}</div>
            <div class="item">
              <div :class="{
                call_ed: item.status == 4,
                underway: item.status == 5,
                padding: item.status == 2 || item.status == 3,
              }" class="status">{{ statusMap[item.status] }}</div>
            </div>
            <div class="item">{{ item.platformName || '-' }}</div>
            <div class="item">
              <div v-if="item.optTimeTemp" class="time_place">预计完成时间</div>
              <div>{{ item.optTimeTemp || '-' }}</div>
            </div>
          </div>
          <div v-else class="empty">
            <div class="title">温馨提示</div>
            <div class="line">1、请司机根据叫号屏提示入园</div>
            <div class="line">2、未叫号车辆请耐心等待</div>
            <div class="line">3、请有序排队入园</div>
            <div class="line">4、装卸货结束禁止在园区逗留</div>
            <div class="line">5、请遵守园区安全规章制度</div>
          </div>
        </div>
        <div class="qrcode_wrap">
          <div class="qrcode">
            <canvas id="qrcode" width="210" height="210"></canvas>
        <div class="current">
          <div class="tip_wrap">
            <img src="@/assets/images/call/ic_left@2x.png" class="icon icon_l" alt="">
            <img src="@/assets/images/call/ic_right@2x.png" class="icon icon_r" alt="">
            <div v-if="callList.length > 0" class="current_plat">
              <div class="id_card">{{ activeCall.carCodeFront }}</div>
              <div class="no">({{ activeCall.signNum }})</div>
              <div class="place">
                <span>前往</span>
                <span class="plat"> {{ activeCall.platformName }} </span>
                <span>作业</span>
              </div>
            </div>
            <div v-else class="empty">
              <div class="title">温馨提示</div>
              <div class="line">1、请司机根据叫号屏提示入园</div>
              <div class="line">2、未叫号车辆请耐心等待</div>
              <div class="line">3、请有序排队入园</div>
              <div class="line">4、装卸货结束禁止在园区逗留</div>
              <div class="line">5、请遵守园区安全规章制度</div>
            </div>
          </div>
          <div class="title">请扫码签到</div>
          <div class="qrcode_wrap">
            <div class="qrcode">
              <canvas id="qrcode" width="220" height="220"></canvas>
            </div>
            <div class="title">请扫码签到</div>
          </div>
        </div>
      </div>
      <div class="main_footer">
        <img src="@/assets/images/call/ic_news@2x.png" class="icon" alt="">
        <div class="title">请根据队列提示信息，依次等候进场</div>
        <div class="icon"></div>
      </div>
    </div>
    <div class="main_footer">
      <img @click="handleFull" src="@/assets/images/call/ic_news@2x.png" class="icon" alt="">
      <div class="title">请根据队列提示信息，依次等候进场</div>
      <div class="icon"></div>
    </div>
  </div>
  </v-scale-screen>

</template>

<style lang="scss" scoped>
@@ -270,11 +271,8 @@

.main_app {
  color: #fff;
  position: fixed;
  top: 0;
  left: 0;
  width: 100%;
  height: 100vh;
  width: 1920px;
  height: 1080px;
  overflow: hidden;
  background-color: #092030;
  position: relative;
@@ -284,13 +282,14 @@

  .main_header {
    width: 100%;
    height: 112px;
    flex: 10.3;
    position: relative;
    display: flex;
    align-items: center;
    justify-content: space-between;
    padding: 0 50px;
    z-index: 11;

    .title {
      font-weight: 800;
      font-size: 48px;
@@ -331,7 +330,7 @@
  }

  .main_content {
    flex: 1;
    flex: 82.2;
    display: flex;
    padding: 30px 20px;
    position: relative;
@@ -404,6 +403,7 @@
          font-size: bold;
          font-size: 36px;
        }

        background: linear-gradient(180deg, #00B5D1 0%, #003C57 100%) !important;
      }
    }
@@ -429,6 +429,7 @@
          padding: 30px 40px;
          color: #FFA000;
          height: 100%;

          .id_card {
            font-weight: 500;
            font-size: 68px;
@@ -458,6 +459,7 @@
          font-weight: 500;
          font-size: 26px;
          height: 100%;

          .title {
            text-align: center;
            font-weight: bold;
@@ -515,7 +517,7 @@

  .main_footer {
    background-color: #1D8D9E;
    height: 80px;
    flex: 7.4;
    display: flex;
    align-items: center;
    padding: 0 50px;

 server/system_gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: system_gateway
  # å®‰å…¨é…ç½®

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

@@ -331,7 +331,6 @@
        int currentMonth = Integer.parseInt(sdfMonth.format(currentDate));
        List<String> list = new ArrayList<>();

        System.out.println("近12个月份：");
        for (int i = 0; i < month; i++) {
            int tempYear = currentYear;
            int tempMonth = currentMonth - i;

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

@@ -19,16 +19,14 @@

public class SmsConstants {



    public static final String inventCode ="inventCode" ;
    public static final String visit ="visit" ;
    public static final String visitReport ="visitReport" ;
    public static final String hiddenDanger ="hiddenDanger" ;
    public static final String carUse ="carUse" ;
    public static final String meeting ="meeting" ;
    public static final String platformBook ="platformBook" ;
    public static final String platformJob ="platformJob" ;
    public static final String inventCode ="0" ;
    public static final String visit ="1" ;
    public static final String visitReport ="2" ;
    public static final String hiddenDanger ="3" ;
    public static final String carUse ="4" ;
    public static final String meeting ="5" ;
    public static final String platformBook ="6" ;
    public static final String platformJob ="7" ;


    /**
@@ -91,7 +89,6 @@
        String carUseBookCancel = "carUseBookCancel";
    }


    /**
     * ç‰©æµè½¦é¢„约
     */
@@ -103,7 +100,7 @@
        //物流车预约-审批驳回短信通知模板（给申请人）
        String platformBookAuditFail = "platformBookAuditFail";
        //物流车预约-入园预约取消短信通知模板（给申请人）
        String carUseBookCancel = "carUseBookCancel";
        String platformBookCancel = "platformBookCancel";
    }


@@ -116,22 +113,21 @@
        //物流车作业-运输任务中止提醒（给司机）：。
        String platformJobStopJob = "platformJobStopJob";
        //物流车预约-叫号入园等待（给司机）
        String platformBookCallIn = "platformBookCallIn";
        String platformJobCallIn = "platformJobCallIn";
        //物流车预约-月台叫号（给司机）
        String platformBookSingIn = "platformBookSingIn";
        String platformJobSingIn = "platformJobSingIn";
        //物流车预约-月台叫号过号（给司机）
        String platformBookOverNum = "platformBookOverNum";
        String platformJobOverNum = "platformJobOverNum";
        //物流车预约-作业开始（给司机）
        String platformBookWorking = "platformBookWorking";
        String platformJobWorking = "platformJobWorking";
        //物流车预约-作业完成（给司机）
        String platformBookFinish = "platformBookFinish";
        String platformJobFinish = "platformJobFinish";
        //物流车预约-作业异常挂起（给司机）
        String platformBookError = "platformBookError";
        String platformJobError = "platformJobError";
        //物流车预约-月台转移（给司机）
        String platformBookMove = "platformBookMove";
        String platformJobMove = "platformJobMove";
        //物流车预约-月台停靠超时（给司机）
        String platformBookTimeOut = "platformBookTimeOut";

        String platformJobTimeOut = "platformJobTimeOut";
    }



 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: visitsAdmin
    # å®‰å…¨é…ç½®

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

@@ -151,7 +151,6 @@
    @TableField(exist = false)
    private String auditName;


    @ApiModelProperty(value = "审批信息数据")
    @TableField(exist = false)
    private ApproveDataVO approveDateVO;

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

@@ -13,6 +13,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
@@ -32,12 +33,14 @@
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.doumee.service.business.third.EmayService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -110,6 +113,15 @@

    @Autowired
    private VisitParkMapper visitParkMapper;

    @Autowired
    private SmsConfigMapper smsConfigMapper;

    @Autowired
    private SmsEmailMapper smsEmailMapper;

    @Autowired
    private EmayService emayService;


    @Override
@@ -445,7 +457,6 @@
            this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
        }
        approveJoinMapper.insert(approveList);

    }


@@ -563,6 +574,19 @@
                approve.setAddrParam(approveParam.getAddrParam());
                approve.setType(Constants.ZERO);
                approveList.add(approve);

                if(Constants.equalsInteger(approve.getStatus(),Constants.ONE)){
                    //发送短信通知
                    if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.reason)){
                        //物流车预约
                        SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
                                emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,businessId,
                                SmsConstants.platformBookContent.platformBookWaitAudit,
                                null,null
                        );
                    }
                }

            }
        }
    }
@@ -1233,6 +1257,17 @@
                            .in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
                }
                /**开启下一级别的数据为待审核**/

                List<Approve> waitAuditList = approveJoinMapper.selectJoinList(Approve.class,
                        new MPJLambdaWrapper<Approve>()
                                .selectAll(Approve.class)
                                .selectAs(Member::getPhone,Approve::getMemberPhone)
                                .leftJoin(Member.class,Member::getId,Approve::getChekorId)
                                .eq(Approve::getStatus,Constants.approveStatus.wait)
                                .eq(Approve::getObjId,approve.getObjId())
                                .eq(Approve::getObjType,approve.getObjType())
                                .eq(Approve::getLevel,(approve.getLevel()+1)));

                approveJoinMapper.update(null,new UpdateWrapper<Approve>()
                        .lambda()
                        .set(Approve::getStatus,Constants.approveStatus.auditIng)
@@ -1243,6 +1278,21 @@
                        .eq(Approve::getObjType,approve.getObjType())
                        .eq(Approve::getLevel,(approve.getLevel()+1))
                );
                //发送短信通知  ä¸‹çº§å®¡æ‰¹äºº


                List<String> memberPhone = waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getMemberPhone())).map(i->i.getMemberPhone()).collect(Collectors.toList());
                if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
                    SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
                            emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,approveDTO.getObjId(),
                            SmsConstants.platformBookContent.platformBookWaitAudit,
                            approveDTO.getCheckInfo(),memberPhone
                    );
                }




                if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
                        ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
                        ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
@@ -1252,8 +1302,6 @@
                             visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
                        }
                    }


                }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
                        Constants.approveObjectType.unCityUseCar)){
                    this.updDriver(approveDTO,approve,false);
@@ -1443,8 +1491,7 @@
            visits.setEditDate(new Date());
            visits.setEditor(approveDTO.getLoginUserInfo().getMemberId());
            //下发访客报备车辆信息

            if(approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
            if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)&&approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
                Boolean sendStatus = true;
                //查询当前启用的停车场
                List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>()
@@ -1514,41 +1561,53 @@
            platformBooks.setStatus(approveDTO.getStatus());
            platformBooks.setEditDate(new Date());
            platformBooks.setEditor(approveDTO.getLoginUserInfo().getMemberId());
            PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
            if(Objects.isNull(platformReason)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到入园原因数据");
            }
            PlatformGroup platformGroup = platformGroupMapper.selectById(platformReason.getGroupId());
            if(Objects.isNull(platformGroup)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到入园原因配置月台组数据");
            }
            if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
                PlatformReason platformReason = platformReasonMapper.selectById(platformBooks.getReasonId());
                if(Objects.isNull(platformReason)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到入园原因数据");
                }
                PlatformGroup platformGroup = platformGroupMapper.selectById(platformReason.getGroupId());
                if(Objects.isNull(platformGroup)){
                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到入园原因配置月台组数据");
                }

            //生成任务记录
            PlatformJob platformJob = platformBooks.toPlatformJob();
            platformJob.setId(null);
            platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
            if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
                platformJob.setType(Constants.platformJobType.wxcxh);
            }else if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
                platformJob.setType(Constants.platformJobType.wxczh);
            }else{
                platformJob.setType(Constants.platformJobType.sgscxh);
                //生成任务记录
                PlatformJob platformJob = platformBooks.toPlatformJob();
                platformJob.setId(null);
                platformJob.setPlatformGroupId(platformReason.getGroupId().intValue());
                if(Constants.equalsInteger(platformGroup.getType(),Constants.ZERO)){
                    platformJob.setType(Constants.platformJobType.wxcxh);
                }else if(Constants.equalsInteger(platformGroup.getType(),Constants.ONE)){
                    platformJob.setType(Constants.platformJobType.wxczh);
                }else{
                    platformJob.setType(Constants.platformJobType.sgscxh);
                }
                platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
                platformJobMapper.insert(platformJob);
                platformBooks.setJobId(platformJob.getId());
                platformBooksMapper.updateById(platformBooks);
                //生成任务操作记录
                PlatformLog platformLog = new PlatformLog();
                platformLog.setCreateDate(new Date());
                platformLog.setJobId(platformJob.getId());
                platformLog.setIsdeleted(Constants.ZERO);
                platformLog.setParam4(platformJob.getCarCodeFront());
                platformLog.setContent(Constants.PlatformJobLogType.CREATE.getInfo());
                platformLog.setObjType(Constants.PlatformJobLogType.CREATE.getKey());
                platformLog.setObjId(platformJob.getId().toString());
                platformLog.setAfterContent(JSONObject.toJSONString(platformJob));
                platformLogMapper.insert(platformLog);
            }
            platformJob.setStatus(Constants.PlatformJobStatus.WART_SIGN_IN.getKey());
            platformJobMapper.insert(platformJob);
            platformBooks.setJobId(platformJob.getId());
            platformBooksMapper.updateById(platformBooks);
            //生成任务操作记录
            PlatformLog platformLog = new PlatformLog();
            platformLog.setCreateDate(new Date());
            platformLog.setJobId(platformJob.getId());
            platformLog.setIsdeleted(Constants.ZERO);
            platformLog.setParam4(platformJob.getCarCodeFront());
            platformLog.setContent(Constants.PlatformJobLogType.CREATE.getInfo());
            platformLog.setObjType(Constants.PlatformJobLogType.CREATE.getKey());
            platformLog.setObjId(platformJob.getId().toString());
            platformLog.setAfterContent(JSONObject.toJSONString(platformJob));
            platformLogMapper.insert(platformLog);
            //发送短信通知
            SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
                    emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,platformBooks.getId(),
                    Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.platformBookContent.platformBookAuditSuccess:
                            SmsConstants.platformBookContent.platformBookAuditFail,
                    approveDTO.getCheckInfo(),null
            );

            //TODO å‘送微信公众号消息

        }else{
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }

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

@@ -10,6 +10,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.ApproveJoinMapper;
@@ -26,6 +27,7 @@
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.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
import org.apache.tomcat.util.bcel.Const;
import org.springframework.beans.BeanUtils;
@@ -77,6 +79,14 @@
    @Autowired
    private CarsMapper carsMapper;

    @Autowired
    private SmsConfigMapper smsConfigMapper;

    @Autowired
    private SmsEmailMapper smsEmailMapper;

    @Autowired
    private EmayService emayService;

    @Override
    public Integer create(PlatformBooks platformBooks) {
@@ -255,7 +265,7 @@
        if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda().eq(Cars::getIsdeleted,Constants.ZERO).eq(Cars::getCode,platformBooksApplyDTO.getCarCodeFront()))>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"["+platformBooksApplyDTO.getCarCodeFront()+"]属于内部车辆，无法预约");
        };
        ApproveTempl approveTempl = approveTemplMapper.selectById(platformReason.getId());
        ApproveTempl approveTempl = approveTemplMapper.selectById(platformReason.getApproveTemplId());
        if(Objects.isNull(approveTempl)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未配置审批流,请联系管理员");
        }
@@ -272,7 +282,7 @@
        platformBooksMapper.insert(platformBooks);

        //创建审批流信息
        approveService.createApproveForPlatfrom(platformReason.getApproveTemplId(),platformBooks.getId(),platformBooks.getDriverId());
        approveService.createApproveForPlatfrom(approveTempl.getId(),platformBooks.getId(),platformBooks.getDriverId());
        return platformBooks.getId();
    }

@@ -389,6 +399,15 @@
                .eq(Approve::getObjType,Constants.approveObjectType.logisticsCarUse)
                .eq(Approve::getObjId,revokeDTO.getId())
        );

        //发送短信通知
        SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,model.getId(),
                        SmsConstants.platformBookContent.platformBookCancel,
                null,null
        );


    }



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

@@ -13,10 +13,7 @@
import com.doumee.core.model.LoginUserInfo;
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.PositionUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;
@@ -34,6 +31,8 @@
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.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -48,6 +47,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.Date;
import java.util.stream.Collectors;

/**
@@ -96,6 +96,17 @@
    @Autowired
    private VisitParkMapper visitParkMapper;

    @Autowired
    private SmsConfigMapper smsConfigMapper;

    @Autowired
    private SmsEmailMapper smsEmailMapper;

    @Autowired
    private EmayService emayService;

    @Autowired
    private PlatformBroadcastLogMapper platformBroadcastLogMapper;

    @Override
    public Integer create(PlatformJob platformJob) {
@@ -825,6 +836,12 @@
        savePlatformLog(Constants.PlatformJobLogType.IN_WAIT.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.IN_WAIT.getInfo());

        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobCallIn,null,null
        );

        return platformJob;
    }

@@ -1010,7 +1027,61 @@
        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.CALLED.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.CALLED.getInfo().replace("{data}",platform.getName()));

        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobSingIn,platform.getName(),null
        );

        //广播 led通知
        this.broadcastAndLEed(platformJob,Constants.PlatformBroadcastContent.CALLING.getInfo().replace("{param2}",platform.getName()));
        return platformJob;
    }


    public void broadcastAndLEed(PlatformJob model,String content){
        int speed = 13;
        try {
            speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
        }catch (Exception e){

        }
        List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
                .eq(PlatformDevice::getPlatformId,model.getPlatformId())
                .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
        if(deviceList ==null || deviceList.size() == 0){
            return;
        }
        content = content.replace("${param}",model.getPlatformName());
        content = content.replace("${param2}",model.getCarCodeFront());
        List<String> broadcastList = new ArrayList<>();
        List<String> ledList = new ArrayList<>();
        String bNames = "";
        List<PlatformBroadcastLog> logList = new ArrayList<>();
        for(PlatformDevice device : deviceList){
            if(StringUtils.isNotBlank(device.getHkId())){
                continue;
            }
            if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
                //如果是LED
                PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(device.getHkNo(),device.getName(),content,speed,1);
                logList.add(log);
                ledList.add(device.getHkId());
            }else  if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
                //如果是广播点
                bNames += device.getName()+";";
                broadcastList.add(device.getHkId());
            }
        }
        if(broadcastList.size()>0){
            PlatformBroadcastLog log = HkSyncPushServiceImpl.dealBroadcastBiz(model,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo());
            logList.add(log);
        }
        if(logList.size()>0){
            platformBroadcastLogMapper.insert(logList);
        }

    }


@@ -1062,6 +1133,13 @@
        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.TRANSFERING.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.TRANSFERING.getInfo().replace("{data}",oldPlatform.getName()));


        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobMove,oldPlatform.getName(),platform.getName()
        );
    }


@@ -1091,6 +1169,13 @@
        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.OVER_NUMBER.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.OVER_NUMBER.getInfo());
        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobOverNum,null,null
        );


        return platformJob;
    }

@@ -1113,6 +1198,8 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,业务状态已流转！");
        }

        Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());

        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);

@@ -1124,6 +1211,12 @@
        //存储操作日志
        savePlatformLog(Constants.PlatformJobLogType.EXCEPTION.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.EXCEPTION.getInfo());

        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobError,platform.getName(),null
        );
    }


@@ -1149,8 +1242,7 @@
        if(Objects.isNull(platform)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到月台信息");
        }


        
        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);
        if(Objects.isNull(platformJob.getStartDate())){
@@ -1164,6 +1256,12 @@
        savePlatformLog(Constants.PlatformJobLogType.WORKING.getKey(),oldPlatformJob,platformJob,
                Constants.PlatformJobLogType.WORKING.getInfo().replace("{data}",platform.getName()));

        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobWorking,platform.getName(),null
        );
        
        return platformJob;
    }

@@ -1186,6 +1284,13 @@
        ||Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.EXCEPTION.getKey()) )){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起,业务状态已流转！");
        }


        Platform platform = platformJoinMapper.selectById(platformJob.getPlatformId());
        if(Objects.isNull(platform)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到月台信息");
        }
        
        PlatformJob oldPlatformJob = new PlatformJob();
        BeanUtils.copyProperties(platformJob,oldPlatformJob);

@@ -1204,6 +1309,15 @@
            //TODO å¤–协车卸货 æˆ–者 å¸‚公司车卸货 åˆ™æ ¹æ®ä»»åŠ¡æƒ…况

        }
 
        //发送短信信息
        SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
                emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
                SmsConstants.platformJobContent.platformJobFinish,platform.getName(),null
        );

        //广播 led通知
        this.broadcastAndLEed(platformJob,Constants.PlatformBroadcastContent.DONE.getInfo());
        return platformJob;
    }

@@ -1237,10 +1351,6 @@
        savePlatformLog(Constants.PlatformJobLogType.AUTHED_LEAVE.getKey(),oldPlatformJob,platformJob ,
                Constants.PlatformJobLogType.AUTHED_LEAVE.getInfo());
        return platformJob;




    }



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

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

import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,10 +13,13 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformBooksMapper;
import com.doumee.dao.business.PlatformJobMapper;
import com.doumee.dao.business.SmsConfigMapper;
import com.doumee.dao.business.SmsEmailMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.SmsEmail;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
@@ -26,8 +30,10 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * çŸ­ä¿¡é‚®ä»¶ä¿¡æ¯è¡¨Service实现
@@ -251,29 +257,113 @@
    }



    





    public static void sendBusiness(EmayService emayService ,SmsEmailMapper smsEmailMapper ,List<String> phoneList,String objType,String content,Integer objId){
        for (String phone:phoneList) {
            boolean result=   emayService.sendSingleSms(phone,content);
            if(!result){
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，短信验证码发送失败，请稍后重试！");
    /**
     * ç”¨è½¦ç”³è¯· çŸ­ä¿¡é€šçŸ¥é…ç½®
     * @param emayService
     * @param smsEmailMapper
     * @param smsConfigMapper
     * @param platformBooksMapper
     * @param objId
     * @param objCode
     * @param msg
     * @param auditUser
     */
    public static void sendPlatformBookSms(SystemDictDataBiz systemDictDataBiz,EmayService emayService ,SmsEmailMapper smsEmailMapper ,SmsConfigMapper smsConfigMapper,
            PlatformBooksMapper platformBooksMapper,Integer objId,String objCode,String msg,List<String> auditUser){
        try{
            SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
                    objCode).last(" limit 1 "));
            //开启短信通知
            if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
                String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
                PlatformBooks platformBooks = platformBooksMapper.selectById(objId);
                if(Objects.nonNull(platformBooks)){
                    if(objCode.equals(SmsConstants.platformBookContent.platformBookAuditSuccess)){
                        //您的【车辆入园申请】已经审批通过，入园时间为{入园时间}，请提前30分钟前往现场签到。如计划有变，请及时联系审核人员。
                        content = content.replace("{入园时间}",DateUtil.getDate(platformBooks.getArriveDate(),"yyyy-MM-dd HH:mm"));
                        sendBusinessSms(emayService,smsEmailMapper,
                                Arrays.asList(platformBooks.getDriverPhone().split(",")),SmsConstants.platformBook,content,platformBooks.getId());
                    }else if(objCode.equals(SmsConstants.platformBookContent.platformBookAuditFail) || objCode.equals(SmsConstants.platformBookContent.platformBookCancel)){
                        //您的【车辆入园申请】已被驳回，驳回原因为：{驳回原因}。如有疑问，请联系审核人员。
                        content = content.replace("{驳回原因}",msg);
                        //您的【车辆入园申请】已被取消，取消原因为：{取消原因}。如有疑问，请联系审核人员。
                        content = content.replace("{取消原因}",msg);
                        sendBusinessSms(emayService,smsEmailMapper,
                                Arrays.asList(platformBooks.getDriverPhone().split(",")),SmsConstants.platformBook,content,platformBooks.getId());
                    }else{
                        //您有一条【车辆入园申请】需要处理，详细信息请前往微信公众号查看。
                        sendBusinessSms(emayService,smsEmailMapper,
                                auditUser,SmsConstants.platformBook,content,platformBooks.getId());
                    }
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }


    /**
     * ç”¨è½¦ç”³è¯· çŸ­ä¿¡é€šçŸ¥é…ç½®
     * @param emayService
     * @param smsEmailMapper
     * @param smsConfigMapper
     * @param platformJobMapper
     * @param objId
     * @param objCode
     * @param platformName
     */
    public static void sendPlatformJobSms(SystemDictDataBiz systemDictDataBiz,EmayService emayService , SmsEmailMapper smsEmailMapper , SmsConfigMapper smsConfigMapper,
                                          PlatformJobMapper platformJobMapper, Integer objId, String objCode, String platformName,String newPlatformName){
        //platformJobNewJob    {车牌号}车主您好，您有一个新的运输任务，详细信息请前往微信公众号查看。
        //platformJobStopJob    {车牌号}车主您好，您的运输任务已被取消，详细信息请前往微信公众号查看。
        //platformJobCallIn    {车牌号}车主您好，请在10分钟内，前往园区等待区等待叫号作业。
        //platformJobSingIn    {车牌号}车主您好，请在10分钟内，前往{月台名称}进行作业。
        //platformJobOverNum    {车牌号}车主您好，您的任务已过号，请重新签到排队等待。
        //platformJobWorking    {车牌号}车主您好，您的车辆已在{月台名称}开始作业，请随时关注作业情况。
        //platformJobFinish    {车牌号}车主您好，您的车辆已在{月台名称}完成作业，请及时驶离月台。
        //platformJobError    {车牌号}车主您好，您在{月台名称}的作业任务已经被异常挂起，请及时关注具体情况。
        //platformJobMove    {车牌号}车主您好，您在{月台名称}的作业任务已经已被转移至{转移后月台名称}，请及时关注叫号情况。
        //platformJobTimeOut    {车牌号}车主您好，您在{月台名称}已停靠超时，请尽快驶离以免影响后续作业。
        try{
            SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
                    objCode).last(" limit 1 "));
            //开启短信通知
            if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
                String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
                PlatformJob platformJob = platformJobMapper.selectById(objId);
                if(Objects.nonNull(platformJob)){
                    content = content.replace("{车牌号}",platformJob.getCarCodeFront());
                    if(StringUtils.isNotBlank(platformName)&&content.indexOf("{月台名称}")>=Constants.ZERO){
                        content = content.replace("{月台名称}",platformName);
                    }
                    if(StringUtils.isNotBlank(newPlatformName)&&content.indexOf("{转移后月台名称}")>=Constants.ZERO){
                        content = content.replace("{转移后月台名称}",newPlatformName);
                    }
                    sendBusinessSms(emayService,smsEmailMapper,
                            Arrays.asList(platformJob.getDrivierPhone().split(",")),SmsConstants.platformJob,content,platformJob.getId());
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }

    public static void sendBusinessSms(EmayService emayService, SmsEmailMapper smsEmailMapper, List<String> phoneList, String objType, String content, Integer objId){
        for (String phone:phoneList) {
            SmsEmail smsEmail = new SmsEmail();
            smsEmail.setIsdeleted(Constants.ZERO);
            smsEmail.setCreateDate(new Date());
            smsEmail.setStatus(Constants.ONE);
            smsEmail.setType(Constants.ZERO);
            smsEmail.setTitle("业务短信");
            smsEmail.setPhone(phone);
            smsEmail.setContent(content);
            smsEmail.setObjType(objType);
            smsEmail.setObjId(objId);
            smsEmailMapper.insert(smsEmail);
            emayService.sendSingleSms(phone,content);

        }
    }


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

@@ -1082,16 +1082,24 @@
            }
        }
        if(broadcastList.size()>0){
            PlatformBroadcastLog log = dealBroadcastBiz(model,broadcastList,bNames);
            PlatformBroadcastLog log = dealBroadcastBiz(model,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo());
            logList.add(log);
        }
        if(logList.size()>0){
            platformBroadcastLogMapper.insert(logList);
        }
    }
    public static PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames) {

    /**
     * å¹¿æ’­é€šçŸ¥
     * @param model
     * @param broadcastList
     * @param bNames
     * @param content1
     * @return
     */
    public static PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames , String content1) {
        PlatformBroadcastLog log = new PlatformBroadcastLog();
        String content1 =Constants.PlatformBroadcastContent.WRONG_IN.getInfo();
        content1 = content1.replace("${param}",model.getCarCodeFront());

        log.setCreateDate(new Date());