Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/domain/bo/RemoteUserAccountBo.java

@@ -132,4 +132,10 @@ public class RemoteUserAccountBo implements Serializable {
      * 更新者
      */
     private Long updateBy;
+
+    /**
+     * 第三方人员状态
+     */
+    private String userState;
+
 }

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/domain/vo/RemoteCardDataVo.java

@@ -53,7 +53,8 @@ public class RemoteCardDataVo implements Serializable {
      * 持卡人
      */
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/service/RemoteTeamService.java

@@ -45,4 +45,6 @@ public interface RemoteTeamService {
      * @return 团客列表
      */
     R<List<RemoteTeamVo>> selectDoingTeam(Date doingDate);
+
+    R<Object> deleteTeamByOtherId(String otherId, Long operatorId);
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/TraineeBusiness.java

@@ -444,6 +444,7 @@ public class TraineeBusiness {
                 lockCardInfo.setCheckinDate(DateUtil.formatDateTime(userCardData.getStartTime()));
                 lockCardInfo.setCheckoutDate(DateUtil.formatDateTime(userCardData.getEndTime()));
                 lockCardInfo.setDataRemark(userCardData.getRemark());
+                lockCardInfo.setClassName(userCardData.getTeamName());
                 // lockCardInfo.setManageCard(userCardData);
             } else{
                 log.error("没有对应的住宿信息-[数据:{},卡号:{}]", cardData, cardId);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -65,7 +65,6 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
     private final IPtCardService ptCardService;
     private final IPtBagService bagService;
     private final IPtCardtypeService cardTypeService;
-    //private final CardBusiness cardBusiness;
 
     @DubboReference
     private final RemoteDeptService remoteDeptService;

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/KfProvideCardHis.java

@@ -59,7 +59,8 @@ public class KfProvideCardHis extends TenantEntity {
      * 持卡人
      */
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/bo/KfProvideCardHisBo.java

@@ -59,7 +59,8 @@ public class KfProvideCardHisBo extends BaseEntity {
      * 持卡人
      */
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/vo/KfProvideCardHisVo.java

@@ -67,7 +67,8 @@ public class KfProvideCardHisVo implements Serializable {
      */
     @ExcelProperty(value = "持卡人")
     private String masterName;
-
+    private String teamName;
+    private String phone;
     /**
      * 生效时间
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteCardDataServiceImpl.java

@@ -1,5 +1,6 @@
 package org.dromara.hotel.dubbo;
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -52,6 +53,8 @@ public class RemoteCardDataServiceImpl implements RemoteCardDataService {
     public RemoteCardDataVo getCardDataByBo(RemoteCardDataBo remoteBo) {
         KfProvideCardHisBo bo = MapstructUtils.convert(remoteBo, KfProvideCardHisBo.class);
         KfProvideCardHisVo vo = cardHisService.queryByBo(bo);
-        return MapstructUtils.convert(vo, RemoteCardDataVo.class);
+        RemoteCardDataVo remoteVo = new RemoteCardDataVo();
+        BeanUtil.copyProperties(vo, remoteVo);
+        return remoteVo;
     }
 }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteTeamServiceImpl.java

@@ -109,4 +109,10 @@ public class RemoteTeamServiceImpl implements RemoteTeamService {
         List<KfTeamVo> vos = kfTeamService.selectDoingTeam(doingDate);
         return R.ok(MapstructUtils.convert(vos, RemoteTeamVo.class));
     }
+
+    @Override
+    public R<Object> deleteTeamByOtherId(String otherId, Long operatorId) {
+        boolean result = kfTeamService.deleteWithOtherId(otherId, operatorId);
+        return result ? R.ok() : R.fail();
+    }
 }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/IKfTeamService.java

@@ -74,5 +74,22 @@ public interface IKfTeamService {
      */
     KfTeamVo selectTeamByBo(KfTeamBo bo);
 
+    /**
+     * 查询正在进行的团客信息
+     * @param doingDate 进行时间
+     * @return 团客清单
+     */
     List<KfTeamVo> selectDoingTeam(Date doingDate);
+
+    /**
+     * 批量删除团客
+     * @param otherIds 团客Id
+     * @param operatorId 操作员Id
+     * @return 删除结果
+     */
+    Boolean deleteWithOtherIds(Collection<String> otherIds, Long operatorId);
+
+    Boolean deleteWithOtherId(String otherId,Long operatorId);
+
+    Boolean deleteWithOtherId(String otherId);
 }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfTeamServiceImpl.java

@@ -1,33 +1,33 @@
 package org.dromara.hotel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.HotelBusinessConstants;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.hotel.domain.KfGuest;
 import org.dromara.hotel.domain.KfGuestTeamR;
+import org.dromara.hotel.domain.KfTeam;
 import org.dromara.hotel.domain.bo.KfGuestBo;
-import org.dromara.hotel.mapper.KfGuestMapper;
-import org.dromara.hotel.mapper.KfGuestTeamRMapper;
-import org.dromara.hotel.service.IKfGuestService;
-import org.springframework.stereotype.Service;
 import org.dromara.hotel.domain.bo.KfTeamBo;
 import org.dromara.hotel.domain.vo.KfTeamVo;
-import org.dromara.hotel.domain.KfTeam;
+import org.dromara.hotel.mapper.KfGuestMapper;
+import org.dromara.hotel.mapper.KfGuestTeamRMapper;
 import org.dromara.hotel.mapper.KfTeamMapper;
 import org.dromara.hotel.service.IKfTeamService;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 客团信息Service业务层处理
@@ -50,7 +50,7 @@ public class KfTeamServiceImpl implements IKfTeamService {
      * @return 客团信息
      */
     @Override
-    public KfTeamVo queryById(Long id){
+    public KfTeamVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -92,17 +92,17 @@ public class KfTeamServiceImpl implements IKfTeamService {
         return lqw;
     }
 
-    private QueryWrapper<KfTeam> buildQueryWrapper(KfTeamBo bo,String tableAlias) {
+    private QueryWrapper<KfTeam> buildQueryWrapper(KfTeamBo bo, String tableAlias) {
         QueryWrapper<KfTeam> lqw = new QueryWrapper<>();
         String columnPrefix = "";
-        if(StringUtils.isNotBlank(tableAlias)){
+        if (StringUtils.isNotBlank(tableAlias)) {
             columnPrefix = tableAlias + ".";
         }
-        lqw.like(StringUtils.isNotBlank(bo.getName()), columnPrefix+"name", bo.getName());
-        lqw.eq(bo.getStartTime() != null, columnPrefix+"start_time", bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, columnPrefix+"end_time", bo.getEndTime());
-        lqw.eq(bo.getPlanQuantity() != null, columnPrefix+"plan_quantity", bo.getPlanQuantity());
-        lqw.eq(StringUtils.isNotBlank(bo.getOtherId()), columnPrefix+"other_id", bo.getOtherId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), columnPrefix + "name", bo.getName());
+        lqw.eq(bo.getStartTime() != null, columnPrefix + "start_time", bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, columnPrefix + "end_time", bo.getEndTime());
+        lqw.eq(bo.getPlanQuantity() != null, columnPrefix + "plan_quantity", bo.getPlanQuantity());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherId()), columnPrefix + "other_id", bo.getOtherId());
         return lqw;
     }
 
@@ -123,11 +123,11 @@ public class KfTeamServiceImpl implements IKfTeamService {
             bo.setId(add.getId());
             //2.新增客人信息
             List<KfGuestBo> guestBoList = bo.getGuestList();
-            if(guestBoList != null && guestBoList.size() > 0){
+            if (guestBoList != null && guestBoList.size() > 0) {
                 List<Long> guestIdList =
                     new java.util.ArrayList<>(guestBoList.stream().filter(item -> item.getId() != null).map(item -> item.getId()).toList());
                 List<KfGuestBo> noIdBoList = guestBoList.stream().filter(item -> item.getId() == null).toList();
-                if(noIdBoList != null && noIdBoList.size() > 0){
+                if (noIdBoList != null && noIdBoList.size() > 0) {
                     Collection<KfGuest> noIdList = MapstructUtils.convert(noIdBoList, KfGuest.class);
                     guestMapper.insertBatch(noIdList);
                     guestIdList.addAll(noIdList.stream().map(KfGuest::getId).toList());
@@ -165,11 +165,11 @@ public class KfTeamServiceImpl implements IKfTeamService {
         List<KfGuestBo> newGuests =
             bo.getGuestList().stream().filter(item -> !dbGuestIds.contains(item.getId())).toList();
         //3.处理新的客人
-        if(newGuests.size() > 0){
+        if (newGuests.size() > 0) {
             List<Long> guestIdList =
                 newGuests.stream().filter(item -> item.getId() != null).map(item -> item.getId()).toList();
             List<KfGuestBo> noIdBoList = newGuests.stream().filter(item -> item.getId() == null).toList();
-            if(noIdBoList != null && noIdBoList.size() > 0){
+            if (noIdBoList != null && noIdBoList.size() > 0) {
                 Collection<KfGuest> noIdList = MapstructUtils.convert(noIdBoList, KfGuest.class);
                 guestMapper.insertBatch(noIdList);
                 noIdList.stream().forEach(item -> guestIdList.add(item.getId()));
@@ -190,7 +190,7 @@ public class KfTeamServiceImpl implements IKfTeamService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(KfTeam entity){
+    private void validEntityBeforeSave(KfTeam entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -203,14 +203,15 @@ public class KfTeamServiceImpl implements IKfTeamService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
+        //if (isValid) {
+        //    //TODO 做一些业务上的校验,判断是否需要校验
+        //}
         return baseMapper.deleteByIds(ids) > 0;
     }
 
     /**
      * 查询团客信息
+     *
      * @param bo 团客业务对象
      * @return 团客信息
      */
@@ -226,4 +227,30 @@ public class KfTeamServiceImpl implements IKfTeamService {
         return baseMapper.selectVoList(new LambdaQueryWrapper<KfTeam>()
             .le(KfTeam::getStartTime, doingDate).ge(KfTeam::getEndTime, doingDate));
     }
+
+    @Override
+    public Boolean deleteWithOtherIds(Collection<String> otherIds, Long operatorId) {
+        LambdaUpdateWrapper<KfTeam> luw = new LambdaUpdateWrapper<>();
+        luw.set(KfTeam::getDelFlag, "2");
+        luw.set(KfTeam::getUpdateBy, operatorId);
+        luw.in(KfTeam::getOtherId, otherIds);
+        return baseMapper.update(null, luw) > 0;
+    }
+
+    @Override
+    public Boolean deleteWithOtherId(String otherId, Long operatorId) {
+        LambdaUpdateWrapper<KfTeam> luw = new LambdaUpdateWrapper<>();
+        luw.set(KfTeam::getDelFlag, "2");
+        luw.set(KfTeam::getUpdateBy, operatorId);
+        luw.eq(KfTeam::getOtherId, otherId);
+        return baseMapper.update(null, luw) > 0;
+    }
+
+    @Override
+    public Boolean deleteWithOtherId(String otherId) {
+        LambdaUpdateWrapper<KfTeam> luw = new LambdaUpdateWrapper<>();
+        luw.set(KfTeam::getDelFlag, "2");
+        luw.in(KfTeam::getOtherId, otherId);
+        return baseMapper.update(null, luw) > 0;
+    }
 }

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/SyncRemoteDeptService.java

@@ -125,4 +125,8 @@ public class SyncRemoteDeptService {
     public R<ErrorInfo> insertRemoteTeam(RemoteTeamBo remoteTeamBo) {
         return remoteTeamService.insertTeamByBo(remoteTeamBo);
     }
+
+    public R<Object> deleteTeamByOtherId(String otherId, Long operatorId){
+        return remoteTeamService.deleteTeamByOtherId(otherId, operatorId);
+    }
 }

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/ISyncDeptStrategy.java

@@ -21,4 +21,10 @@ public interface ISyncDeptStrategy {
      * @param deptList 部门数据
      */
     void syncDept(List<ResourceDept> deptList);
+
+    /**
+     * 同步删除部门数据
+     * @param deptList 部门列表
+     */
+    void syncDelDept(List<ResourceDept> deptList);
 }

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/SyncDeptStrategyContent.java

@@ -35,4 +35,15 @@ public class SyncDeptStrategyContent {
     public void syncDept(List<ResourceDept> deptList ,String syncResource){
         strategyMap.get(syncResource).syncDept(deptList);
     }
+
+    /**
+     * 同步删除部门处理入口
+     * @param deptList 部门列表
+     * @param syncResource 数据来源
+     */
+    public void syncDelDept(List<ResourceDept> deptList ,String syncResource){
+        strategyMap.get(syncResource).syncDelDept(deptList);
+    }
+
+
 }

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/impl/GraduateClassStrategyImpl.java

@@ -51,6 +51,11 @@ public class GraduateClassStrategyImpl implements ISyncDeptStrategy {
         syncMessage.forEach(System.out::println);
     }
 
+    @Override
+    public void syncDelDept(List<ResourceDept> deptList) {
+
+    }
+
     /**
      * 单个研究生班级处理
      *
@@ -95,7 +100,6 @@ public class GraduateClassStrategyImpl implements ISyncDeptStrategy {
             return R.fail(e.getMessage());
         }
     }
-
     /**
      * 组装写库的研究生班级
      * 研究生的班级结构为 在校研究生(系统初始化后的固定值)->年级(对应年份)->班级(对应班名)

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/impl/HrDeptStrategyImpl.java

@@ -51,6 +51,21 @@ public class HrDeptStrategyImpl implements ISyncDeptStrategy {
         syncMessage.forEach(System.out::println);
     }
 
+    @Override
+    public void syncDelDept(List<ResourceDept> deptList) {
+        List<String> syncDelMessage = new ArrayList<>();
+        deptList.forEach(resourceDept -> {
+            R<Object>result = syncRemoteDeptService.deleteDeptByOtherId(resourceDept.getDept_id());
+
+            if (result.getCode() == R.SUCCESS) {
+                syncDelMessage.add(MessageFormat.format("[同步删除部门成功]-[{0}]", JsonUtils.toJsonString(resourceDept)));
+            } else {
+                syncDelMessage.add(MessageFormat.format("[同步删除部门失败]-[{0}]-[{1}]", JsonUtils.toJsonString(resourceDept), result.getMsg()));
+            }
+        });
+        syncDelMessage.forEach(System.out::println);
+    }
+
     /**
      * 单个部门处理
      *

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/dept/strategy/impl/TrainClassStrategyImpl.java

@@ -65,6 +65,30 @@ public class TrainClassStrategyImpl implements ISyncDeptStrategy {
         syncTeamMessage.forEach(System.out::println);
     }
 
+    @Override
+    public void syncDelDept(List<ResourceDept> deptList) {
+        List<String> syncDelMessage = new ArrayList<>();
+        List<String> syncDelTeamMessage = new ArrayList<>();
+        deptList.forEach(resourceDept -> {
+            R<Object>result = syncRemoteDeptService.deleteDeptByOtherId(resourceDept.getDept_id());
+
+            if (result.getCode() == R.SUCCESS) {
+                syncDelMessage.add(MessageFormat.format("[同步删除培训班成功]-[{0}]", JsonUtils.toJsonString(resourceDept)));
+            } else {
+                syncDelMessage.add(MessageFormat.format("[同步删除培训班失败]-[{0}]-[{1}]", JsonUtils.toJsonString(resourceDept), result.getMsg()));
+            }
+
+            result = syncRemoteDeptService.deleteTeamByOtherId(resourceDept.getDept_id(), resourceDept.getOperatorId());
+            if (result.getCode() == R.SUCCESS) {
+                syncDelTeamMessage.add(MessageFormat.format("[同步删除团客成功]-[{0}]", JsonUtils.toJsonString(resourceDept)));
+            } else {
+                syncDelTeamMessage.add(MessageFormat.format("[同步删除团客失败]-[{0}]-[{1}]", JsonUtils.toJsonString(resourceDept), result.getMsg()));
+            }
+        });
+        syncDelMessage.forEach(System.out::println);
+        syncDelTeamMessage.forEach(System.out::println);
+    }
+
     /**
      * 单个培训班级的处理
      * 党校->培训班->校本部->年份->学期->班级

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/event/kafka/impl/teacher/DeptDelEventStrategyImpl.java

@@ -4,10 +4,15 @@ import cn.hutool.json.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.server.base.service.dept.SyncRemoteDeptService;
+import org.dromara.server.base.service.dept.strategy.SyncDeptStrategyContent;
+import org.dromara.server.common.constant.SyncResourceConstants;
+import org.dromara.server.common.domain.bo.ResourceDept;
 import org.dromara.server.mq.constant.kafka.TeacherEventConstraints;
 import org.dromara.server.mq.event.kafka.IEventStrategy;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * name: DeptDelEventStrategyImpl
  * package: org.dromara.server.mq.event.kafka.teacher.impl
@@ -22,11 +27,10 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 @Service(TeacherEventConstraints.DEPT_DEL)
 public class DeptDelEventStrategyImpl implements IEventStrategy {
-    private final SyncRemoteDeptService syncRemoteDeptService;
+    private final SyncDeptStrategyContent syncDeptStrategyContent;
     @Override
     public void doMsgHandle(JSONObject data) {
-        String otherId = data.get("dept_id").toString();
-
-        syncRemoteDeptService.deleteDeptByOtherId(otherId);
+        List<ResourceDept> resourceDeptlist = TeacherUtils.getSyncDept(data);
+        syncDeptStrategyContent.syncDelDept(resourceDeptlist, SyncResourceConstants.HR_DEPT);
     }
 }

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/event/kafka/impl/train/ClassDelEventStrategyImpl.java

@@ -3,11 +3,16 @@ package org.dromara.server.mq.event.kafka.impl.train;
 import cn.hutool.json.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.server.base.service.dept.strategy.SyncDeptStrategyContent;
+import org.dromara.server.common.constant.SyncResourceConstants;
+import org.dromara.server.common.domain.bo.ResourceDept;
 import org.dromara.server.mq.constant.kafka.TeacherEventConstraints;
 import org.dromara.server.mq.constant.kafka.TrainEventConstraints;
 import org.dromara.server.mq.event.kafka.IEventStrategy;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * name: TeacherAddEventStrategyImpl
  * package: org.dromara.server.mq.event.kafka.teacher.impl
@@ -22,8 +27,10 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 @Service(TrainEventConstraints.TRAIN_CLASS_DEL)
 public class ClassDelEventStrategyImpl implements IEventStrategy {
+    private final SyncDeptStrategyContent syncDeptStrategyContent;
     @Override
     public void doMsgHandle(JSONObject msg) {
-
+        List<ResourceDept> resourceDeptList = TrainUtils.getSycClass(msg);
+        syncDeptStrategyContent.syncDelDept(resourceDeptList, SyncResourceConstants.TRAIN_CLASS);
     }
 }