最新版本541200007

jiangping

2024-11-12 95ddc157639fc6e9102d2e1fa8ca164af66685d6

最新版本541200007

 admin/.env.development

@@ -1,8 +1,8 @@
# å¼€å‘环境配置
NODE_ENV = 'development'

VUE_APP_API_URL  = 'http://localhost:10010'
#VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'http://192.168.0.103:10010'
# VUE_APP_API_URL  = 'http://192.168.0.173/gateway_interface'
# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
 VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'


 admin/src/components/common/CommonHeader.vue

@@ -32,8 +32,8 @@
    </div>
    <!-- ä¿®æ”¹å¯†ç  -->
      <GlobalAlertWindow title="修改密码" :visible.sync="visible.changePwd"
        :showClose="!userInfo.needChangePwd || userInfo.needChangePwd == '0'"
        :showCancel="!userInfo.needChangePwd || userInfo.needChangePwd == '0'" @confirm="confirmChangePwd"
        :showClose="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')"
        :showCancel="userInfo && (!userInfo.needChangePwd || userInfo.needChangePwd == '0')" @confirm="confirmChangePwd"
        @close="visible.changePwd = false">
        <el-form :model="changePwdData.form" ref="changePwdDataForm" :rules="changePwdData.rules">
          <el-form-item label="原始密码" prop="oldPwd" required>
