From 18ad3510102bafa05890622aa102afc88a49470f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Wed, 30 Jul 2025 10:33:33 +0800 Subject: [PATCH] 1 --- .../cory/controller/OtherDateSource.java | 1 - .../cory/domain/SysProjectTeamSquad.java | 62 +++++++++ .../cory/domain/vo/SysProjectTeamSquadVo.java | 121 ++++++++++++++++++ .../cory/mapper/ShiftMeetingMapper.java | 15 +++ .../cory/service/IShiftMeetingService.java | 11 ++ .../service/impl/ShiftMeetingServiceImpl.java | 35 +++++ 6 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java index 4c550c2b..96a3e80a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/controller/OtherDateSource.java @@ -33,7 +33,6 @@ public class OtherDateSource { /** * 获取项目列表 */ - @SaCheckPermission("cory:otherDateSourceService:list") @GetMapping("/list") public TableDataInfo list(SysProjectListReq bo, PageQuery pageQuery) { return otherDateSourceService.list(bo, pageQuery); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java new file mode 100644 index 00000000..6b55436c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/SysProjectTeamSquad.java @@ -0,0 +1,62 @@ +package org.dromara.cory.domain; + +import com.baomidou.mybatisplus.annotation.*; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author 铁憨憨 + * @Date 2025/7/29 9:27 + * @Version 1.0 + */ +@Data +@TableName("sys_project_team_squad") +public class SysProjectTeamSquad implements Serializable { + + @TableId(type = IdType.AUTO) + private Long id; + + @NotNull(message = "班组ID不能为空") + private Long teamId; + + private Date meetingDate; + + @Length(max = 255, message = "宣讲人ID长度不能超过255个字符") + private String compereId; + + private String participantId; + + @Length(max = 65535, message = "班会内容长度不能超过65535个字符") + private String content; + + @Length(max = 65535, message = "班会图片长度不能超过65535个字符") + private String picture; + + @Length(max = 50, message = "创建人长度不能超过50个字符") + private String createBy; + + @Length(max = 50, message = "更新人长度不能超过50个字符") + private String updateBy; + + @TableField(fill = FieldFill.INSERT) + private Date createdAt; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updatedAt; + + private Date deletedAt; + + @Length(max = 255, message = "班组名称长度不能超过255个字符") + private String teamName; + + @Length(max = 255, message = "劳务公司名称长度不能超过255个字符") + private String labourserviceName; + + private Long projectId; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java new file mode 100644 index 00000000..6a7aef9b --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/domain/vo/SysProjectTeamSquadVo.java @@ -0,0 +1,121 @@ +package org.dromara.cory.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Pattern; +import lombok.Data; +import org.dromara.cory.domain.SysProject; +import org.hibernate.validator.constraints.Length; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author 铁憨憨 + * @Date 2025/7/29 9:35 + * @Version 1.0 + */ + +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysProject.class) +public class SysProjectTeamSquadVo implements Serializable { + + @TableId(type = IdType.AUTO) + private Long id; + + @Length(max = 64, message = "项目名称长度不能超过64个字符") + private String projectName; + + @Length(max = 64, message = "项目简称长度不能超过64个字符") + private String shortName; + + private Long pId; + + @Pattern(regexp = "[01]", message = "状态值必须为0或1") + private String status; + + @Length(max = 255, message = "项目图片URL长度不能超过255个字符") + private String picUrl; + + @Length(max = 20, message = "经度长度不能超过20个字符") + private String lng; + + @Length(max = 20, message = "纬度长度不能超过20个字符") + private String lat; + + @Length(max = 500, message = "备注长度不能超过500个字符") + private String remark; + + @Length(max = 20, message = "项目类型长度不能超过20个字符") + private String type; + + @Pattern(regexp = "[12]", message = "项目类型值必须为1或2") + private String isType; + + @Length(max = 20, message = "展示颜色长度不能超过20个字符") + private String colourRgb; + + @Length(max = 64, message = "创建者长度不能超过64个字符") + private String createBy; + + @Length(max = 64, message = "更新者长度不能超过64个字符") + private String updateBy; + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + private Date deletedAt; + + @Deprecated + @Length(max = 255, message = "项目ID长度不能超过255个字符") + private String projectId; + + @Length(max = 8192, message = "视角参数长度不能超过8192个字符") + private String view; + + @Length(max = 255, message = "项目地址长度不能超过255个字符") + private String projectSite; + + @Length(max = 50, message = "负责人长度不能超过50个字符") + private String principal; + + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "负责人电话格式不正确") + private String principalPhone; + + @Length(max = 64, message = "小程序薪资负责人长度不能超过64个字符") + private String principalXz; + + @Length(max = 64, message = "实际容量长度不能超过64个字符") + private String actual; + + @Length(max = 64, message = "计划容量长度不能超过64个字符") + private String plan; + + @Length(max = 64, message = "开工时间长度不能超过64个字符") + private String onStreamTime; + + @Pattern(regexp = "^\\d{2}:\\d{2},\\d{2}:\\d{2}$", message = "打卡范围格式不正确，应为HH:MM,HH:MM") + private String punchRange; + + @Min(value = 0, message = "设计总量不能小于0") + private Integer designTotal; + + @Length(max = 255, message = "安全协议书长度不能超过255个字符") + private String securityAgreement; + + @Min(value = 0, message = "排序字段不能小于0") + private Long sort; + + @Pattern(regexp = "[12]", message = "显示隐藏值必须为1或2") + private String showHidden; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java new file mode 100644 index 00000000..8e41f834 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/mapper/ShiftMeetingMapper.java @@ -0,0 +1,15 @@ +package org.dromara.cory.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.cory.domain.SysProject; +import org.dromara.cory.domain.SysProjectTeamSquad; +import org.dromara.cory.domain.vo.SysProjectVo; + +/** + * @Author 铁憨憨 + * @Date 2025/7/29 9:25 + * @Version 1.0 + */ +public interface ShiftMeetingMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java new file mode 100644 index 00000000..1c683f87 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/IShiftMeetingService.java @@ -0,0 +1,11 @@ +package org.dromara.cory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.cory.domain.SysProjectTeamSquad; + +/** + * @Author 铁憨憨 + * @Date 2025/7/29 9:26 + * @Version 1.0 + */public interface IShiftMeetingService extends IService { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java new file mode 100644 index 00000000..3773a122 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cory/service/impl/ShiftMeetingServiceImpl.java @@ -0,0 +1,35 @@ +package org.dromara.cory.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.cory.domain.SysProject; +import org.dromara.cory.domain.SysProjectTeamSquad; +import org.dromara.cory.domain.bo.SysProjectListReq; +import org.dromara.cory.domain.vo.SysProjectVo; +import org.dromara.cory.mapper.OtherDateSourceMapper; +import org.dromara.cory.mapper.ShiftMeetingMapper; +import org.dromara.cory.service.IOtherDateSourceService; +import org.dromara.cory.service.IShiftMeetingService; +import org.springframework.stereotype.Service; + +import java.util.Collection; + +/** + * @Author 铁憨憨 + * @Date 2025/7/29 9:25 + * @Version 1.0 + */ + +@Slf4j +@RequiredArgsConstructor +@Service +@DS("slave") +public class ShiftMeetingServiceImpl extends ServiceImpl implements IShiftMeetingService { + +}