diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 11258a14..a69eabd8 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -176,7 +176,7 @@ mybatis-plus: # 数据加密 mybatis-encryptor: # 是否开启加密 - enable: false + enable: true # 默认加密算法 algorithm: BASE64 # 编码方式 BASE64/HEX。默认BASE64 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubAttendanceMachineUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubAttendanceMachineUserController.java new file mode 100644 index 00000000..b05cbb99 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubAttendanceMachineUserController.java @@ -0,0 +1,65 @@ +package org.dromara.contractor.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineSendInfoUserReq; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineUserQueryReq; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineUserRemoveReq; +import org.dromara.contractor.domain.vo.SubAttendanceMachineUserVo; +import org.dromara.contractor.service.ISubAttendanceMachineUserService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 分包考勤机用户 + * + * @author lilemy + * @date 2025-11-21 15:38 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/contractor/attendanceMachineUser") +public class SubAttendanceMachineUserController extends BaseController { + + private final ISubAttendanceMachineUserService subAttendanceMachineUserService; + + /** + * 查询考勤机用户列表 + */ + @SaCheckPermission("contractor:attendanceMachineUser:list") + @GetMapping("/list") + public R> list(SubAttendanceMachineUserQueryReq req) { + return R.ok(subAttendanceMachineUserService.queryList(req)); + } + + /** + * 下发用户到考勤机中 + */ + @SaCheckPermission("contractor:attendanceMachineUser:add") + @Log(title = "分包考勤机用户", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/send") + public R sendPersonInfo(@Validated @RequestBody SubAttendanceMachineSendInfoUserReq req) { + return R.ok(subAttendanceMachineUserService.sendPersonInfo(req)); + } + + /** + * 删除考勤机用户 + */ + @SaCheckPermission("contractor:attendanceMachineUser:remove") + @Log(title = "分包考勤机用户", businessType = BusinessType.DELETE) + @RepeatSubmit() + @DeleteMapping() + public R remove(@Validated @RequestBody SubAttendanceMachineUserRemoveReq req) { + return toAjax(subAttendanceMachineUserService.remove(req)); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineSendInfoUserReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineSendInfoUserReq.java new file mode 100644 index 00000000..660edbe1 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineSendInfoUserReq.java @@ -0,0 +1,32 @@ +package org.dromara.contractor.domain.dto.attendancemachineuser; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * @author lilemy + * @date 2025-11-21 15:36 + */ +@Data +public class SubAttendanceMachineSendInfoUserReq implements Serializable { + + @Serial + private static final long serialVersionUID = -6517799483848691652L; + + /** + * 考勤机主键ID + */ + @NotNull(message = "考勤机不能为空") + private Long machineId; + + /** + * 用户ID列表 + */ + @NotNull(message = "用户列表不能为空") + private List userIds; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineUserQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineUserQueryReq.java new file mode 100644 index 00000000..a6ba4a90 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineUserQueryReq.java @@ -0,0 +1,46 @@ +package org.dromara.contractor.domain.dto.attendancemachineuser; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-11-21 15:36 + */ +@Data +public class SubAttendanceMachineUserQueryReq implements Serializable { + + @Serial + private static final long serialVersionUID = -1629819732452840391L; + + /** + * 考勤机主键ID + */ + @NotNull(message = "考勤机不能为空") + private Long machineId; + + /** + * 项目ID + */ + @NotNull(message = "项目不能为空") + private Long projectId; + + /** + * 分包ID + */ + @NotNull(message = "分包不能为空") + private Long contractorId; + + /** + * 用户名称 + */ + private String userName; + + /** + * 标识（是否下发） + */ + private Integer identifying; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineUserRemoveReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineUserRemoveReq.java new file mode 100644 index 00000000..d30f9e28 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/attendancemachineuser/SubAttendanceMachineUserRemoveReq.java @@ -0,0 +1,31 @@ +package org.dromara.contractor.domain.dto.attendancemachineuser; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * @author lilemy + * @date 2025-11-21 15:36 + */ +@Data +public class SubAttendanceMachineUserRemoveReq implements Serializable { + + @Serial + private static final long serialVersionUID = -8880884070612972760L; + + /** + * 考勤机主键ID + */ + @NotNull(message = "考勤机不能为空") + private Long machineId; + + /** + * 用户ID列表 + */ + @NotNull(message = "用户列表不能为空") + private List userIds; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachineUser.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/SubAttendanceMachineUserVo.java similarity index 53% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachineUser.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/SubAttendanceMachineUserVo.java index c7e340b8..d86ebf14 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachineUser.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/SubAttendanceMachineUserVo.java @@ -1,28 +1,23 @@ -package org.dromara.project.domain; +package org.dromara.contractor.domain.vo; import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; + /** - * 考勤机用户对象 bus_attendance_machine_user + * 考勤机用户视图对象 * * @author lilemy - * @date 2025-10-15 + * @date 2025-11-21 */ @Data -public class BusAttendanceMachineUser implements Serializable { +public class SubAttendanceMachineUserVo implements Serializable { @Serial private static final long serialVersionUID = 1L; - /** - * 主键ID - */ - private Long id; - /** * 考勤机主键ID */ @@ -31,26 +26,21 @@ public class BusAttendanceMachineUser implements Serializable { /** * 班组ID */ - private Long teamId; + private Long contractorId; /** * 用户ID */ private Long userId; + /** + * 用户名称 + */ + private String userName; + /** * 标识（是否下发） */ private Integer identifying; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubAttendanceMachineUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubAttendanceMachineUserService.java new file mode 100644 index 00000000..b04a12e3 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubAttendanceMachineUserService.java @@ -0,0 +1,41 @@ +package org.dromara.contractor.service; + +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineSendInfoUserReq; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineUserQueryReq; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineUserRemoveReq; +import org.dromara.contractor.domain.vo.SubAttendanceMachineUserVo; + +import java.util.List; + +/** + * 分包考勤机用户Service接口 + * + * @author lilemy + * @date 2025-11-21 15:33 + */ +public interface ISubAttendanceMachineUserService { + + /** + * 查询符合条件的考勤机用户列表 + * + * @param req 查询条件 + * @return 考勤机用户列表 + */ + List queryList(SubAttendanceMachineUserQueryReq req); + + /** + * 下发用户到考勤机中 + * + * @param req 下发用户参数 + * @return 下发结果 + */ + String sendPersonInfo(SubAttendanceMachineSendInfoUserReq req); + + /** + * 删除考勤机用户 + * + * @param req 删除参数 + * @return 删除结果 + */ + Boolean remove(SubAttendanceMachineUserRemoveReq req); +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubAttendanceMachineUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubAttendanceMachineUserServiceImpl.java new file mode 100644 index 00000000..975f7cb8 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubAttendanceMachineUserServiceImpl.java @@ -0,0 +1,182 @@ +package org.dromara.contractor.service.impl; + +import cn.hutool.core.collection.CollUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineSendInfoUserReq; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineUserQueryReq; +import org.dromara.contractor.domain.dto.attendancemachineuser.SubAttendanceMachineUserRemoveReq; +import org.dromara.contractor.domain.vo.SubAttendanceMachineUserVo; +import org.dromara.contractor.service.ISubAttendanceMachineUserService; +import org.dromara.contractor.service.ISubConstructionUserService; +import org.dromara.mobileAttendanceMachine.DeviceMessageSender; +import org.dromara.mobileAttendanceMachine.KqjEntity; +import org.dromara.project.domain.BusAttendanceMachine; +import org.dromara.project.service.IBusAttendanceMachineService; +import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysOssService; +import org.dromara.system.service.ISysUserService; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * 分包考勤机用户Service业务层处理 + * + * @author lilemy + * @date 2025-11-21 15:35 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SubAttendanceMachineUserServiceImpl implements ISubAttendanceMachineUserService { + + private final IBusAttendanceMachineService attendanceMachineService; + + private final DeviceMessageSender deviceMessageSender; + + private final ISubConstructionUserService constructionUserService; + + private final ISysUserService userService; + + private final ISysOssService ossService; + + /** + * 查询符合条件的考勤机用户列表 + * + * @param req 查询条件 + * @return 考勤机用户列表 + */ + @Override + public List queryList(SubAttendanceMachineUserQueryReq req) { + List userVoList = userService.selectFbUserList(req.getProjectId(), List.of(req.getContractorId()), req.getUserName()); + if (CollUtil.isEmpty(userVoList)) { + return CollUtil.newArrayList(); + } + BusAttendanceMachine machine = attendanceMachineService.getById(req.getMachineId()); + if (machine == null) { + throw new ServiceException("考勤机不存在", HttpStatus.NOT_FOUND); + } + // 判断选择分包和考勤机是否一致 + if (StringUtils.isBlank(machine.getContractors())) { + throw new ServiceException("考勤机未绑定分包", HttpStatus.NOT_FOUND); + } + if (!Arrays.stream(machine.getContractors().split(",")) + .map(Long::parseLong) + .collect(Collectors.toSet()).contains(req.getContractorId())) { + throw new ServiceException("所选分包与考勤机不匹配", HttpStatus.NOT_FOUND); + } + // 获取考勤机里的用户 + Set userIdList = new HashSet<>(); + try { + KqjEntity.CommonResponse response = deviceMessageSender.getAllUsers(machine.getSn()); + int code = response.getData().getCode(); + if (code == 0 || code == 200) { + log.info("获取考勤机数据成功：{}", response.getData()); + String[] userIds = response.getData().getUserIds(); + userIdList = Arrays.stream(userIds).collect(Collectors.toSet()); + } + } catch (Exception e) { + log.error("获取考勤机用户失败，sn：{}", machine.getSn(), e); + throw new ServiceException("获取考勤机用户失败", HttpStatus.ERROR); + } + Set finalUserIdList = userIdList; + return userVoList.stream().map(userVo -> { + SubAttendanceMachineUserVo vo = new SubAttendanceMachineUserVo(); + vo.setMachineId(req.getMachineId()); + vo.setContractorId(req.getContractorId()); + vo.setUserId(userVo.getUserId()); + vo.setUserName(userVo.getUserName()); + if (CollUtil.isEmpty(finalUserIdList)) { + vo.setIdentifying(0); + } else if (finalUserIdList.contains(userVo.getUserId().toString())) { + vo.setIdentifying(1); + } else { + vo.setIdentifying(0); + } + return vo; + }).toList(); + } + + /** + * 下发用户到考勤机中 + * + * @param req 下发用户参数 + * @return 下发结果 + */ + @Override + public String sendPersonInfo(SubAttendanceMachineSendInfoUserReq req) { + Long machineId = req.getMachineId(); + List userIds = req.getUserIds(); + BusAttendanceMachine machine = attendanceMachineService.getById(machineId); + if (machine == null) { + throw new ServiceException("考勤机不存在"); + } + List userList = constructionUserService.lambdaQuery() + .in(SubConstructionUser::getSysUserId, userIds) + .list(); + // 获取用户人脸照信息 + List faceIds = userList.stream().map(SubConstructionUser::getFacePic).map(Long::parseLong).distinct().toList(); + List ossVos = ossService.listByIds(faceIds); + Map ossVoMap = ossVos.stream() + .collect(Collectors.toMap(SysOssVo::getOssId, v -> v)); + // 返回数据 + StringBuilder sb = new StringBuilder(); + sb.append("用户：["); + int count = 0; + for (SubConstructionUser user : userList) { + String facePic = user.getFacePic(); + if (StringUtils.isBlank(facePic)) { + sb.append(user.getUserName()).append(" "); + count++; + continue; + } + SysOssVo ossVo = ossVoMap.get(Long.parseLong(facePic)); + if (ossVo == null) { + sb.append(user.getUserName()).append(" "); + count++; + continue; + } + Boolean result = deviceMessageSender.sendPersonnelInformation(machine.getSn(), + user.getSysUserId().toString(), user.getUserName(), ossVo.getUrl()); + log.info("考勤机 Sn：{} ，用户：{} 下发成功", machine.getSn(), user.getUserName()); + if (!result) { + sb.append(user.getUserName()).append(" "); + count++; + } + } + sb.append("] 下发失败"); + return count == 0 ? "下发成功" : sb.toString(); + } + + /** + * 删除考勤机用户 + * + * @param req 删除参数 + * @return 删除结果 + */ + @Override + public Boolean remove(SubAttendanceMachineUserRemoveReq req) { + Long machineId = req.getMachineId(); + List userIds = req.getUserIds(); + BusAttendanceMachine machine = attendanceMachineService.getById(machineId); + if (machine == null) { + throw new ServiceException("考勤机不存在", HttpStatus.NOT_FOUND); + } + String[] userIdArray = userIds.stream() + .map(String::valueOf) // 将 Long 转成 String + .toArray(String[]::new); + try { + KqjEntity.CommonResponse response = deviceMessageSender.batchDeleteUsers(machine.getSn(), userIdArray); + return response.getData().getCode() == 0 || response.getData().getCode() == 200; + } catch (Exception e) { + throw new ServiceException("删除考勤机用户失败", HttpStatus.ERROR); + } + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java index d4e6ce78..507c02a6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java @@ -3,49 +3,49 @@ package org.dromara.gps.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.vehicle.domain.VehVehicleInfo; -import org.dromara.vehicle.domain.vo.VehVehicleInfoVo; -import org.dromara.vehicle.service.IVehVehicleInfoService; -import org.dromara.vehicle.service.IVehVehicleTripService; -import org.dromara.websocket.websocket.service.InitOnStartWebSocketServer; import org.dromara.common.core.exception.ServiceException; 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.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.websocket.dto.WebSocketMessageDto; import org.dromara.common.websocket.holder.WebSocketSessionHolder; import org.dromara.common.websocket.utils.WebSocketUtils; +import org.dromara.gps.domain.GpsEquipment; import org.dromara.gps.domain.GpsManmachine; +import org.dromara.gps.domain.bo.GpsEquipmentBo; import org.dromara.gps.domain.bo.GpsEquipmentSonBo; import org.dromara.gps.domain.vo.GpsEquipmentSonVo; +import org.dromara.gps.domain.vo.GpsEquipmentVo; import org.dromara.gps.domain.vo.GpsProjectVo; import org.dromara.gps.domain.vo.GpsUserVo; +import org.dromara.gps.mapper.GpsEquipmentMapper; import org.dromara.gps.mapper.GpsManmachineMapper; +import org.dromara.gps.service.IGpsEquipmentService; import org.dromara.gps.service.IGpsEquipmentSonService; import org.dromara.project.domain.vo.project.BusProjectVo; import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysUserService; +import org.dromara.vehicle.domain.VehVehicleInfo; +import org.dromara.vehicle.domain.vo.VehVehicleInfoVo; +import org.dromara.vehicle.service.IVehVehicleInfoService; +import org.dromara.vehicle.service.IVehVehicleTripService; +import org.dromara.websocket.websocket.service.InitOnStartWebSocketServer; import org.dromara.websocket.websocket.service.VehicleWebSocketServer; import org.redisson.api.DeletedObjectListener; import org.redisson.api.ExpiredObjectListener; import org.redisson.api.listener.SetObjectListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.dromara.gps.domain.bo.GpsEquipmentBo; -import org.dromara.gps.domain.vo.GpsEquipmentVo; -import org.dromara.gps.domain.GpsEquipment; -import org.dromara.gps.mapper.GpsEquipmentMapper; -import org.dromara.gps.service.IGpsEquipmentService; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -63,7 +63,8 @@ import java.util.*; @RequiredArgsConstructor @Service @Slf4j -public class GpsEquipmentServiceImpl extends ServiceImpl implements IGpsEquipmentService { +public class GpsEquipmentServiceImpl extends ServiceImpl + implements IGpsEquipmentService { private final GpsEquipmentMapper baseMapper; @@ -87,7 +88,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl queryPageList(GpsEquipmentBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - if (bo.getType() == 1){ + if (bo.getType() == 1) { List list = result.getRecords().stream() .filter(gpsEquipment -> gpsEquipment.getProjectId() != null) .toList(); - list.forEach(item -> { - if (item.getUserId() != null){ - item.setType(1); - }else{ - item.setType(2); - } - if (item.getClientType() != null){ - if (item.getClientType() == 0){ - SysUserVo sysUserVo = userService.queryById(item.getUserId()); - if (sysUserVo != null) { - item.setUserName(sysUserVo.getNickName()); - } - }else if (item.getClientType() == 1){ - VehVehicleInfoVo vehVehicleInfoVo = iVehVehicleInfoService.queryById(item.getUserId()); - if (vehVehicleInfoVo != null) { - item.setUserName(vehVehicleInfoVo.getPlateNumber()); - } + list.forEach(item -> { + if (item.getUserId() != null) { + item.setType(1); + } else { + item.setType(2); + } + if (item.getClientType() != null) { + if (item.getClientType() == 0) { + SysUserVo sysUserVo = userService.queryById(item.getUserId()); + if (sysUserVo != null) { + item.setUserName(sysUserVo.getNickName()); + } + } else if (item.getClientType() == 1) { + VehVehicleInfoVo vehVehicleInfoVo = iVehVehicleInfoService.queryById(item.getUserId()); + if (vehVehicleInfoVo != null) { + item.setUserName(vehVehicleInfoVo.getPlateNumber()); } } + } + BusProjectVo busProjectVo = projectService.selectById(item.getProjectId()); + if (busProjectVo != null) { + item.setProjectName(busProjectVo.getProjectName()); + } + }); + result.setRecords(list); + } else if (bo.getType() == 2) { + List list = result.getRecords().stream() + .filter(gpsEquipment -> gpsEquipment.getProjectId() == null).toList(); + list.forEach(item -> { + if (item.getProjectId() != null) { BusProjectVo busProjectVo = projectService.selectById(item.getProjectId()); if (busProjectVo != null) { item.setProjectName(busProjectVo.getProjectName()); } - }); - result.setRecords(list); - }else if (bo.getType() == 2){ - List list = result.getRecords().stream() - .filter(gpsEquipment -> gpsEquipment.getProjectId() == null).toList(); - list.forEach(item ->{ - if (item.getProjectId() != null) { - BusProjectVo busProjectVo = projectService.selectById(item.getProjectId()); - if (busProjectVo != null) { - item.setProjectName(busProjectVo.getProjectName()); - } - } - item.setType(2); - }); + } + item.setType(2); + }); result.setRecords(list); } return TableDataInfo.build(result); @@ -205,7 +206,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; @@ -230,7 +231,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl() .eq(GpsEquipment::getClientId, gpsEquipment.getClientId())); - if(equipment == null){ + if (equipment == null) { gpsEquipment.setGpsType(0); baseMapper.insert(gpsEquipment); } @@ -239,8 +240,8 @@ public class GpsEquipmentServiceImpl extends ServiceImpl 0){ + if (onlineCount > 0) { String ued = ueStructureJsonMessage(gpsEquipmentSon, equipment.getModelId()); InitOnStartWebSocketServer.sendToAll(ued); } @@ -284,12 +285,11 @@ public class GpsEquipmentServiceImpl extends ServiceImpl 0) { String vehicled = vehicleStructureJsonMessage(gpsEquipmentSon); - VehicleWebSocketServer.sendToSubscription(gpsEquipmentSon.getUserId()+"-"+gpsEquipmentSon.getTripId(), vehicled); + VehicleWebSocketServer.sendToSubscription(gpsEquipmentSon.getUserId() + "-" + gpsEquipmentSon.getTripId(), vehicled); } } - Set sessionsAll = WebSocketSessionHolder.getSessionsAll(); if (!sessionsAll.isEmpty()) { @@ -319,17 +319,17 @@ public class GpsEquipmentServiceImpl extends ServiceImpl() - .set(GpsEquipment::getUserId,bo.getUserId()) - .set(GpsEquipment::getProjectId,bo.getProjectId()) - .set(GpsEquipment::getClientType,bo.getClientType()) - .eq(GpsEquipment::getId,bo.getId())); + .set(GpsEquipment::getUserId, bo.getUserId()) + .set(GpsEquipment::getProjectId, bo.getProjectId()) + .set(GpsEquipment::getClientType, bo.getClientType()) + .eq(GpsEquipment::getId, bo.getId())); //只能绑定一个设备 List gpsManmachines = gpsManmachineMapper.selectList(Wrappers.lambdaQuery() .eq(GpsManmachine::getUserId, bo.getUserId())); - if(CollectionUtil.isNotEmpty(gpsManmachines)){ + if (CollectionUtil.isNotEmpty(gpsManmachines)) { throw new ServiceException("选中用户已绑定设备"); } GpsManmachine gpsManmachine = new GpsManmachine(); gpsManmachine.setClientId(bo.getClientId()); gpsManmachine.setUserId(bo.getUserId()); - gpsManmachine.setType(bo.getClientType()== 1 ? 1:2); - if (bo.getClientType() == 1){ - iVehVehicleInfoService.update(new LambdaUpdateWrapper().set(VehVehicleInfo::getClientId,bo.getClientId()).eq(VehVehicleInfo::getId,bo.getUserId())); + gpsManmachine.setType(bo.getClientType() == 1 ? 1 : 2); + if (bo.getClientType() == 1) { + iVehVehicleInfoService.update(new LambdaUpdateWrapper().set(VehVehicleInfo::getClientId, bo.getClientId()).eq(VehVehicleInfo::getId, bo.getUserId())); } return gpsManmachineMapper.insert(gpsManmachine) > 0; @@ -473,27 +477,28 @@ public class GpsEquipmentServiceImpl extends ServiceImpl().set(VehVehicleInfo::getClientId,null).eq(VehVehicleInfo::getId,gpsEquipmentVo.getUserId())); + if (gpsEquipmentVo.getClientType() == 1) { + iVehVehicleInfoService.update(new LambdaUpdateWrapper().set(VehVehicleInfo::getClientId, null).eq(VehVehicleInfo::getId, gpsEquipmentVo.getUserId())); } baseMapper.update(new LambdaUpdateWrapper() - .set(GpsEquipment::getUserId,null) - .set(GpsEquipment::getClientType,null) - .eq(GpsEquipment::getId,bo.getId())); + .set(GpsEquipment::getUserId, null) + .set(GpsEquipment::getClientType, null) + .eq(GpsEquipment::getId, bo.getId())); GpsManmachine gpsManmachine = new GpsManmachine(); gpsManmachine.setClientId(bo.getClientId()); return gpsManmachineMapper.delete(new LambdaQueryWrapper() - .eq(GpsManmachine::getClientId, gpsManmachine.getClientId()))> 0; + .eq(GpsManmachine::getClientId, gpsManmachine.getClientId())) > 0; } /** * 获取设备绑定用户列表 - * @param bo - * @return + * + * @param bo 设备信息 + * @return GPS人机关联视图对象列表 */ @Override public List getUserList(GpsEquipmentBo bo) { - List gpsUserVos = baseMapper.getUserList(bo.getClientId()); + List gpsUserVos = baseMapper.getUserList(bo.getClientId()); if (gpsUserVos == null || gpsUserVos.isEmpty()) { return null; } @@ -504,7 +509,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl getClientList(Long projectId, LocalDateTime startOfDay, LocalDateTime now) { - return gpsEquipmentSonService.getClientList(projectId,startOfDay,now); + return gpsEquipmentSonService.getClientList(projectId, startOfDay, now); } @Override @@ -540,7 +545,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl() .eq(GpsEquipment::getProjectId, gpsEquipment.getProjectId()) .eq(GpsEquipment::getUserId, gpsEquipment.getUserId())); - if(equipment == null){ + if (equipment == null) { gpsEquipment.setGpsType(1); // gpsEquipment.setClientId(jsonObject.getStr("deviceId")); baseMapper.insert(gpsEquipment); @@ -557,7 +562,7 @@ public class GpsEquipmentServiceImpl extends ServiceImpl 0){ + if (onlineCount > 0) { if (equipment != null && StringUtils.isNotEmpty(equipment.getModelId())) { String ued = ueStructureJsonMessage(gpsEquipmentSonBo, equipment.getModelId()); InitOnStartWebSocketServer.sendToAll(ued); @@ -585,17 +590,17 @@ public class GpsEquipmentServiceImpl extends ServiceImpl getUserListByProjectId(Long projectId, LocalDateTime startOfDay, LocalDateTime now) { - return gpsEquipmentSonService.getUserListByProjectId(projectId,startOfDay,now); + return gpsEquipmentSonService.getUserListByProjectId(projectId, startOfDay, now); } @Override public List getUeClientList(LocalDateTime startOfDay, LocalDateTime now) { - return gpsEquipmentSonService.getUeClientList(startOfDay,now); + return gpsEquipmentSonService.getUeClientList(startOfDay, now); } @Override public List getUeUserListByProjectId(LocalDateTime startOfDay, LocalDateTime now) { - return gpsEquipmentSonService.getUeUserListByProjectId(startOfDay,now); + return gpsEquipmentSonService.getUeUserListByProjectId(startOfDay, now); } @Override diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/project/DeleteProjectCache.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/project/DeleteProjectCache.java index 2a500827..a4789ac9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/project/DeleteProjectCache.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/project/DeleteProjectCache.java @@ -3,6 +3,7 @@ package org.dromara.job.project; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.dromara.project.constant.BusProjectConstant; +import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.Cursor; import org.springframework.data.redis.core.ScanOptions; import org.springframework.data.redis.core.StringRedisTemplate; @@ -35,11 +36,16 @@ public class DeleteProjectCache { .count(1000) // 每次 scan 的数量 .build(); Set keysToDelete = new HashSet<>(); - Cursor cursor = stringRedisTemplate.getConnectionFactory() - .getConnection() - .scan(scanOptions); - while (cursor.hasNext()) { - keysToDelete.add(new String(cursor.next())); + RedisConnectionFactory connectionFactory = stringRedisTemplate.getConnectionFactory(); + if (connectionFactory == null) { + log.error("Redis 连接工厂异常"); + return; + } + try (Cursor cursor = connectionFactory.getConnection() + .keyCommands().scan(scanOptions)) { + while (cursor.hasNext()) { + keysToDelete.add(new String(cursor.next())); + } } // 批量删除 if (!keysToDelete.isEmpty()) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineController.java index 2146ab6b..c4d54256 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineController.java @@ -13,8 +13,9 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineContractorUpdateReq; import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineQueryReq; -import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineUpdateReq; +import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineTeamUpdateReq; import org.dromara.project.domain.vo.BusAttendanceMachineVo; import org.dromara.project.service.IBusAttendanceMachineService; import org.springframework.validation.annotation.Validated; @@ -69,14 +70,25 @@ public class BusAttendanceMachineController extends BaseController { } /** - * 修改考勤机 + * 修改考勤机班组 */ @SaCheckPermission("project:attendanceMachine:edit") @Log(title = "考勤机", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PutMapping() - public R edit(@Validated @RequestBody BusAttendanceMachineUpdateReq req) { - return toAjax(busAttendanceMachineService.updateByBo(req)); + @PutMapping("/team") + public R edit(@Validated @RequestBody BusAttendanceMachineTeamUpdateReq req) { + return toAjax(busAttendanceMachineService.updateTeam(req)); + } + + /** + * 修改考勤机分包 + */ + @SaCheckPermission("project:attendanceMachine:edit") + @Log(title = "考勤机", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/contractor") + public R editContractor(@Validated @RequestBody BusAttendanceMachineContractorUpdateReq req) { + return toAjax(busAttendanceMachineService.updateContractor(req)); } /** @@ -100,7 +112,7 @@ public class BusAttendanceMachineController extends BaseController { @RepeatSubmit() @PostMapping("/reissue/{ids}") public R reissue(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids){ + @PathVariable Long[] ids) { busAttendanceMachineService.reissue(List.of(ids)); return R.ok("已开始执行，请稍后刷新"); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineUserController.java index a534a8f4..4f58663b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusAttendanceMachineUserController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * 考勤机用户 + * 班组考勤机用户 * * @author lilemy * @date 2025-10-15 @@ -44,7 +44,7 @@ public class BusAttendanceMachineUserController extends BaseController { * 下发用户到考勤机中 */ @SaCheckPermission("project:attendanceMachineUser:add") - @Log(title = "考勤机用户", businessType = BusinessType.INSERT) + @Log(title = "班组考勤机用户", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/send") public R sendPersonInfo(@Validated @RequestBody BusAttendanceMachineSendInfoUserReq req) { @@ -55,7 +55,7 @@ public class BusAttendanceMachineUserController extends BaseController { * 删除考勤机用户 */ @SaCheckPermission("project:attendanceMachineUser:remove") - @Log(title = "考勤机用户", businessType = BusinessType.DELETE) + @Log(title = "班组考勤机用户", businessType = BusinessType.DELETE) @RepeatSubmit() @DeleteMapping() public R remove(@Validated @RequestBody BusAttendanceMachineUserRemoveReq req) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachine.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachine.java index c71fb2cf..b73b6f40 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachine.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusAttendanceMachine.java @@ -47,6 +47,11 @@ public class BusAttendanceMachine implements Serializable { */ private String teams; + /** + * 分包id，多个逗号分隔 + */ + private String contractors; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineContractorUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineContractorUpdateReq.java new file mode 100644 index 00000000..584d3132 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineContractorUpdateReq.java @@ -0,0 +1,40 @@ +package org.dromara.project.domain.dto.attendancemachine; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-11-21 10:56 + */ +@Data +public class BusAttendanceMachineContractorUpdateReq implements Serializable { + + @Serial + private static final long serialVersionUID = 4141889040329671715L; + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空") + private Long id; + + /** + * 项目ID + */ + @NotNull(message = "项目ID不能为空") + private Long projectId; + + /** + * 分包id，多个逗号分隔 + */ + private String contractors; + + /** + * 备注 + */ + private String remark; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineTeamUpdateReq.java similarity index 90% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineUpdateReq.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineTeamUpdateReq.java index d8f774d4..2eb76598 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/dto/attendancemachine/BusAttendanceMachineTeamUpdateReq.java @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2025-10-15 16:15 */ @Data -public class BusAttendanceMachineUpdateReq implements Serializable { +public class BusAttendanceMachineTeamUpdateReq implements Serializable { @Serial private static final long serialVersionUID = 4764015594443520162L; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceMachineVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceMachineVo.java index d49fe642..5af11850 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceMachineVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusAttendanceMachineVo.java @@ -8,6 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; import org.dromara.project.domain.BusAttendanceMachine; import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; @@ -68,11 +69,22 @@ public class BusAttendanceMachineVo implements Serializable { @ExcelProperty(value = "班组id，多个逗号分隔") private String teams; + /** + * 分包id，多个逗号分隔 + */ + @ExcelProperty(value = "分包id，多个逗号分隔") + private String contractors; + /** * 班组列表 */ private List teamsList; + /** + * 分包列表 + */ + private List contractorsList; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineService.java index 7403c90a..617c6e11 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineService.java @@ -1,15 +1,13 @@ package org.dromara.project.service; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.constraints.NotEmpty; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.domain.BusAttendanceMachine; +import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineContractorUpdateReq; import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineQueryReq; -import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineUpdateReq; +import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineTeamUpdateReq; import org.dromara.project.domain.vo.BusAttendanceMachineVo; -import org.springframework.scheduling.annotation.Async; -import org.springframework.web.bind.annotation.PathVariable; import java.util.Collection; import java.util.List; @@ -55,12 +53,20 @@ public interface IBusAttendanceMachineService extends IService ids, Boolean isValid); - + /** + * 重发下发考勤机所有人员 + * + * @param ids 待重发考勤机的主键集合 + */ void reissue(Collection ids); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineUserService.java index 9b4d751e..c747ddcd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusAttendanceMachineUserService.java @@ -8,7 +8,7 @@ import org.dromara.project.domain.vo.BusAttendanceMachineUserVo; import java.util.List; /** - * 考勤机用户Service接口 + * 班组考勤机用户Service接口 * * @author lilemy * @date 2025-10-15 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineServiceImpl.java index b981ac2e..8f3f5855 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineServiceImpl.java @@ -8,20 +8,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.contractor.domain.SubConstructionUser; +import org.dromara.contractor.domain.SubContractor; +import org.dromara.contractor.domain.vo.contractor.SubContractorVo; import org.dromara.contractor.service.ISubConstructionUserService; +import org.dromara.contractor.service.ISubContractorService; import org.dromara.mobileAttendanceMachine.DeviceMessageSender; import org.dromara.project.domain.BusAttendanceMachine; import org.dromara.project.domain.BusProject; import org.dromara.project.domain.BusProjectTeam; import org.dromara.project.domain.BusProjectTeamMember; +import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineContractorUpdateReq; import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineQueryReq; -import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineUpdateReq; +import org.dromara.project.domain.dto.attendancemachine.BusAttendanceMachineTeamUpdateReq; import org.dromara.project.domain.vo.BusAttendanceMachineVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamVo; import org.dromara.project.mapper.BusAttendanceMachineMapper; @@ -30,7 +35,9 @@ import org.dromara.project.service.IBusProjectService; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.project.service.IBusProjectTeamService; import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.service.ISysOssService; +import org.dromara.system.service.ISysUserService; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; @@ -45,6 +52,7 @@ import java.util.stream.Collectors; * @author lilemy * @date 2025-10-15 */ +@Slf4j @RequiredArgsConstructor @Service public class BusAttendanceMachineServiceImpl extends ServiceImpl @@ -59,6 +67,9 @@ public class BusAttendanceMachineServiceImpl extends ServiceImpl lqw = buildQueryWrapper(req); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List records = result.getRecords(); + // 获取班组id列表 List teamIds = records.stream() .map(BusAttendanceMachineVo::getTeams) .filter(StringUtils::isNotBlank) .flatMap(team -> Arrays.stream(team.split(",")) // flatMap 展开内部 stream .map(Long::parseLong)) .toList(); - if (CollUtil.isEmpty(teamIds)) { + // 获取分包id列表 + List contractorIds = records.stream() + .map(BusAttendanceMachineVo::getContractors) + .filter(StringUtils::isNotBlank) + .flatMap(contractor -> Arrays.stream(contractor.split(",")) // flatMap 展开内部 stream + .map(Long::parseLong)) + .toList(); + if (CollUtil.isEmpty(teamIds) && CollUtil.isEmpty(contractorIds)) { return TableDataInfo.build(result); } - List projectTeams = projectTeamService.listByIds(teamIds); - Map teamMap = projectTeams.stream() - .collect(Collectors.toMap(BusProjectTeam::getId, BusProjectTeam::getTeamName)); + Map teamMap = new HashMap<>(); + Map contractorMap = new HashMap<>(); + if (CollUtil.isNotEmpty(teamIds)) { + List projectTeams = projectTeamService.listByIds(teamIds); + teamMap = projectTeams.stream() + .collect(Collectors.toMap(BusProjectTeam::getId, BusProjectTeam::getTeamName)); + } + if (CollUtil.isNotEmpty(contractorIds)) { + List contractors = contractorService.listByIds(contractorIds); + contractorMap = contractors.stream() + .collect(Collectors.toMap(SubContractor::getId, SubContractor::getName)); + } + Map finalTeamMap = teamMap; + Map finalContractorMap = contractorMap; records.forEach(machine -> { String teams = machine.getTeams(); if (StringUtils.isNotBlank(teams)) { @@ -113,11 +146,22 @@ public class BusAttendanceMachineServiceImpl extends ServiceImpl teamVoList = t.stream().map(teamId -> { BusProjectTeamVo vo = new BusProjectTeamVo(); vo.setId(teamId); - vo.setTeamName(teamMap.getOrDefault(teamId, "未命名")); + vo.setTeamName(finalTeamMap.getOrDefault(teamId, "未命名")); return vo; }).toList(); machine.setTeamsList(teamVoList); } + String contractors = machine.getContractors(); + if (StringUtils.isNotBlank(contractors)) { + List c = Arrays.stream(contractors.split(",")).map(Long::parseLong).toList(); + List contractorVoList = c.stream().map(contractorId -> { + SubContractorVo vo = new SubContractorVo(); + vo.setId(contractorId); + vo.setName(finalContractorMap.getOrDefault(contractorId, "未命名")); + return vo; + }).toList(); + machine.setContractorsList(contractorVoList); + } }); result.setRecords(records); return TableDataInfo.build(result); @@ -173,7 +217,7 @@ public class BusAttendanceMachineServiceImpl extends ServiceImpl { + if (!team.getProjectId().equals(projectId)) { + throw new ServiceException(team.getTeamName() + "不属于所选项目", HttpStatus.BAD_REQUEST); + } + }); String oldTeams = oldMachine.getTeams(); if (StringUtils.isNotBlank(oldTeams)) { List oldTeamIds = Arrays.stream(oldTeams.split(",")) @@ -247,7 +296,12 @@ public class BusAttendanceMachineServiceImpl extends ServiceImpl { - if (!team.getProjectId().equals(projectId)) { - throw new ServiceException(team.getTeamName() + "不属于所选项目", HttpStatus.BAD_REQUEST); + } + return this.updateById(machine); + } + + /** + * 修改考勤机（分包） + * + * @param req 考勤机 + * @return 是否修改成功 + */ + @Override + public Boolean updateContractor(BusAttendanceMachineContractorUpdateReq req) { + Long id = req.getId(); + BusAttendanceMachine oldMachine = this.getById(id); + if (oldMachine == null) { + throw new ServiceException("考勤机不存在", HttpStatus.NOT_FOUND); + } + BusAttendanceMachine machine = new BusAttendanceMachine(); + BeanUtils.copyProperties(req, machine); + // 判断分包是否属于所选项目 + Long projectId = req.getProjectId(); + BusProject project = projectService.getById(projectId); + if (project == null) { + throw new ServiceException("所选项目不存在", HttpStatus.NOT_FOUND); + } + String contractors = req.getContractors(); + if (StringUtils.isNotBlank(contractors)) { + List contractorIds = Arrays.stream(contractors.split(",")) + .map(Long::parseLong) + .distinct() + .toList(); + List subContractors = contractorService.listByIds(contractorIds); + if (subContractors.size() != contractorIds.size()) { + throw new ServiceException("所选分包不存在", HttpStatus.NOT_FOUND); + } + subContractors.forEach(contractor -> { + if (!contractor.getProjectId().equals(projectId)) { + throw new ServiceException(contractor.getName() + "不属于所选项目", HttpStatus.BAD_REQUEST); } }); + String oldContractors = oldMachine.getContractors(); + if (StringUtils.isNotBlank(oldContractors)) { + List oldContractorIds = Arrays.stream(oldContractors.split(",")) + .map(Long::parseLong) + .distinct() + .toList(); + // 获取新增的分包ID + List added = contractorIds.stream() + .filter(t -> !oldContractorIds.contains(t)) + .toList(); + // 获取删除的分包ID + List deleted = oldContractorIds.stream() + .filter(t -> !contractorIds.contains(t)) + .toList(); + // 删除的分包不为空时，删除考勤机中对应的人数 + if (CollUtil.isNotEmpty(deleted)) { + // 获取待删除的分包的所有用户id + List userIds = userService.selectFbUserList(projectId, deleted, null) + .stream().map(SysUserVo::getUserId).toList(); + if (CollUtil.isNotEmpty(userIds)) { + String[] userIdArray = userIds.stream() + .map(String::valueOf) // 将 Long 转成 String + .toArray(String[]::new); + try { + deviceMessageSender.batchDeleteUsers(machine.getSn(), userIdArray); + } catch (Exception e) { + throw new ServiceException("删除考勤机用户失败", HttpStatus.ERROR); + } + } + } + // 新增的分包不为空时，添加考勤机中对应人 + if (CollUtil.isNotEmpty(added)) { + // 获取待添加到考勤机的分包的所有用户id + List userIds = userService.selectFbUserList(projectId, deleted, null) + .stream().map(SysUserVo::getUserId).toList(); + // 获取待添加到考勤机的用户信息 + List users = constructionUserService.lambdaQuery() + .in(SubConstructionUser::getSysUserId, userIds) + .list(); + // 获取用户的头像 + List faceIds = users.stream().map(SubConstructionUser::getFacePic).map(Long::valueOf).distinct().toList(); + List faceList = ossService.listByIds(faceIds); + Map faceMap = new HashMap<>(); + if (faceList != null) { + faceMap = faceList.stream().collect(Collectors.toMap(SysOssVo::getOssId, SysOssVo::getUrl)); + } + for (SubConstructionUser user : users) { + // 添加考勤机中用户 + String facePic = user.getFacePic(); + String faceUrl = StringUtils.isNotBlank(facePic) ? faceMap.get(Long.valueOf(facePic)) : ""; + if (StringUtils.isNotBlank(faceUrl)) { + // 添加考勤机中用户 + deviceMessageSender.sendPersonnelInformation(machine.getSn(), user.getSysUserId().toString(), + user.getUserName(), faceUrl); + } + } + } + } else { + // 添加考勤机中对应人 + List userIds = userService.selectFbUserList(machine.getProjectId(), contractorIds, null) + .stream().map(SysUserVo::getUserId) + .toList(); + // 获取待添加到考勤机的用户信息 + List users = constructionUserService.lambdaQuery() + .in(SubConstructionUser::getSysUserId, userIds) + .list(); + if (CollUtil.isEmpty(users)) { + throw new ServiceException("所选分包没有用户", HttpStatus.NOT_FOUND); + } + // 获取用户的头像 + List faceIds = users.stream().map(SubConstructionUser::getFacePic).map(Long::valueOf).distinct().toList(); + List faceList = ossService.listByIds(faceIds); + Map faceMap = new HashMap<>(); + if (faceList != null) { + faceMap = faceList.stream().collect(Collectors.toMap(SysOssVo::getOssId, SysOssVo::getUrl)); + } + for (SubConstructionUser user : users) { + // 添加考勤机中用户 + String facePic = user.getFacePic(); + String faceUrl = StringUtils.isNotBlank(facePic) ? faceMap.get(Long.valueOf(facePic)) : ""; + if (StringUtils.isNotBlank(faceUrl)) { + // 添加考勤机中用户 + deviceMessageSender.sendPersonnelInformation(machine.getSn(), user.getSysUserId().toString(), + user.getUserName(), faceUrl); + } + } + } } return this.updateById(machine); } @@ -303,12 +485,29 @@ public class BusAttendanceMachineServiceImpl extends ServiceImpl ids, Boolean isValid) { + List machines = this.listByIds(ids); + if (CollUtil.isEmpty(machines) || machines.size() != ids.size()) { + throw new ServiceException("数据不存在"); + } if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 + // 删除考勤机下发的人员 + for (BusAttendanceMachine machine : machines) { + try { + deviceMessageSender.deleteAllUsers(machine.getSn()); + } catch (Exception e) { + log.error("删除考勤人员异常", e); + throw new ServiceException("删除考勤人员异常"); + } + } } return baseMapper.deleteByIds(ids) > 0; } + /** + * 重发下发考勤机所有人员 + * + * @param ids 待重发考勤机的主键集合 + */ @Async @Override public void reissue(Collection ids) { @@ -323,28 +522,38 @@ public class BusAttendanceMachineServiceImpl extends ServiceImpl oldTeamIds = Arrays.stream(teams.split(",")) - .map(Long::parseLong) - .distinct() - .toList(); - - List userIds = projectTeamMemberService.lambdaQuery() - .select(BusProjectTeamMember::getMemberId) - .in(BusProjectTeamMember::getTeamId, oldTeamIds) - .list() - .stream().map(BusProjectTeamMember::getMemberId) - .toList(); + List userIds = new ArrayList<>(); + if (StrUtil.isNotBlank(teams)) { + List oldTeamIds = Arrays.stream(teams.split(",")) + .map(Long::parseLong) + .distinct() + .toList(); + List teamUserIds = projectTeamMemberService.lambdaQuery() + .select(BusProjectTeamMember::getMemberId) + .in(BusProjectTeamMember::getTeamId, oldTeamIds) + .list() + .stream().map(BusProjectTeamMember::getMemberId) + .toList(); + userIds.addAll(teamUserIds); + } + if (StrUtil.isNotBlank(contractors)) { + List oldContractorIds = Arrays.stream(contractors.split(",")) + .map(Long::parseLong) + .distinct() + .toList(); + List userVos = userService.selectFbUserList(machine.getProjectId(), oldContractorIds, null); + userIds.addAll(userVos.stream().map(SysUserVo::getUserId).distinct().toList()); + } if (CollUtil.isEmpty(userIds)) { continue; } - List users = constructionUserService.lambdaQuery() .in(SubConstructionUser::getSysUserId, userIds) .list(); - Map faceMap = new HashMap<>(); List list = users.stream().map(SubConstructionUser::getFacePic).filter(StrUtil::isNotBlank).toList(); if (CollUtil.isNotEmpty(list)) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineUserServiceImpl.java index ee9ba9a1..6179edba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceMachineUserServiceImpl.java @@ -28,7 +28,7 @@ import java.util.*; import java.util.stream.Collectors; /** - * 考勤机用户Service业务层处理 + * 班组考勤机用户Service业务层处理 * * @author lilemy * @date 2025-10-15 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index b7b5fc39..c91f9c1f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -5,9 +5,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.project.domain.dto.attendance.SubTodayUserDto; import org.dromara.project.domain.dto.attendance.SubTwoWeekDto; import org.dromara.project.domain.dto.attendance.SubUserAttendanceQueryReq; -import org.dromara.project.domain.dto.attendance.TodayUserDto; -import org.dromara.project.domain.vo.attendance.AttendanceTodayUserVo; -import org.dromara.project.domain.vo.attendance.SubUserAttendanceTotalVo; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.dto.AppUserUpdatePasswordDto; @@ -15,7 +12,6 @@ import org.dromara.system.domain.dto.FbUserListDto; import org.dromara.system.domain.dto.role.SysRoleProjectDto; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; @@ -32,6 +28,16 @@ public interface ISysUserService { TableDataInfo selectPageFbUserList(FbUserListDto user, PageQuery pageQuery); + /** + * 获取分包用户列表 + * + * @param projectId 项目id + * @param contractorIds 分包id列表 + * @param nickName 用户昵称 + * @return 分包用户列表 + */ + List selectFbUserList(Long projectId, List contractorIds, String nickName); + /** * 根据条件分页查询用户列表 * @@ -260,6 +266,7 @@ public interface ISysUserService { /** * 根据部门 ID 获取用户 ID -> 名称 映射 + * * @param deptId * @return */ @@ -274,19 +281,19 @@ public interface ISysUserService { Long save(SysUser sysUser); - Boolean updateAppUserType(Long userId,String appUserType,List projectIds); + Boolean updateAppUserType(Long userId, String appUserType, List projectIds); List selectUserListByDeptByType(SysUserBo sysUserBo); Boolean queryProjectRelevancy(Long userId); - List selectUserListByAppUserType(String appUserType,Long projectId,Long contractorId); + List selectUserListByAppUserType(String appUserType, Long projectId, Long contractorId); - Boolean updateFb(Long userId,Long contractorId,Boolean isSub); + Boolean updateFb(Long userId, Long contractorId, Boolean isSub); - List selectUserByRoleIdAndProjectId(Long roleId,Long projectId); + List selectUserByRoleIdAndProjectId(Long roleId, Long projectId); - List selectUserByRoleIdsAndProjectId(List roleIds,Long projectId); + List selectUserByRoleIdsAndProjectId(List roleIds, Long projectId); String queryNameById(Long id); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 97b5baf1..d540863a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -16,7 +16,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.aspectj.apache.bcel.generic.RET; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.dto.UserDTO; @@ -43,8 +42,6 @@ import org.dromara.project.domain.BusUserProjectRelevancy; import org.dromara.project.domain.dto.attendance.SubTodayUserDto; import org.dromara.project.domain.dto.attendance.SubTwoWeekDto; import org.dromara.project.domain.dto.attendance.SubUserAttendanceQueryReq; -import org.dromara.project.domain.dto.attendance.TodayUserDto; -import org.dromara.project.domain.vo.attendance.SubUserAttendanceTotalVo; import org.dromara.project.domain.vo.projectteam.BusProjectTeamAppVo; import org.dromara.project.service.IBusProjectTeamService; import org.dromara.project.service.IBusUserProjectRelevancyService; @@ -58,14 +55,12 @@ import org.dromara.system.domain.vo.SysRoleVo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.*; -import org.dromara.system.service.ISysOssService; import org.dromara.system.service.ISysRoleService; import org.dromara.system.service.ISysUserFileService; import org.dromara.system.service.ISysUserService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.context.annotation.Lazy; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -107,7 +102,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Lazy @Resource - private IDesDesignChangeService desDesignChangeService; + private IDesDesignChangeService desDesignChangeService; @Lazy @Resource @@ -155,9 +150,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysUser::getAppUserType, "2"); - wrapper.like(StringUtils.isNotBlank(dto.getUserName()),SysUser::getUserName, dto.getUserName()); - wrapper.like(StringUtils.isNotBlank(dto.getPhonenumber()),SysUser::getPhonenumber, dto.getPhonenumber()); - wrapper.like(StringUtils.isNotBlank(dto.getNickName()),SysUser::getNickName, dto.getNickName()); + wrapper.like(StringUtils.isNotBlank(dto.getUserName()), SysUser::getUserName, dto.getUserName()); + wrapper.like(StringUtils.isNotBlank(dto.getPhonenumber()), SysUser::getPhonenumber, dto.getPhonenumber()); + wrapper.like(StringUtils.isNotBlank(dto.getNickName()), SysUser::getNickName, dto.getNickName()); wrapper.exists("SELECT 1 FROM bus_user_project_relevancy " + "WHERE bus_user_project_relevancy.user_id = u.user_id " + "AND project_id = {0}", dto.getProjectId()); @@ -188,6 +183,26 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return TableDataInfo.build(page); } + /** + * 获取分包用户列表 + * + * @param projectId 项目id + * @param contractorIds 分包id列表 + * @param nickName 用户昵称 + * @return 分包用户列表 + */ + @Override + public List selectFbUserList(Long projectId, List contractorIds, String nickName) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SysUser::getAppUserType, "2"); + lqw.exists(projectId != null, "SELECT 1 FROM bus_user_project_relevancy " + + "WHERE bus_user_project_relevancy.user_id = u.user_id " + + "AND project_id = {0}", projectId); + lqw.in(CollUtil.isNotEmpty(contractorIds), SysUser::getContractorId, contractorIds); + lqw.like(StringUtils.isNotBlank(nickName), SysUser::getNickName, nickName); + return baseMapper.selectUserList(lqw); + } + /** * 根据条件分页查询用户列表 * @@ -525,7 +540,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { throw new ServiceException("修改用户" + user.getUserName() + "信息失败"); } //修改construction_user表 - if(user.getAppUserType() != null){ + if (user.getAppUserType() != null) { constructionUserService.lambdaUpdate() .set(SubConstructionUser::getUserRole, user.getAppUserType()) .eq(SubConstructionUser::getSysUserId, user.getUserId()) @@ -930,17 +945,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override @Transactional(rollbackFor = Exception.class) - public Boolean updateAppUserType(Long userId, String appUserType,List projectIds) { + public Boolean updateAppUserType(Long userId, String appUserType, List projectIds) { //app用户类型 0-施工人员 1-管理人员 2-分包人员 SysUser sysUser = baseMapper.selectById(userId); if (sysUser == null) { throw new ServiceException("用户不存在!"); } - if(appUserType.equals(sysUser.getAppUserType())){ + if (appUserType.equals(sysUser.getAppUserType())) { throw new ServiceException("当前已是选中用户类型 !"); } String oldType = sysUser.getAppUserType(); - if(AppUserTypeEnum.FB.getType().equals(oldType)){ + if (AppUserTypeEnum.FB.getType().equals(oldType)) { List byUserId = projectTeamService.getByUserId(sysUser.getUserId(), null); if (!byUserId.isEmpty()) { throw new ServiceException("请先解除对班组的管理!"); @@ -966,7 +981,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { if (AppUserTypeEnum.SG.getType().equals(oldType)) { //施工人员->管理人员/分包人员 //清除app所有角色 userRoleMapper.deleteAppRoleByUserId(userId); - }else { //管理人员 <-> 施工人员 + } else { //管理人员 <-> 施工人员 //清除所有角色 userRoleMapper.delete(new LambdaQueryWrapper() .eq(SysUserRole::getUserId, userId)); @@ -975,15 +990,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService { List list = userProjectRelevancyService.list(Wrappers.lambdaQuery() .eq(BusUserProjectRelevancy::getUserId, userId)); List projects = list.stream().map(BusUserProjectRelevancy::getProjectId).collect(Collectors.toList()); - if(CollectionUtil.isEmpty(projects)){ - if(CollectionUtil.isEmpty(projectIds)){ + if (CollectionUtil.isEmpty(projects)) { + if (CollectionUtil.isEmpty(projectIds)) { throw new ServiceException("请选择项目!"); } projects = projectIds; } Long roleId = 2L; - if(!AppUserTypeEnum.SG.getType().equals(appUserType)){ + if (!AppUserTypeEnum.SG.getType().equals(appUserType)) { roleId = AppUserTypeEnum.getByType(appUserType).getRoleId(); } ArrayList sysUserRoles = new ArrayList<>(); @@ -996,7 +1011,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } userRoleMapper.insertBatch(sysUserRoles); - if(CollectionUtil.isNotEmpty(projectIds)){ + if (CollectionUtil.isNotEmpty(projectIds)) { List relevancies = new ArrayList<>(); for (Long project : projectIds) { BusUserProjectRelevancy relevancy = new BusUserProjectRelevancy(); @@ -1015,7 +1030,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return baseMapper.update(null, new LambdaUpdateWrapper() .set(SysUser::getAppUserType, appUserType) - .set(contractorId!=null,SysUser::getContractorId, contractorId) + .set(contractorId != null, SysUser::getContractorId, contractorId) .eq(SysUser::getUserId, userId)) > 0; } @@ -1032,8 +1047,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } @Override - public List selectUserListByAppUserType(String appUserType,Long projectId,Long contractorId) { - return baseMapper.selectUserListByAppUserType(appUserType,projectId,contractorId); + public List selectUserListByAppUserType(String appUserType, Long projectId, Long contractorId) { + return baseMapper.selectUserListByAppUserType(appUserType, projectId, contractorId); } @@ -1284,21 +1299,21 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } @Override - public Boolean updateFb(Long userId,Long contractorId,Boolean isSub) { + public Boolean updateFb(Long userId, Long contractorId, Boolean isSub) { SysUser sysUser = baseMapper.selectById(userId); sysUser.setContractorId(contractorId); - if(isSub){ + if (isSub) { SubConstructionUser constructionUser = constructionUserService.lambdaQuery() .eq(SubConstructionUser::getSysUserId, userId) .one(); - if(constructionUser != null){ + if (constructionUser != null) { constructionUser.setContractorId(contractorId); constructionUserService.updateById(constructionUser); } } - return baseMapper.updateById(sysUser)>0; + return baseMapper.updateById(sysUser) > 0; } @Override @@ -1311,7 +1326,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { List list1 = sysUserRoles.stream().map(SysUserRole::getUserId).toList(); if (CollUtil.isNotEmpty(list1)) { return baseMapper.selectList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getNickName, SysUser::getAvatar,SysUser::getPhonenumber) + .select(SysUser::getUserId, SysUser::getNickName, SysUser::getAvatar, SysUser::getPhonenumber) .eq(SysUser::getStatus, SystemConstants.NORMAL) .in(SysUser::getUserId, list1) ); @@ -1328,7 +1343,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { List list1 = sysUserRoles.stream().map(SysUserRole::getUserId).toList(); if (CollUtil.isNotEmpty(list1)) { return baseMapper.selectList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getNickName, SysUser::getAvatar,SysUser::getPhonenumber) + .select(SysUser::getUserId, SysUser::getNickName, SysUser::getAvatar, SysUser::getPhonenumber) .eq(SysUser::getStatus, SystemConstants.NORMAL) .in(SysUser::getUserId, list1) ); @@ -1347,7 +1362,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public Boolean deletion() { Long userId = LoginHelper.getUserId(); SubConstructionUser constructionUser = constructionUserService.getByUserId(userId); - if(constructionUser!=null && constructionUser.getTeamId()!=null){ + if (constructionUser != null && constructionUser.getTeamId() != null) { throw new ServiceException("请先退出班组"); } @@ -1375,7 +1390,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { //删除用户角色关联 userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); - return baseMapper.deleteById(userId)>0; + return baseMapper.deleteById(userId) > 0; } @Override @@ -1394,9 +1409,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } UserDTO userDTO = BeanUtil.copyProperties(sysUser, UserDTO.class); - if(sysUser.getAvatar() != null){ + if (sysUser.getAvatar() != null) { SysOss sysOss = ossMapper.selectById(sysUser.getAvatar()); - if(sysOss != null){ + if (sysOss != null) { userDTO.setAvatarUrl(sysOss.getUrl()); } } @@ -1404,13 +1419,13 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } @Override - public List selectUserByProfession(String code, String businessId,String type,Long projectId) { + public List selectUserByProfession(String code, String businessId, String type, Long projectId) { //procDesignFile 过程图纸 //bpDesignFile 蓝图审核 //moneydesignchanged 资金设计变更管理 //designchanged 设计变更审批 String specialty = null; - if("procDesignFile".equals(code) || "bpDesignFile".equals(code)){ + if ("procDesignFile".equals(code) || "bpDesignFile".equals(code)) { DesVolumeFile volumeFile = volumeFileService.getById(businessId); DesVolumeCatalog volumeCatalog = volumeCatalogService.getById(volumeFile.getVolumeCatalogId()); specialty = volumeCatalog.getSpecialty(); @@ -1418,11 +1433,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { DesDesignChange desDesignChange = desDesignChangeService.getById(businessId); specialty = desDesignChange.getSpecialty(); } - if(specialty == null){ + if (specialty == null) { return null; } - List longs = desUserService.selectbySpecialtyAndType(specialty, type,projectId); + List longs = desUserService.selectbySpecialtyAndType(specialty, type, projectId); return longs.stream().map(String::valueOf).toList(); } @@ -1432,8 +1447,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysUser::getAppUserType, "2"); - wrapper.like(StringUtils.isNotBlank(dto.getUserName()),SysUser::getUserName, dto.getUserName()); - wrapper.like(dto.getContractorId()!=null,SysUser::getContractorId, dto.getContractorId()); + wrapper.like(StringUtils.isNotBlank(dto.getUserName()), SysUser::getUserName, dto.getUserName()); + wrapper.like(dto.getContractorId() != null, SysUser::getContractorId, dto.getContractorId()); wrapper.exists("SELECT 1 FROM bus_user_project_relevancy " + "WHERE bus_user_project_relevancy.user_id = sys_user.user_id " + "AND project_id = {0}", dto.getProjectId()); @@ -1442,13 +1457,13 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } @Override - public TableDataInfo selectPageFbUserAttendanceList(SubUserAttendanceQueryReq dto, PageQuery pageQuery){ + public TableDataInfo selectPageFbUserAttendanceList(SubUserAttendanceQueryReq dto, PageQuery pageQuery) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysUser::getAppUserType, "2"); - wrapper.eq(dto.getContractorId()!=null,SysUser::getContractorId, dto.getContractorId()); - wrapper.like(StringUtils.isNotBlank(dto.getUserName()),SysUser::getUserName, dto.getUserName()); + wrapper.eq(dto.getContractorId() != null, SysUser::getContractorId, dto.getContractorId()); + wrapper.like(StringUtils.isNotBlank(dto.getUserName()), SysUser::getUserName, dto.getUserName()); wrapper.exists("SELECT 1 FROM bus_user_project_relevancy " + "WHERE bus_user_project_relevancy.user_id = u.user_id " + "AND project_id = {0}", dto.getProjectId()); @@ -1475,21 +1490,21 @@ public class SysUserServiceImpl implements ISysUserService, UserService { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysUser::getAppUserType, "2"); - wrapper.eq(dto.getContractorId()!=null,SysUser::getContractorId, dto.getContractorId()); - wrapper.like(StringUtils.isNotBlank(dto.getUserName()),SysUser::getUserName, dto.getUserName()); + wrapper.eq(dto.getContractorId() != null, SysUser::getContractorId, dto.getContractorId()); + wrapper.like(StringUtils.isNotBlank(dto.getUserName()), SysUser::getUserName, dto.getUserName()); wrapper.exists("SELECT 1 FROM bus_user_project_relevancy " + "WHERE bus_user_project_relevancy.user_id = u.user_id " + "AND project_id = {0}", dto.getProjectId()); - if("1".equals(dto.getType())){ + if ("1".equals(dto.getType())) { wrapper.in(SysUser::getUserId, dto.getUserIds()); - }else if("2".equals(dto.getType())){ - if(dto.getIsToday()){ - wrapper.notIn(CollectionUtil.isNotEmpty(dto.getUserIds()),SysUser::getUserId, dto.getUserIds()); - }else { + } else if ("2".equals(dto.getType())) { + if (dto.getIsToday()) { + wrapper.notIn(CollectionUtil.isNotEmpty(dto.getUserIds()), SysUser::getUserId, dto.getUserIds()); + } else { wrapper.in(SysUser::getUserId, dto.getUserIds()); } - }else{ + } else { wrapper.in(SysUser::getUserId, dto.getUserIds()); } @@ -1516,7 +1531,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { Long userId = LoginHelper.getUserId(); SysUser sysUser = baseMapper.selectById(userId); boolean checkpw = BCrypt.checkpw(dto.getOldPassword(), sysUser.getPassword()); - if(!checkpw){ + if (!checkpw) { throw new ServiceException("旧密码错误"); } return resetUserPwd(sysUser.getUserId(), BCrypt.hashpw(dto.getNewPassword()));