@@ -114,7 +114,7 @@
  },
  mounted() {
    // needChangePwd 0 : é»˜è®¤å¯†ç éœ€è¦ä¿®æ”¹ï¼Œ1 ä¸éœ€è¦
    if (!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0') {
    if (userInfo &&(!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0')) {
      this.visible.changePwd = true
    }
  },

 admin/src/views/operation/serviceCar/apprRecord.vue

@@ -120,6 +120,11 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column
            prop="carCode"
            label="车牌号"
            min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="memberName"
          label="提报人"
          min-width="80px"
@@ -129,11 +134,6 @@
          label="所属组织"
          min-width="150px"
        ></el-table-column>
        <el-table-column
          prop="carCode"
          label="车牌号"
          min-width="100px"
        ></el-table-column>
        <el-table-column label="用车时间" min-width="170px">
          <template slot-scope="{ row }">
            <span v-if="row.startTime">èµ·:{{ row.startTime.slice(0,16) }}</span
@@ -142,6 +142,11 @@
          </template>
        </el-table-column>
        <el-table-column
            prop="memberNames"
            label="乘车人"
            min-width="180px"
        ></el-table-column>
        <el-table-column
          prop="planUseDate"
          label="出发时间"
          min-width="150px"

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/UserRelMapper.java

@@ -2,11 +2,12 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.UserRel;
import com.github.yulichang.base.MPJBaseMapper;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/05/04 18:18
 */
public interface UserRelMapper extends BaseMapper<UserRel> {
public interface UserRelMapper extends MPJBaseMapper<UserRel> {

}

 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/UserRel.java

@@ -67,6 +67,9 @@
    @ApiModelProperty(value = "参会人员名称")
    @TableField(exist = false)
    private String realName;
    @ApiModelProperty(value = "参会人员手机号")
    @TableField(exist = false)
    private String userPhone;




 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -10,16 +10,15 @@
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.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.*;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.request.QrOpenDoorDto;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.RoomStatisticsVo;
@@ -56,6 +55,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.Date;
import java.util.stream.Collectors;

/**
@@ -71,6 +71,8 @@
    private String desPwd;
    @Autowired
    private BookingsMapper bookingsMapper;
    @Autowired
    private SmsConfigMapper smsConfigMapper;
    @Autowired
    private SystemUserMapper systemUserMapper;
    @Autowired
@@ -109,6 +111,8 @@

    @Autowired
    private NoticesJoinMapper noticesMapper;
    @Autowired
    private SmsEmailMapper smsEmailMapper;

    @Autowired
    private UserRelMapper userRelMapper;
@@ -126,6 +130,11 @@
    @Transactional(rollbackFor = {BusinessException.class, Exception.class})
    public Integer create(Bookings bookings) {
        LoginUserInfo user = bookings.getLoginUserInfo();
        Rooms rooms = roomsMapper.selectById(bookings.getRoomId());
        if(rooms==null ){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，该会议室暂时无法预约");
        }
        bookings.setRoomName(rooms.getName());
        isCreateParamValid(bookings, user);
        bookings.setCreateDate(new Date());
        bookings.setCreator(user.getId());
@@ -140,7 +149,9 @@
        updateProjectRel(bookings, user);
        handleFile(bookings, user);
        //发送会议预约成功通知
        if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
        this.sendNotice(bookings, MeetConstants.TWO);
        }
        //发送微信订阅通知
//        sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));

@@ -1294,22 +1305,52 @@
        //1、参与会议：参与会议即将开始  ç»™æ¯ä¸ªå‚会人员发送会议通知并且给会议预约人发送预定的会议即将开始 å¦‚果预订人也参与会议，则会有2条会议通知
        //2、会议预定成功，给所有参会人员与预约人都发送
        //3、会议取消 ä¼šè®®å–消，给所有参会人员都发送
        List<UserRel> userRelList = userRelMapper.selectList(new QueryWrapper<UserRel>()
                .eq("OBJ_TYPE", MeetConstants.ONE)
                .eq("OBJ_ID", bookings.getId())
                .eq("ISDELETED", MeetConstants.ZERO)
        List<UserRel> userRelList = userRelMapper.selectJoinList(UserRel.class,new MPJLambdaWrapper<UserRel>()
                .selectAll(UserRel.class)
                .selectAs(SystemUser::getRealname,UserRel::getRealName)
                .selectAs(SystemUser::getMobile,UserRel::getUserPhone)
                .leftJoin(SystemUser.class,SystemUser::getId,UserRel::getUserId)
                .eq(UserRel::getObjType, MeetConstants.ONE)
                .eq(UserRel::getObjId, bookings.getId())
                .eq(UserRel::getIsdeleted, MeetConstants.ZERO)
        );
        List<SmsEmail> smsEmailList = new ArrayList<>();
        List<Notices> noticeList = new ArrayList<>();
        SmsConfig smsConfig = null;
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.MEETING_START;
        if (sendType.equals(MeetConstants.THREE)){
            noticeObjectType = Constants.NoticeObjectType.MEETING_CACEL;
        }else   if (sendType.equals(MeetConstants.TWO)){
            noticeObjectType = Constants.NoticeObjectType.MEETING_BOOK_SUCCESS;
            smsConfig   = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
                    SmsConstants.meetingContent.meetingBookJoinUser)
                    .eq(SmsConfig::getIsdeleted,Constants.ZERO)
                    .last(" limit 1 "));
        }
        if(userRelList!=null && userRelList.size()>0){
            for (UserRel i : userRelList) {
                Notices notices = new Notices(noticeObjectType,i.getId(),noticeObjectType.getInfo(), i.getUserId(), Constants.ZERO);
                noticeList.add(notices);
                if (smsConfig!=null && Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
                    SmsEmail smsEmail = new SmsEmail();
                    //{参会人员姓名}，您好！您有一个新的会议，会议主题：{会议主题}，会议地点：{会议室名称}，会议时间：{会议时间段}，请按时参加
                    String timeInfo =DateUtil.getFomartDate( bookings.getStartTime(),"MM/dd HH:mm")+"-"
                            +DateUtil.getFomartDate( bookings.getEndTime(),"HH:mm");
                    smsEmail.setPhone(i.getUserPhone());
                    smsEmail.setRemark("等待发送");
                    smsEmail.setStatus(Constants.TWO);//
                    smsEmail.setIsdeleted(Constants.ZERO);
                    smsEmail.setType(Constants.ZERO);
                    smsEmail.setObjId(bookings.getId());
                    smsEmail.setCreateDate(new Date());
                    smsEmail.setTitle("会议室申请参会通知");
                    smsEmail.setContent(StringUtils.defaultString(smsConfig.getContent(),"")
                            .replace("{参会人员姓名}",StringUtils.defaultString(i.getRealName(),""))
                            .replace("{会议主题}",StringUtils.defaultString(bookings.getName(),""))
                            .replace("{会议室名称}",StringUtils.defaultString(bookings.getRoomName(),""))
                            .replace("{会议时间段}",StringUtils.defaultString(timeInfo,"")));
                    smsEmailList.add(smsEmail);
                }
            }
        }
        //给参会人员插入
@@ -1318,6 +1359,9 @@
        if(noticeList.size()>0){
            noticesMapper.insert(noticeList);
        }
        if(smsEmailList.size()>0){
            smsEmailMapper.insert(smsEmailList);//待发短信数据
        }
    }



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

@@ -129,6 +129,13 @@
        //物流车预约-月台停靠超时（给司机）
        String platformJobTimeOut = "platformJobTimeOut";
    }
    /**
     * è®®å®¤ç”³è¯·
     */
    public interface meetingContent{
        // meetingBookJoinUser    ä¼šè®®å®¤ç”³è¯·ï¼ˆé€šçŸ¥å‚会人）
        String meetingBookJoinUser = "meetingBookJoinUser";
    }




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

ÎļþÃû´Ó server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/SmsConfigMapper.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.dao.business;
package com.doumee.dao.business.dao;

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

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

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

@@ -74,8 +74,8 @@
    @ExcelColumn(name="邮箱")
    private String email;

    @ApiModelProperty(value = "状态 0未使用 1已使用")
    @ExcelColumn(name="状态 0未使用 1已使用")
    @ApiModelProperty(value = "状态 0未使用 1已使用 2等待发送")
    @ExcelColumn(name="状态 0未使用 1已使用 2等待发送")
    private Integer status;

    @ApiModelProperty(value = "类型 0短信 1邮件")
@@ -87,7 +87,7 @@
    private Integer objId;

    @ApiModelProperty(value = "关联对象类型 0=验证码；1=访客业务；2=访客报备；3=隐患随手拍；4=用车申请；5=会议室信息；6=物流车预约；7=物流车作业")
    @ExcelColumn(name="关联对象类型 0=验证码；1=访客业务；2=访客报备；3=隐患随手拍；4=用车申请；5=会议室信息；6=物流车预约；7=物流车作业")
    @ExcelColumn(name="关联对象类型 0=验证码；1=访客业务；2=访客报备；3=隐患随手拍；4=用车申请；5=会议室信息；6=物流车预约；7=物流车作业;8=会议室申请")
    private String objType;

    @ApiModelProperty(value = "附件集合")

 server/system_timer/src/main/java/com/doumee/api/timer/QuartzCloudController.java

@@ -31,6 +31,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:quartz:create")
    public ApiResponse  create(@RequestBody QuartzJob quartzJob ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
          quartzJob.setState(Constants.ONE);
          quartzJobService.insert(quartzJob) ;
          return ApiResponse.success(null);
    }

 server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java

@@ -82,6 +82,9 @@
    @ApiOperation("【数字化月台】月台等待作业超时业务")
    @GetMapping("/timer/platformJob/platformJobWaitTimeOut")
    ApiResponse platformJobWaitTimeOut();
    @ApiOperation("【短信通知】定时发送等待短信任务")
    @GetMapping("/timer/sms/sendWaitingSmsNotice")
    ApiResponse sendWaitingSmsNotice();




 server/visits/admin_timer/src/main/java/com/doumee/api/HkSmsEmailTimerController.java

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

import com.doumee.core.model.ApiResponse;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/30 15:33
 */
@Api(tags = "短信发送定时任务")
@RestController
@RequestMapping("/timer/sms")
public class HkSmsEmailTimerController extends BaseController {
    @Autowired
    private SmsEmailService smsEmailService;
    @ApiOperation("开启定时短信发送定时任务")
    @GetMapping("/sendWaitingSmsNotice")
    public ApiResponse sendWaitingSmsNotice() {
        smsEmailService.sendWaitingSmsNotice();
        return ApiResponse.success("开启定时短信发送定时任务成功");
    }

}

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

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

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

@@ -25,117 +25,124 @@
public class CarUseBook extends LoginUserModel {
    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    //@ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    //@ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    //@ExcelColumn(name="创建时间")
    @ExcelColumn(name="申请时间",index =11,width = 10)
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    //@ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    //@ExcelColumn(name="更新时间")
    @ExcelColumn(name="操作时间",index =12,width = 10)
      private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    //@ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    //@ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "车牌号")
    @ExcelColumn(name="车牌号")
    @ExcelColumn(name="车牌号",index =1,width = 8)
    private String carCode;

    @ApiModelProperty(value = "车辆编码（关联cars)", example = "1")
    @ExcelColumn(name="车辆编码（关联cars)")
    //@ExcelColumn(name="车辆编码（关联cars)")
    private Integer carId;

    @ApiModelProperty(value = "开始时间")
    @ExcelColumn(name="开始时间")
//  
    //@ExcelColumn(name="开始时间")
    @ExcelColumn(name="开始时间",index =4,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date startTime;

    @ApiModelProperty(value = "结束时间")
    @ExcelColumn(name="结束时间")
//  
    //@ExcelColumn(name="结束时间")
    @ExcelColumn(name="结束时间",index =5,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    @ApiModelProperty(value = "预计出发时间")
    @ExcelColumn(name="预计出发时间")
    //@ExcelColumn(name="预计出发时间")
    @ExcelColumn(name="出发时间",index =7,width = 10)
    private String planUseDate;

    @ApiModelProperty(value = "状态 0申请中 1审核中 2审批通过 3审批不通过  4已取消", example = "1")
    @ExcelColumn(name="状态 0申请中 1审核中 2审批通过 3审批不通过  4已取消")
    //@ExcelColumn(name="状态 0申请中 1审核中 2审批通过 3审批不通过  4已取消")
    @ExcelColumn(name="状态",index =10,width = 8,valueMapping = "0=申请中;1=审核中;2=审批通过;3=审批不通过;4=已撤销;")
    private Integer status;

    @ApiModelProperty(value = "审批时间(最近一次）")
    @ExcelColumn(name="审批时间(最近一次）")
    //@ExcelColumn(name="审批时间(最近一次）")
    private Date checkDate;

    @ApiModelProperty(value = "审批人(最近一次）", example = "1")
    @ExcelColumn(name="审批人(最近一次）")
    //@ExcelColumn(name="审批人(最近一次）")
    private Integer checkUserId;

    @ApiModelProperty(value = "审批备注(最近一次）")
    @ExcelColumn(name="审批备注(最近一次）")
    //@ExcelColumn(name="审批备注(最近一次）")
    private String checkInfo;

    @ApiModelProperty(value = "取消类型 0申请人取消 1派车员撤销")
    @ExcelColumn(name="取消类型 0申请人取消 1派车员撤销")
    //@ExcelColumn(name="取消类型 0申请人取消 1派车员撤销")
    private Integer cancelType;

    @ApiModelProperty(value = "是否已取消 0未取消 1已取消")
    @ExcelColumn(name="是否已取消 0未取消 1已取消")
    //@ExcelColumn(name="是否已取消 0未取消 1已取消")
    private Integer cancelStatus;

    @ApiModelProperty(value = "取消时间")
    @ExcelColumn(name="取消时间")
    //@ExcelColumn(name="取消时间")
    private Date cancelTime;

    @ApiModelProperty(value = "取消人", example = "1")
    @ExcelColumn(name="取消人")
    //@ExcelColumn(name="取消人")
    private Integer cancelUser;

    @ApiModelProperty(value = "取消备注")
    @ExcelColumn(name="取消备注")
    //@ExcelColumn(name="取消备注")
    private String cancelInfo;

    @ApiModelProperty(value = "目的地类型 0市内用车 1市外用车", example = "1")
    @ExcelColumn(name="目的地类型 0市内用车 1市外用车")
    //@ExcelColumn(name="目的地类型 0市内用车 1市外用车")
    @ExcelColumn(name="目的地类型",index =8,width = 5,valueMapping = "0=市内用车;1=市外用车")
    private Integer type;

    @ApiModelProperty(value = "乘车人编码集合，多个英文逗号隔开", example = "1")
    @ExcelColumn(name="乘车人编码集合，多个英文逗号隔开")
    //@ExcelColumn(name="乘车人编码集合，多个英文逗号隔开")
    private String memberIds;

    @ApiModelProperty(value = "乘车人姓名集合，多个英文逗号隔开")
    @ExcelColumn(name="乘车人姓名集合，多个英文逗号隔开")
    //@ExcelColumn(name="乘车人姓名集合，多个英文逗号隔开")
    @ExcelColumn(name="乘车人",index =6,width = 10)
    private String memberNames;

    @ApiModelProperty(value = "用车事由")
    @ExcelColumn(name="用车事由")
    //@ExcelColumn(name="用车事由")
    private String content;

    @ApiModelProperty(value = "目的地")
    @ExcelColumn(name="目的地")
    //@ExcelColumn(name="目的地")
    @ExcelColumn(name="目的地",index =9,width = 10)
    private String addr;

    @ApiModelProperty(value = "申请人编码(关联member)", example = "1")
    @ExcelColumn(name="申请人编码(关联member)")
    //@ExcelColumn(name="申请人编码(关联member)")
    private Integer memberId;

    @ApiModelProperty(value = "司机编码（关联memberId）", example = "1")
    @ExcelColumn(name="司机编码（关联memberId）")
    //@ExcelColumn(name="司机编码（关联memberId）")
    private Integer driverId;

    @ApiModelProperty(value = "司机姓名", example = "1")
@@ -146,9 +153,11 @@
    private String driverPhone;
    @ApiModelProperty(value = "申请人姓名", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="提报人",index =2,width = 8)
    private String memberName;
    @ApiModelProperty(value = "申请人所属组织名称", example = "1")
    @TableField(exist = false)
    @ExcelColumn(name="所属组织",index =3,width = 20)
    private String companyName;
    @ApiModelProperty(value = "申请人手机号", example = "1")
    @TableField(exist = false)

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

@@ -97,4 +97,5 @@
     */
    long count(SmsEmail smsEmail);

    void sendWaitingSmsNotice();
}

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

@@ -17,6 +17,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.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.join.ApproveJoinMapper;

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

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
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.join.CarUseBookJoinMapper;

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

@@ -16,6 +16,7 @@
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.MultifileMapper;

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

@@ -11,6 +11,7 @@
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
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.*;

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

@@ -18,6 +18,7 @@
import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
import com.doumee.dao.business.join.PlatformJoinMapper;

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

@@ -3,7 +3,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.model.SmsConfig;
import com.doumee.service.business.SmsConfigService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,13 +8,11 @@
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;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.SmsEmailService;
@@ -27,7 +24,6 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.net.URLEncoder;
import java.util.*;
import java.util.Date;

@@ -254,6 +250,32 @@
    public long count(SmsEmail smsEmail) {
        QueryWrapper<SmsEmail> wrapper = new QueryWrapper<>(smsEmail);
        return smsEmailMapper.selectCount(wrapper);
    }
    @Override
    public void sendWaitingSmsNotice(){
        LambdaQueryWrapper<SmsEmail> wrapper = new LambdaQueryWrapper<SmsEmail>()
                .eq(SmsEmail::getIsdeleted,Constants.ZERO)
                .eq(SmsEmail::getStatus,Constants.TWO);
        List<SmsEmail> smsEmails = smsEmailMapper.selectList(wrapper);
        if(smsEmails!=null && smsEmails.size()>0){
            for(SmsEmail model : smsEmails){
                if(model.getPhone() == null){
                    model.setStatus(Constants.THREE);//发送失败
                    model.setRemark("手机号为空，取消任务发送！");
                }else{
                    try {
                        emayService.sendSmsByHk(model.getPhone(),model.getContent());
                        model.setStatus(Constants.ONE);//发送成功
                        model.setRemark("短信任务发送成功");
                    }catch (Exception e){
                        model.setStatus(Constants.THREE);//发送失败
                        model.setRemark("短信任务发送失败！"+e.getMessage());
                    }
                }
                model.setEditDate(new Date());
                smsEmailMapper.updateById(model);
            }
        }
    }

    /**
@@ -546,8 +568,6 @@
            smsEmail.setObjId(objId);
            smsEmailMapper.insert(smsEmail);
            emayService.sendSmsByHk(phone,content);


        }
    }


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

@@ -28,6 +28,7 @@
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.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.join.DeviceJoinMapper;

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

@@ -13,6 +13,7 @@
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;

@@ -20,7 +21,6 @@
import com.doumee.service.business.third.EmayService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;