diff --git a/health/src/main/java/com/ccsens/health/service/AbnormalService.java b/health/src/main/java/com/ccsens/health/service/AbnormalService.java index eb35d070..ac57273e 100644 --- a/health/src/main/java/com/ccsens/health/service/AbnormalService.java +++ b/health/src/main/java/com/ccsens/health/service/AbnormalService.java @@ -123,6 +123,7 @@ public class AbnormalService implements IAbnormalService { throw new BaseException(CodeEnum.FILL_ERROR); } + HealthAbnormal healthAbnormal = new HealthAbnormal(); healthAbnormal.setId(snowflake.nextId()); BeanUtil.copyProperties(addAbnormal, healthAbnormal); diff --git a/health/src/main/java/com/ccsens/health/service/ClockService.java b/health/src/main/java/com/ccsens/health/service/ClockService.java index 2a057683..f2dda75d 100644 --- a/health/src/main/java/com/ccsens/health/service/ClockService.java +++ b/health/src/main/java/com/ccsens/health/service/ClockService.java @@ -20,6 +20,7 @@ import com.ccsens.util.exception.BaseException; import com.ccsens.util.wx.WxXcxUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.netflix.discovery.provider.ISerializer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -54,6 +55,8 @@ public class ClockService implements IClockService { @Autowired private IUserService userService; @Autowired + private IStudentService studentService; + @Autowired private TallFeignClient tallFeignClient; @Value("${spring.profiles.active}") private String active; @@ -457,6 +460,12 @@ public class ClockService implements IClockService { @Override public PageInfo selectSiteMemberList(ClockDto.SelectSiteMember param) { + //判断学号姓名是否是用一个人 + if(StrUtil.isNotEmpty(param.getWkno()) && StrUtil.isNotEmpty(param.getName())) { + if (!studentService.isSameWknoAndName(param.getWkno(), param.getName())) { + throw new BaseException(CodeEnum.FILL_ERROR); + } + } PageHelper.startPage(param.getPageNum(), param.getPageSize()); List siteMemberList = siteDao.selectSiteMemberList(param); return new PageInfo<>(siteMemberList); diff --git a/health/src/main/java/com/ccsens/health/service/IStudentService.java b/health/src/main/java/com/ccsens/health/service/IStudentService.java index d9381dca..8e9c1c1d 100644 --- a/health/src/main/java/com/ccsens/health/service/IStudentService.java +++ b/health/src/main/java/com/ccsens/health/service/IStudentService.java @@ -4,6 +4,7 @@ import com.ccsens.health.bean.dto.MemberDto; import com.ccsens.health.bean.vo.MemberVo; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import org.springframework.stereotype.Service; import java.io.File; import java.util.List; @@ -39,4 +40,6 @@ public interface IStudentService { * @return */ MemberVo.MemberJudge pageMember(long userId); + + boolean isSameWknoAndName(String wkno,String name); } diff --git a/health/src/main/java/com/ccsens/health/service/JourneyService.java b/health/src/main/java/com/ccsens/health/service/JourneyService.java index 0878178e..c9cfc88a 100644 --- a/health/src/main/java/com/ccsens/health/service/JourneyService.java +++ b/health/src/main/java/com/ccsens/health/service/JourneyService.java @@ -56,6 +56,7 @@ public class JourneyService implements IJourneyService{ @Autowired private JourneyAbnormalDao journeyAbnormalDao; + @Override public JourneyVo.BackSchoolStatistics backSchoolStatistics() { long totalMember = studentService.getTotalMember(); @@ -160,6 +161,12 @@ public class JourneyService implements IJourneyService{ */ @Override public PageInfo getJourneyInfoList(JourneyDto.SelectJourneyByName param, Long userId) { + //判断学号姓名是否是用一个人 + if(StrUtil.isNotEmpty(param.getWkno()) && StrUtil.isNotEmpty(param.getName())) { + if (!studentService.isSameWknoAndName(param.getWkno(), param.getName())) { + throw new BaseException(CodeEnum.FILL_ERROR); + } + } PageHelper.startPage(param.getPageNum(), param.getPageSize()); List studentJourneyInfos = journeyDao.getJourneyInfoList(param); return new PageInfo<>(studentJourneyInfos); diff --git a/health/src/main/java/com/ccsens/health/service/StudentService.java b/health/src/main/java/com/ccsens/health/service/StudentService.java index e7fa1264..e9b0a0bc 100644 --- a/health/src/main/java/com/ccsens/health/service/StudentService.java +++ b/health/src/main/java/com/ccsens/health/service/StudentService.java @@ -2,6 +2,7 @@ package com.ccsens.health.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.health.bean.dto.JourneyDto; import com.ccsens.health.bean.dto.MemberDto; @@ -194,6 +195,13 @@ public class StudentService implements IStudentService{ MemberVo.ContactPatientVo vo = new MemberVo.ContactPatientVo(); //请求参数 MemberDto.ContactPatientDto dto = params.getParam(); + //判断学号姓名是否是用一个人 + if(StrUtil.isNotEmpty(dto.getPatientMkno()) && StrUtil.isNotEmpty(dto.getPatientName())) { + if (!isSameWknoAndName(dto.getPatientMkno(), dto.getPatientName())) { + throw new BaseException(CodeEnum.FILL_ERROR); + } + } + // 校外行程车次 List carNos = new ArrayList<>(); if (StrUtil.isNotBlank(dto.getCarNo())) { @@ -295,6 +303,21 @@ public class StudentService implements IStudentService{ return site; } + /** + * 判断学号和姓名是否匹配 + */ + @Override + public boolean isSameWknoAndName(String wkno,String name){ + MemberExample memberExample = new MemberExample(); + memberExample.createCriteria().andWknoEqualTo(wkno); + List memberList = memberDao.selectByExample(memberExample); + if(CollectionUtil.isNotEmpty(memberList)){ + if(memberList.get(0).getName().equalsIgnoreCase(name)){ + return true; + } + } + return false; + } // /** // * 初始化健康信息 // * @param endTime diff --git a/health/src/main/java/com/ccsens/health/service/UserService.java b/health/src/main/java/com/ccsens/health/service/UserService.java index b910f077..03541e7a 100644 --- a/health/src/main/java/com/ccsens/health/service/UserService.java +++ b/health/src/main/java/com/ccsens/health/service/UserService.java @@ -50,6 +50,8 @@ public class UserService implements IUserService { private MemberDao memberDao; @Resource private JourneyDao journeyDao; + @Autowired + private IStudentService studentService; /** * 查询个人信息 @@ -255,6 +257,12 @@ public class UserService implements IUserService { List trackInfoList = new ArrayList<>(); UserDto.selectTrack selectTrack = params.getParam(); + //判断学号姓名是否是用一个人 + if(StrUtil.isNotEmpty(selectTrack.getWkno()) && StrUtil.isNotEmpty(selectTrack.getName())) { + if (!studentService.isSameWknoAndName(selectTrack.getWkno(), selectTrack.getName())) { + throw new BaseException(CodeEnum.FILL_ERROR); + } + } Long startTime = selectTrack.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : selectTrack.getStartTime(); Long endTime = selectTrack.getEndTime() == null ? System.currentTimeMillis() : selectTrack.getEndTime(); diff --git a/health/src/main/resources/application-prod.yml b/health/src/main/resources/application-prod.yml index 5847e0be..6db11ffa 100644 --- a/health/src/main/resources/application-prod.yml +++ b/health/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ server: - port: 7080 + port: 7081 servlet: context-path: spring: snowflake: - datacenterId: 1 - workerId: 1 + datacenterId: 2 + workerId: 2 application: name: health datasource: diff --git a/health/src/main/resources/mapper_dao/RealNameAuthDao.xml b/health/src/main/resources/mapper_dao/RealNameAuthDao.xml index abeb7f8a..08798dc8 100644 --- a/health/src/main/resources/mapper_dao/RealNameAuthDao.xml +++ b/health/src/main/resources/mapper_dao/RealNameAuthDao.xml @@ -31,6 +31,8 @@ join t_member m on r.no = m.wkno where m.rec_status = 0 + and + s.rec_status = 0 and m.name = #{name} diff --git a/health/src/main/resources/mapper_dao/SiteDao.xml b/health/src/main/resources/mapper_dao/SiteDao.xml index f309b089..1330a52d 100644 --- a/health/src/main/resources/mapper_dao/SiteDao.xml +++ b/health/src/main/resources/mapper_dao/SiteDao.xml @@ -30,7 +30,6 @@ COUNT(c.id) as number FROM t_site s left join t_site_clock_in c on c.site_id = s.id - and c.time <= #{time} and c.out_time >= #{time} diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java new file mode 100644 index 00000000..8ff26c26 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java @@ -0,0 +1,24 @@ +package com.ccsens.tall.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +@Data +public class PluginDto { + @Data + @ApiModel("添加评论") + public static class AddCommentPlugin { + @ApiModelProperty("任务id") + @NotNull(message = "任务id为空") + private Long taskId; + @ApiModelProperty("评论内容") + @NotEmpty(message = "您还什么都没写") + @Size(max =140,min = 0,message = "信息格式错误") + private String description; + } +} diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java index 26270cc3..09489422 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java @@ -85,6 +85,8 @@ public class TaskDto { @ApiModelProperty("任务在当前时间的subTimeId") @NotNull(message = "taskId is required.") private Long id; + @ApiModelProperty("开始任务的时间 如果为空则为当前时间") + private Long startTime; } @Data diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java index db69a3f1..ddcc9765 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/UserDto.java @@ -97,7 +97,15 @@ public class UserDto { @ApiModelProperty("来源 0：默认注册，1：HT病人注册") private byte source = WebConstant.Regist.SOURCE; } - + //注册 + @Data + @ApiModel + public static class UserSignupSystem{ + @ApiModelProperty("账号") + private String account; + @ApiModelProperty("密码") + private String password; + } @Data @ApiModel public static class WxMergePhone{ diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java index 2110dcda..87f44a95 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java @@ -12,22 +12,24 @@ public class ProShow implements Serializable { private Byte filter; - private String timeShow; - - private Byte duration; - private Byte isShowMvp; private Byte createTask; - private Byte showShortcuts; - private Date createdAt; private Date updatedAt; private Byte recStatus; + private String timeShow; + + private Byte duration; + + private Byte showShortcuts; + + private Byte selectTaskType; + private static final long serialVersionUID = 1L; public Long getId() { @@ -62,22 +64,6 @@ public class ProShow implements Serializable { this.filter = filter; } - public String getTimeShow() { - return timeShow; - } - - public void setTimeShow(String timeShow) { - this.timeShow = timeShow == null ? null : timeShow.trim(); - } - - public Byte getDuration() { - return duration; - } - - public void setDuration(Byte duration) { - this.duration = duration; - } - public Byte getIsShowMvp() { return isShowMvp; } @@ -94,14 +80,6 @@ public class ProShow implements Serializable { this.createTask = createTask; } - public Byte getShowShortcuts() { - return showShortcuts; - } - - public void setShowShortcuts(Byte showShortcuts) { - this.showShortcuts = showShortcuts; - } - public Date getCreatedAt() { return createdAt; } @@ -126,6 +104,38 @@ public class ProShow implements Serializable { this.recStatus = recStatus; } + public String getTimeShow() { + return timeShow; + } + + public void setTimeShow(String timeShow) { + this.timeShow = timeShow == null ? null : timeShow.trim(); + } + + public Byte getDuration() { + return duration; + } + + public void setDuration(Byte duration) { + this.duration = duration; + } + + public Byte getShowShortcuts() { + return showShortcuts; + } + + public void setShowShortcuts(Byte showShortcuts) { + this.showShortcuts = showShortcuts; + } + + public Byte getSelectTaskType() { + return selectTaskType; + } + + public void setSelectTaskType(Byte selectTaskType) { + this.selectTaskType = selectTaskType; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -136,14 +146,15 @@ public class ProShow implements Serializable { sb.append(", projectId=").append(projectId); sb.append(", slide=").append(slide); sb.append(", filter=").append(filter); - sb.append(", timeShow=").append(timeShow); - sb.append(", duration=").append(duration); sb.append(", isShowMvp=").append(isShowMvp); sb.append(", createTask=").append(createTask); - sb.append(", showShortcuts=").append(showShortcuts); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", timeShow=").append(timeShow); + sb.append(", duration=").append(duration); + sb.append(", showShortcuts=").append(showShortcuts); + sb.append(", selectTaskType=").append(selectTaskType); sb.append("]"); return sb.toString(); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java index baac0833..81ecc10d 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java @@ -345,136 +345,6 @@ public class ProShowExample { return (Criteria) this; } - public Criteria andTimeShowIsNull() { - addCriterion("time_show is null"); - return (Criteria) this; - } - - public Criteria andTimeShowIsNotNull() { - addCriterion("time_show is not null"); - return (Criteria) this; - } - - public Criteria andTimeShowEqualTo(String value) { - addCriterion("time_show =", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowNotEqualTo(String value) { - addCriterion("time_show <>", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowGreaterThan(String value) { - addCriterion("time_show >", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowGreaterThanOrEqualTo(String value) { - addCriterion("time_show >=", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowLessThan(String value) { - addCriterion("time_show <", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowLessThanOrEqualTo(String value) { - addCriterion("time_show <=", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowLike(String value) { - addCriterion("time_show like", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowNotLike(String value) { - addCriterion("time_show not like", value, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowIn(List values) { - addCriterion("time_show in", values, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowNotIn(List values) { - addCriterion("time_show not in", values, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowBetween(String value1, String value2) { - addCriterion("time_show between", value1, value2, "timeShow"); - return (Criteria) this; - } - - public Criteria andTimeShowNotBetween(String value1, String value2) { - addCriterion("time_show not between", value1, value2, "timeShow"); - return (Criteria) this; - } - - public Criteria andDurationIsNull() { - addCriterion("duration is null"); - return (Criteria) this; - } - - public Criteria andDurationIsNotNull() { - addCriterion("duration is not null"); - return (Criteria) this; - } - - public Criteria andDurationEqualTo(Byte value) { - addCriterion("duration =", value, "duration"); - return (Criteria) this; - } - - public Criteria andDurationNotEqualTo(Byte value) { - addCriterion("duration <>", value, "duration"); - return (Criteria) this; - } - - public Criteria andDurationGreaterThan(Byte value) { - addCriterion("duration >", value, "duration"); - return (Criteria) this; - } - - public Criteria andDurationGreaterThanOrEqualTo(Byte value) { - addCriterion("duration >=", value, "duration"); - return (Criteria) this; - } - - public Criteria andDurationLessThan(Byte value) { - addCriterion("duration <", value, "duration"); - return (Criteria) this; - } - - public Criteria andDurationLessThanOrEqualTo(Byte value) { - addCriterion("duration <=", value, "duration"); - return (Criteria) this; - } - - public Criteria andDurationIn(List values) { - addCriterion("duration in", values, "duration"); - return (Criteria) this; - } - - public Criteria andDurationNotIn(List values) { - addCriterion("duration not in", values, "duration"); - return (Criteria) this; - } - - public Criteria andDurationBetween(Byte value1, Byte value2) { - addCriterion("duration between", value1, value2, "duration"); - return (Criteria) this; - } - - public Criteria andDurationNotBetween(Byte value1, Byte value2) { - addCriterion("duration not between", value1, value2, "duration"); - return (Criteria) this; - } - public Criteria andIsShowMvpIsNull() { addCriterion("is_show_mvp is null"); return (Criteria) this; @@ -595,66 +465,6 @@ public class ProShowExample { return (Criteria) this; } - public Criteria andShowShortcutsIsNull() { - addCriterion("show_shortcuts is null"); - return (Criteria) this; - } - - public Criteria andShowShortcutsIsNotNull() { - addCriterion("show_shortcuts is not null"); - return (Criteria) this; - } - - public Criteria andShowShortcutsEqualTo(Byte value) { - addCriterion("show_shortcuts =", value, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsNotEqualTo(Byte value) { - addCriterion("show_shortcuts <>", value, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsGreaterThan(Byte value) { - addCriterion("show_shortcuts >", value, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsGreaterThanOrEqualTo(Byte value) { - addCriterion("show_shortcuts >=", value, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsLessThan(Byte value) { - addCriterion("show_shortcuts <", value, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsLessThanOrEqualTo(Byte value) { - addCriterion("show_shortcuts <=", value, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsIn(List values) { - addCriterion("show_shortcuts in", values, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsNotIn(List values) { - addCriterion("show_shortcuts not in", values, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsBetween(Byte value1, Byte value2) { - addCriterion("show_shortcuts between", value1, value2, "showShortcuts"); - return (Criteria) this; - } - - public Criteria andShowShortcutsNotBetween(Byte value1, Byte value2) { - addCriterion("show_shortcuts not between", value1, value2, "showShortcuts"); - return (Criteria) this; - } - public Criteria andCreatedAtIsNull() { addCriterion("created_at is null"); return (Criteria) this; @@ -834,6 +644,256 @@ public class ProShowExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andTimeShowIsNull() { + addCriterion("time_show is null"); + return (Criteria) this; + } + + public Criteria andTimeShowIsNotNull() { + addCriterion("time_show is not null"); + return (Criteria) this; + } + + public Criteria andTimeShowEqualTo(String value) { + addCriterion("time_show =", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotEqualTo(String value) { + addCriterion("time_show <>", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowGreaterThan(String value) { + addCriterion("time_show >", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowGreaterThanOrEqualTo(String value) { + addCriterion("time_show >=", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowLessThan(String value) { + addCriterion("time_show <", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowLessThanOrEqualTo(String value) { + addCriterion("time_show <=", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowLike(String value) { + addCriterion("time_show like", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotLike(String value) { + addCriterion("time_show not like", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowIn(List values) { + addCriterion("time_show in", values, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotIn(List values) { + addCriterion("time_show not in", values, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowBetween(String value1, String value2) { + addCriterion("time_show between", value1, value2, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotBetween(String value1, String value2) { + addCriterion("time_show not between", value1, value2, "timeShow"); + return (Criteria) this; + } + + public Criteria andDurationIsNull() { + addCriterion("duration is null"); + return (Criteria) this; + } + + public Criteria andDurationIsNotNull() { + addCriterion("duration is not null"); + return (Criteria) this; + } + + public Criteria andDurationEqualTo(Byte value) { + addCriterion("duration =", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotEqualTo(Byte value) { + addCriterion("duration <>", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationGreaterThan(Byte value) { + addCriterion("duration >", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationGreaterThanOrEqualTo(Byte value) { + addCriterion("duration >=", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationLessThan(Byte value) { + addCriterion("duration <", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationLessThanOrEqualTo(Byte value) { + addCriterion("duration <=", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationIn(List values) { + addCriterion("duration in", values, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotIn(List values) { + addCriterion("duration not in", values, "duration"); + return (Criteria) this; + } + + public Criteria andDurationBetween(Byte value1, Byte value2) { + addCriterion("duration between", value1, value2, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotBetween(Byte value1, Byte value2) { + addCriterion("duration not between", value1, value2, "duration"); + return (Criteria) this; + } + + public Criteria andShowShortcutsIsNull() { + addCriterion("show_shortcuts is null"); + return (Criteria) this; + } + + public Criteria andShowShortcutsIsNotNull() { + addCriterion("show_shortcuts is not null"); + return (Criteria) this; + } + + public Criteria andShowShortcutsEqualTo(Byte value) { + addCriterion("show_shortcuts =", value, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsNotEqualTo(Byte value) { + addCriterion("show_shortcuts <>", value, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsGreaterThan(Byte value) { + addCriterion("show_shortcuts >", value, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsGreaterThanOrEqualTo(Byte value) { + addCriterion("show_shortcuts >=", value, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsLessThan(Byte value) { + addCriterion("show_shortcuts <", value, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsLessThanOrEqualTo(Byte value) { + addCriterion("show_shortcuts <=", value, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsIn(List values) { + addCriterion("show_shortcuts in", values, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsNotIn(List values) { + addCriterion("show_shortcuts not in", values, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsBetween(Byte value1, Byte value2) { + addCriterion("show_shortcuts between", value1, value2, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andShowShortcutsNotBetween(Byte value1, Byte value2) { + addCriterion("show_shortcuts not between", value1, value2, "showShortcuts"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeIsNull() { + addCriterion("select_task_type is null"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeIsNotNull() { + addCriterion("select_task_type is not null"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeEqualTo(Byte value) { + addCriterion("select_task_type =", value, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeNotEqualTo(Byte value) { + addCriterion("select_task_type <>", value, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeGreaterThan(Byte value) { + addCriterion("select_task_type >", value, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("select_task_type >=", value, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeLessThan(Byte value) { + addCriterion("select_task_type <", value, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeLessThanOrEqualTo(Byte value) { + addCriterion("select_task_type <=", value, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeIn(List values) { + addCriterion("select_task_type in", values, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeNotIn(List values) { + addCriterion("select_task_type not in", values, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeBetween(Byte value1, Byte value2) { + addCriterion("select_task_type between", value1, value2, "selectTaskType"); + return (Criteria) this; + } + + public Criteria andSelectTaskTypeNotBetween(Byte value1, Byte value2) { + addCriterion("select_task_type not between", value1, value2, "selectTaskType"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskComment.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskComment.java new file mode 100644 index 00000000..c84abef0 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskComment.java @@ -0,0 +1,117 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProTaskComment implements Serializable { + private Long id; + + private Long userId; + + private Long taskSubTimeId; + + private Long time; + + private String description; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Long projectid; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getTaskSubTimeId() { + return taskSubTimeId; + } + + public void setTaskSubTimeId(Long taskSubTimeId) { + this.taskSubTimeId = taskSubTimeId; + } + + public Long getTime() { + return time; + } + + public void setTime(Long time) { + this.time = time; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + public Long getProjectid() { + return projectid; + } + + public void setProjectid(Long projectid) { + this.projectid = projectid; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", userId=").append(userId); + sb.append(", taskSubTimeId=").append(taskSubTimeId); + sb.append(", time=").append(time); + sb.append(", description=").append(description); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", projectid=").append(projectid); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskCommentExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskCommentExample.java new file mode 100644 index 00000000..e34db30f --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskCommentExample.java @@ -0,0 +1,751 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProTaskCommentExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProTaskCommentExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIsNull() { + addCriterion("task_sub_time_id is null"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIsNotNull() { + addCriterion("task_sub_time_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdEqualTo(Long value) { + addCriterion("task_sub_time_id =", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotEqualTo(Long value) { + addCriterion("task_sub_time_id <>", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdGreaterThan(Long value) { + addCriterion("task_sub_time_id >", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_sub_time_id >=", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdLessThan(Long value) { + addCriterion("task_sub_time_id <", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdLessThanOrEqualTo(Long value) { + addCriterion("task_sub_time_id <=", value, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdIn(List values) { + addCriterion("task_sub_time_id in", values, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotIn(List values) { + addCriterion("task_sub_time_id not in", values, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdBetween(Long value1, Long value2) { + addCriterion("task_sub_time_id between", value1, value2, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTaskSubTimeIdNotBetween(Long value1, Long value2) { + addCriterion("task_sub_time_id not between", value1, value2, "taskSubTimeId"); + return (Criteria) this; + } + + public Criteria andTimeIsNull() { + addCriterion("time is null"); + return (Criteria) this; + } + + public Criteria andTimeIsNotNull() { + addCriterion("time is not null"); + return (Criteria) this; + } + + public Criteria andTimeEqualTo(Long value) { + addCriterion("time =", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotEqualTo(Long value) { + addCriterion("time <>", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThan(Long value) { + addCriterion("time >", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeGreaterThanOrEqualTo(Long value) { + addCriterion("time >=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThan(Long value) { + addCriterion("time <", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeLessThanOrEqualTo(Long value) { + addCriterion("time <=", value, "time"); + return (Criteria) this; + } + + public Criteria andTimeIn(List values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List values) { + addCriterion("time not in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeBetween(Long value1, Long value2) { + addCriterion("time between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotBetween(Long value1, Long value2) { + addCriterion("time not between", value1, value2, "time"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andProjectidIsNull() { + addCriterion("projectId is null"); + return (Criteria) this; + } + + public Criteria andProjectidIsNotNull() { + addCriterion("projectId is not null"); + return (Criteria) this; + } + + public Criteria andProjectidEqualTo(Long value) { + addCriterion("projectId =", value, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidNotEqualTo(Long value) { + addCriterion("projectId <>", value, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidGreaterThan(Long value) { + addCriterion("projectId >", value, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidGreaterThanOrEqualTo(Long value) { + addCriterion("projectId >=", value, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidLessThan(Long value) { + addCriterion("projectId <", value, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidLessThanOrEqualTo(Long value) { + addCriterion("projectId <=", value, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidIn(List values) { + addCriterion("projectId in", values, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidNotIn(List values) { + addCriterion("projectId not in", values, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidBetween(Long value1, Long value2) { + addCriterion("projectId between", value1, value2, "projectid"); + return (Criteria) this; + } + + public Criteria andProjectidNotBetween(Long value1, Long value2) { + addCriterion("projectId not between", value1, value2, "projectid"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskShow.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskShow.java new file mode 100644 index 00000000..09cacfc8 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskShow.java @@ -0,0 +1,150 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class ProTaskShow implements Serializable { + private Long id; + + private Long projectId; + + private Long taskDetailId; + + private String timeShow; + + private Byte duration; + + private Byte createTask; + + private Byte showHardware; + + private Byte showDeliver; + + private Byte showMoney; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getTaskDetailId() { + return taskDetailId; + } + + public void setTaskDetailId(Long taskDetailId) { + this.taskDetailId = taskDetailId; + } + + public String getTimeShow() { + return timeShow; + } + + public void setTimeShow(String timeShow) { + this.timeShow = timeShow == null ? null : timeShow.trim(); + } + + public Byte getDuration() { + return duration; + } + + public void setDuration(Byte duration) { + this.duration = duration; + } + + public Byte getCreateTask() { + return createTask; + } + + public void setCreateTask(Byte createTask) { + this.createTask = createTask; + } + + public Byte getShowHardware() { + return showHardware; + } + + public void setShowHardware(Byte showHardware) { + this.showHardware = showHardware; + } + + public Byte getShowDeliver() { + return showDeliver; + } + + public void setShowDeliver(Byte showDeliver) { + this.showDeliver = showDeliver; + } + + public Byte getShowMoney() { + return showMoney; + } + + public void setShowMoney(Byte showMoney) { + this.showMoney = showMoney; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", projectId=").append(projectId); + sb.append(", taskDetailId=").append(taskDetailId); + sb.append(", timeShow=").append(timeShow); + sb.append(", duration=").append(duration); + sb.append(", createTask=").append(createTask); + sb.append(", showHardware=").append(showHardware); + sb.append(", showDeliver=").append(showDeliver); + sb.append(", showMoney=").append(showMoney); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskShowExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskShowExample.java new file mode 100644 index 00000000..6638f77f --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskShowExample.java @@ -0,0 +1,931 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ProTaskShowExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ProTaskShowExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdIsNull() { + addCriterion("task_detail_id is null"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdIsNotNull() { + addCriterion("task_detail_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdEqualTo(Long value) { + addCriterion("task_detail_id =", value, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdNotEqualTo(Long value) { + addCriterion("task_detail_id <>", value, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdGreaterThan(Long value) { + addCriterion("task_detail_id >", value, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_detail_id >=", value, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdLessThan(Long value) { + addCriterion("task_detail_id <", value, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdLessThanOrEqualTo(Long value) { + addCriterion("task_detail_id <=", value, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdIn(List values) { + addCriterion("task_detail_id in", values, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdNotIn(List values) { + addCriterion("task_detail_id not in", values, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdBetween(Long value1, Long value2) { + addCriterion("task_detail_id between", value1, value2, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTaskDetailIdNotBetween(Long value1, Long value2) { + addCriterion("task_detail_id not between", value1, value2, "taskDetailId"); + return (Criteria) this; + } + + public Criteria andTimeShowIsNull() { + addCriterion("time_show is null"); + return (Criteria) this; + } + + public Criteria andTimeShowIsNotNull() { + addCriterion("time_show is not null"); + return (Criteria) this; + } + + public Criteria andTimeShowEqualTo(String value) { + addCriterion("time_show =", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotEqualTo(String value) { + addCriterion("time_show <>", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowGreaterThan(String value) { + addCriterion("time_show >", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowGreaterThanOrEqualTo(String value) { + addCriterion("time_show >=", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowLessThan(String value) { + addCriterion("time_show <", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowLessThanOrEqualTo(String value) { + addCriterion("time_show <=", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowLike(String value) { + addCriterion("time_show like", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotLike(String value) { + addCriterion("time_show not like", value, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowIn(List values) { + addCriterion("time_show in", values, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotIn(List values) { + addCriterion("time_show not in", values, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowBetween(String value1, String value2) { + addCriterion("time_show between", value1, value2, "timeShow"); + return (Criteria) this; + } + + public Criteria andTimeShowNotBetween(String value1, String value2) { + addCriterion("time_show not between", value1, value2, "timeShow"); + return (Criteria) this; + } + + public Criteria andDurationIsNull() { + addCriterion("duration is null"); + return (Criteria) this; + } + + public Criteria andDurationIsNotNull() { + addCriterion("duration is not null"); + return (Criteria) this; + } + + public Criteria andDurationEqualTo(Byte value) { + addCriterion("duration =", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotEqualTo(Byte value) { + addCriterion("duration <>", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationGreaterThan(Byte value) { + addCriterion("duration >", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationGreaterThanOrEqualTo(Byte value) { + addCriterion("duration >=", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationLessThan(Byte value) { + addCriterion("duration <", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationLessThanOrEqualTo(Byte value) { + addCriterion("duration <=", value, "duration"); + return (Criteria) this; + } + + public Criteria andDurationIn(List values) { + addCriterion("duration in", values, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotIn(List values) { + addCriterion("duration not in", values, "duration"); + return (Criteria) this; + } + + public Criteria andDurationBetween(Byte value1, Byte value2) { + addCriterion("duration between", value1, value2, "duration"); + return (Criteria) this; + } + + public Criteria andDurationNotBetween(Byte value1, Byte value2) { + addCriterion("duration not between", value1, value2, "duration"); + return (Criteria) this; + } + + public Criteria andCreateTaskIsNull() { + addCriterion("create_task is null"); + return (Criteria) this; + } + + public Criteria andCreateTaskIsNotNull() { + addCriterion("create_task is not null"); + return (Criteria) this; + } + + public Criteria andCreateTaskEqualTo(Byte value) { + addCriterion("create_task =", value, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskNotEqualTo(Byte value) { + addCriterion("create_task <>", value, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskGreaterThan(Byte value) { + addCriterion("create_task >", value, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskGreaterThanOrEqualTo(Byte value) { + addCriterion("create_task >=", value, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskLessThan(Byte value) { + addCriterion("create_task <", value, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskLessThanOrEqualTo(Byte value) { + addCriterion("create_task <=", value, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskIn(List values) { + addCriterion("create_task in", values, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskNotIn(List values) { + addCriterion("create_task not in", values, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskBetween(Byte value1, Byte value2) { + addCriterion("create_task between", value1, value2, "createTask"); + return (Criteria) this; + } + + public Criteria andCreateTaskNotBetween(Byte value1, Byte value2) { + addCriterion("create_task not between", value1, value2, "createTask"); + return (Criteria) this; + } + + public Criteria andShowHardwareIsNull() { + addCriterion("show_hardware is null"); + return (Criteria) this; + } + + public Criteria andShowHardwareIsNotNull() { + addCriterion("show_hardware is not null"); + return (Criteria) this; + } + + public Criteria andShowHardwareEqualTo(Byte value) { + addCriterion("show_hardware =", value, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareNotEqualTo(Byte value) { + addCriterion("show_hardware <>", value, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareGreaterThan(Byte value) { + addCriterion("show_hardware >", value, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareGreaterThanOrEqualTo(Byte value) { + addCriterion("show_hardware >=", value, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareLessThan(Byte value) { + addCriterion("show_hardware <", value, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareLessThanOrEqualTo(Byte value) { + addCriterion("show_hardware <=", value, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareIn(List values) { + addCriterion("show_hardware in", values, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareNotIn(List values) { + addCriterion("show_hardware not in", values, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareBetween(Byte value1, Byte value2) { + addCriterion("show_hardware between", value1, value2, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowHardwareNotBetween(Byte value1, Byte value2) { + addCriterion("show_hardware not between", value1, value2, "showHardware"); + return (Criteria) this; + } + + public Criteria andShowDeliverIsNull() { + addCriterion("show_deliver is null"); + return (Criteria) this; + } + + public Criteria andShowDeliverIsNotNull() { + addCriterion("show_deliver is not null"); + return (Criteria) this; + } + + public Criteria andShowDeliverEqualTo(Byte value) { + addCriterion("show_deliver =", value, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverNotEqualTo(Byte value) { + addCriterion("show_deliver <>", value, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverGreaterThan(Byte value) { + addCriterion("show_deliver >", value, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverGreaterThanOrEqualTo(Byte value) { + addCriterion("show_deliver >=", value, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverLessThan(Byte value) { + addCriterion("show_deliver <", value, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverLessThanOrEqualTo(Byte value) { + addCriterion("show_deliver <=", value, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverIn(List values) { + addCriterion("show_deliver in", values, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverNotIn(List values) { + addCriterion("show_deliver not in", values, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverBetween(Byte value1, Byte value2) { + addCriterion("show_deliver between", value1, value2, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowDeliverNotBetween(Byte value1, Byte value2) { + addCriterion("show_deliver not between", value1, value2, "showDeliver"); + return (Criteria) this; + } + + public Criteria andShowMoneyIsNull() { + addCriterion("show_money is null"); + return (Criteria) this; + } + + public Criteria andShowMoneyIsNotNull() { + addCriterion("show_money is not null"); + return (Criteria) this; + } + + public Criteria andShowMoneyEqualTo(Byte value) { + addCriterion("show_money =", value, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyNotEqualTo(Byte value) { + addCriterion("show_money <>", value, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyGreaterThan(Byte value) { + addCriterion("show_money >", value, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyGreaterThanOrEqualTo(Byte value) { + addCriterion("show_money >=", value, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyLessThan(Byte value) { + addCriterion("show_money <", value, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyLessThanOrEqualTo(Byte value) { + addCriterion("show_money <=", value, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyIn(List values) { + addCriterion("show_money in", values, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyNotIn(List values) { + addCriterion("show_money not in", values, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyBetween(Byte value1, Byte value2) { + addCriterion("show_money between", value1, value2, "showMoney"); + return (Criteria) this; + } + + public Criteria andShowMoneyNotBetween(Byte value1, Byte value2) { + addCriterion("show_money not between", value1, value2, "showMoney"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysAuth.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysAuth.java index b20e247e..ab12530f 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysAuth.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysAuth.java @@ -1,117 +1,128 @@ -package com.ccsens.tall.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class SysAuth implements Serializable { - private Long id; - - private Long userId; - - private Byte identifyType; - - private String identifier; - - private String credential; - - private String salt; - - private Date createdAt; - - private Date updatedAt; - - private Byte recStatus; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Byte getIdentifyType() { - return identifyType; - } - - public void setIdentifyType(Byte identifyType) { - this.identifyType = identifyType; - } - - public String getIdentifier() { - return identifier; - } - - public void setIdentifier(String identifier) { - this.identifier = identifier == null ? null : identifier.trim(); - } - - public String getCredential() { - return credential; - } - - public void setCredential(String credential) { - this.credential = credential == null ? null : credential.trim(); - } - - public String getSalt() { - return salt; - } - - public void setSalt(String salt) { - this.salt = salt == null ? null : salt.trim(); - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getRecStatus() { - return recStatus; - } - - public void setRecStatus(Byte recStatus) { - this.recStatus = recStatus; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", userId=").append(userId); - sb.append(", identifyType=").append(identifyType); - sb.append(", identifier=").append(identifier); - sb.append(", credential=").append(credential); - sb.append(", salt=").append(salt); - sb.append(", createdAt=").append(createdAt); - sb.append(", updatedAt=").append(updatedAt); - sb.append(", recStatus=").append(recStatus); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysAuth implements Serializable { + private Long id; + + private Long userId; + + private Byte identifyType; + + private String identifier; + + private String credential; + + private String salt; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private Byte registerType; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Byte getIdentifyType() { + return identifyType; + } + + public void setIdentifyType(Byte identifyType) { + this.identifyType = identifyType; + } + + public String getIdentifier() { + return identifier; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier == null ? null : identifier.trim(); + } + + public String getCredential() { + return credential; + } + + public void setCredential(String credential) { + this.credential = credential == null ? null : credential.trim(); + } + + public String getSalt() { + return salt; + } + + public void setSalt(String salt) { + this.salt = salt == null ? null : salt.trim(); + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + public Byte getRegisterType() { + return registerType; + } + + public void setRegisterType(Byte registerType) { + this.registerType = registerType; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", userId=").append(userId); + sb.append(", identifyType=").append(identifyType); + sb.append(", identifier=").append(identifier); + sb.append(", credential=").append(credential); + sb.append(", salt=").append(salt); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append(", registerType=").append(registerType); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysAuthExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysAuthExample.java index cc202475..6b97ecb5 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysAuthExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysAuthExample.java @@ -1,771 +1,831 @@ -package com.ccsens.tall.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysAuthExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysAuthExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(Long value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(Long value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(Long value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(Long value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(Long value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(Long value1, Long value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(Long value1, Long value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeIsNull() { - addCriterion("identify_type is null"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeIsNotNull() { - addCriterion("identify_type is not null"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeEqualTo(Byte value) { - addCriterion("identify_type =", value, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeNotEqualTo(Byte value) { - addCriterion("identify_type <>", value, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeGreaterThan(Byte value) { - addCriterion("identify_type >", value, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("identify_type >=", value, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeLessThan(Byte value) { - addCriterion("identify_type <", value, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeLessThanOrEqualTo(Byte value) { - addCriterion("identify_type <=", value, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeIn(List values) { - addCriterion("identify_type in", values, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeNotIn(List values) { - addCriterion("identify_type not in", values, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeBetween(Byte value1, Byte value2) { - addCriterion("identify_type between", value1, value2, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifyTypeNotBetween(Byte value1, Byte value2) { - addCriterion("identify_type not between", value1, value2, "identifyType"); - return (Criteria) this; - } - - public Criteria andIdentifierIsNull() { - addCriterion("identifier is null"); - return (Criteria) this; - } - - public Criteria andIdentifierIsNotNull() { - addCriterion("identifier is not null"); - return (Criteria) this; - } - - public Criteria andIdentifierEqualTo(String value) { - addCriterion("identifier =", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierNotEqualTo(String value) { - addCriterion("identifier <>", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierGreaterThan(String value) { - addCriterion("identifier >", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierGreaterThanOrEqualTo(String value) { - addCriterion("identifier >=", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierLessThan(String value) { - addCriterion("identifier <", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierLessThanOrEqualTo(String value) { - addCriterion("identifier <=", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierLike(String value) { - addCriterion("identifier like", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierNotLike(String value) { - addCriterion("identifier not like", value, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierIn(List values) { - addCriterion("identifier in", values, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierNotIn(List values) { - addCriterion("identifier not in", values, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierBetween(String value1, String value2) { - addCriterion("identifier between", value1, value2, "identifier"); - return (Criteria) this; - } - - public Criteria andIdentifierNotBetween(String value1, String value2) { - addCriterion("identifier not between", value1, value2, "identifier"); - return (Criteria) this; - } - - public Criteria andCredentialIsNull() { - addCriterion("credential is null"); - return (Criteria) this; - } - - public Criteria andCredentialIsNotNull() { - addCriterion("credential is not null"); - return (Criteria) this; - } - - public Criteria andCredentialEqualTo(String value) { - addCriterion("credential =", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialNotEqualTo(String value) { - addCriterion("credential <>", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialGreaterThan(String value) { - addCriterion("credential >", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialGreaterThanOrEqualTo(String value) { - addCriterion("credential >=", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialLessThan(String value) { - addCriterion("credential <", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialLessThanOrEqualTo(String value) { - addCriterion("credential <=", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialLike(String value) { - addCriterion("credential like", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialNotLike(String value) { - addCriterion("credential not like", value, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialIn(List values) { - addCriterion("credential in", values, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialNotIn(List values) { - addCriterion("credential not in", values, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialBetween(String value1, String value2) { - addCriterion("credential between", value1, value2, "credential"); - return (Criteria) this; - } - - public Criteria andCredentialNotBetween(String value1, String value2) { - addCriterion("credential not between", value1, value2, "credential"); - return (Criteria) this; - } - - public Criteria andSaltIsNull() { - addCriterion("salt is null"); - return (Criteria) this; - } - - public Criteria andSaltIsNotNull() { - addCriterion("salt is not null"); - return (Criteria) this; - } - - public Criteria andSaltEqualTo(String value) { - addCriterion("salt =", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltNotEqualTo(String value) { - addCriterion("salt <>", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltGreaterThan(String value) { - addCriterion("salt >", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltGreaterThanOrEqualTo(String value) { - addCriterion("salt >=", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltLessThan(String value) { - addCriterion("salt <", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltLessThanOrEqualTo(String value) { - addCriterion("salt <=", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltLike(String value) { - addCriterion("salt like", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltNotLike(String value) { - addCriterion("salt not like", value, "salt"); - return (Criteria) this; - } - - public Criteria andSaltIn(List values) { - addCriterion("salt in", values, "salt"); - return (Criteria) this; - } - - public Criteria andSaltNotIn(List values) { - addCriterion("salt not in", values, "salt"); - return (Criteria) this; - } - - public Criteria andSaltBetween(String value1, String value2) { - addCriterion("salt between", value1, value2, "salt"); - return (Criteria) this; - } - - public Criteria andSaltNotBetween(String value1, String value2) { - addCriterion("salt not between", value1, value2, "salt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNull() { - addCriterion("rec_status is null"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNotNull() { - addCriterion("rec_status is not null"); - return (Criteria) this; - } - - public Criteria andRecStatusEqualTo(Byte value) { - addCriterion("rec_status =", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotEqualTo(Byte value) { - addCriterion("rec_status <>", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThan(Byte value) { - addCriterion("rec_status >", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("rec_status >=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThan(Byte value) { - addCriterion("rec_status <", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThanOrEqualTo(Byte value) { - addCriterion("rec_status <=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusIn(List values) { - addCriterion("rec_status in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotIn(List values) { - addCriterion("rec_status not in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusBetween(Byte value1, Byte value2) { - addCriterion("rec_status between", value1, value2, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { - addCriterion("rec_status not between", value1, value2, "recStatus"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysAuthExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysAuthExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeIsNull() { + addCriterion("identify_type is null"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeIsNotNull() { + addCriterion("identify_type is not null"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeEqualTo(Byte value) { + addCriterion("identify_type =", value, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeNotEqualTo(Byte value) { + addCriterion("identify_type <>", value, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeGreaterThan(Byte value) { + addCriterion("identify_type >", value, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("identify_type >=", value, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeLessThan(Byte value) { + addCriterion("identify_type <", value, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeLessThanOrEqualTo(Byte value) { + addCriterion("identify_type <=", value, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeIn(List values) { + addCriterion("identify_type in", values, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeNotIn(List values) { + addCriterion("identify_type not in", values, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeBetween(Byte value1, Byte value2) { + addCriterion("identify_type between", value1, value2, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifyTypeNotBetween(Byte value1, Byte value2) { + addCriterion("identify_type not between", value1, value2, "identifyType"); + return (Criteria) this; + } + + public Criteria andIdentifierIsNull() { + addCriterion("identifier is null"); + return (Criteria) this; + } + + public Criteria andIdentifierIsNotNull() { + addCriterion("identifier is not null"); + return (Criteria) this; + } + + public Criteria andIdentifierEqualTo(String value) { + addCriterion("identifier =", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierNotEqualTo(String value) { + addCriterion("identifier <>", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierGreaterThan(String value) { + addCriterion("identifier >", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierGreaterThanOrEqualTo(String value) { + addCriterion("identifier >=", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierLessThan(String value) { + addCriterion("identifier <", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierLessThanOrEqualTo(String value) { + addCriterion("identifier <=", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierLike(String value) { + addCriterion("identifier like", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierNotLike(String value) { + addCriterion("identifier not like", value, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierIn(List values) { + addCriterion("identifier in", values, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierNotIn(List values) { + addCriterion("identifier not in", values, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierBetween(String value1, String value2) { + addCriterion("identifier between", value1, value2, "identifier"); + return (Criteria) this; + } + + public Criteria andIdentifierNotBetween(String value1, String value2) { + addCriterion("identifier not between", value1, value2, "identifier"); + return (Criteria) this; + } + + public Criteria andCredentialIsNull() { + addCriterion("credential is null"); + return (Criteria) this; + } + + public Criteria andCredentialIsNotNull() { + addCriterion("credential is not null"); + return (Criteria) this; + } + + public Criteria andCredentialEqualTo(String value) { + addCriterion("credential =", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialNotEqualTo(String value) { + addCriterion("credential <>", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialGreaterThan(String value) { + addCriterion("credential >", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialGreaterThanOrEqualTo(String value) { + addCriterion("credential >=", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialLessThan(String value) { + addCriterion("credential <", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialLessThanOrEqualTo(String value) { + addCriterion("credential <=", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialLike(String value) { + addCriterion("credential like", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialNotLike(String value) { + addCriterion("credential not like", value, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialIn(List values) { + addCriterion("credential in", values, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialNotIn(List values) { + addCriterion("credential not in", values, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialBetween(String value1, String value2) { + addCriterion("credential between", value1, value2, "credential"); + return (Criteria) this; + } + + public Criteria andCredentialNotBetween(String value1, String value2) { + addCriterion("credential not between", value1, value2, "credential"); + return (Criteria) this; + } + + public Criteria andSaltIsNull() { + addCriterion("salt is null"); + return (Criteria) this; + } + + public Criteria andSaltIsNotNull() { + addCriterion("salt is not null"); + return (Criteria) this; + } + + public Criteria andSaltEqualTo(String value) { + addCriterion("salt =", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotEqualTo(String value) { + addCriterion("salt <>", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltGreaterThan(String value) { + addCriterion("salt >", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltGreaterThanOrEqualTo(String value) { + addCriterion("salt >=", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltLessThan(String value) { + addCriterion("salt <", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltLessThanOrEqualTo(String value) { + addCriterion("salt <=", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltLike(String value) { + addCriterion("salt like", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotLike(String value) { + addCriterion("salt not like", value, "salt"); + return (Criteria) this; + } + + public Criteria andSaltIn(List values) { + addCriterion("salt in", values, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotIn(List values) { + addCriterion("salt not in", values, "salt"); + return (Criteria) this; + } + + public Criteria andSaltBetween(String value1, String value2) { + addCriterion("salt between", value1, value2, "salt"); + return (Criteria) this; + } + + public Criteria andSaltNotBetween(String value1, String value2) { + addCriterion("salt not between", value1, value2, "salt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRegisterTypeIsNull() { + addCriterion("register_type is null"); + return (Criteria) this; + } + + public Criteria andRegisterTypeIsNotNull() { + addCriterion("register_type is not null"); + return (Criteria) this; + } + + public Criteria andRegisterTypeEqualTo(Byte value) { + addCriterion("register_type =", value, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeNotEqualTo(Byte value) { + addCriterion("register_type <>", value, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeGreaterThan(Byte value) { + addCriterion("register_type >", value, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("register_type >=", value, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeLessThan(Byte value) { + addCriterion("register_type <", value, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeLessThanOrEqualTo(Byte value) { + addCriterion("register_type <=", value, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeIn(List values) { + addCriterion("register_type in", values, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeNotIn(List values) { + addCriterion("register_type not in", values, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeBetween(Byte value1, Byte value2) { + addCriterion("register_type between", value1, value2, "registerType"); + return (Criteria) this; + } + + public Criteria andRegisterTypeNotBetween(Byte value1, Byte value2) { + addCriterion("register_type not between", value1, value2, "registerType"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java index 9f904717..a52df7a9 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java @@ -30,6 +30,8 @@ public class SysDomain implements Serializable { private Byte recStatus; + private String foreverProjectId; + private static final long serialVersionUID = 1L; public Long getId() { @@ -136,6 +138,14 @@ public class SysDomain implements Serializable { this.recStatus = recStatus; } + public String getForeverProjectId() { + return foreverProjectId; + } + + public void setForeverProjectId(String foreverProjectId) { + this.foreverProjectId = foreverProjectId == null ? null : foreverProjectId.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -155,6 +165,7 @@ public class SysDomain implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", foreverProjectId=").append(foreverProjectId); sb.append("]"); return sb.toString(); } diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java index 6cadfa21..11d52065 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomainExample.java @@ -954,6 +954,76 @@ public class SysDomainExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andForeverProjectIdIsNull() { + addCriterion("forever_project_id is null"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdIsNotNull() { + addCriterion("forever_project_id is not null"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdEqualTo(String value) { + addCriterion("forever_project_id =", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdNotEqualTo(String value) { + addCriterion("forever_project_id <>", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdGreaterThan(String value) { + addCriterion("forever_project_id >", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdGreaterThanOrEqualTo(String value) { + addCriterion("forever_project_id >=", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdLessThan(String value) { + addCriterion("forever_project_id <", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdLessThanOrEqualTo(String value) { + addCriterion("forever_project_id <=", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdLike(String value) { + addCriterion("forever_project_id like", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdNotLike(String value) { + addCriterion("forever_project_id not like", value, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdIn(List values) { + addCriterion("forever_project_id in", values, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdNotIn(List values) { + addCriterion("forever_project_id not in", values, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdBetween(String value1, String value2) { + addCriterion("forever_project_id between", value1, value2, "foreverProjectId"); + return (Criteria) this; + } + + public Criteria andForeverProjectIdNotBetween(String value1, String value2) { + addCriterion("forever_project_id not between", value1, value2, "foreverProjectId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysMessageType.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysMessageType.java new file mode 100644 index 00000000..68c8dd60 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysMessageType.java @@ -0,0 +1,117 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysMessageType implements Serializable { + private Long id; + + private String name; + + private String path; + + private Byte operateType; + + private String template; + + private String description; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path == null ? null : path.trim(); + } + + public Byte getOperateType() { + return operateType; + } + + public void setOperateType(Byte operateType) { + this.operateType = operateType; + } + + public String getTemplate() { + return template; + } + + public void setTemplate(String template) { + this.template = template == null ? null : template.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", name=").append(name); + sb.append(", path=").append(path); + sb.append(", operateType=").append(operateType); + sb.append(", template=").append(template); + sb.append(", description=").append(description); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysMessageTypeExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysMessageTypeExample.java new file mode 100644 index 00000000..1c0c84e1 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysMessageTypeExample.java @@ -0,0 +1,781 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysMessageTypeExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysMessageTypeExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andPathIsNull() { + addCriterion("path is null"); + return (Criteria) this; + } + + public Criteria andPathIsNotNull() { + addCriterion("path is not null"); + return (Criteria) this; + } + + public Criteria andPathEqualTo(String value) { + addCriterion("path =", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotEqualTo(String value) { + addCriterion("path <>", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThan(String value) { + addCriterion("path >", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThanOrEqualTo(String value) { + addCriterion("path >=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThan(String value) { + addCriterion("path <", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThanOrEqualTo(String value) { + addCriterion("path <=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLike(String value) { + addCriterion("path like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotLike(String value) { + addCriterion("path not like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathIn(List values) { + addCriterion("path in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathNotIn(List values) { + addCriterion("path not in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathBetween(String value1, String value2) { + addCriterion("path between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andPathNotBetween(String value1, String value2) { + addCriterion("path not between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andOperateTypeIsNull() { + addCriterion("operate_type is null"); + return (Criteria) this; + } + + public Criteria andOperateTypeIsNotNull() { + addCriterion("operate_type is not null"); + return (Criteria) this; + } + + public Criteria andOperateTypeEqualTo(Byte value) { + addCriterion("operate_type =", value, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeNotEqualTo(Byte value) { + addCriterion("operate_type <>", value, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeGreaterThan(Byte value) { + addCriterion("operate_type >", value, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("operate_type >=", value, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeLessThan(Byte value) { + addCriterion("operate_type <", value, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeLessThanOrEqualTo(Byte value) { + addCriterion("operate_type <=", value, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeIn(List values) { + addCriterion("operate_type in", values, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeNotIn(List values) { + addCriterion("operate_type not in", values, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeBetween(Byte value1, Byte value2) { + addCriterion("operate_type between", value1, value2, "operateType"); + return (Criteria) this; + } + + public Criteria andOperateTypeNotBetween(Byte value1, Byte value2) { + addCriterion("operate_type not between", value1, value2, "operateType"); + return (Criteria) this; + } + + public Criteria andTemplateIsNull() { + addCriterion("template is null"); + return (Criteria) this; + } + + public Criteria andTemplateIsNotNull() { + addCriterion("template is not null"); + return (Criteria) this; + } + + public Criteria andTemplateEqualTo(String value) { + addCriterion("template =", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotEqualTo(String value) { + addCriterion("template <>", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateGreaterThan(String value) { + addCriterion("template >", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateGreaterThanOrEqualTo(String value) { + addCriterion("template >=", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateLessThan(String value) { + addCriterion("template <", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateLessThanOrEqualTo(String value) { + addCriterion("template <=", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateLike(String value) { + addCriterion("template like", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotLike(String value) { + addCriterion("template not like", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateIn(List values) { + addCriterion("template in", values, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotIn(List values) { + addCriterion("template not in", values, "template"); + return (Criteria) this; + } + + public Criteria andTemplateBetween(String value1, String value2) { + addCriterion("template between", value1, value2, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotBetween(String value1, String value2) { + addCriterion("template not between", value1, value2, "template"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProject.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProject.java index 4c47c40d..1763d352 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysProject.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProject.java @@ -1,172 +1,172 @@ -package com.ccsens.tall.bean.po; - -import java.io.Serializable; -import java.util.Date; - -public class SysProject implements Serializable { - private Long id; - - private Long creatorId; - - private Long parentTaskId; - - private Long sceneId; - - private String name; - - private String description; - - private Long beginTime; - - private Long endTime; - - private String address; - - private Byte published; - - private Byte template; - - private Date createdAt; - - private Date updatedAt; - - private Byte recStatus; - - private static final long serialVersionUID = 1L; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getCreatorId() { - return creatorId; - } - - public void setCreatorId(Long creatorId) { - this.creatorId = creatorId; - } - - public Long getParentTaskId() { - return parentTaskId; - } - - public void setParentTaskId(Long parentTaskId) { - this.parentTaskId = parentTaskId; - } - - public Long getSceneId() { - return sceneId; - } - - public void setSceneId(Long sceneId) { - this.sceneId = sceneId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name == null ? null : name.trim(); - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description == null ? null : description.trim(); - } - - public Long getBeginTime() { - return beginTime; - } - - public void setBeginTime(Long beginTime) { - this.beginTime = beginTime; - } - - public Long getEndTime() { - return endTime; - } - - public void setEndTime(Long endTime) { - this.endTime = endTime; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address == null ? null : address.trim(); - } - - public Byte getPublished() { - return published; - } - - public void setPublished(Byte published) { - this.published = published; - } - - public Byte getTemplate() { - return template; - } - - public void setTemplate(Byte template) { - this.template = template; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } - - public Byte getRecStatus() { - return recStatus; - } - - public void setRecStatus(Byte recStatus) { - this.recStatus = recStatus; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", creatorId=").append(creatorId); - sb.append(", parentTaskId=").append(parentTaskId); - sb.append(", sceneId=").append(sceneId); - sb.append(", name=").append(name); - sb.append(", description=").append(description); - sb.append(", beginTime=").append(beginTime); - sb.append(", endTime=").append(endTime); - sb.append(", address=").append(address); - sb.append(", published=").append(published); - sb.append(", template=").append(template); - sb.append(", createdAt=").append(createdAt); - sb.append(", updatedAt=").append(updatedAt); - sb.append(", recStatus=").append(recStatus); - sb.append("]"); - return sb.toString(); - } +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysProject implements Serializable { + private Long id; + + private Long creatorId; + + private Long parentTaskId; + + private Long sceneId; + + private String name; + + private String description; + + private Long beginTime; + + private Long endTime; + + private String address; + + private Byte published; + + private Byte template; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCreatorId() { + return creatorId; + } + + public void setCreatorId(Long creatorId) { + this.creatorId = creatorId; + } + + public Long getParentTaskId() { + return parentTaskId; + } + + public void setParentTaskId(Long parentTaskId) { + this.parentTaskId = parentTaskId; + } + + public Long getSceneId() { + return sceneId; + } + + public void setSceneId(Long sceneId) { + this.sceneId = sceneId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description == null ? null : description.trim(); + } + + public Long getBeginTime() { + return beginTime; + } + + public void setBeginTime(Long beginTime) { + this.beginTime = beginTime; + } + + public Long getEndTime() { + return endTime; + } + + public void setEndTime(Long endTime) { + this.endTime = endTime; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address == null ? null : address.trim(); + } + + public Byte getPublished() { + return published; + } + + public void setPublished(Byte published) { + this.published = published; + } + + public Byte getTemplate() { + return template; + } + + public void setTemplate(Byte template) { + this.template = template; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", creatorId=").append(creatorId); + sb.append(", parentTaskId=").append(parentTaskId); + sb.append(", sceneId=").append(sceneId); + sb.append(", name=").append(name); + sb.append(", description=").append(description); + sb.append(", beginTime=").append(beginTime); + sb.append(", endTime=").append(endTime); + sb.append(", address=").append(address); + sb.append(", published=").append(published); + sb.append(", template=").append(template); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectExample.java index 635e3278..2c31c159 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectExample.java +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectExample.java @@ -1,1071 +1,1071 @@ -package com.ccsens.tall.bean.po; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SysProjectExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SysProjectExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Long value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Long value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Long value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Long value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Long value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Long value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Long value1, Long value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Long value1, Long value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNull() { - addCriterion("creator_id is null"); - return (Criteria) this; - } - - public Criteria andCreatorIdIsNotNull() { - addCriterion("creator_id is not null"); - return (Criteria) this; - } - - public Criteria andCreatorIdEqualTo(Long value) { - addCriterion("creator_id =", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotEqualTo(Long value) { - addCriterion("creator_id <>", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThan(Long value) { - addCriterion("creator_id >", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) { - addCriterion("creator_id >=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThan(Long value) { - addCriterion("creator_id <", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdLessThanOrEqualTo(Long value) { - addCriterion("creator_id <=", value, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdIn(List values) { - addCriterion("creator_id in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotIn(List values) { - addCriterion("creator_id not in", values, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdBetween(Long value1, Long value2) { - addCriterion("creator_id between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andCreatorIdNotBetween(Long value1, Long value2) { - addCriterion("creator_id not between", value1, value2, "creatorId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdIsNull() { - addCriterion("parent_task_id is null"); - return (Criteria) this; - } - - public Criteria andParentTaskIdIsNotNull() { - addCriterion("parent_task_id is not null"); - return (Criteria) this; - } - - public Criteria andParentTaskIdEqualTo(Long value) { - addCriterion("parent_task_id =", value, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdNotEqualTo(Long value) { - addCriterion("parent_task_id <>", value, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdGreaterThan(Long value) { - addCriterion("parent_task_id >", value, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdGreaterThanOrEqualTo(Long value) { - addCriterion("parent_task_id >=", value, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdLessThan(Long value) { - addCriterion("parent_task_id <", value, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdLessThanOrEqualTo(Long value) { - addCriterion("parent_task_id <=", value, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdIn(List values) { - addCriterion("parent_task_id in", values, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdNotIn(List values) { - addCriterion("parent_task_id not in", values, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdBetween(Long value1, Long value2) { - addCriterion("parent_task_id between", value1, value2, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andParentTaskIdNotBetween(Long value1, Long value2) { - addCriterion("parent_task_id not between", value1, value2, "parentTaskId"); - return (Criteria) this; - } - - public Criteria andSceneIdIsNull() { - addCriterion("scene_id is null"); - return (Criteria) this; - } - - public Criteria andSceneIdIsNotNull() { - addCriterion("scene_id is not null"); - return (Criteria) this; - } - - public Criteria andSceneIdEqualTo(Long value) { - addCriterion("scene_id =", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotEqualTo(Long value) { - addCriterion("scene_id <>", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdGreaterThan(Long value) { - addCriterion("scene_id >", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdGreaterThanOrEqualTo(Long value) { - addCriterion("scene_id >=", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdLessThan(Long value) { - addCriterion("scene_id <", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdLessThanOrEqualTo(Long value) { - addCriterion("scene_id <=", value, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdIn(List values) { - addCriterion("scene_id in", values, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotIn(List values) { - addCriterion("scene_id not in", values, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdBetween(Long value1, Long value2) { - addCriterion("scene_id between", value1, value2, "sceneId"); - return (Criteria) this; - } - - public Criteria andSceneIdNotBetween(Long value1, Long value2) { - addCriterion("scene_id not between", value1, value2, "sceneId"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andBeginTimeIsNull() { - addCriterion("begin_time is null"); - return (Criteria) this; - } - - public Criteria andBeginTimeIsNotNull() { - addCriterion("begin_time is not null"); - return (Criteria) this; - } - - public Criteria andBeginTimeEqualTo(Long value) { - addCriterion("begin_time =", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeNotEqualTo(Long value) { - addCriterion("begin_time <>", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeGreaterThan(Long value) { - addCriterion("begin_time >", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { - addCriterion("begin_time >=", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeLessThan(Long value) { - addCriterion("begin_time <", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeLessThanOrEqualTo(Long value) { - addCriterion("begin_time <=", value, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeIn(List values) { - addCriterion("begin_time in", values, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeNotIn(List values) { - addCriterion("begin_time not in", values, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeBetween(Long value1, Long value2) { - addCriterion("begin_time between", value1, value2, "beginTime"); - return (Criteria) this; - } - - public Criteria andBeginTimeNotBetween(Long value1, Long value2) { - addCriterion("begin_time not between", value1, value2, "beginTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNull() { - addCriterion("end_time is null"); - return (Criteria) this; - } - - public Criteria andEndTimeIsNotNull() { - addCriterion("end_time is not null"); - return (Criteria) this; - } - - public Criteria andEndTimeEqualTo(Long value) { - addCriterion("end_time =", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotEqualTo(Long value) { - addCriterion("end_time <>", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThan(Long value) { - addCriterion("end_time >", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { - addCriterion("end_time >=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThan(Long value) { - addCriterion("end_time <", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeLessThanOrEqualTo(Long value) { - addCriterion("end_time <=", value, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeIn(List values) { - addCriterion("end_time in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotIn(List values) { - addCriterion("end_time not in", values, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeBetween(Long value1, Long value2) { - addCriterion("end_time between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andEndTimeNotBetween(Long value1, Long value2) { - addCriterion("end_time not between", value1, value2, "endTime"); - return (Criteria) this; - } - - public Criteria andAddressIsNull() { - addCriterion("address is null"); - return (Criteria) this; - } - - public Criteria andAddressIsNotNull() { - addCriterion("address is not null"); - return (Criteria) this; - } - - public Criteria andAddressEqualTo(String value) { - addCriterion("address =", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressNotEqualTo(String value) { - addCriterion("address <>", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressGreaterThan(String value) { - addCriterion("address >", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressGreaterThanOrEqualTo(String value) { - addCriterion("address >=", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressLessThan(String value) { - addCriterion("address <", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressLessThanOrEqualTo(String value) { - addCriterion("address <=", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressLike(String value) { - addCriterion("address like", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressNotLike(String value) { - addCriterion("address not like", value, "address"); - return (Criteria) this; - } - - public Criteria andAddressIn(List values) { - addCriterion("address in", values, "address"); - return (Criteria) this; - } - - public Criteria andAddressNotIn(List values) { - addCriterion("address not in", values, "address"); - return (Criteria) this; - } - - public Criteria andAddressBetween(String value1, String value2) { - addCriterion("address between", value1, value2, "address"); - return (Criteria) this; - } - - public Criteria andAddressNotBetween(String value1, String value2) { - addCriterion("address not between", value1, value2, "address"); - return (Criteria) this; - } - - public Criteria andPublishedIsNull() { - addCriterion("published is null"); - return (Criteria) this; - } - - public Criteria andPublishedIsNotNull() { - addCriterion("published is not null"); - return (Criteria) this; - } - - public Criteria andPublishedEqualTo(Byte value) { - addCriterion("published =", value, "published"); - return (Criteria) this; - } - - public Criteria andPublishedNotEqualTo(Byte value) { - addCriterion("published <>", value, "published"); - return (Criteria) this; - } - - public Criteria andPublishedGreaterThan(Byte value) { - addCriterion("published >", value, "published"); - return (Criteria) this; - } - - public Criteria andPublishedGreaterThanOrEqualTo(Byte value) { - addCriterion("published >=", value, "published"); - return (Criteria) this; - } - - public Criteria andPublishedLessThan(Byte value) { - addCriterion("published <", value, "published"); - return (Criteria) this; - } - - public Criteria andPublishedLessThanOrEqualTo(Byte value) { - addCriterion("published <=", value, "published"); - return (Criteria) this; - } - - public Criteria andPublishedIn(List values) { - addCriterion("published in", values, "published"); - return (Criteria) this; - } - - public Criteria andPublishedNotIn(List values) { - addCriterion("published not in", values, "published"); - return (Criteria) this; - } - - public Criteria andPublishedBetween(Byte value1, Byte value2) { - addCriterion("published between", value1, value2, "published"); - return (Criteria) this; - } - - public Criteria andPublishedNotBetween(Byte value1, Byte value2) { - addCriterion("published not between", value1, value2, "published"); - return (Criteria) this; - } - - public Criteria andTemplateIsNull() { - addCriterion("template is null"); - return (Criteria) this; - } - - public Criteria andTemplateIsNotNull() { - addCriterion("template is not null"); - return (Criteria) this; - } - - public Criteria andTemplateEqualTo(Byte value) { - addCriterion("template =", value, "template"); - return (Criteria) this; - } - - public Criteria andTemplateNotEqualTo(Byte value) { - addCriterion("template <>", value, "template"); - return (Criteria) this; - } - - public Criteria andTemplateGreaterThan(Byte value) { - addCriterion("template >", value, "template"); - return (Criteria) this; - } - - public Criteria andTemplateGreaterThanOrEqualTo(Byte value) { - addCriterion("template >=", value, "template"); - return (Criteria) this; - } - - public Criteria andTemplateLessThan(Byte value) { - addCriterion("template <", value, "template"); - return (Criteria) this; - } - - public Criteria andTemplateLessThanOrEqualTo(Byte value) { - addCriterion("template <=", value, "template"); - return (Criteria) this; - } - - public Criteria andTemplateIn(List values) { - addCriterion("template in", values, "template"); - return (Criteria) this; - } - - public Criteria andTemplateNotIn(List values) { - addCriterion("template not in", values, "template"); - return (Criteria) this; - } - - public Criteria andTemplateBetween(Byte value1, Byte value2) { - addCriterion("template between", value1, value2, "template"); - return (Criteria) this; - } - - public Criteria andTemplateNotBetween(Byte value1, Byte value2) { - addCriterion("template not between", value1, value2, "template"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNull() { - addCriterion("created_at is null"); - return (Criteria) this; - } - - public Criteria andCreatedAtIsNotNull() { - addCriterion("created_at is not null"); - return (Criteria) this; - } - - public Criteria andCreatedAtEqualTo(Date value) { - addCriterion("created_at =", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotEqualTo(Date value) { - addCriterion("created_at <>", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThan(Date value) { - addCriterion("created_at >", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("created_at >=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThan(Date value) { - addCriterion("created_at <", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtLessThanOrEqualTo(Date value) { - addCriterion("created_at <=", value, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtIn(List values) { - addCriterion("created_at in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotIn(List values) { - addCriterion("created_at not in", values, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtBetween(Date value1, Date value2) { - addCriterion("created_at between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andCreatedAtNotBetween(Date value1, Date value2) { - addCriterion("created_at not between", value1, value2, "createdAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNull() { - addCriterion("updated_at is null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIsNotNull() { - addCriterion("updated_at is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedAtEqualTo(Date value) { - addCriterion("updated_at =", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotEqualTo(Date value) { - addCriterion("updated_at <>", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThan(Date value) { - addCriterion("updated_at >", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { - addCriterion("updated_at >=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThan(Date value) { - addCriterion("updated_at <", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { - addCriterion("updated_at <=", value, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtIn(List values) { - addCriterion("updated_at in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotIn(List values) { - addCriterion("updated_at not in", values, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtBetween(Date value1, Date value2) { - addCriterion("updated_at between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { - addCriterion("updated_at not between", value1, value2, "updatedAt"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNull() { - addCriterion("rec_status is null"); - return (Criteria) this; - } - - public Criteria andRecStatusIsNotNull() { - addCriterion("rec_status is not null"); - return (Criteria) this; - } - - public Criteria andRecStatusEqualTo(Byte value) { - addCriterion("rec_status =", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotEqualTo(Byte value) { - addCriterion("rec_status <>", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThan(Byte value) { - addCriterion("rec_status >", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { - addCriterion("rec_status >=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThan(Byte value) { - addCriterion("rec_status <", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusLessThanOrEqualTo(Byte value) { - addCriterion("rec_status <=", value, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusIn(List values) { - addCriterion("rec_status in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotIn(List values) { - addCriterion("rec_status not in", values, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusBetween(Byte value1, Byte value2) { - addCriterion("rec_status between", value1, value2, "recStatus"); - return (Criteria) this; - } - - public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { - addCriterion("rec_status not between", value1, value2, "recStatus"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysProjectExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysProjectExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCreatorIdIsNull() { + addCriterion("creator_id is null"); + return (Criteria) this; + } + + public Criteria andCreatorIdIsNotNull() { + addCriterion("creator_id is not null"); + return (Criteria) this; + } + + public Criteria andCreatorIdEqualTo(Long value) { + addCriterion("creator_id =", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdNotEqualTo(Long value) { + addCriterion("creator_id <>", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdGreaterThan(Long value) { + addCriterion("creator_id >", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) { + addCriterion("creator_id >=", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdLessThan(Long value) { + addCriterion("creator_id <", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdLessThanOrEqualTo(Long value) { + addCriterion("creator_id <=", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdIn(List values) { + addCriterion("creator_id in", values, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdNotIn(List values) { + addCriterion("creator_id not in", values, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdBetween(Long value1, Long value2) { + addCriterion("creator_id between", value1, value2, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdNotBetween(Long value1, Long value2) { + addCriterion("creator_id not between", value1, value2, "creatorId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdIsNull() { + addCriterion("parent_task_id is null"); + return (Criteria) this; + } + + public Criteria andParentTaskIdIsNotNull() { + addCriterion("parent_task_id is not null"); + return (Criteria) this; + } + + public Criteria andParentTaskIdEqualTo(Long value) { + addCriterion("parent_task_id =", value, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdNotEqualTo(Long value) { + addCriterion("parent_task_id <>", value, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdGreaterThan(Long value) { + addCriterion("parent_task_id >", value, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("parent_task_id >=", value, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdLessThan(Long value) { + addCriterion("parent_task_id <", value, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdLessThanOrEqualTo(Long value) { + addCriterion("parent_task_id <=", value, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdIn(List values) { + addCriterion("parent_task_id in", values, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdNotIn(List values) { + addCriterion("parent_task_id not in", values, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdBetween(Long value1, Long value2) { + addCriterion("parent_task_id between", value1, value2, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andParentTaskIdNotBetween(Long value1, Long value2) { + addCriterion("parent_task_id not between", value1, value2, "parentTaskId"); + return (Criteria) this; + } + + public Criteria andSceneIdIsNull() { + addCriterion("scene_id is null"); + return (Criteria) this; + } + + public Criteria andSceneIdIsNotNull() { + addCriterion("scene_id is not null"); + return (Criteria) this; + } + + public Criteria andSceneIdEqualTo(Long value) { + addCriterion("scene_id =", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotEqualTo(Long value) { + addCriterion("scene_id <>", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdGreaterThan(Long value) { + addCriterion("scene_id >", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdGreaterThanOrEqualTo(Long value) { + addCriterion("scene_id >=", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLessThan(Long value) { + addCriterion("scene_id <", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLessThanOrEqualTo(Long value) { + addCriterion("scene_id <=", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdIn(List values) { + addCriterion("scene_id in", values, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotIn(List values) { + addCriterion("scene_id not in", values, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdBetween(Long value1, Long value2) { + addCriterion("scene_id between", value1, value2, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotBetween(Long value1, Long value2) { + addCriterion("scene_id not between", value1, value2, "sceneId"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andBeginTimeIsNull() { + addCriterion("begin_time is null"); + return (Criteria) this; + } + + public Criteria andBeginTimeIsNotNull() { + addCriterion("begin_time is not null"); + return (Criteria) this; + } + + public Criteria andBeginTimeEqualTo(Long value) { + addCriterion("begin_time =", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotEqualTo(Long value) { + addCriterion("begin_time <>", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThan(Long value) { + addCriterion("begin_time >", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeGreaterThanOrEqualTo(Long value) { + addCriterion("begin_time >=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThan(Long value) { + addCriterion("begin_time <", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeLessThanOrEqualTo(Long value) { + addCriterion("begin_time <=", value, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeIn(List values) { + addCriterion("begin_time in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotIn(List values) { + addCriterion("begin_time not in", values, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeBetween(Long value1, Long value2) { + addCriterion("begin_time between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andBeginTimeNotBetween(Long value1, Long value2) { + addCriterion("begin_time not between", value1, value2, "beginTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andAddressIsNull() { + addCriterion("address is null"); + return (Criteria) this; + } + + public Criteria andAddressIsNotNull() { + addCriterion("address is not null"); + return (Criteria) this; + } + + public Criteria andAddressEqualTo(String value) { + addCriterion("address =", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotEqualTo(String value) { + addCriterion("address <>", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThan(String value) { + addCriterion("address >", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThanOrEqualTo(String value) { + addCriterion("address >=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThan(String value) { + addCriterion("address <", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThanOrEqualTo(String value) { + addCriterion("address <=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLike(String value) { + addCriterion("address like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotLike(String value) { + addCriterion("address not like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressIn(List values) { + addCriterion("address in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotIn(List values) { + addCriterion("address not in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressBetween(String value1, String value2) { + addCriterion("address between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotBetween(String value1, String value2) { + addCriterion("address not between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andPublishedIsNull() { + addCriterion("published is null"); + return (Criteria) this; + } + + public Criteria andPublishedIsNotNull() { + addCriterion("published is not null"); + return (Criteria) this; + } + + public Criteria andPublishedEqualTo(Byte value) { + addCriterion("published =", value, "published"); + return (Criteria) this; + } + + public Criteria andPublishedNotEqualTo(Byte value) { + addCriterion("published <>", value, "published"); + return (Criteria) this; + } + + public Criteria andPublishedGreaterThan(Byte value) { + addCriterion("published >", value, "published"); + return (Criteria) this; + } + + public Criteria andPublishedGreaterThanOrEqualTo(Byte value) { + addCriterion("published >=", value, "published"); + return (Criteria) this; + } + + public Criteria andPublishedLessThan(Byte value) { + addCriterion("published <", value, "published"); + return (Criteria) this; + } + + public Criteria andPublishedLessThanOrEqualTo(Byte value) { + addCriterion("published <=", value, "published"); + return (Criteria) this; + } + + public Criteria andPublishedIn(List values) { + addCriterion("published in", values, "published"); + return (Criteria) this; + } + + public Criteria andPublishedNotIn(List values) { + addCriterion("published not in", values, "published"); + return (Criteria) this; + } + + public Criteria andPublishedBetween(Byte value1, Byte value2) { + addCriterion("published between", value1, value2, "published"); + return (Criteria) this; + } + + public Criteria andPublishedNotBetween(Byte value1, Byte value2) { + addCriterion("published not between", value1, value2, "published"); + return (Criteria) this; + } + + public Criteria andTemplateIsNull() { + addCriterion("template is null"); + return (Criteria) this; + } + + public Criteria andTemplateIsNotNull() { + addCriterion("template is not null"); + return (Criteria) this; + } + + public Criteria andTemplateEqualTo(Byte value) { + addCriterion("template =", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotEqualTo(Byte value) { + addCriterion("template <>", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateGreaterThan(Byte value) { + addCriterion("template >", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateGreaterThanOrEqualTo(Byte value) { + addCriterion("template >=", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateLessThan(Byte value) { + addCriterion("template <", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateLessThanOrEqualTo(Byte value) { + addCriterion("template <=", value, "template"); + return (Criteria) this; + } + + public Criteria andTemplateIn(List values) { + addCriterion("template in", values, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotIn(List values) { + addCriterion("template not in", values, "template"); + return (Criteria) this; + } + + public Criteria andTemplateBetween(Byte value1, Byte value2) { + addCriterion("template between", value1, value2, "template"); + return (Criteria) this; + } + + public Criteria andTemplateNotBetween(Byte value1, Byte value2) { + addCriterion("template not between", value1, value2, "template"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobot.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobot.java new file mode 100644 index 00000000..fec3cfb0 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobot.java @@ -0,0 +1,84 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysProjectRobot implements Serializable { + private Long id; + + private Long robotId; + + private Long projectId; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getRobotId() { + return robotId; + } + + public void setRobotId(Long robotId) { + this.robotId = robotId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", robotId=").append(robotId); + sb.append(", projectId=").append(projectId); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotExample.java new file mode 100644 index 00000000..ecb04fea --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotExample.java @@ -0,0 +1,561 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysProjectRobotExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysProjectRobotExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andRobotIdIsNull() { + addCriterion("robot_id is null"); + return (Criteria) this; + } + + public Criteria andRobotIdIsNotNull() { + addCriterion("robot_id is not null"); + return (Criteria) this; + } + + public Criteria andRobotIdEqualTo(Long value) { + addCriterion("robot_id =", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotEqualTo(Long value) { + addCriterion("robot_id <>", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdGreaterThan(Long value) { + addCriterion("robot_id >", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdGreaterThanOrEqualTo(Long value) { + addCriterion("robot_id >=", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdLessThan(Long value) { + addCriterion("robot_id <", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdLessThanOrEqualTo(Long value) { + addCriterion("robot_id <=", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdIn(List values) { + addCriterion("robot_id in", values, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotIn(List values) { + addCriterion("robot_id not in", values, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdBetween(Long value1, Long value2) { + addCriterion("robot_id between", value1, value2, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotBetween(Long value1, Long value2) { + addCriterion("robot_id not between", value1, value2, "robotId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotMessage.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotMessage.java new file mode 100644 index 00000000..4906811c --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotMessage.java @@ -0,0 +1,95 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysProjectRobotMessage implements Serializable { + private Long id; + + private Long projectRobotId; + + private Long messageId; + + private Byte allMessage; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProjectRobotId() { + return projectRobotId; + } + + public void setProjectRobotId(Long projectRobotId) { + this.projectRobotId = projectRobotId; + } + + public Long getMessageId() { + return messageId; + } + + public void setMessageId(Long messageId) { + this.messageId = messageId; + } + + public Byte getAllMessage() { + return allMessage; + } + + public void setAllMessage(Byte allMessage) { + this.allMessage = allMessage; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", projectRobotId=").append(projectRobotId); + sb.append(", messageId=").append(messageId); + sb.append(", allMessage=").append(allMessage); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotMessageExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotMessageExample.java new file mode 100644 index 00000000..1043892c --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProjectRobotMessageExample.java @@ -0,0 +1,621 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysProjectRobotMessageExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysProjectRobotMessageExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdIsNull() { + addCriterion("project_robot_id is null"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdIsNotNull() { + addCriterion("project_robot_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdEqualTo(Long value) { + addCriterion("project_robot_id =", value, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdNotEqualTo(Long value) { + addCriterion("project_robot_id <>", value, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdGreaterThan(Long value) { + addCriterion("project_robot_id >", value, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_robot_id >=", value, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdLessThan(Long value) { + addCriterion("project_robot_id <", value, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdLessThanOrEqualTo(Long value) { + addCriterion("project_robot_id <=", value, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdIn(List values) { + addCriterion("project_robot_id in", values, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdNotIn(List values) { + addCriterion("project_robot_id not in", values, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdBetween(Long value1, Long value2) { + addCriterion("project_robot_id between", value1, value2, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andProjectRobotIdNotBetween(Long value1, Long value2) { + addCriterion("project_robot_id not between", value1, value2, "projectRobotId"); + return (Criteria) this; + } + + public Criteria andMessageIdIsNull() { + addCriterion("message_id is null"); + return (Criteria) this; + } + + public Criteria andMessageIdIsNotNull() { + addCriterion("message_id is not null"); + return (Criteria) this; + } + + public Criteria andMessageIdEqualTo(Long value) { + addCriterion("message_id =", value, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdNotEqualTo(Long value) { + addCriterion("message_id <>", value, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdGreaterThan(Long value) { + addCriterion("message_id >", value, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdGreaterThanOrEqualTo(Long value) { + addCriterion("message_id >=", value, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdLessThan(Long value) { + addCriterion("message_id <", value, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdLessThanOrEqualTo(Long value) { + addCriterion("message_id <=", value, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdIn(List values) { + addCriterion("message_id in", values, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdNotIn(List values) { + addCriterion("message_id not in", values, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdBetween(Long value1, Long value2) { + addCriterion("message_id between", value1, value2, "messageId"); + return (Criteria) this; + } + + public Criteria andMessageIdNotBetween(Long value1, Long value2) { + addCriterion("message_id not between", value1, value2, "messageId"); + return (Criteria) this; + } + + public Criteria andAllMessageIsNull() { + addCriterion("all_message is null"); + return (Criteria) this; + } + + public Criteria andAllMessageIsNotNull() { + addCriterion("all_message is not null"); + return (Criteria) this; + } + + public Criteria andAllMessageEqualTo(Byte value) { + addCriterion("all_message =", value, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageNotEqualTo(Byte value) { + addCriterion("all_message <>", value, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageGreaterThan(Byte value) { + addCriterion("all_message >", value, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageGreaterThanOrEqualTo(Byte value) { + addCriterion("all_message >=", value, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageLessThan(Byte value) { + addCriterion("all_message <", value, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageLessThanOrEqualTo(Byte value) { + addCriterion("all_message <=", value, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageIn(List values) { + addCriterion("all_message in", values, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageNotIn(List values) { + addCriterion("all_message not in", values, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageBetween(Byte value1, Byte value2) { + addCriterion("all_message between", value1, value2, "allMessage"); + return (Criteria) this; + } + + public Criteria andAllMessageNotBetween(Byte value1, Byte value2) { + addCriterion("all_message not between", value1, value2, "allMessage"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProject_robot.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProject_robot.java new file mode 100644 index 00000000..818ca361 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProject_robot.java @@ -0,0 +1,84 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysProject_robot implements Serializable { + private Long id; + + private Long robotId; + + private Long projectId; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getRobotId() { + return robotId; + } + + public void setRobotId(Long robotId) { + this.robotId = robotId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", robotId=").append(robotId); + sb.append(", projectId=").append(projectId); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysProject_robotExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysProject_robotExample.java new file mode 100644 index 00000000..1e1c7c8c --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysProject_robotExample.java @@ -0,0 +1,561 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysProject_robotExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysProject_robotExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andRobotIdIsNull() { + addCriterion("robot_id is null"); + return (Criteria) this; + } + + public Criteria andRobotIdIsNotNull() { + addCriterion("robot_id is not null"); + return (Criteria) this; + } + + public Criteria andRobotIdEqualTo(Long value) { + addCriterion("robot_id =", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotEqualTo(Long value) { + addCriterion("robot_id <>", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdGreaterThan(Long value) { + addCriterion("robot_id >", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdGreaterThanOrEqualTo(Long value) { + addCriterion("robot_id >=", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdLessThan(Long value) { + addCriterion("robot_id <", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdLessThanOrEqualTo(Long value) { + addCriterion("robot_id <=", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdIn(List values) { + addCriterion("robot_id in", values, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotIn(List values) { + addCriterion("robot_id not in", values, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdBetween(Long value1, Long value2) { + addCriterion("robot_id between", value1, value2, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotBetween(Long value1, Long value2) { + addCriterion("robot_id not between", value1, value2, "robotId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysRobot.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobot.java new file mode 100644 index 00000000..b2f47280 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobot.java @@ -0,0 +1,95 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysRobot implements Serializable { + private Long id; + + private String name; + + private String webHook; + + private Byte clientType; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getWebHook() { + return webHook; + } + + public void setWebHook(String webHook) { + this.webHook = webHook == null ? null : webHook.trim(); + } + + public Byte getClientType() { + return clientType; + } + + public void setClientType(Byte clientType) { + this.clientType = clientType; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", name=").append(name); + sb.append(", webHook=").append(webHook); + sb.append(", clientType=").append(clientType); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotExample.java new file mode 100644 index 00000000..3000713d --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotExample.java @@ -0,0 +1,641 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysRobotExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysRobotExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andWebHookIsNull() { + addCriterion("web_hook is null"); + return (Criteria) this; + } + + public Criteria andWebHookIsNotNull() { + addCriterion("web_hook is not null"); + return (Criteria) this; + } + + public Criteria andWebHookEqualTo(String value) { + addCriterion("web_hook =", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookNotEqualTo(String value) { + addCriterion("web_hook <>", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookGreaterThan(String value) { + addCriterion("web_hook >", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookGreaterThanOrEqualTo(String value) { + addCriterion("web_hook >=", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookLessThan(String value) { + addCriterion("web_hook <", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookLessThanOrEqualTo(String value) { + addCriterion("web_hook <=", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookLike(String value) { + addCriterion("web_hook like", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookNotLike(String value) { + addCriterion("web_hook not like", value, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookIn(List values) { + addCriterion("web_hook in", values, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookNotIn(List values) { + addCriterion("web_hook not in", values, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookBetween(String value1, String value2) { + addCriterion("web_hook between", value1, value2, "webHook"); + return (Criteria) this; + } + + public Criteria andWebHookNotBetween(String value1, String value2) { + addCriterion("web_hook not between", value1, value2, "webHook"); + return (Criteria) this; + } + + public Criteria andClientTypeIsNull() { + addCriterion("client_type is null"); + return (Criteria) this; + } + + public Criteria andClientTypeIsNotNull() { + addCriterion("client_type is not null"); + return (Criteria) this; + } + + public Criteria andClientTypeEqualTo(Byte value) { + addCriterion("client_type =", value, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeNotEqualTo(Byte value) { + addCriterion("client_type <>", value, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeGreaterThan(Byte value) { + addCriterion("client_type >", value, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("client_type >=", value, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeLessThan(Byte value) { + addCriterion("client_type <", value, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeLessThanOrEqualTo(Byte value) { + addCriterion("client_type <=", value, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeIn(List values) { + addCriterion("client_type in", values, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeNotIn(List values) { + addCriterion("client_type not in", values, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeBetween(Byte value1, Byte value2) { + addCriterion("client_type between", value1, value2, "clientType"); + return (Criteria) this; + } + + public Criteria andClientTypeNotBetween(Byte value1, Byte value2) { + addCriterion("client_type not between", value1, value2, "clientType"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotLog.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotLog.java new file mode 100644 index 00000000..5affa7e2 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotLog.java @@ -0,0 +1,150 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class SysRobotLog implements Serializable { + private Long id; + + private Long robotId; + + private Long projectId; + + private Long taskId; + + private Long userId; + + private Long roleId; + + private Long messageTypeId; + + private Long sendTime; + + private Byte complete; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getRobotId() { + return robotId; + } + + public void setRobotId(Long robotId) { + this.robotId = robotId; + } + + public Long getProjectId() { + return projectId; + } + + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public Long getTaskId() { + return taskId; + } + + public void setTaskId(Long taskId) { + this.taskId = taskId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Long getRoleId() { + return roleId; + } + + public void setRoleId(Long roleId) { + this.roleId = roleId; + } + + public Long getMessageTypeId() { + return messageTypeId; + } + + public void setMessageTypeId(Long messageTypeId) { + this.messageTypeId = messageTypeId; + } + + public Long getSendTime() { + return sendTime; + } + + public void setSendTime(Long sendTime) { + this.sendTime = sendTime; + } + + public Byte getComplete() { + return complete; + } + + public void setComplete(Byte complete) { + this.complete = complete; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", robotId=").append(robotId); + sb.append(", projectId=").append(projectId); + sb.append(", taskId=").append(taskId); + sb.append(", userId=").append(userId); + sb.append(", roleId=").append(roleId); + sb.append(", messageTypeId=").append(messageTypeId); + sb.append(", sendTime=").append(sendTime); + sb.append(", complete=").append(complete); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotLogExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotLogExample.java new file mode 100644 index 00000000..06624e35 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/SysRobotLogExample.java @@ -0,0 +1,921 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysRobotLogExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysRobotLogExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andRobotIdIsNull() { + addCriterion("robot_id is null"); + return (Criteria) this; + } + + public Criteria andRobotIdIsNotNull() { + addCriterion("robot_id is not null"); + return (Criteria) this; + } + + public Criteria andRobotIdEqualTo(Long value) { + addCriterion("robot_id =", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotEqualTo(Long value) { + addCriterion("robot_id <>", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdGreaterThan(Long value) { + addCriterion("robot_id >", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdGreaterThanOrEqualTo(Long value) { + addCriterion("robot_id >=", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdLessThan(Long value) { + addCriterion("robot_id <", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdLessThanOrEqualTo(Long value) { + addCriterion("robot_id <=", value, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdIn(List values) { + addCriterion("robot_id in", values, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotIn(List values) { + addCriterion("robot_id not in", values, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdBetween(Long value1, Long value2) { + addCriterion("robot_id between", value1, value2, "robotId"); + return (Criteria) this; + } + + public Criteria andRobotIdNotBetween(Long value1, Long value2) { + addCriterion("robot_id not between", value1, value2, "robotId"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNull() { + addCriterion("project_id is null"); + return (Criteria) this; + } + + public Criteria andProjectIdIsNotNull() { + addCriterion("project_id is not null"); + return (Criteria) this; + } + + public Criteria andProjectIdEqualTo(Long value) { + addCriterion("project_id =", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotEqualTo(Long value) { + addCriterion("project_id <>", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThan(Long value) { + addCriterion("project_id >", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("project_id >=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThan(Long value) { + addCriterion("project_id <", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdLessThanOrEqualTo(Long value) { + addCriterion("project_id <=", value, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdIn(List values) { + addCriterion("project_id in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotIn(List values) { + addCriterion("project_id not in", values, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdBetween(Long value1, Long value2) { + addCriterion("project_id between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andProjectIdNotBetween(Long value1, Long value2) { + addCriterion("project_id not between", value1, value2, "projectId"); + return (Criteria) this; + } + + public Criteria andTaskIdIsNull() { + addCriterion("task_id is null"); + return (Criteria) this; + } + + public Criteria andTaskIdIsNotNull() { + addCriterion("task_id is not null"); + return (Criteria) this; + } + + public Criteria andTaskIdEqualTo(Long value) { + addCriterion("task_id =", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotEqualTo(Long value) { + addCriterion("task_id <>", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdGreaterThan(Long value) { + addCriterion("task_id >", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdGreaterThanOrEqualTo(Long value) { + addCriterion("task_id >=", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdLessThan(Long value) { + addCriterion("task_id <", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdLessThanOrEqualTo(Long value) { + addCriterion("task_id <=", value, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdIn(List values) { + addCriterion("task_id in", values, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotIn(List values) { + addCriterion("task_id not in", values, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdBetween(Long value1, Long value2) { + addCriterion("task_id between", value1, value2, "taskId"); + return (Criteria) this; + } + + public Criteria andTaskIdNotBetween(Long value1, Long value2) { + addCriterion("task_id not between", value1, value2, "taskId"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNull() { + addCriterion("role_id is null"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNotNull() { + addCriterion("role_id is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdEqualTo(Long value) { + addCriterion("role_id =", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotEqualTo(Long value) { + addCriterion("role_id <>", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThan(Long value) { + addCriterion("role_id >", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThanOrEqualTo(Long value) { + addCriterion("role_id >=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThan(Long value) { + addCriterion("role_id <", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThanOrEqualTo(Long value) { + addCriterion("role_id <=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdIn(List values) { + addCriterion("role_id in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotIn(List values) { + addCriterion("role_id not in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdBetween(Long value1, Long value2) { + addCriterion("role_id between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotBetween(Long value1, Long value2) { + addCriterion("role_id not between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdIsNull() { + addCriterion("message_type_id is null"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdIsNotNull() { + addCriterion("message_type_id is not null"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdEqualTo(Long value) { + addCriterion("message_type_id =", value, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdNotEqualTo(Long value) { + addCriterion("message_type_id <>", value, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdGreaterThan(Long value) { + addCriterion("message_type_id >", value, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdGreaterThanOrEqualTo(Long value) { + addCriterion("message_type_id >=", value, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdLessThan(Long value) { + addCriterion("message_type_id <", value, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdLessThanOrEqualTo(Long value) { + addCriterion("message_type_id <=", value, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdIn(List values) { + addCriterion("message_type_id in", values, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdNotIn(List values) { + addCriterion("message_type_id not in", values, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdBetween(Long value1, Long value2) { + addCriterion("message_type_id between", value1, value2, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andMessageTypeIdNotBetween(Long value1, Long value2) { + addCriterion("message_type_id not between", value1, value2, "messageTypeId"); + return (Criteria) this; + } + + public Criteria andSendTimeIsNull() { + addCriterion("send_time is null"); + return (Criteria) this; + } + + public Criteria andSendTimeIsNotNull() { + addCriterion("send_time is not null"); + return (Criteria) this; + } + + public Criteria andSendTimeEqualTo(Long value) { + addCriterion("send_time =", value, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeNotEqualTo(Long value) { + addCriterion("send_time <>", value, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeGreaterThan(Long value) { + addCriterion("send_time >", value, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeGreaterThanOrEqualTo(Long value) { + addCriterion("send_time >=", value, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeLessThan(Long value) { + addCriterion("send_time <", value, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeLessThanOrEqualTo(Long value) { + addCriterion("send_time <=", value, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeIn(List values) { + addCriterion("send_time in", values, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeNotIn(List values) { + addCriterion("send_time not in", values, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeBetween(Long value1, Long value2) { + addCriterion("send_time between", value1, value2, "sendTime"); + return (Criteria) this; + } + + public Criteria andSendTimeNotBetween(Long value1, Long value2) { + addCriterion("send_time not between", value1, value2, "sendTime"); + return (Criteria) this; + } + + public Criteria andCompleteIsNull() { + addCriterion("complete is null"); + return (Criteria) this; + } + + public Criteria andCompleteIsNotNull() { + addCriterion("complete is not null"); + return (Criteria) this; + } + + public Criteria andCompleteEqualTo(Byte value) { + addCriterion("complete =", value, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteNotEqualTo(Byte value) { + addCriterion("complete <>", value, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteGreaterThan(Byte value) { + addCriterion("complete >", value, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteGreaterThanOrEqualTo(Byte value) { + addCriterion("complete >=", value, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteLessThan(Byte value) { + addCriterion("complete <", value, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteLessThanOrEqualTo(Byte value) { + addCriterion("complete <=", value, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteIn(List values) { + addCriterion("complete in", values, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteNotIn(List values) { + addCriterion("complete not in", values, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteBetween(Byte value1, Byte value2) { + addCriterion("complete between", value1, value2, "complete"); + return (Criteria) this; + } + + public Criteria andCompleteNotBetween(Byte value1, Byte value2) { + addCriterion("complete not between", value1, value2, "complete"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java index 2f35101b..ebbfa2f8 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/DomainVo.java @@ -22,7 +22,7 @@ public class DomainVo { private String companyName; @ApiModelProperty("系统名") private String systemName; - @ApiModelProperty("系统名") + @ApiModelProperty("登陆背景图路径") private String backdropUrl; @ApiModelProperty("标题") private String caption; @@ -30,7 +30,7 @@ public class DomainVo { private String headline; @ApiModelProperty("是否显示日历 0不显示 1显示") - private int showCalender; + private int showCalendar; @ApiModelProperty("不展示日历时。显示的项目的id") private Long showProjectId; } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/MemberVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/MemberVo.java index bca4fc8d..6c27ab71 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/MemberVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/MemberVo.java @@ -3,6 +3,10 @@ package com.ccsens.tall.bean.vo; import lombok.Data; import lombok.Getter; import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + @Data public class MemberVo { @@ -19,4 +23,23 @@ public class MemberVo { private Long joinTime; private Long stakeholderId; } + +// @Data +// public static class FirstRole{ +// private Long id; +// private String name; +// private List secondRoleList = new ArrayList<>(); +// } +// @Data +// public static class SecondRole{ +// private Long id; +// private String name; +// private String roleExclude; +// private List memberList; +// } +// @Data +// public static class Member{ +// private Long id; +// private String name; +// } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java index 96a0384f..6551962b 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/PluginVo.java @@ -38,4 +38,27 @@ public class PluginVo { @ApiModelProperty("是否支持模糊查询") private int isFuzzy; } + + /** + * 评论 + */ + @ApiModel("评论后返回") + @Data + public static class CommentInfo { + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("任务id") + private Long taskId; + @ApiModelProperty("用户id") + private Long userId; + @ApiModelProperty("头像") + private String avatarUrl; + @ApiModelProperty("用户姓名") + private String userName; + @ApiModelProperty("评论时间") + private Long commentTime; + @ApiModelProperty("评论内容") + private String description; + } + } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java index 42495381..f3f71c44 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java @@ -90,6 +90,25 @@ public class ProjectVo { private int filter; @ApiModelProperty("是否展示添加任务按钮 0：不展示 1：展示") private int createTask; + @ApiModelProperty("是否展示MVP 0：不展示 1：展示") + private int showMvp; + @JsonIgnore//0日程，1天，2周，3月 + private int selectTaskType; + @ApiModelProperty("查询任务类型") + private String selectType; + + public String getSelectType(){ + if(ObjectUtil.isNull(selectTaskType)) { + return null; + } + switch (selectTaskType){ + case 0: return this.selectType = "日程"; + case 1: return this.selectType = "天"; + case 2: return this.selectType = "周"; + case 3: return this.selectType = "月"; + default: return this.selectType = "日程"; + } + } } @ApiModel diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index d8569e3e..ff3cfc78 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -21,8 +21,8 @@ public class TaskVo { private List globalTaskList; @ApiModelProperty("普通任务") private List normalTaskList; - @ApiModelProperty("显示的配置") - private ProShow proShow; +// @ApiModelProperty("显示的配置") +// private ProShow proShow; @ApiModelProperty("分页信息") private PageInfo pageInfo; } @@ -96,12 +96,12 @@ public class TaskVo { private Long endTime; @ApiModelProperty("时长") private Long duration; - @ApiModelProperty("显示的日期格式") - private String showTimeFormat; - @ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示") - private int showShortcuts; - @ApiModelProperty("是否展示添加任务的按钮 0不展示 1展示") - private int createTask; +// @ApiModelProperty("显示的日期格式") +// private String showTimeFormat; +// @ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示") +// private int showShortcuts; +// @ApiModelProperty("是否展示添加任务的按钮 0不展示 1展示") +// private int createTask; @ApiModelProperty("循环周期") private String cycle; @ApiModelProperty("跳转模式 0自动，1延迟,2手动") @@ -136,6 +136,8 @@ public class TaskVo { private Byte timeStatus = 0; @ApiModelProperty("当前周期内任务的序号") private int sequence; + @ApiModelProperty("任务配置") + private ProTaskShow proTaskConfig; @ApiModelProperty("页面/接口路径") private String webPath; @@ -163,18 +165,45 @@ public class TaskVo { private int slide; @ApiModelProperty("过滤器显示 0：都显示 1：都不显示 2.只展示时间轴/清单") private int filter; + @ApiModelProperty("是否展示mvp 0不展示 1展示") + private int isShowMvp; + @ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示") + private int showShortcuts; + @ApiModelProperty("开始时间显示样式（默认 MM-dd HH:mm) 为空时不展示时间") private String showTimeFormat; @ApiModelProperty("时长展示单位 0：根据时长转换成对应分钟或小时 1：不展示 2：转化成分钟 3：转化成小时") private int duration; - @ApiModelProperty("是否展示mvp 0不展示 1展示") - private int isShowMvp; @ApiModelProperty("是否显示新建任务按钮 0不展示 1展示") private int createTask; - @ApiModelProperty("是否展示快捷方式（交付物硬件按钮）0不展示 1展示") - private int showShortcuts; + @ApiModelProperty("是否展示硬件按钮 0不展示 1展示") + private int showHardware; + @ApiModelProperty("是否展示交付物按钮 0不展示 1展示") + private int showDeliver; + @ApiModelProperty("是否展示奖惩金额按钮 0不展示 1展示") + private int showMoney; } + @ApiModel + @Data + public static class ProTaskShow{ + @ApiModelProperty("开始时间显示样式（默认 MM-DD HH:mm) 为空时不展示时间") + private String timeShow; + @ApiModelProperty("时长展示单位 0：根据时长转换成对应分钟或小时 1：不展示 2：转化成分钟 3：转化成小时") + private int duration; + @ApiModelProperty("是否显示新建任务按钮 0不展示 1展示") + private int createTask; + @ApiModelProperty("是否展示硬件按钮 0不展示 1展示") + private int showHardware; + @ApiModelProperty("是否展示交付物按钮 0不展示 1展示") + private int showDeliver; + @ApiModelProperty("是否展示奖惩金额按钮 0不展示 1展示") + private int showMoney; + @ApiModelProperty("时间轴上显示计划时间还是实际时间 0计划时间，1实际时间") + private int showRealTime; + @ApiModelProperty("是否展示完成按钮 0不展示 1展示") + private int showFinish; + } @ApiModel @Data @@ -289,4 +318,10 @@ public class TaskVo { private Long projectId; private String projectName; } + +// @Data +// public static class FirstTask{ +// private Long id; +// private String taskName; +// } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/WbsVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/WbsVo.java new file mode 100644 index 00000000..4b3f8f1e --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/WbsVo.java @@ -0,0 +1,225 @@ +package com.ccsens.tall.bean.vo; + +import cn.hutool.core.util.ObjectUtil; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +public class WbsVo { + /** + * 项目信息 + */ + @Data + public static class ProjectInfo{ + private String name; + private String description; + private String address; + private Long beginTime; + private String strBeginTime; + private Long endTime; + private String strEndTime; + + public String getStrBeginTime(){ + if(ObjectUtil.isNotNull(beginTime)){ + return new SimpleDateFormat("yyyy/MM/dd HH:mm").format(beginTime); + }else{ + return null; + } + } + public String getStrEndTime(){ + if(ObjectUtil.isNotNull(endTime)){ + return new SimpleDateFormat("yyyy/MM/dd HH:mm").format(endTime); + }else{ + return null; + } + } + } + /** + * 成员及奖惩干系人 + */ + @Data + public static class MemberAndStakeholder{ + private String memberName; + private String memberPhone; + private String stakeholderName; + private String stakeholderPhone; + } + /** + * 一级角色 + */ + @Data + public static class FirstRole{ + private Long id; + private String name; + private List secondRoleList = new ArrayList<>(); + } + + /** + * 二级角色 + */ + @Data + public static class SecondRole{ + private Long id; + private String name; + //对谁不可见 + private String roleExclude; + private List memberList; + } + + /** + * 角色下的成员 + */ + @Data + public static class Member{ + private Long id; + private String name; + } + + /** + * 一级任务 + */ + @Data + public static class FirstTask{ + private Long id; + private String taskName; + private List secondTaskList = new ArrayList<>(); + } + /** + * 二级任务 + */ + @Data + public static class SecondTask{ + private Long id; + private String name; + private String description; + private Long beginTime; + private Long endTime; + private Long duration; + private String cycle; + private String subTaskSheetName; + private String subProjectName; + private List deliverInfoList; + private String executorRoleName; + private String checkerRoleName; + private BigDecimal money; + private String delay; + private Long delayTime; + private List subTaskList = new ArrayList<>(); + public Long getDuration(){ + if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { + return endTime - beginTime; + } + return null; + } + } + /** + * 分组下的任务 + */ + @Data + public static class SubTask{ + private Long id; + private String name; + private Long beginTime; + private Long endTime; + private String cycle; + private Long duration; + private String memberName; + private String checkerRoleName; + private String description; + public Long getDuration(){ + if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { + return endTime - beginTime; + } + return null; + } + } + + /** + * 交付物名字及文件地址 + */ + @Data + public static class DeliverInfo{ + private String name; + private List pathList; + } + + /** + * 插件信息 + */ + @Data + public static class PluginInfo{ + private String secondTaskName; + private String pluginName; + } + + /** + * 项目里的任务清单 + */ + @Data + public static class ChecklistByProjectId{ + private String projectName; + private String taskName; + private Long taskId; + private String roleName; + private Long beginTime; + private Long endTime; + private String cycle; + private Long duration; + private Long completeTime; + //"状态：0-未开始，1-进行中，2-已完成" + private String process; + + public Long getDuration(){ + if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { + return endTime - beginTime; + } + return null; + } + } + + /** + * 项目内的交付物信息 + */ + @Data + public static class DeliverWithExcel{ + private String projectName; + private String taskName; + private Long taskBeginTime; + private Long taskEndTime; + private Long taskDuration; + private String taskCycle; + private Long deliverId; + private String deliverName; + private String jumpPath; + public Long getTaskDuration(){ + if(ObjectUtil.isNotNull(taskBeginTime) && ObjectUtil.isNotNull(taskEndTime)) { + return taskEndTime - taskBeginTime; + } + return null; + } + } + + /** + * 有交付物的subTime + */ + @Data + public static class SubTime { + private Long subBeginTime; + private Long subEndTime; + private List subTimeDeliverInfoList; + } + /** + * 交付物详情 + */ + @Data + public static class SubTimeDeliverInfo { + private String fileName; + private String filePath; + } +} diff --git a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java index 09039e74..38610bb1 100644 --- a/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java +++ b/tall/src/main/java/com/ccsens/tall/config/SpringConfig.java @@ -135,7 +135,7 @@ public class SpringConfig implements WebMvcConfigurer { .addPathPatterns("/users/**") .excludePathPatterns("/users/signin") .excludePathPatterns("/users/smscode") - .excludePathPatterns("/users/signup") + .excludePathPatterns("/users/signup/**") .excludePathPatterns("/users/password") .excludePathPatterns("/users/account") .excludePathPatterns("/users/token") diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java index 51e1ffb2..1f501c15 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProMemberDao.java @@ -1,6 +1,7 @@ package com.ccsens.tall.persist.dao; import com.ccsens.tall.bean.vo.MemberVo; +import com.ccsens.tall.bean.vo.WbsVo; import com.ccsens.tall.persist.mapper.ProMemberMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,4 +13,8 @@ public interface ProMemberDao extends ProMemberMapper{ MemberVo.MemberInfo selectByProjectIdAndUserId(@Param("projectId") Long projectId, @Param("userId") Long userId); List selectAuthedMemberByProjectId(@Param("projectId") Long projectId); + + List selectByRoleId(@Param("roleId")Long roleId); + + List getMemberAndStakeholder(@Param("projectId")Long projectId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java index f24afd35..46f9bdba 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java @@ -33,4 +33,6 @@ public interface ProRoleDao extends ProRoleMapper{ *@date: 2019/12/5 12:12 */ List selectByProjectAndName(MemberRoleDto.Assign assign); + + List selectSecondRoleName(@Param("projectId")Long projectId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleExcludeDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleExcludeDao.java index b682cee2..c98a2bf8 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleExcludeDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleExcludeDao.java @@ -1,8 +1,10 @@ package com.ccsens.tall.persist.dao; import com.ccsens.tall.persist.mapper.ProRoleExcludeMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @Repository public interface ProRoleExcludeDao extends ProRoleExcludeMapper { + String selectStrByRoleId(@Param("roleId") Long roleId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskCommentDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskCommentDao.java new file mode 100644 index 00000000..af6df15f --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskCommentDao.java @@ -0,0 +1,14 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.bean.vo.PluginVo; +import com.ccsens.tall.persist.mapper.ProTaskCommentMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ProTaskCommentDao extends ProTaskCommentMapper { + List getCommentByTaskId(@Param("taskId") Long taskId); + +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskShowDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskShowDao.java new file mode 100644 index 00000000..5f230745 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProTaskShowDao.java @@ -0,0 +1,11 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.persist.mapper.ProTaskShowMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProTaskShowDao extends ProTaskShowMapper { + TaskVo.ProTaskShow getProTaskShowByTaskId(@Param("taskId") Long taskId); +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysPluginDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysPluginDao.java index 6895c5d9..241f6571 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysPluginDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysPluginDao.java @@ -2,6 +2,7 @@ package com.ccsens.tall.persist.dao; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.bean.vo.WbsVo; import com.ccsens.tall.persist.mapper.SysPluginMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -15,4 +16,8 @@ public interface SysPluginDao extends SysPluginMapper{ List getPluginByTask(@Param("taskId") Long taskId); List selectSignFuzzy(@Param("projectId") Long projectId, @Param("signFieldId") Long signFieldId, @Param("key") String key); + + void deleteByTaskId(@Param("taskId")Long taskId); + + List getPluginNameAndTaskName(@Param("projectId")Long projectId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysRobotDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysRobotDao.java new file mode 100644 index 00000000..01361ae6 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysRobotDao.java @@ -0,0 +1,8 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.SysRobotMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface SysRobotDao extends SysRobotMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java index 908e9c76..22d78e29 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java @@ -2,6 +2,7 @@ package com.ccsens.tall.persist.dao; import com.ccsens.tall.bean.vo.DeliverVo; import com.ccsens.tall.bean.vo.ProjectVo; +import com.ccsens.tall.bean.vo.WbsVo; import com.ccsens.tall.persist.mapper.ProTaskDeliverMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -19,4 +20,8 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{ List selectDeliverByUserId(@Param("userId") Long userId); void deletePostLogCheckerByPostLogId(@Param("postLogId") Long postLogId); + + List getDeliverAllByProject(@Param("projectId")Long projectId); + + List selectFileInfoByDeliverId(@Param("deliverId")Long deliverId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java index 361fc980..a80b1cb3 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java @@ -1,8 +1,10 @@ package com.ccsens.tall.persist.dao; +import com.ccsens.tall.bean.po.ProTaskDetail; import com.ccsens.tall.bean.po.ProTaskSubTime; import com.ccsens.tall.bean.vo.TaskVo; +import com.ccsens.tall.bean.vo.WbsVo; import com.ccsens.tall.persist.mapper.ProTaskDetailMapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -32,4 +34,10 @@ public interface TaskDetailDao extends ProTaskDetailMapper { void selectTaskByDetailId(@Param("detailId") Long detailId); TaskVo.TaskIdAndSubTimeIdByParentIdAndTime selectSubTimeByTaskParentIdAndTime(@Param("parentId")Long parentId, @Param("now")Long now); + + String getTaskMemberNameByTaskId(@Param("taskId")Long taskId); + + List selectAllByProject(@Param("projectId")Long projectId); + + List getChecklistsByProjectId(@Param("projectId")Long projectId,@Param("roleId")Long roleId,@Param("allMemberId")Long allMemberId,@Param("startTime")Long startTime,@Param("endTime")Long endTime); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskSubTimeDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskSubTimeDao.java index 4eac660d..405a4c8d 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/TaskSubTimeDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/TaskSubTimeDao.java @@ -1,8 +1,15 @@ package com.ccsens.tall.persist.dao; +import com.ccsens.tall.bean.po.ProTaskSubTime; import com.ccsens.tall.persist.mapper.ProTaskSubTimeMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface TaskSubTimeDao extends ProTaskSubTimeMapper{ + List getUnderwayTaskByRoleId(@Param("subTaskId") Long subTaskId, @Param("roleId") Long roleId); + + void clearTaskRealTime(@Param("projectId")Long projectId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskCommentMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskCommentMapper.java new file mode 100644 index 00000000..029967c2 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskCommentMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProTaskComment; +import com.ccsens.tall.bean.po.ProTaskCommentExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProTaskCommentMapper { + long countByExample(ProTaskCommentExample example); + + int deleteByExample(ProTaskCommentExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProTaskComment record); + + int insertSelective(ProTaskComment record); + + List selectByExample(ProTaskCommentExample example); + + ProTaskComment selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProTaskComment record, @Param("example") ProTaskCommentExample example); + + int updateByExample(@Param("record") ProTaskComment record, @Param("example") ProTaskCommentExample example); + + int updateByPrimaryKeySelective(ProTaskComment record); + + int updateByPrimaryKey(ProTaskComment record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskShowMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskShowMapper.java new file mode 100644 index 00000000..0a4bd218 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskShowMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.ProTaskShow; +import com.ccsens.tall.bean.po.ProTaskShowExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ProTaskShowMapper { + long countByExample(ProTaskShowExample example); + + int deleteByExample(ProTaskShowExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ProTaskShow record); + + int insertSelective(ProTaskShow record); + + List selectByExample(ProTaskShowExample example); + + ProTaskShow selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") ProTaskShow record, @Param("example") ProTaskShowExample example); + + int updateByExample(@Param("record") ProTaskShow record, @Param("example") ProTaskShowExample example); + + int updateByPrimaryKeySelective(ProTaskShow record); + + int updateByPrimaryKey(ProTaskShow record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysAuthMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysAuthMapper.java index 1d194790..2c99a4f9 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysAuthMapper.java +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysAuthMapper.java @@ -1,31 +1,30 @@ -package com.ccsens.tall.persist.mapper; - -import com.ccsens.tall.bean.po.SysAuth; -import com.ccsens.tall.bean.po.SysAuthExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysAuthMapper { - long countByExample(SysAuthExample example); - - int deleteByExample(SysAuthExample example); - - int deleteByPrimaryKey(Long id); - - int insert(SysAuth record); - - int insertSelective(SysAuth record); - - List selectByExample(SysAuthExample example); - - SysAuth selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") SysAuth record, @Param("example") SysAuthExample example); - - int updateByExample(@Param("record") SysAuth record, @Param("example") SysAuthExample example); - - int updateByPrimaryKeySelective(SysAuth record); - - int updateByPrimaryKey(SysAuth record); +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysAuth; +import com.ccsens.tall.bean.po.SysAuthExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysAuthMapper { + long countByExample(SysAuthExample example); + + int deleteByExample(SysAuthExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysAuth record); + + int insertSelective(SysAuth record); + + List selectByExample(SysAuthExample example); + + SysAuth selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysAuth record, @Param("example") SysAuthExample example); + + int updateByExample(@Param("record") SysAuth record, @Param("example") SysAuthExample example); + + int updateByPrimaryKeySelective(SysAuth record); + + int updateByPrimaryKey(SysAuth record); } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysMessageTypeMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysMessageTypeMapper.java new file mode 100644 index 00000000..25a2f4e2 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysMessageTypeMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysMessageType; +import com.ccsens.tall.bean.po.SysMessageTypeExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysMessageTypeMapper { + long countByExample(SysMessageTypeExample example); + + int deleteByExample(SysMessageTypeExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysMessageType record); + + int insertSelective(SysMessageType record); + + List selectByExample(SysMessageTypeExample example); + + SysMessageType selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysMessageType record, @Param("example") SysMessageTypeExample example); + + int updateByExample(@Param("record") SysMessageType record, @Param("example") SysMessageTypeExample example); + + int updateByPrimaryKeySelective(SysMessageType record); + + int updateByPrimaryKey(SysMessageType record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectMapper.java index 54ab93d8..ef6bc291 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectMapper.java +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectMapper.java @@ -1,31 +1,30 @@ -package com.ccsens.tall.persist.mapper; - -import com.ccsens.tall.bean.po.SysProject; -import com.ccsens.tall.bean.po.SysProjectExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SysProjectMapper { - long countByExample(SysProjectExample example); - - int deleteByExample(SysProjectExample example); - - int deleteByPrimaryKey(Long id); - - int insert(SysProject record); - - int insertSelective(SysProject record); - - List selectByExample(SysProjectExample example); - - SysProject selectByPrimaryKey(Long id); - - int updateByExampleSelective(@Param("record") SysProject record, @Param("example") SysProjectExample example); - - int updateByExample(@Param("record") SysProject record, @Param("example") SysProjectExample example); - - int updateByPrimaryKeySelective(SysProject record); - - int updateByPrimaryKey(SysProject record); +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysProject; +import com.ccsens.tall.bean.po.SysProjectExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysProjectMapper { + long countByExample(SysProjectExample example); + + int deleteByExample(SysProjectExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysProject record); + + int insertSelective(SysProject record); + + List selectByExample(SysProjectExample example); + + SysProject selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysProject record, @Param("example") SysProjectExample example); + + int updateByExample(@Param("record") SysProject record, @Param("example") SysProjectExample example); + + int updateByPrimaryKeySelective(SysProject record); + + int updateByPrimaryKey(SysProject record); } \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectRobotMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectRobotMapper.java new file mode 100644 index 00000000..4ed473f1 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectRobotMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysProjectRobot; +import com.ccsens.tall.bean.po.SysProjectRobotExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysProjectRobotMapper { + long countByExample(SysProjectRobotExample example); + + int deleteByExample(SysProjectRobotExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysProjectRobot record); + + int insertSelective(SysProjectRobot record); + + List selectByExample(SysProjectRobotExample example); + + SysProjectRobot selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysProjectRobot record, @Param("example") SysProjectRobotExample example); + + int updateByExample(@Param("record") SysProjectRobot record, @Param("example") SysProjectRobotExample example); + + int updateByPrimaryKeySelective(SysProjectRobot record); + + int updateByPrimaryKey(SysProjectRobot record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectRobotMessageMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectRobotMessageMapper.java new file mode 100644 index 00000000..7d8f7614 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysProjectRobotMessageMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysProjectRobotMessage; +import com.ccsens.tall.bean.po.SysProjectRobotMessageExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysProjectRobotMessageMapper { + long countByExample(SysProjectRobotMessageExample example); + + int deleteByExample(SysProjectRobotMessageExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysProjectRobotMessage record); + + int insertSelective(SysProjectRobotMessage record); + + List selectByExample(SysProjectRobotMessageExample example); + + SysProjectRobotMessage selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysProjectRobotMessage record, @Param("example") SysProjectRobotMessageExample example); + + int updateByExample(@Param("record") SysProjectRobotMessage record, @Param("example") SysProjectRobotMessageExample example); + + int updateByPrimaryKeySelective(SysProjectRobotMessage record); + + int updateByPrimaryKey(SysProjectRobotMessage record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysRobotLogMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysRobotLogMapper.java new file mode 100644 index 00000000..eefc4d3d --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysRobotLogMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysRobotLog; +import com.ccsens.tall.bean.po.SysRobotLogExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysRobotLogMapper { + long countByExample(SysRobotLogExample example); + + int deleteByExample(SysRobotLogExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysRobotLog record); + + int insertSelective(SysRobotLog record); + + List selectByExample(SysRobotLogExample example); + + SysRobotLog selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysRobotLog record, @Param("example") SysRobotLogExample example); + + int updateByExample(@Param("record") SysRobotLog record, @Param("example") SysRobotLogExample example); + + int updateByPrimaryKeySelective(SysRobotLog record); + + int updateByPrimaryKey(SysRobotLog record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/SysRobotMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysRobotMapper.java new file mode 100644 index 00000000..8b0a57d6 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/SysRobotMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.SysRobot; +import com.ccsens.tall.bean.po.SysRobotExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysRobotMapper { + long countByExample(SysRobotExample example); + + int deleteByExample(SysRobotExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysRobot record); + + int insertSelective(SysRobot record); + + List selectByExample(SysRobotExample example); + + SysRobot selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysRobot record, @Param("example") SysRobotExample example); + + int updateByExample(@Param("record") SysRobot record, @Param("example") SysRobotExample example); + + int updateByPrimaryKeySelective(SysRobot record); + + int updateByPrimaryKey(SysRobot record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 5de26eb1..0c9d1b89 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -15,6 +15,7 @@ import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.LongValue; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -26,6 +27,8 @@ import org.springframework.transaction.annotation.Transactional; import java.io.FileInputStream; import java.io.InputStream; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; @Slf4j @@ -146,16 +149,19 @@ public class ExcelService implements IExcelService { wbsSubSheetService.getPluginConfig(sysProject.getId(),xssfWorkbook,taskDetails); //读取签到信息表 wbsSubSheetService.getSigninSheet(sysProject.getId(),xssfWorkbook,taskDetails); + //读取智能助手表 + wbsSubSheetService.getRoBotSheet(sysProject.getId(),xssfWorkbook); return sysProject; } /** * 添加项目 */ - private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId, SysProject sysProject) { + private void readProject(XSSFSheet wbsSheet, int projectInfoStart, int projectInfoEnd, Long currentUserId, SysProject sysProject) throws Exception { XSSFRow row = wbsSheet.getRow(projectInfoStart + 1); String projectName = ExcelUtil.getCellValue(row.getCell(0)); if (StrUtil.isNotEmpty(projectName)) { + String begin = ExcelUtil.getCellValue(row.getCell(3)); String end = ExcelUtil.getCellValue(row.getCell(4)); if (StrUtil.isNotEmpty(begin) && StrUtil.isNotEmpty(end)) { @@ -393,7 +399,7 @@ public class ExcelService implements IExcelService { } } - //TODO 添加mvp角色 + //添加mvp角色 ProRole proMemberRole = new ProRole(); proMemberRole.setName(WebConstant.ROLE_NAME.MVP.phase); proMemberRole.setParentId(firstRoleId); @@ -592,6 +598,7 @@ public class ExcelService implements IExcelService { String task1 = ExcelUtil.getCellValue(row.getCell(1)); //二级任务名称 String task2 = ExcelUtil.getCellValue(row.getCell(2)); + String description = ExcelUtil.getCellValue(row.getCell(3)); String beginTime = ExcelUtil.getCellValue(row.getCell(4)); String endTime = ExcelUtil.getCellValue(row.getCell(5)); @@ -734,7 +741,6 @@ public class ExcelService implements IExcelService { } //TODO 跳转任务(应该在循环外处理) - //跳转次数 //输入文档 if (StrUtil.isNotEmpty(input)) { @@ -783,9 +789,6 @@ public class ExcelService implements IExcelService { case "硬件学习计划表": wbsSubSheetService.getSubTask(xssfWorkbook, subTaskCell, taskDetail, taskDetails, proMembers, deliver, hasGroupMap); break; - case "方圆学习计划表": - wbsSubSheetService.getSubTask(xssfWorkbook, subTaskCell, taskDetail, taskDetails, proMembers, deliver, hasGroupMap); - break; case "全体学习计划表": wbsSubSheetService.getSubTask(xssfWorkbook, subTaskCell, taskDetail, taskDetails, proMembers, deliver, hasGroupMap); break; @@ -802,10 +805,11 @@ public class ExcelService implements IExcelService { // throw new BaseException(CodeEnum.WBS_SUB_TASK_ANALYSIS.addMsg(wbsSheet.getSheetName() + i)); wbsSubSheetService.getSubTask(xssfWorkbook, subTaskCell, taskDetail, taskDetails, proMembers, deliver, hasGroupMap); } - } else { - //不是分组任务，直接添加交付物 - readDeliverSheet(deliver, xssfWorkbook, taskDetail.getId()); } +// else { +// //不是分组任务，直接添加交付物 + readDeliverSheet(deliver, xssfWorkbook, taskDetail.getId()); +// } //添加任务 proTaskDetailService.saveTaskDetail(taskDetail); taskDetails.add(taskDetail); @@ -843,173 +847,7 @@ public class ExcelService implements IExcelService { taskDetails.add(endTask); } -// /** -// * 读取年终总结子表 -// */ -// public void getSubTaskMt(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, -// List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) { -// List taskNameList = new ArrayList<>(); -// -// XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); -// if (ObjectUtil.isNotNull(subTaskSheet)) { -// for (int a = 2; a < subTaskSheet.getLastRowNum(); a++) { -// String nameCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(1)); -// String beginCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(2)); -// String endCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(3)); -// //重复时间、相对时间 -// String repeatCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(4)); -// String memberCell = StringUtil.replaceComma(ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(6))); -// //备注 -// String descriptionCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(8)); -// if (StrUtil.isNotEmpty(nameCell)) { -// ProTaskDetail subTask = new ProTaskDetail(); -// BeanUtil.copyProperties(parentTaskDetail, subTask); -// subTask.setId(snowflake.nextId()); -// subTask.setName(nameCell); -// subTask.setDescription(descriptionCell); -// if (StrUtil.isNotEmpty(beginCell)) { -// subTask.setBeginTime(Long.valueOf(beginCell)); -// } -// if (StrUtil.isNotEmpty(endCell)) { -// subTask.setEndTime(Long.valueOf(endCell)); -// } -// subTask.setLevel((byte) 2); -// subTask.setHasGroup((byte) 0); -// if (StrUtil.isNotEmpty(memberCell)) { -// if (memberCell.equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { -// subTask.setAllMember((byte) 1); -// } else { -// subTask.setAllMember((byte) 0); -// if (CollectionUtil.isNotEmpty(proMembers)) { -// Long proMemberId = null; -// for (ProMember proMember : proMembers) { -// if (memberCell.equalsIgnoreCase(proMember.getNickname())) { -// proMemberId = proMember.getId(); -// ProTaskMember proTaskMember = new ProTaskMember(); -// proTaskMember.setId(snowflake.nextId()); -// proTaskMember.setMemberId(proMemberId); -// proTaskMember.setTaskDetailId(subTask.getId()); -// taskMemberService.saveTaskMember(proTaskMember); -// break; -// } -// } -// if (ObjectUtil.isNull(proMemberId)) { -// throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a)); -// } -// } -// } -// } else { -// throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a)); -// } -// -// //给每个子任务添加交付物 -// readDeliverSheet(deliverCell, xssfWorkbook, subTask.getId()); -// -// proTaskDetailService.saveTaskDetail(subTask); -// taskDetails.add(subTask); -// taskNameList.add(subTask); -// } -// } -// hasGroupMap.put(parentTaskDetail.getName(), taskNameList); -// } else { -// throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); -// } -// } -// /** -// * 读取子任务表 -// */ -// public void getSubTask(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, -// List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) { -// XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); -// Long startTime = parentTaskDetail.getBeginTime(); -// if (ObjectUtil.isNotNull(subTaskSheet)) { -// String str = ExcelUtil.getCellValue(subTaskSheet.getRow(1).getCell(4)); -// for (int a = 2; a < subTaskSheet.getLastRowNum(); a++) { -// String nameCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(1)); -// String beginCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(2)); -// String endCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(3)); -// //重复时间、相对时间 -// String repeatCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(4)); -// String memberCell = StringUtil.replaceComma(ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(6))); -// //备注 -// String descriptionCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(8)); -// if (StrUtil.isNotEmpty(nameCell)) { -// ProTaskDetail subTask = new ProTaskDetail(); -// BeanUtil.copyProperties(parentTaskDetail, subTask); -// subTask.setId(snowflake.nextId()); -// subTask.setName(nameCell); -// subTask.setDescription(descriptionCell); -// subTask.setLevel((byte) 3); -// subTask.setHasGroup((byte) 0); -// subTask.setParentId(parentTaskDetail.getId()); -// if (StrUtil.isNotEmpty(memberCell)) { -// if (memberCell.equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)) { -// parentTaskDetail.setAllMember((byte) 1); -// subTask.setAllMember((byte) 1); -// } else { -// parentTaskDetail.setAllMember((byte) 0); -// subTask.setAllMember((byte) 0); -// List memberList = StringUtil.extractMessage(memberCell); -// if (CollectionUtil.isNotEmpty(memberList)) { -// for (String memberName : memberList) { -// if (CollectionUtil.isNotEmpty(proMembers)) { -// Long proMemberId = null; -// for (ProMember proMember : proMembers) { -// if (memberName.equalsIgnoreCase(proMember.getNickname())) { -// proMemberId = proMember.getId(); -// ProTaskMember proTaskMember = new ProTaskMember(); -// proTaskMember.setId(snowflake.nextId()); -// proTaskMember.setTaskDetailId(subTask.getId()); -// proTaskMember.setMemberId(proMemberId); -// taskMemberService.saveTaskMember(proTaskMember); -// break; -// } -// } -// if (ObjectUtil.isNull(proMemberId)) { -// throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a)); -// } -// } -// } -// } else { -// throw new BaseException(CodeEnum.WSB_NOT_MEMBER.addMsg(subTaskSheet.getSheetName() + a)); -// } -// } -// } -// -// if (StrUtil.isNotEmpty(repeatCell)) { -// if ("重复时间".equals(str)) { -// subTask.setCycle(repeatCell); -// } -// if ("相对时间".equals(str)) { -// subTask.setBeginTime(startTime); -// Long relative = StringUtil.severalDay(repeatCell); -// if (ObjectUtil.isNotNull(relative)) { -// subTask.setEndTime(startTime + relative); -// } -// } -// } else { -// if (ObjectUtil.isNotNull(beginCell)) { -// subTask.setBeginTime(Long.valueOf(beginCell)); -// } -// if (ObjectUtil.isNotNull(endCell)) { -// subTask.setEndTime(Long.valueOf(endCell)); -// } -// parentTaskDetail.setBeginTime(subTask.getBeginTime()); -// } -// startTime = subTask.getEndTime(); -// //给每个子任务添加交付物 -// readDeliverSheet(deliverCell, xssfWorkbook, subTask.getId()); -// -// proTaskDetailService.saveTaskDetail(subTask); -// taskDetails.add(subTask); -// } -// } -// } else { -// throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); -// } -// parentTaskDetail.setRecStatus((byte) 2); -// } /** * 分解任务时间 @@ -1057,7 +895,7 @@ public class ExcelService implements IExcelService { * 读取交付物表 */ @Override - public void readDeliverSheet(String deliverCell, XSSFWorkbook xssfWorkbook, Long taskId) { + public void readDeliverSheet(String deliverCell, XSSFWorkbook xssfWorkbook, Long taskId) throws Exception { if (StrUtil.isNotEmpty(deliverCell)) { String str = ""; if (deliverCell.length() > 4) { @@ -1066,6 +904,9 @@ public class ExcelService implements IExcelService { if ("关联表".equals(str)) { String subStr = deliverCell.substring(4); XSSFSheet subSheet = xssfWorkbook.getSheet(subStr); + if(ObjectUtil.isNull(subSheet)){ + throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); + } for (int i = 2; i <= subSheet.getLastRowNum(); i++) { String deliver = ExcelUtil.getCellValue(subSheet.getRow(i).getCell(1)); if (StrUtil.isNotEmpty(deliver)) { @@ -1100,7 +941,7 @@ public class ExcelService implements IExcelService { * @param taskDetails * @param proRoles */ - private void readPlugin(XSSFWorkbook xssfWorkbook, List taskDetails, List proRoles, Map> hasGroupMap) { + private void readPlugin(XSSFWorkbook xssfWorkbook, List taskDetails, List proRoles, Map> hasGroupMap) throws Exception { SysPluginExample pluginExample = new SysPluginExample(); pluginExample.clear(); List sysPluginList = sysPluginDao.selectByExample(pluginExample); diff --git a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java new file mode 100644 index 00000000..42132d3b --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java @@ -0,0 +1,906 @@ +package com.ccsens.tall.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.ZipUtil; +import cn.hutool.crypto.SecureUtil; +import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.WbsVo; +import com.ccsens.tall.persist.dao.*; +import com.ccsens.util.PoiUtil; +import com.ccsens.util.WebConstant; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.ResourceLoader; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.unit.DataUnit; + +import java.io.*; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class ExportWbsService implements IExportWbsService{ + @Autowired + private SysProjectDao sysProjectDao; + @Autowired + private ProMemberDao proMemberDao; + @Autowired + private ProRoleDao proRoleDao; + @Autowired + private ProRoleExcludeDao proRoleExcludeDao; + @Autowired + private TaskDetailDao taskDetailDao; + @Autowired + private TaskDeliverDao taskDeliverDao; + @Autowired + private SysPluginDao sysPluginDao; + @Autowired + private TaskDeliverService taskDeliverService; + @Autowired + private ProTaskDetailService taskDetailService; + @Autowired + private ProRoleService proRoleService; + + @Override + public String exportWbs(Long projectId) throws Exception { + //1、查找项目信息 + SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); + WbsVo.ProjectInfo projectInfo = new WbsVo.ProjectInfo(); + BeanUtil.copyProperties(sysProject,projectInfo); + //2、查找所有成员信息 + List memberList = getMemberAndStakeholder(projectId); + //3、查找所有角色及角色下的成员，对谁不可见 + List roleList = getAllRole(projectId); + //4、查找任务信息 + List taskList = getAllTask(projectId); + //5、查找插件信息 + List roleName = proRoleDao.selectSecondRoleName(projectId); + List pluginInfoList = sysPluginDao.getPluginNameAndTaskName(projectId); + + //6、写入WBS + Workbook wb = new XSSFWorkbook(); + //wbsSheet + List> wbsSheet = new ArrayList<>(); + writeProjectInfo(wbsSheet,projectInfo); + writeRoleInfo(wbsSheet,roleList); + Map>> subSheetMap = writeTaskInfo(wbsSheet,taskList); + PoiUtil.exportWB("WBS", wbsSheet, wb); + + //项目成员sheet + List> memberSheet = new ArrayList<>(); + writeMemberInfo(memberSheet,memberList); + PoiUtil.exportWB("项目成员表", memberSheet, wb); + //插件sheet + List> pluginSheet = new ArrayList<>(); + writePluginInfo(pluginSheet,roleName,pluginInfoList); + PoiUtil.exportWB("插件", pluginSheet, wb); + //子任务sheet + if(CollectionUtil.isNotEmpty(subSheetMap)){ + for (Map.Entry>> entry : subSheetMap.entrySet()) { + PoiUtil.exportWB(entry.getKey(), entry.getValue(), wb); + } + } + //写入文件 + String fileName = "/exportWbs/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = WebConstant.UPLOAD_PATH_BASE + fileName; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + OutputStream stream = new FileOutputStream(tmpFile); + wb.write(stream); + stream.close(); + + return WebConstant.TEST_URL_BASE + fileName; + } + /** + * 查找所有成员及奖惩干系人 + */ + private List getMemberAndStakeholder(Long projectId) { + return proMemberDao.getMemberAndStakeholder(projectId); + } + + /** + * 查找所有任务 + * @param projectId + * @return + */ + private List getAllTask(Long projectId) { + Map taskMap = new HashMap<>(); + List firstTaskList = new ArrayList<>(); + + Map secondTaskMap = new HashMap<>(); + + //获取项目下所有任务 +// ProTaskDetailExample proTaskDetailExample = new ProTaskDetailExample(); +// proTaskDetailExample.createCriteria().andProjectIdEqualTo(projectId).andLevelNotEqualTo((byte) 0); +// proTaskDetailExample.setOrderByClause("level"); +// List taskDetailList = taskDetailDao.selectByExample(proTaskDetailExample); + List taskDetailList = taskDetailDao.selectAllByProject(projectId); + if(CollectionUtil.isNotEmpty(taskDetailList)){ + for(ProTaskDetail taskDetail : taskDetailList){ + if(taskDetail.getLevel() == 1){ + WbsVo.FirstTask firstTask = new WbsVo.FirstTask(); + firstTask.setId(taskDetail.getId()); + firstTask.setTaskName(taskDetail.getName()); + + taskMap.put(taskDetail.getId(),firstTask); + firstTaskList.add(firstTask); + }else if(taskDetail.getLevel() == 2){ + WbsVo.FirstTask firstTask = taskMap.get(taskDetail.getParentId()); + if(ObjectUtil.isNotNull(firstTask)) { + WbsVo.SecondTask secondTask = new WbsVo.SecondTask(); + BeanUtil.copyProperties(taskDetail, secondTask); + //处理子项目 + if(StrUtil.isNotEmpty(taskDetail.getSubProject()) && "0".equalsIgnoreCase(taskDetail.getSubProject())){ + secondTask.setSubProjectName(taskDetail.getSubProject()); + } + //查询负责人姓名，检查人姓名 + secondTask.setExecutorRoleName(getNameByRoleId(taskDetail.getExecutorRole())); + secondTask.setCheckerRoleName(getNameByRoleId(taskDetail.getCheckerRole())); + //处理交付物 + secondTask.setDeliverInfoList(getDeliverByTaskId(taskDetail.getId())); + //处理奖惩金额 + if(ObjectUtil.isNotNull(taskDetail.getMoney())) { + secondTask.setMoney(BigDecimal.valueOf(taskDetail.getMoney()).divide(BigDecimal.valueOf(100))); + } + //处理延时模式 + secondTask.setDelay(WebConstant.TASK_DELAY.valueOf(taskDetail.getDelay()).phase); + + secondTaskMap.put(taskDetail.getId(),secondTask); + firstTask.getSecondTaskList().add(secondTask); + } + }else if(taskDetail.getLevel() == 3){ + WbsVo.SecondTask secondTask = secondTaskMap.get(taskDetail.getParentId()); + if(ObjectUtil.isNotNull(secondTask)) { + WbsVo.SubTask subTask = new WbsVo.SubTask(); + BeanUtil.copyProperties(taskDetail,subTask); + //处理成员 + if(taskDetail.getAllMember() == 0){ + String memberName = taskDetailDao.getTaskMemberNameByTaskId(taskDetail.getId()); + if(StrUtil.isNotEmpty(memberName)) { + String[] memberNames = memberName.split(","); + memberName = ""; + for (int i = 0; i < memberNames.length; i++) { + if(i == 0){ + memberName = memberName + "("+memberNames[i]+")"; + }else { + memberName = memberName + "和"+"("+memberNames[i]+")"; + } + } + } + subTask.setMemberName(memberName); + } + //添加至二级任务中 + secondTask.getSubTaskList().add(subTask); + if(StrUtil.isEmpty(secondTask.getSubTaskSheetName())){ + secondTask.setSubTaskSheetName(secondTask.getName()+"表"); + } + } + } + } + } + return firstTaskList; + } + + /** + * 根据id查角色名 + */ + private String getNameByRoleId(Long roleId){ + ProRole role = proRoleDao.selectByPrimaryKey(roleId); + if(ObjectUtil.isNotNull(role)){ + return role.getName(); + } + return null; + } + + /** + * 获取交付物名称和上传的文件的路径 + */ + private List getDeliverByTaskId(Long taskId){ + List deliverInfoList = new ArrayList<>(); + + ProTaskDeliverExample deliverExample = new ProTaskDeliverExample(); + deliverExample.createCriteria().andTaskDetailIdEqualTo(taskId); + List deliverList = taskDeliverDao.selectByExample(deliverExample); + if(CollectionUtil.isNotEmpty(deliverList)){ + for(ProTaskDeliver taskDeliver : deliverList){ + WbsVo.DeliverInfo deliverInfo = new WbsVo.DeliverInfo(); + deliverInfo.setName(taskDeliver.getName()); + deliverInfoList.add(deliverInfo); + } + } + return deliverInfoList; + } + + /** + * 查找所有角色 + * @param projectId + * @return + */ + private List getAllRole(Long projectId) { + Map firstMap = new HashMap<>(); + List firstRoleList = new ArrayList<>(); + //查角色 + List notInName = new ArrayList<>(); + notInName.add("MVP"); + notInName.add("Creator"); + notInName.add("MoneyStakeholder"); + notInName.add("Attention"); + ProRoleExample proRoleExample = new ProRoleExample(); + proRoleExample.createCriteria().andProjectIdEqualTo(projectId).andNameNotIn(notInName); + proRoleExample.setOrderByClause("parent_id"); + List proRoleList = proRoleDao.selectByExample(proRoleExample); + if(CollectionUtil.isNotEmpty(proRoleList)){ + for(ProRole proRole : proRoleList){ + if(proRole.getParentId() == 0){ + WbsVo.FirstRole firstRole = new WbsVo.FirstRole(); + firstRole.setId(proRole.getId()); + firstRole.setName(proRole.getDescription()); + + firstMap.put(proRole.getId(),firstRole); + firstRoleList.add(firstRole); + }else { + WbsVo.FirstRole firstRole = firstMap.get(proRole.getParentId()); + if(ObjectUtil.isNotNull(firstRole)){ + WbsVo.SecondRole secondRole = new WbsVo.SecondRole(); + secondRole.setId(proRole.getId()); + secondRole.setName(proRole.getName()); + //查找角色下的成员 + List memberList = proMemberDao.selectByRoleId(secondRole.getId()); + secondRole.setMemberList(memberList); + //查找对谁不可见信息 + String exclude = proRoleExcludeDao.selectStrByRoleId(secondRole.getId()); + secondRole.setRoleExclude(exclude); + firstRole.getSecondRoleList().add(secondRole); + } + } + } + } + return firstRoleList; + } + + /** + * 将项目数据写入excel + */ + private void writeProjectInfo( List> wbsInfo ,WbsVo.ProjectInfo sysProject) throws Exception { + List projectHeader = new ArrayList<>(); + projectHeader.add(new PoiUtil.PoiUtilCell("项目信息（Project Information）",5,1)); + wbsInfo.add(projectHeader); + + List projectTitle = new ArrayList<>(); + projectTitle.add(new PoiUtil.PoiUtilCell("名称")); + projectTitle.add(new PoiUtil.PoiUtilCell("描述")); + projectTitle.add(new PoiUtil.PoiUtilCell("地点")); + projectTitle.add(new PoiUtil.PoiUtilCell("开始时间")); + projectTitle.add(new PoiUtil.PoiUtilCell("结束时间")); + wbsInfo.add(projectTitle); + + List projectInfo = new ArrayList<>(); + projectInfo.add(new PoiUtil.PoiUtilCell(sysProject.getName())); + projectInfo.add(new PoiUtil.PoiUtilCell(sysProject.getDescription())); + projectInfo.add(new PoiUtil.PoiUtilCell(sysProject.getAddress())); + projectInfo.add(new PoiUtil.PoiUtilCell(sysProject.getStrBeginTime())); + projectInfo.add(new PoiUtil.PoiUtilCell(sysProject.getStrEndTime())); + wbsInfo.add(projectInfo); + + List s1 = new ArrayList<>(); + List s2 = new ArrayList<>(); + wbsInfo.add(s1); + wbsInfo.add(s2); + } + + /** + * 将角色成员数据写入excel + */ + private void writeRoleInfo(List> wbsInfo, List roleList) { + List roleHeader = new ArrayList<>(); + roleHeader.add(new PoiUtil.PoiUtilCell("项目成员（Project Members）",6,1)); + wbsInfo.add(roleHeader); + + List roleTitle = new ArrayList<>(); + roleTitle.add(new PoiUtil.PoiUtilCell("序号")); + roleTitle.add(new PoiUtil.PoiUtilCell("系统角色")); + roleTitle.add(new PoiUtil.PoiUtilCell("角色")); + roleTitle.add(new PoiUtil.PoiUtilCell("成员")); + roleTitle.add(new PoiUtil.PoiUtilCell("对谁不可见")); + roleTitle.add(new PoiUtil.PoiUtilCell("备注")); + wbsInfo.add(roleTitle); + + int index = 1; + //一级角色 + if(CollectionUtil.isNotEmpty(roleList)) { + for(WbsVo.FirstRole firstRole : roleList){ + //计算一级角色的合并单元格数量 + int r = 0; + if (CollectionUtil.isNotEmpty(firstRole.getSecondRoleList())) { + for (WbsVo.SecondRole secondRole : firstRole.getSecondRoleList()) { + if (CollectionUtil.isNotEmpty(secondRole.getMemberList())) { + r += secondRole.getMemberList().size(); + }else { + r++; + } + } + r = r == 0 ? 1 : r; + } + //二级角色 + if (CollectionUtil.isNotEmpty(firstRole.getSecondRoleList())) { + for (int i = 0; i < firstRole.getSecondRoleList().size(); i++) { + WbsVo.SecondRole secondRole = firstRole.getSecondRoleList().get(i); + //成员 + if (CollectionUtil.isNotEmpty(secondRole.getMemberList())) { + for(int j = 0; j < secondRole.getMemberList().size(); j++){ + WbsVo.Member member = secondRole.getMemberList().get(j); + + List roleInfo = new ArrayList<>(); + roleInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + //写入一级角色 + if(i == 0 && j == 0){ + roleInfo.add(new PoiUtil.PoiUtilCell(firstRole.getName(),1,r)); + }else{ + roleInfo.add(new PoiUtil.PoiUtilCell()); + } + //写入二级角色 + if(j == 0){ + roleInfo.add(new PoiUtil.PoiUtilCell(secondRole.getName(),1,secondRole.getMemberList().size())); + }else{ + roleInfo.add(new PoiUtil.PoiUtilCell()); + } + //写入成员名 + roleInfo.add(new PoiUtil.PoiUtilCell(member.getName())); + //写入对谁不可见 + if(j == 0){ + roleInfo.add(new PoiUtil.PoiUtilCell(secondRole.getRoleExclude(),1,secondRole.getMemberList().size())); + }else{ + roleInfo.add(new PoiUtil.PoiUtilCell()); + } + wbsInfo.add(roleInfo); + index++; + } + } else { + List roleInfo = new ArrayList<>(); + roleInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + if(i == 0){ + roleInfo.add(new PoiUtil.PoiUtilCell(firstRole.getName(),1,firstRole.getSecondRoleList().size())); + }else { + roleInfo.add(new PoiUtil.PoiUtilCell()); + } + roleInfo.add(new PoiUtil.PoiUtilCell(secondRole.getName())); + roleInfo.add(new PoiUtil.PoiUtilCell()); + roleInfo.add(new PoiUtil.PoiUtilCell(secondRole.getRoleExclude())); + wbsInfo.add(roleInfo); + index++; + } + } + } else { + List roleInfo = new ArrayList<>(); + roleInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + roleInfo.add(new PoiUtil.PoiUtilCell(firstRole.getName())); + wbsInfo.add(roleInfo); + index++; + } + } + } + +// List s1 = new ArrayList<>(); +// List s2 = new ArrayList<>(); +// wbsInfo.add(s1); +// wbsInfo.add(s2); + } + + /** + * 将任务数据写入excel 返回子任务表的数据和交付物的数据 + */ + private Map>> writeTaskInfo(List> wbsInfo, List taskList) { + //返回子任务的数据map + Map>> subSheetMap = new HashMap<>(); + + List taskHeader = new ArrayList<>(); + taskHeader.add(new PoiUtil.PoiUtilCell("项目任务分解（WBS）",19,1)); + wbsInfo.add(taskHeader); + + List taskTitle = new ArrayList<>(); + taskTitle.add(new PoiUtil.PoiUtilCell("序号")); + taskTitle.add(new PoiUtil.PoiUtilCell("任务（节点）")); + taskTitle.add(new PoiUtil.PoiUtilCell("二级任务（节点）")); + taskTitle.add(new PoiUtil.PoiUtilCell("任务描述/要求")); + taskTitle.add(new PoiUtil.PoiUtilCell("开始时间")); + taskTitle.add(new PoiUtil.PoiUtilCell("结束时间")); + taskTitle.add(new PoiUtil.PoiUtilCell("任务时长（小时）")); + taskTitle.add(new PoiUtil.PoiUtilCell("重复")); + taskTitle.add(new PoiUtil.PoiUtilCell("关联子日程表")); + taskTitle.add(new PoiUtil.PoiUtilCell("关联子项目表")); + taskTitle.add(new PoiUtil.PoiUtilCell("交付物/MVP项")); + taskTitle.add(new PoiUtil.PoiUtilCell("负责人")); + taskTitle.add(new PoiUtil.PoiUtilCell("检查人")); + taskTitle.add(new PoiUtil.PoiUtilCell("即时奖惩（元）")); + taskTitle.add(new PoiUtil.PoiUtilCell("任务切换模式")); + taskTitle.add(new PoiUtil.PoiUtilCell("延迟时间"+"\n"+"（自动延迟模式可用）")); + taskTitle.add(new PoiUtil.PoiUtilCell("跳转任务")); + taskTitle.add(new PoiUtil.PoiUtilCell("跳转次数")); + taskTitle.add(new PoiUtil.PoiUtilCell("执行时间（小时）")); + wbsInfo.add(taskTitle); + + int index = 1; + + if(CollectionUtil.isNotEmpty(taskList)){ + for(WbsVo.FirstTask firstTask : taskList){ + if(CollectionUtil.isNotEmpty(firstTask.getSecondTaskList())){ + for(int i = 0; i < firstTask.getSecondTaskList().size(); i++){ + WbsVo.SecondTask secondTask = firstTask.getSecondTaskList().get(i); + List taskInfo = new ArrayList<>(); + taskInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + if(i == 0) { + taskInfo.add(new PoiUtil.PoiUtilCell(firstTask.getTaskName(),1,firstTask.getSecondTaskList().size())); + }else{ + taskInfo.add(new PoiUtil.PoiUtilCell()); + } + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getName())); + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getDescription())); + if(StrUtil.isEmpty(secondTask.getCycle())) { + if(ObjectUtil.isNotNull(secondTask.getBeginTime())){ + taskInfo.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(secondTask.getBeginTime()))); + }else { + taskInfo.add(new PoiUtil.PoiUtilCell()); + } + if(ObjectUtil.isNotNull(secondTask.getEndTime())){ + taskInfo.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(secondTask.getEndTime()))); + }else { + taskInfo.add(new PoiUtil.PoiUtilCell()); + } + if(ObjectUtil.isNotNull(secondTask.getDuration())){ + taskInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(secondTask.getDuration() / 1000 / 3600))); + }else { + taskInfo.add(new PoiUtil.PoiUtilCell()); + } + }else { + taskInfo.add(new PoiUtil.PoiUtilCell()); + taskInfo.add(new PoiUtil.PoiUtilCell()); + taskInfo.add(new PoiUtil.PoiUtilCell()); + } + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getCycle())); + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getSubTaskSheetName())); + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getSubProjectName())); + //如果有子任务，创建子表 + List> subTaskList = null; + if(CollectionUtil.isNotEmpty(secondTask.getSubTaskList())){ + subTaskList = writeSubTask(secondTask.getSubTaskSheetName(),secondTask.getSubTaskList()); + subSheetMap.put(secondTask.getSubTaskSheetName(),subTaskList); + } + //TODO 交付物 + if(CollectionUtil.isNotEmpty(secondTask.getDeliverInfoList())){ + if(secondTask.getDeliverInfoList().size() > 1){ + taskInfo.add(new PoiUtil.PoiUtilCell("关联表-"+secondTask.getName()+"进程表")); + List> deliverList = writeDeliver(secondTask.getDeliverInfoList(),secondTask.getName()+"进程表",secondTask.getExecutorRoleName()); + subSheetMap.put(secondTask.getName()+"进程表",deliverList); + }else { + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getDeliverInfoList().get(0).getName())); + } + }else { + taskInfo.add(new PoiUtil.PoiUtilCell()); + } + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getExecutorRoleName())); + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getCheckerRoleName())); + taskInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(secondTask.getMoney()))); + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getDelay())); + if(secondTask.getDelayTime() == 0){ + taskInfo.add(new PoiUtil.PoiUtilCell()); + }else { + taskInfo.add(new PoiUtil.PoiUtilCell(secondTask.getDelayTime() / 1000 / 60 + "分钟")); + } + wbsInfo.add(taskInfo); + index++; + } + }else { + List taskInfo = new ArrayList<>(); + taskInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + taskInfo.add(new PoiUtil.PoiUtilCell(firstTask.getTaskName())); + wbsInfo.add(taskInfo); + index++; + } + } + } + return subSheetMap; + } + + /** + * 生成交付物表的写入数据 + */ + private List> writeDeliver(List deliverInfoList, String sheetName, String executorRoleName) { + List> list = new ArrayList<>(); + + List deliverHeader = new ArrayList<>(); + deliverHeader.add(new PoiUtil.PoiUtilCell(sheetName,4,1)); + list.add(deliverHeader); + + List deliverTitle = new ArrayList<>(); + deliverTitle.add(new PoiUtil.PoiUtilCell("序号")); + deliverTitle.add(new PoiUtil.PoiUtilCell("交付物")); + deliverTitle.add(new PoiUtil.PoiUtilCell("成员")); + deliverTitle.add(new PoiUtil.PoiUtilCell("备注")); + list.add(deliverTitle); + + int index = 1; + for(WbsVo.DeliverInfo deliver : deliverInfoList) { + List deliverInfo = new ArrayList<>(); + deliverInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + deliverInfo.add(new PoiUtil.PoiUtilCell(deliver.getName())); + deliverInfo.add(new PoiUtil.PoiUtilCell(executorRoleName)); + list.add(deliverInfo); + index++; + } + return list; + } + + /** + * 生成子任务表的写入数据 + */ + private List> writeSubTask(String subTaskSheetName,List subTaskList) { + List> list = new ArrayList<>(); + + List subTaskHeader = new ArrayList<>(); + subTaskHeader.add(new PoiUtil.PoiUtilCell(subTaskSheetName,9,1)); + list.add(subTaskHeader); + + List subTaskTitle = new ArrayList<>(); + subTaskTitle.add(new PoiUtil.PoiUtilCell("序号")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("任务")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("开始时间")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("结束时间")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("重复时间")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("持续时间")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("成员")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("检查人")); + subTaskTitle.add(new PoiUtil.PoiUtilCell("备注")); + list.add(subTaskTitle); + + int index = 1; + for(WbsVo.SubTask subTask : subTaskList){ + List subTaskInfo = new ArrayList<>(); + subTaskInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + subTaskInfo.add(new PoiUtil.PoiUtilCell(subTask.getName())); + if(StrUtil.isNotEmpty(subTask.getCycle())){ + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + subTaskInfo.add(new PoiUtil.PoiUtilCell(subTask.getCycle())); + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + }else { + if(ObjectUtil.isNotNull(subTask.getBeginTime())){ + subTaskInfo.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(subTask.getBeginTime()))); + }else { + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + } + if(ObjectUtil.isNotNull(subTask.getEndTime())){ + subTaskInfo.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(subTask.getEndTime()))); + }else { + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + } + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + if(ObjectUtil.isNotNull(subTask.getDuration())){ + subTaskInfo.add(new PoiUtil.PoiUtilCell(subTask.getDuration() / 1000 / 3600 + "小时")); + }else { + subTaskInfo.add(new PoiUtil.PoiUtilCell()); + } + } + subTaskInfo.add(new PoiUtil.PoiUtilCell(subTask.getMemberName())); + subTaskInfo.add(new PoiUtil.PoiUtilCell(subTask.getCheckerRoleName())); + subTaskInfo.add(new PoiUtil.PoiUtilCell(subTask.getDescription())); + list.add(subTaskInfo); + index++; + } + return list; + } + + /** + * 将项目成员数据写入excel + */ + private void writeMemberInfo(List> memberSheet,List memberList) { + List taskTitle = new ArrayList<>(); + taskTitle.add(new PoiUtil.PoiUtilCell("序号")); + taskTitle.add(new PoiUtil.PoiUtilCell("成员名")); + taskTitle.add(new PoiUtil.PoiUtilCell("电话/账号")); + taskTitle.add(new PoiUtil.PoiUtilCell("奖惩干系人")); + taskTitle.add(new PoiUtil.PoiUtilCell("干系人账号")); + memberSheet.add(taskTitle); + + int index = 1; + if(CollectionUtil.isNotEmpty(memberList)){ + for(WbsVo.MemberAndStakeholder member : memberList){ + List taskInfo = new ArrayList<>(); + taskInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + taskInfo.add(new PoiUtil.PoiUtilCell(member.getMemberName())); + taskInfo.add(new PoiUtil.PoiUtilCell(member.getMemberPhone())); + taskInfo.add(new PoiUtil.PoiUtilCell(member.getStakeholderName())); + taskInfo.add(new PoiUtil.PoiUtilCell(member.getStakeholderPhone())); + memberSheet.add(taskInfo); + index++; + } + } + } + + /** + * 将插件数据写入excel + */ + private void writePluginInfo(List> pluginSheet, List roleName, List pluginInfoList) { + List pluginHeader = new ArrayList<>(); + pluginHeader.add(new PoiUtil.PoiUtilCell("插件信息",roleName.size()+2,1)); + pluginSheet.add(pluginHeader); + + List pluginTitle = new ArrayList<>(); + pluginTitle.add(new PoiUtil.PoiUtilCell("序号")); + pluginTitle.add(new PoiUtil.PoiUtilCell("任务/节点")); + pluginTitle.add(new PoiUtil.PoiUtilCell("插件名",roleName.size(),1)); + pluginSheet.add(pluginTitle); + + List pluginRoleName = new ArrayList<>(); + pluginRoleName.add(new PoiUtil.PoiUtilCell()); + pluginRoleName.add(new PoiUtil.PoiUtilCell()); + if(CollectionUtil.isNotEmpty(roleName)){ + for(String role : roleName){ + pluginRoleName.add(new PoiUtil.PoiUtilCell(role)); + } + } + pluginSheet.add(pluginRoleName); + + int index = 1; + if(CollectionUtil.isNotEmpty(pluginInfoList)){ + String taskName = pluginInfoList.get(0).getSecondTaskName(); + List pluginInfo = new ArrayList<>(); + pluginInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + pluginInfo.add(new PoiUtil.PoiUtilCell(pluginInfoList.get(0).getSecondTaskName())); + + for(WbsVo.PluginInfo plugin : pluginInfoList){ + if(plugin.getSecondTaskName().equalsIgnoreCase(taskName)){ + pluginInfo.add(new PoiUtil.PoiUtilCell(plugin.getPluginName())); + }else { + pluginSheet.add(pluginInfo); + index++; + + taskName = plugin.getSecondTaskName(); + pluginInfo = new ArrayList<>(); + pluginInfo.add(new PoiUtil.PoiUtilCell(String.valueOf(index))); + pluginInfo.add(new PoiUtil.PoiUtilCell(plugin.getSecondTaskName())); + pluginInfo.add(new PoiUtil.PoiUtilCell(plugin.getPluginName())); + } + } + pluginSheet.add(pluginInfo); + index++; + } + } + + + /** + * 导出项目清单 + */ + @Override + public String exportChecklist(Long userId,Long projectId,Long roleId,Long startTime,Long endTime) throws Exception { + //获取“全体成员”角色 + ProRole allMember = proRoleService.getAllMember(projectId); + Long allMemberId = null; + if (ObjectUtil.isNotNull(allMember)) { + allMemberId = allMember.getId(); + } + //获取清单信息 + List checklists = taskDetailDao.getChecklistsByProjectId(projectId,roleId,allMemberId,startTime,endTime); + //转换成写入excel的数据 + List> list = writeCheckList(userId,checklists); + + //读取模板 + ResourceLoader resourceLoader = new DefaultResourceLoader(); + InputStream is = resourceLoader.getResource("classpath:template/checklistTemplate.xlsx").getInputStream(); + XSSFWorkbook wb = new XSSFWorkbook(is); + //写入数据 + PoiUtil.exportWB("单项目", list, wb); + //生成文件 + String fileName = "/exportWbs/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + String path = WebConstant.UPLOAD_PATH_BASE + fileName; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + OutputStream stream = new FileOutputStream(tmpFile); + wb.write(stream); + stream.close(); + + return WebConstant.TEST_URL_BASE + fileName; + } + /** + * 生成清单excel的写入数据 + */ + private List> writeCheckList(Long userId,List checklists) throws Exception { + //转换成写入excel的数据 + List> list = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(checklists)){ + List row1 = new ArrayList<>(); + list.add(row1); + list.add(row1); + list.add(row1); + List row3 = new ArrayList<>(); + row3.add(new PoiUtil.PoiUtilCell("时间",null,null)); + row3.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis()),null,null)); + row3.add(new PoiUtil.PoiUtilCell()); + row3.add(new PoiUtil.PoiUtilCell("项目",null,null)); + row3.add(new PoiUtil.PoiUtilCell(checklists.get(0).getProjectName(),null,null)); + list.add(row3); + list.add(row1); + int index = 1; + for(WbsVo.ChecklistByProjectId checklist : checklists){ + //获取任务的完成状态和完成时间 + Long subTimeId = taskDeliverService.isTaskOrSubTime(checklist.getTaskId()); + if(ObjectUtil.isNotNull(subTimeId)) { + ProSubTimeMember subTimeMember = taskDetailService.getProcessByUserIdAndTask(userId, subTimeId); + if (ObjectUtil.isNotNull(subTimeMember)) { + checklist.setCompleteTime(subTimeMember.getRealFinishTime()); + checklist.setProcess(WebConstant.EVENT_PROCESS.valueOf(subTimeMember.getComplatedStatus()).phase); + } + } + List checkList = new ArrayList<>(); + checkList.add(new PoiUtil.PoiUtilCell(String.valueOf(index),null,null)); + checkList.add(new PoiUtil.PoiUtilCell(checklist.getTaskName(),null,null)); + checkList.add(new PoiUtil.PoiUtilCell(checklist.getRoleName(),null,null)); + if(StrUtil.isNotEmpty(checklist.getCycle()) && !"不重复".equalsIgnoreCase(checklist.getCycle())){ + checkList.add(new PoiUtil.PoiUtilCell()); + checkList.add(new PoiUtil.PoiUtilCell(checklist.getCycle())); + }else { + checkList.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(checklist.getBeginTime()), null, null)); + String duration = null; + if (checklist.getDuration() / 1000 / 3600 >= 2) { + duration = checklist.getDuration() / 1000 / 3600 + "小时"; + } else { + duration = checklist.getDuration() / 1000 / 60 + "分钟"; + } + checkList.add(new PoiUtil.PoiUtilCell(duration, null, null)); + } + if(ObjectUtil.isNotNull(checklist.getCompleteTime())) { + checkList.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(checklist.getCompleteTime()), null, null)); + }else { + checkList.add(new PoiUtil.PoiUtilCell()); + } + checkList.add(new PoiUtil.PoiUtilCell(checklist.getProcess(),null,null)); + list.add(checkList); + index++; + } + } + return list; + } + + /** + * 导出MVP + * @param currentUserId + * @param projectId + * @return + * @throws Exception + */ + @Override + public String exportDeliver(Long currentUserId, Long projectId) throws Exception { + String path = ""; + //查找所有交付物的信息 + List deliverWithExcelList = taskDeliverDao.getDeliverAllByProject(projectId); + if(CollectionUtil.isNotEmpty(deliverWithExcelList)) { + //找出交付物文件 + String filePath = getZip(deliverWithExcelList); + //生成excel表格 + writeMvpList(deliverWithExcelList,filePath); + //生成压缩包并返回下载路径 + String zipPath = "/project/" + DateUtil.today() +"/"+ deliverWithExcelList.get(0).getProjectName()+".zip"; + ZipUtil.zip(WebConstant.UPLOAD_PATH_BASE + "/"+filePath, WebConstant.UPLOAD_PATH_BASE + zipPath); + path = WebConstant.TEST_URL_BASE + zipPath; + //删除压缩前的文件 + FileUtil.del(WebConstant.UPLOAD_PATH_BASE + "/"+filePath); + } + //返回 + return path; + } + private String getZip(List deliverWithExcelList)throws Exception { + String uuid = SecureUtil.simpleUUID(); + if(CollectionUtil.isNotEmpty(deliverWithExcelList)){ + for(WbsVo.DeliverWithExcel deliverWithExcel : deliverWithExcelList) { + if (ObjectUtil.isNotNull(deliverWithExcel.getDeliverId())) { + List subTimeList = taskDeliverDao.selectFileInfoByDeliverId(deliverWithExcel.getDeliverId()); + if(CollectionUtil.isNotEmpty(subTimeList)){ + deliverWithExcel.setJumpPath(deliverWithExcel.getTaskName() + "/" + deliverWithExcel.getDeliverName()); + for(WbsVo.SubTime subTime : subTimeList){ + if(CollectionUtil.isNotEmpty(subTime.getSubTimeDeliverInfoList())){ + for(WbsVo.SubTimeDeliverInfo subTimeDeliverInfo : subTime.getSubTimeDeliverInfoList()){ + File file = new File(WebConstant.UPLOAD_PATH_BASE + "/" + subTimeDeliverInfo.getFilePath()); + if(!file.exists()){ + continue; + } + InputStream is = new FileInputStream(file); + String uploadTime = new SimpleDateFormat("yyyy-MM-dd").format(subTime.getSubBeginTime()); + String fileName = "/"+uuid+"/" + deliverWithExcel.getTaskName() + "/" + deliverWithExcel.getDeliverName() + "/" +uploadTime+"/"+ subTimeDeliverInfo.getFileName(); + String path = WebConstant.UPLOAD_PATH_BASE + fileName; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + FileUtil.writeFromStream(is,path); + } + } + } + } + } + } + } + return uuid; + } + private void writeMvpList(List deliverWithExcelList,String filePath) throws Exception { + //转换成写入excel的数据 + List> list = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(deliverWithExcelList)){ + List row1 = new ArrayList<>(); + list.add(row1); + list.add(row1); + list.add(row1); + List row3 = new ArrayList<>(); + row3.add(new PoiUtil.PoiUtilCell("时间",null,null)); + row3.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis()),null,null)); + row3.add(new PoiUtil.PoiUtilCell()); + row3.add(new PoiUtil.PoiUtilCell("项目",null,null)); + row3.add(new PoiUtil.PoiUtilCell(deliverWithExcelList.get(0).getProjectName(),null,null)); + list.add(row3); + list.add(row1); + int index = 1; + for(WbsVo.DeliverWithExcel deliverWithExcel : deliverWithExcelList){ + + List mvpList = new ArrayList<>(); + mvpList.add(new PoiUtil.PoiUtilCell(String.valueOf(index),null,null)); + mvpList.add(new PoiUtil.PoiUtilCell(deliverWithExcel.getTaskName(),2,1,null,null)); + mvpList.add(new PoiUtil.PoiUtilCell()); + if(StrUtil.isNotEmpty(deliverWithExcel.getTaskCycle()) && !"不重复".equalsIgnoreCase(deliverWithExcel.getTaskCycle())){ + mvpList.add(new PoiUtil.PoiUtilCell()); + mvpList.add(new PoiUtil.PoiUtilCell(deliverWithExcel.getTaskCycle())); + }else { + mvpList.add(new PoiUtil.PoiUtilCell(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(deliverWithExcel.getTaskBeginTime()), null, null)); + String duration = null; + if (deliverWithExcel.getTaskDuration() / 1000 / 3600 >= 2) { + duration = deliverWithExcel.getTaskDuration() / 1000 / 3600 + "小时"; + } else { + duration = deliverWithExcel.getTaskDuration() / 1000 / 60 + "分钟"; + } + mvpList.add(new PoiUtil.PoiUtilCell(duration, null, null)); + } + if(StrUtil.isEmpty(deliverWithExcel.getJumpPath())) { + mvpList.add(new PoiUtil.PoiUtilCell(deliverWithExcel.getDeliverName(), null, null)); + }else { + PoiUtil.PoiUtilCell poiUtilCell = new PoiUtil.PoiUtilCell(deliverWithExcel.getDeliverName(), null, null); + poiUtilCell.setPath(deliverWithExcel.getJumpPath()); + mvpList.add(poiUtilCell); + } + list.add(mvpList); + index++; + } + } + //读取模板文件 + ResourceLoader resourceLoader = new DefaultResourceLoader(); + InputStream is = resourceLoader.getResource("classpath:template/mvpTemplate.xlsx").getInputStream(); + XSSFWorkbook wb = new XSSFWorkbook(is); + //写入数据 + PoiUtil.exportWB("MVP", list, wb); + //生成文件 + String fileName = "/"+filePath+"/" + "MVP" + ".xlsx"; + String path = WebConstant.UPLOAD_PATH_BASE + fileName; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + OutputStream stream = new FileOutputStream(tmpFile); + wb.write(stream); + stream.close(); + } + +} diff --git a/tall/src/main/java/com/ccsens/tall/service/IExcelService.java b/tall/src/main/java/com/ccsens/tall/service/IExcelService.java index ee78750a..4daabee9 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IExcelService.java @@ -7,5 +7,5 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; public interface IExcelService { ProjectVo.ProjectInfo readXls(String path, Long currentUserId) throws Exception; - void readDeliverSheet(String deliverCell, XSSFWorkbook xssfWorkbook, Long taskId); + void readDeliverSheet(String deliverCell, XSSFWorkbook xssfWorkbook, Long taskId) throws Exception; } diff --git a/tall/src/main/java/com/ccsens/tall/service/IExportWbsService.java b/tall/src/main/java/com/ccsens/tall/service/IExportWbsService.java new file mode 100644 index 00000000..6bbcb219 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/service/IExportWbsService.java @@ -0,0 +1,11 @@ +package com.ccsens.tall.service; + +import java.io.IOException; + +public interface IExportWbsService { + String exportWbs(Long projectId) throws Exception; + + String exportChecklist(Long userId,Long projectId,Long roleId,Long startTime,Long endTime) throws Exception; + + String exportDeliver(Long currentUserId, Long projectId) throws Exception; +} diff --git a/tall/src/main/java/com/ccsens/tall/service/IProjectService.java b/tall/src/main/java/com/ccsens/tall/service/IProjectService.java index 60230e44..240b87ad 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IProjectService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IProjectService.java @@ -23,7 +23,7 @@ public interface IProjectService { ProjectVo.ProjectAllDetailed getProjectList(Long currentUserId, Integer page, Integer pageSize, String key, String start, String end, String role) throws Exception; - List getForever()throws Exception; + List getForever(String domainName)throws Exception; List getProjectByKey(Long currentUserId, String key)throws Exception; diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java index e9a30705..a756ae37 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java @@ -1,6 +1,8 @@ package com.ccsens.tall.service; +import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.po.ProTaskPlugin; +import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; import java.util.List; @@ -9,4 +11,10 @@ public interface ITaskPluginService { void savePlugin(ProTaskPlugin taskPlugin); List getPluginByTask(Long taskId, Long userId) throws Exception; + + PluginVo.CommentInfo addComment(Long userId,PluginDto.AddCommentPlugin addCommentPlugin); + + List getComment(Long currentUserId, Long taskId); + + void deleteComment(Long currentUserId, Long commentId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskSubTimeService.java index f4627a84..557e9cca 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskSubTimeService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskSubTimeService.java @@ -12,4 +12,6 @@ public interface ITaskSubTimeService { void startTask(Long currentUserId, TaskDto.StartTask startTask) throws Exception; TaskVo.NormalTask addTask(Long currentUserId, TaskDto.AddTask addTask) throws Exception; + + void clearTaskRealTime(Long projectId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/IUserService.java b/tall/src/main/java/com/ccsens/tall/service/IUserService.java index e9536e11..bc858faf 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IUserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IUserService.java @@ -18,7 +18,7 @@ public interface IUserService { UserVo.TokenBean generateToken(WebConstant.CLIENT_TYPE client_type, Object subject, Map payLoads) throws Exception; - UserVo.TokenBean getUserInfoAndToken(WebConstant.CLIENT_TYPE client_type, UserVo.UserSign userSignVo, Map theMap) throws Exception; + UserVo.TokenBean getUserInfoAndToken(WebConstant.CLIENT_TYPE client_type, WebConstant.IDENTIFY_TYPE identify_type,UserVo.UserSign userSignVo, Map theMap) throws Exception; boolean tokenNotExistInCache(Long authId) throws Exception; @@ -76,4 +76,6 @@ public interface IUserService { UserVo.TokenBean getTokenByUserId(Long userId); void mergeUserId(Long userId, Long uselessId); + + UserVo.Account systemRegister(UserDto.UserSignupSystem userSignup); } diff --git a/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java b/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java index e350110a..948a58b7 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IWbsSubSheetService.java @@ -10,12 +10,14 @@ import java.util.Map; public interface IWbsSubSheetService { void getSubTask(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, - List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap); + List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) throws Exception; void getSubTaskMt(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, - List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap); + List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) throws Exception; - void getSigninSheet(Long projectId,XSSFWorkbook xssfWorkbook, List taskDetails); + void getSigninSheet(Long projectId,XSSFWorkbook xssfWorkbook, List taskDetails) throws Exception; - void getPluginConfig(Long id, XSSFWorkbook xssfWorkbook, List taskDetails); + void getPluginConfig(Long id, XSSFWorkbook xssfWorkbook, List taskDetails) throws Exception; + + void getRoBotSheet(Long projectId, XSSFWorkbook xssfWorkbook); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index 06709664..c1a014f7 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -281,6 +281,8 @@ public class ProRoleService implements IProRoleService { if (CollectionUtil.isNotEmpty(roleList)) { for (ProRole role : roleList) { deleteRoleByRoleId(role.getId()); + role.setRecStatus((byte) 2); + proRoleDao.updateByPrimaryKeySelective(role); } } } @@ -294,16 +296,28 @@ public class ProRoleService implements IProRoleService { List memberRoleList = memberRoleDao.selectByExample(memberRoleExample); if (CollectionUtil.isNotEmpty(memberRoleList)) { for (ProMemberRole memberRole : memberRoleList) { - proMemberDao.deleteByPrimaryKey(memberRole.getMemberId()); - memberRoleDao.deleteByPrimaryKey(memberRole.getId()); + ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); + if(ObjectUtil.isNotNull(proMember)) { + proMember.setRecStatus((byte) 2); + proMemberDao.updateByPrimaryKeySelective(proMember); + } + memberRole.setRecStatus((byte) 2); + memberRoleDao.updateByPrimaryKeySelective(memberRole); } } //删除对谁不可见 ProRoleExcludeExample excludeExample = new ProRoleExcludeExample(); excludeExample.createCriteria().andRoleIdEqualTo(roleId); - excludeDao.deleteByExample(excludeExample); + List proRoleExcludeList = excludeDao.selectByExample(excludeExample); + if(CollectionUtil.isNotEmpty(proRoleExcludeList)){ + for(ProRoleExclude proRoleExclude : proRoleExcludeList){ + proRoleExclude.setRecStatus((byte) 2); + excludeDao.updateByPrimaryKeySelective(proRoleExclude); + } + } +// excludeDao.deleteByExample(excludeExample); //删除角色 - proRoleDao.deleteByPrimaryKey(roleId); +// proRoleDao.deleteByPrimaryKey(roleId); } } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 337a08be..33919864 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -12,6 +12,7 @@ import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; +import com.ccsens.tall.persist.dao.ProTaskShowDao; import com.ccsens.tall.persist.mapper.ProPluginConfigMapper; import com.ccsens.tall.util.TaskUtil; import com.ccsens.util.CodeEnum; @@ -20,7 +21,6 @@ import com.ccsens.util.WebConstant; import com.ccsens.util.cron.CronConstant; import com.ccsens.util.cron.NatureToDate; import com.ccsens.util.exception.BaseException; -import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +49,8 @@ public class ProTaskDetailService implements IProTaskDetailService { @Autowired private IProShowService proShowService; @Autowired + private ProTaskShowDao proTaskShowDao; + @Autowired private TaskDetailDao taskDetailDao; @Autowired private TaskSubTimeDao taskSubTimeDao; @@ -63,7 +65,7 @@ public class ProTaskDetailService implements IProTaskDetailService { @Autowired private SysProjectDao sysProjectDao; @Autowired - private TaskPluginDao taskPluginDao; + private SysPluginDao sysPluginDao; @Autowired private Snowflake snowflake; @Autowired @@ -108,44 +110,60 @@ public class ProTaskDetailService implements IProTaskDetailService { return obj; } +// /** +// * 获取项目里的任务展示配置 +// */ +// private TaskVo.ProShow getProShow(Long projectId)throws Exception{ +// TaskVo.ProShow proShowInfo = new TaskVo.ProShow(); +// ProShow proShow = proShowService.selectByProjectId(projectId); +//// ProTaskShow proTaskShow = proShowService.selectByProjectId(projectId); +// if(ObjectUtil.isNotNull(proShow)){ +// proShowInfo.setSlide(proShow.getSlide()); +// proShowInfo.setFilter(proShow.getFilter()); +// proShowInfo.setIsShowMvp(proShow.getIsShowMvp()); +// proShowInfo.setCreateTask(proShow.getCreateTask()); +// proShowInfo.setDuration(proShow.getDuration()); +// proShowInfo.setShowTimeFormat(proShow.getTimeShow()); +// proShowInfo.setShowShortcuts(proShow.getShowShortcuts()); +// if(proShow.getDuration() == 1) { +// proShowInfo.setShowTimeFormat(null); +// } +// }else { +// proShowInfo.setSlide(0); +// proShowInfo.setFilter(0); +// proShowInfo.setIsShowMvp(1); +// proShowInfo.setCreateTask(1); +// proShowInfo.setDuration(0); +// proShowInfo.setShowTimeFormat("MM-dd HH:mm"); +// proShowInfo.setShowShortcuts(1); +// } +// return proShowInfo; +// } + /** - * 获取项目里的任务展示配置 + * 查找任务配置 */ - private TaskVo.ProShow getProShow(Long projectId)throws Exception{ - TaskVo.ProShow proShowInfo = new TaskVo.ProShow(); - ProShow proShow = proShowService.selectByProjectId(projectId); - if(ObjectUtil.isNotNull(proShow)){ - proShowInfo.setSlide(proShow.getSlide()); - proShowInfo.setFilter(proShow.getFilter()); - proShowInfo.setIsShowMvp(proShow.getIsShowMvp()); - proShowInfo.setCreateTask(proShow.getCreateTask()); - proShowInfo.setDuration(proShow.getDuration()); - proShowInfo.setShowTimeFormat(proShow.getTimeShow()); - proShowInfo.setShowShortcuts(proShow.getShowShortcuts()); - if(proShow.getDuration() == 1) { - proShowInfo.setShowTimeFormat(null); - } - }else { - proShowInfo.setSlide(0); - proShowInfo.setFilter(0); - proShowInfo.setIsShowMvp(1); - proShowInfo.setCreateTask(1); - proShowInfo.setDuration(0); - proShowInfo.setShowTimeFormat("MM-dd HH:mm"); - proShowInfo.setShowShortcuts(1); + private TaskVo.ProTaskShow getProTaskShow(Long taskId)throws Exception{ + TaskVo.ProTaskShow proTaskShow = proTaskShowDao.getProTaskShowByTaskId(taskId); + if(ObjectUtil.isNull(proTaskShow)){ + proTaskShow = new TaskVo.ProTaskShow(); + proTaskShow.setTimeShow("MM-DD HH:mm"); + proTaskShow.setDuration(0); + proTaskShow.setCreateTask(1); + proTaskShow.setShowHardware(1); + proTaskShow.setShowDeliver(1); + proTaskShow.setShowMoney(1); + proTaskShow.setShowFinish(1); + proTaskShow.setShowRealTime(0); } - return proShowInfo; + return proTaskShow; } /** * 查看任务 项目经理 */ private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long currentUserId, Long projectId,Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { - //任务展示的配置 -// ProShow proShow = proShowService.selectByProjectId(projectId); - TaskVo.ProShow proShow = getProShow(projectId); - TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); - proTaskInfo.setProShow(proShow); + List globalTaskList = new ArrayList<>(); List normalTaskList = new ArrayList<>(); TaskVo.GlobalTask globalTask = null; @@ -176,20 +194,8 @@ public class ProTaskDetailService implements IProTaskDetailService { normalTask.setRoutineLocation(config.getRoutineLocation()); normalTask.setWebPath(config.getWebPath()); } - //一级任务的配置 - if(ObjectUtil.isNotNull(proShow)){ - normalTask.setShowShortcuts(proShow.getShowShortcuts()); - normalTask.setCreateTask(proShow.getCreateTask()); - normalTask.setShowTimeFormat(proShow.getShowTimeFormat()); - if(proShow.getDuration() == 1){ - normalTask.setDuration(null); - normalTask.setShowTimeFormat(null); - } - }else { - normalTask.setShowTimeFormat("MM-dd HH:mm"); - normalTask.setShowShortcuts(1); - normalTask.setCreateTask(1); - } + //一级任务配置 + normalTask.setProTaskConfig(getProTaskShow(normalTask.getDetailId())); //一级任务完成状态 ProSubTimeMember firstSubTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); @@ -214,19 +220,8 @@ public class ProTaskDetailService implements IProTaskDetailService { task.setRealEndTime(subTimeMember.getRealFinishTime()); task.setProcess(subTimeMember.getComplatedStatus()); } - if(ObjectUtil.isNotNull(proShow)){ - task.setShowShortcuts(proShow.getShowShortcuts()); - task.setCreateTask(proShow.getCreateTask()); - task.setShowTimeFormat(proShow.getShowTimeFormat()); - if(proShow.getDuration() == 1){ - task.setDuration(null); - task.setShowTimeFormat(null); - } - }else { - task.setShowTimeFormat("MM-dd HH:mm"); - task.setShowShortcuts(1); - task.setCreateTask(1); - } + //二级任务配置 + task.setProTaskConfig(getProTaskShow(task.getDetailId())); } TaskUtil.Task task = TaskUtil.splitTask(secondNormalTaskList, startTime, endTime, process); if (CollectionUtil.isNotEmpty(task.getGlobalTask())) { @@ -261,11 +256,8 @@ public class ProTaskDetailService implements IProTaskDetailService { * 查看任务 项目成员 */ private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Integer page, Integer pageSize) throws Exception { -// ProShow proShow = proShowService.selectByProjectId(projectId); - TaskVo.ProShow proShow = getProShow(projectId); - TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); - proTaskInfo.setProShow(proShow); + List globalTaskList = new ArrayList<>(); List normalTaskList = new ArrayList<>(); TaskVo.GlobalTask globalTask = null; @@ -277,8 +269,6 @@ public class ProTaskDetailService implements IProTaskDetailService { } //查找该角色的所有任务(全体成员的任务也是这个角色的任务） List secondTaskVoList = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, roleId,allMemberId, startTime, endTime); -// List secondTaskVoList2 = taskDetailDao.selectTaskByRoleAndAllMembers(projectId, allMemberId, startTime, endTime); -// secondTaskVoList.addAll(secondTaskVoList2); if (CollectionUtil.isNotEmpty(secondTaskVoList)) { for (TaskVo.NormalTask normalTask : secondTaskVoList) { @@ -297,21 +287,12 @@ public class ProTaskDetailService implements IProTaskDetailService { normalTask.setProcess(subTimeMember.getComplatedStatus()); normalTask.setRealEndTime(subTimeMember.getRealFinishTime()); } - if(ObjectUtil.isNotNull(proShow)){ - normalTask.setShowShortcuts(proShow.getShowShortcuts()); - normalTask.setCreateTask(proShow.getCreateTask()); - normalTask.setShowTimeFormat(proShow.getShowTimeFormat()); - if(proShow.getDuration() == 1){ - normalTask.setDuration(null); - normalTask.setShowTimeFormat(null); - } - }else { - normalTask.setShowTimeFormat("MM-dd HH:mm"); - normalTask.setShowShortcuts(1); - normalTask.setCreateTask(1); - } + //任务配置 + normalTask.setProTaskConfig(getProTaskShow(normalTask.getDetailId())); } + TaskUtil.Task task = TaskUtil.splitTask(secondTaskVoList, startTime, endTime, process); + if (CollectionUtil.isNotEmpty(task.getGlobalTask())) { for (TaskVo.NormalTask global : task.getGlobalTask()) { globalTask = new TaskVo.GlobalTask(); @@ -322,6 +303,7 @@ public class ProTaskDetailService implements IProTaskDetailService { if (CollectionUtil.isNotEmpty(task.getCommonTask())) { normalTaskList = sortTaskTime(task.getCommonTask()); } + } //2.业务层分页 @@ -353,6 +335,7 @@ public class ProTaskDetailService implements IProTaskDetailService { theNormalTaskList = CollectionUtil.newArrayList(normalTaskList); } } + TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); pageInfo.setTotalPage(totalPages); pageInfo.setCurrentPage(page); @@ -360,10 +343,12 @@ public class ProTaskDetailService implements IProTaskDetailService { proTaskInfo.setPageInfo(pageInfo); proTaskInfo.setGlobalTaskList(globalTaskList); proTaskInfo.setNormalTaskList(theNormalTaskList); + return proTaskInfo; } private List sortTaskTime(List commonTask) { + List normalTaskList = new ArrayList<>(); List secondTaskVoList = null; Set longSet = new HashSet<>(); @@ -413,7 +398,7 @@ public class ProTaskDetailService implements IProTaskDetailService { } continue; } - if (secondTaskVo.getBeginTime() < startTime && secondTaskVo.getEndTime() <= endTime && secondTaskVo.getEndTime() > startTime) { + if(secondTaskVo.getBeginTime() < startTime && secondTaskVo.getEndTime() <= endTime && secondTaskVo.getEndTime() > startTime) { secondTaskVo.setBeginTime(startTime); secondTaskVoList.add(secondTaskVo); } else if (secondTaskVo.getBeginTime() >= startTime && secondTaskVo.getEndTime() <= endTime) { @@ -556,8 +541,6 @@ public class ProTaskDetailService implements IProTaskDetailService { */ @Override public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception { -// ProShow proShow = proShowService.selectByProjectId(projectId); - TaskVo.ProShow proShow = getProShow(projectId); ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId); TaskVo.NormalTask taskDetail = null; @@ -567,26 +550,13 @@ public class ProTaskDetailService implements IProTaskDetailService { if(ObjectUtil.isNotNull(taskDetail)) { // //处理查询到的任务的插件 // managePlugin(currentUserId,task.getExecutorRole(),taskDetail); - //修改任务的完成状态 + //任务的完成状态 ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, taskDetail.getId()); if (ObjectUtil.isNotNull(subTimeMember)) { taskDetail.setProcess(subTimeMember.getComplatedStatus()); taskDetail.setRealEndTime(subTimeMember.getRealFinishTime()); } - //显示的日期格式和时长格式 - if (ObjectUtil.isNotNull(proShow)) { - taskDetail.setShowShortcuts(proShow.getShowShortcuts()); - taskDetail.setCreateTask(proShow.getCreateTask()); - taskDetail.setShowTimeFormat(proShow.getShowTimeFormat()); - if (proShow.getDuration() == 1) { - taskDetail.setDuration(null); - taskDetail.setShowTimeFormat(null); - } - } else { - taskDetail.setShowTimeFormat("MM-dd HH:mm"); - taskDetail.setShowShortcuts(1); - taskDetail.setCreateTask(1); - } + //添加项目信息和插件信息 normalTaskAddPlugin(currentUserId, subTime.getTaskDetailId(), taskDetail); List groupTaskList = new ArrayList<>(); @@ -604,26 +574,13 @@ public class ProTaskDetailService implements IProTaskDetailService { if(ObjectUtil.isNotNull(groupTask)){ // //处理查询到的任务的插件 // managePlugin(currentUserId,task.getExecutorRole(),taskDetail); - //修改任务的完成状态 + //任务的完成状态 ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId, groupTask.getId()); if (ObjectUtil.isNotNull(proSubTimeMember)) { groupTask.setProcess(proSubTimeMember.getComplatedStatus()); groupTask.setRealEndTime(proSubTimeMember.getRealFinishTime()); } - //显示的日期格式和时长格式 - if(ObjectUtil.isNotNull(proShow)){ - groupTask.setShowShortcuts(proShow.getShowShortcuts()); - groupTask.setCreateTask(proShow.getCreateTask()); - groupTask.setShowTimeFormat(proShow.getShowTimeFormat()); - if(proShow.getDuration() == 1){ - groupTask.setDuration(null); - groupTask.setShowTimeFormat(null); - } - }else { - groupTask.setShowTimeFormat("MM-dd HH:mm"); - groupTask.setShowShortcuts(1); - groupTask.setCreateTask(1); - } + //添加项目信息和插件信息 normalTaskAddPlugin(currentUserId, groupTask.getDetailId(), groupTask); //修改返回时子任务的名字（“任务名+（xx和XX）”） @@ -639,40 +596,6 @@ public class ProTaskDetailService implements IProTaskDetailService { } } -// if (ObjectUtil.isNotNull(taskDetail)) { -// -// List groupTaskList = new ArrayList<>(); -// groupTaskList = taskDetailDao.selectTaskByParentId(projectId, taskDetail.getDetailId()); -// if (CollectionUtil.isNotEmpty(groupTaskList)) { -// for (TaskVo.NormalTask groupTask : groupTaskList) { -// //修改任务的完成状态 -// ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId, groupTask.getId()); -// if (ObjectUtil.isNotNull(proSubTimeMember)) { -// groupTask.setProcess(proSubTimeMember.getComplatedStatus()); -// groupTask.setRealEndTime(proSubTimeMember.getRealFinishTime()); -// } -// //显示的日期格式和时长格式 -// if(ObjectUtil.isNotNull(proShow)){ -// groupTask.setShowTimeFormat(proShow.getTimeShow()); -// if(proShow.getDuration() == 1){ -// groupTask.setDuration(null); -// } -// }else { -// groupTask.setShowTimeFormat("MM-dd HH:mm"); -// } -// //添加项目信息和插件信息 -// normalTaskAddPlugin(currentUserId, groupTask.getDetailId(), groupTask); -// //修改返回时子任务的名字（“任务名+（xx和XX）”） -// ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(groupTask.getDetailId()); -// if (proTaskDetail.getAllMember() == 0) { -// groupTask.setName(updateSubTaskName(groupTask.getDetailId(), groupTask.getName())); -// } -// -// } -// taskDetail.setSecondTasks(new ArrayList<>()); -// taskDetail.getSecondTasks().addAll(groupTaskList); -// } -// } } return taskDetail; } @@ -849,7 +772,7 @@ public class ProTaskDetailService implements IProTaskDetailService { taskDetailDao.selectTaskByRoleAndAllMembers(project.getId(), role.getId(), null,startTime, endTime); if (CollectionUtil.isNotEmpty(taskList)) { for (TaskVo.NormalTask normalTask : taskList) { - //修改任务的完成状态 + //任务的完成状态 ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(userId, normalTask.getId()); if (ObjectUtil.isNotNull(proSubTimeMember)) { normalTask.setProcess(proSubTimeMember.getComplatedStatus()); @@ -1099,13 +1022,21 @@ public class ProTaskDetailService implements IProTaskDetailService { //1、删除交付物相关信息 taskDeliverService.deleteDeliverByTaskId(taskId); //2、删除插件 - ProTaskPluginExample pluginExample = new ProTaskPluginExample(); - pluginExample.createCriteria().andTaskDetailIdEqualTo(taskId); - taskPluginDao.deleteByExample(pluginExample); + sysPluginDao.deleteByTaskId(taskId); +// ProTaskPluginExample pluginExample = new ProTaskPluginExample(); +// pluginExample.createCriteria().andTaskDetailIdEqualTo(taskId); +// taskPluginDao.deleteByExample(pluginExample); //3、删除任务与成员关联表 ProTaskMemberExample taskMemberExample = new ProTaskMemberExample(); taskMemberExample.createCriteria().andTaskDetailIdEqualTo(taskId); - taskMemberDao.deleteByExample(taskMemberExample); + List proTaskMemberList = taskMemberDao.selectByExample(taskMemberExample); + if(CollectionUtil.isNotEmpty(proTaskMemberList)){ + for(ProTaskMember proTaskMember : proTaskMemberList){ + proTaskMember.setRecStatus((byte) 2); + taskMemberDao.updateByPrimaryKeySelective(proTaskMember); + } + } +// taskMemberDao.deleteByExample(taskMemberExample); //4、删除任务、子任务和任务完成表 taskDetailDao.selectTaskByDetailId(taskId); } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java index 13d59958..ffd2ee70 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectService.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.DomainVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.persist.dao.*; import com.ccsens.util.CodeEnum; @@ -51,6 +52,8 @@ public class ProjectService implements IProjectService { private IProRoleService proRoleService; @Autowired private Snowflake snowflake; + @Autowired + private SysDomainDao sysDomainDao; @Override public void saveProject(SysProject sysProject) { @@ -144,7 +147,7 @@ public class ProjectService implements IProjectService { Map timeMap = new HashMap<>(); timeMap = DateUtil.projectFormatDateTime(date); Long startMillisTime = timeMap.get("startMillisTime"); - Long endMillisTime = timeMap.get("endMillisTime")+1; + Long endMillisTime = timeMap.get("endMillisTime") + 1; //查找此用户关注的项目 List projectList = sysProjectDao.findProjectIdByUserId(currentUserId, startMillisTime, endMillisTime); projectInfoList = projectInfoByProject(projectList, currentUserId); @@ -187,8 +190,10 @@ public class ProjectService implements IProjectService { projectConfig.setSlide(proShowList.get(0).getSlide()); projectConfig.setCreateTask(proShowList.get(0).getCreateTask()); projectConfig.setFilter(proShowList.get(0).getFilter()); + projectConfig.setShowMvp(proShowList.get(0).getIsShowMvp()); + projectConfig.setSelectTaskType(proShowList.get(0).getSelectTaskType()); projectInfo.setProjectConfig(projectConfig); - }else { + } else { ProjectVo.ProjectConfig projectConfig = new ProjectVo.ProjectConfig(); projectConfig.setFilter(0); projectConfig.setSlide(0); @@ -243,8 +248,10 @@ public class ProjectService implements IProjectService { projectConfig.setSlide(proShowList.get(0).getSlide()); projectConfig.setFilter(proShowList.get(0).getFilter()); projectConfig.setCreateTask(proShowList.get(0).getCreateTask()); + projectConfig.setShowMvp(proShowList.get(0).getIsShowMvp()); + projectConfig.setSelectTaskType(proShowList.get(0).getSelectTaskType()); projectInfo.setProjectConfig(projectConfig); - }else { + } else { ProjectVo.ProjectConfig projectConfig = new ProjectVo.ProjectConfig(); projectConfig.setSlide(0); projectConfig.setFilter(0); @@ -278,13 +285,33 @@ public class ProjectService implements IProjectService { } @Override - public List getForever() { - List templateProject = sysProjectDao.selectByTemplateStatus(2); - if (CollectionUtil.isNotEmpty(templateProject)) { - for (ProjectVo.TemplateStatus templateStatus : templateProject) { - templateStatus.setProcess(1); + public List getForever(String domainName) { + List templateProject = new ArrayList<>(); + + if(StrUtil.isNotEmpty(domainName)) { + SysDomainExample domainExample = new SysDomainExample(); + domainExample.createCriteria().andDomainNameEqualTo(domainName); + List domainList = sysDomainDao.selectByExample(domainExample); + if (CollectionUtil.isNotEmpty(domainList)) { + SysDomain sysDomain = domainList.get(0); + String[] projectIds = sysDomain.getForeverProjectId().split(","); + for(int i = 0; i < projectIds.length; i++){ + SysProject project = sysProjectDao.selectByPrimaryKey(Long.valueOf(projectIds[i])); + ProjectVo.TemplateStatus templateStatus = new ProjectVo.TemplateStatus(); + templateStatus.setId(project.getId()); + templateStatus.setName(project.getName()); + templateStatus.setTemplateStatus(Integer.valueOf(project.getTemplate())); + templateStatus.setProcess(1); + templateProject.add(templateStatus); + } } } +// templateProject = sysProjectDao.selectByTemplateStatus(2); +// if (CollectionUtil.isNotEmpty(templateProject)) { +// for (ProjectVo.TemplateStatus templateStatus : templateProject) { +// templateStatus.setProcess(1); +// } +// } return templateProject; } @@ -385,11 +412,12 @@ public class ProjectService implements IProjectService { //用户在项目中的最高权限 int power = proRoleService.selectPowerByRoleName(currentUserId, projectId); if (power > 1) { -// //修改项目删除状态 - project.setRecStatus(WebConstant.REC_STATUS.Deleted.value); - sysProjectDao.updateByPrimaryKeySelective(project); -// //彻底删除项目 -// deleteProjectById(projectId); + //删除项目下的所有信息 + deleteProjectById(projectId); + //修改项目状态 + project.setRecStatus(WebConstant.REC_STATUS.Deleted.value); + sysProjectDao.updateByPrimaryKeySelective(project); + } else { throw new BaseException(CodeEnum.NOT_POWER); } @@ -407,9 +435,16 @@ public class ProjectService implements IProjectService { //删除这个项目被关注的信息 UserAttentionExample attentionExample = new UserAttentionExample(); attentionExample.createCriteria().andProjectIdEqualTo(projectId); - attentionDao.deleteByExample(attentionExample); - //删除项目 - sysProjectDao.deleteByPrimaryKey(projectId); + List userAttentionList = attentionDao.selectByExample(attentionExample); + if(CollectionUtil.isNotEmpty(userAttentionList)){ + for(UserAttention userAttention : userAttentionList){ + userAttention.setRecStatus((byte) 2); + attentionDao.updateByPrimaryKeySelective(userAttention); + } + } +// attentionDao.deleteByExample(attentionExample); +// //删除项目 +// sysProjectDao.deleteByPrimaryKey(projectId); } /** @@ -438,7 +473,7 @@ public class ProjectService implements IProjectService { throw new BaseException(CodeEnum.NOT_PROJECT); } //返回参数 - projectInfo = getProjectInfoById(userId,newProject.getId()); + projectInfo = getProjectInfoById(userId, newProject.getId()); // projectInfo.setId(newProject.getId()); // projectInfo.setName(newProject.getName()); // projectInfo.setAddress(newProject.getAddress()); @@ -490,6 +525,7 @@ public class ProjectService implements IProjectService { copyTask(oldProjectId, newProjectId, oldRoleMap, newRoleMap); } } + private void copyRoleExclude(List oldRoleList, Map oldRoleMap, Map newRoleMap) { if (CollectionUtil.isNotEmpty(oldRoleList)) { for (ProRole oldRole : oldRoleList) { @@ -647,16 +683,16 @@ public class ProjectService implements IProjectService { public ProjectVo.ProjectInfo changeProjectInfo(Long currentUserId, ProjectDto.ProjectInfoDto projectInfoDto) { //查找项目 SysProject project = sysProjectDao.selectByPrimaryKey(projectInfoDto.getId()); - if(ObjectUtil.isNotNull(project)) { + if (ObjectUtil.isNotNull(project)) { int power = proRoleService.selectPowerByRoleName(currentUserId, project.getId()); if (power > 1) { if (StrUtil.isNotEmpty(projectInfoDto.getName())) { SysProjectExample projectExample = new SysProjectExample(); projectExample.createCriteria().andNameEqualTo(projectInfoDto.getName()); List projectList = sysProjectDao.selectByExample(projectExample); - if(CollectionUtil.isNotEmpty(projectList)){ + if (CollectionUtil.isNotEmpty(projectList)) { throw new BaseException(CodeEnum.REPEAT_PROJECT_NAME); - }else { + } else { project.setName(projectInfoDto.getName()); } } @@ -670,9 +706,9 @@ public class ProjectService implements IProjectService { } else { throw new BaseException(CodeEnum.NOT_POWER); } - }else { + } else { throw new BaseException(CodeEnum.NOT_PROJECT); } - return getProjectInfoById(currentUserId,project.getId()); + return getProjectInfoById(currentUserId, project.getId()); } } diff --git a/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java b/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java index 2e027abd..90c0eed8 100644 --- a/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java +++ b/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java @@ -39,11 +39,11 @@ public class SysDomainService implements ISysDomainService{ domainInfo.setDomainName("https://test.tall.wiki/gateway/tall/v1.0"); domainInfo.setLogo(""); domainInfo.setCompanyName("传控电子科技有限公司"); - domainInfo.setSystemName("欢迎登录时物链条"); + domainInfo.setSystemName("TALL时物链条"); domainInfo.setBackdropUrl(""); domainInfo.setCaption("TM"); domainInfo.setHeadline("TALL"); - domainInfo.setShowCalender(1); + domainInfo.setShowCalendar(1); } return domainInfo; } diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index cd1b4889..7d98a429 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -223,40 +223,6 @@ public class TaskDeliverService implements ITaskDeliverService { throw new BaseException(CodeEnum.NOT_CHECKER); } -// if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())) { -// for (DeliverDto.fileInfo fileInfo : uploadDeliver.getFileInfo()) { -// -// SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId()); -//// if (ObjectUtil.isNotNull(file)) { -// ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); -// deliverPostLog.setId(snowflake.nextId()); -// deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); -// deliverPostLog.setTaskSubTimeId(subTimeId); -// deliverPostLog.setFileId(fileInfo.getId()); -// deliverPostLog.setUserId(currentUserId); -// deliverPostLog.setDescription(uploadDeliver.getDescription()); -// deliverPostLog.setTime(System.currentTimeMillis()); -// deliverPostLog.setIsHistory(0); -// deliverPostLogDao.insertSelective(deliverPostLog); -// //添加交付物检查人表 -// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { -// ProTaskDeliverPostLogChecker postLogChecker = null; -// for (Long checkerId : uploadDeliver.getCheckerIdList()) { -// postLogChecker = new ProTaskDeliverPostLogChecker(); -// postLogChecker.setId(snowflake.nextId()); -// postLogChecker.setDeliverPostLogId(deliverPostLog.getId()); -// postLogChecker.setCheckerId(checkerId); -// postLogCheckerDao.insertSelective(postLogChecker); -// } -// } else { -// throw new BaseException(CodeEnum.NOT_CHECKER); -// } -//// } else { -//// throw new BaseException(CodeEnum.NOT_DELIVER_FILE); -//// } -// } -// } - //修改交付物状态 ProTaskDeliver deliver = new ProTaskDeliver(); deliver.setId(uploadDeliver.getDeliverId()); @@ -332,7 +298,6 @@ public class TaskDeliverService implements ITaskDeliverService { Long now = System.currentTimeMillis(); if(taskDetail.getHasGroup() == 0){ subTimeId = taskDetailDao.selectSubTimeByTaskIdAndTime(taskDetail.getId(), now); - } else { TaskVo.TaskIdAndSubTimeIdByParentIdAndTime taskAndSubTime = taskDetailDao.selectSubTimeByTaskParentIdAndTime(taskDetail.getId(), now); @@ -793,8 +758,11 @@ public class TaskDeliverService implements ITaskDeliverService { for(ProTaskDeliverPostLog deliverPostLog : postLogList){ //删除文件 SysCommitedFile file = commitedFileDao.selectByPrimaryKey(deliverPostLog.getFileId()); - deleteFile(file.getPath()); - commitedFileDao.deleteByPrimaryKey(deliverPostLog.getId()); + file.setRecStatus((byte) 2); + commitedFileDao.updateByPrimaryKeySelective(file); + +// deleteFile(file.getPath()); +// commitedFileDao.deleteByPrimaryKey(deliverPostLog.getId()); //删除交付物和文件、检查人的关联信息 taskDeliverDao.deletePostLogCheckerByPostLogId(deliverPostLog.getId()); } diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java index 0d1148c5..78f48e8d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java @@ -1,14 +1,16 @@ package com.ccsens.tall.service; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.ObjectUtil; +import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; -import com.ccsens.tall.persist.dao.ProRoleDao; -import com.ccsens.tall.persist.dao.SysPluginDao; -import com.ccsens.tall.persist.dao.TaskDetailDao; -import com.ccsens.tall.persist.dao.TaskPluginDao; +import com.ccsens.tall.persist.dao.*; +import com.ccsens.util.CodeEnum; import com.ccsens.util.WebConstant; +import com.ccsens.util.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +34,16 @@ public class TaskPluginService implements ITaskPluginService{ private ProRoleDao roleDao; @Autowired private IProMemberService proMemberService; + @Autowired + private Snowflake snowflake; + @Autowired + private ProTaskCommentDao proTaskCommentDao; + @Autowired + private SysUserDao sysUserDao; + @Autowired + private SysAuthDao sysAuthDao; + @Autowired + private IProRoleService proRoleService; @Override public void savePlugin(ProTaskPlugin taskPlugin) { @@ -78,22 +90,70 @@ public class TaskPluginService implements ITaskPluginService{ } } } -// Iterator it = pluginVoList.iterator(); -// while(it.hasNext()){ -// boolean flag = false; -// TaskVo.PluginVo pluginVo = it.next(); -// if(CollectionUtil.isNotEmpty(roleList)){ -// for(ProRole role : roleList){ -// if(pluginVo.getRoleId().longValue()==role.getId().longValue()){ -// flag = true; -// } -// } -// if(!flag) { -// it.remove(); -// } -// } -// } return pluginList; } + + + /** + * 添加评论 + * @param addCommentPlugin + * @return + */ + @Override + public PluginVo.CommentInfo addComment(Long userId, PluginDto.AddCommentPlugin addCommentPlugin) { + //保存评论信息 + ProTaskComment proTaskComment = new ProTaskComment(); + proTaskComment.setId(snowflake.nextId()); + proTaskComment.setUserId(userId); + proTaskComment.setTaskSubTimeId(addCommentPlugin.getTaskId()); + proTaskComment.setDescription(addCommentPlugin.getDescription()); + proTaskComment.setTime(System.currentTimeMillis()); + proTaskCommentDao.insertSelective(proTaskComment); + //返回发送的信息 + PluginVo.CommentInfo commentInfo = new PluginVo.CommentInfo(); + commentInfo.setId(proTaskComment.getId()); + commentInfo.setUserId(proTaskComment.getUserId()); + commentInfo.setTaskId(proTaskComment.getTaskSubTimeId()); + commentInfo.setCommentTime(proTaskComment.getTime()); + commentInfo.setDescription(proTaskComment.getDescription()); + //查询用户头像和昵称 + SysUser sysUser = sysUserDao.selectByPrimaryKey(userId); + commentInfo.setAvatarUrl(sysUser.getAvatarUrl()); + if(ObjectUtil.isNotNull(sysUser.getNickname())){ + commentInfo.setUserName(sysUser.getNickname()); + }else { + //查询用户的账户名 + SysAuthExample sysAuthExample = new SysAuthExample(); + sysAuthExample.createCriteria().andUserIdEqualTo(userId) + .andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Account.value); + List sysAuthList = sysAuthDao.selectByExample(sysAuthExample); + if(CollectionUtil.isNotEmpty(sysAuthList)){ + commentInfo.setUserName(sysAuthList.get(0).getIdentifier()); + } + } + return commentInfo; + } + + @Override + public List getComment(Long currentUserId, Long taskId) { + List commentInfoList = proTaskCommentDao.getCommentByTaskId(taskId); + return commentInfoList; + } + + @Override + public void deleteComment(Long currentUserId, Long commentId) { + ProTaskComment proTaskComment = proTaskCommentDao.selectByPrimaryKey(commentId); + if(ObjectUtil.isNull(proTaskComment)){ + throw new BaseException(CodeEnum.NOT_COMMENT); + } + //只有管理员和发表评论的本人可以删除 + int power = proRoleService.selectPowerByRoleName(currentUserId, proTaskComment.getProjectid()); + if (power > 1 || currentUserId.longValue() == proTaskComment.getUserId()) { + proTaskComment.setRecStatus((byte) 2); + proTaskCommentDao.updateByPrimaryKeySelective(proTaskComment); + }else { + throw new BaseException(CodeEnum.NOT_POWER); + } + } } diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java index 74b55e66..a1eaa4b8 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java @@ -187,8 +187,15 @@ public class TaskSubTimeService implements ITaskSubTimeService { @Override public void startTask(Long currentUserId, TaskDto.StartTask startTaskDto) throws Exception { ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(startTaskDto.getId()); - Long now = System.currentTimeMillis(); + Long now = startTaskDto.getStartTime() == null ? System.currentTimeMillis() : startTaskDto.getStartTime(); if(ObjectUtil.isNotNull(taskSubTime)){ + if(taskSubTime.getComplatedStatus() != 0){ + throw new BaseException(CodeEnum.TASK_PREPARATION); + } + //结束其他进行中的任务 + completeTask(startTaskDto.getId(),startTaskDto.getRoleId(),now); + + //开始指定的任务 taskSubTime.setRealBeginTime(now); taskSubTime.setComplatedStatus(1); taskSubTimeDao.updateByPrimaryKeySelective(taskSubTime); @@ -254,6 +261,22 @@ public class TaskSubTimeService implements ITaskSubTimeService { } } + /** + * 结束其他进行中的任务 + * @param roleId + * @param time + */ + private void completeTask(Long subTaskId,Long roleId, Long time) { + List proTaskSubTimeList = taskSubTimeDao.getUnderwayTaskByRoleId(subTaskId,roleId); + if(CollectionUtil.isNotEmpty(proTaskSubTimeList)){ + for(ProTaskSubTime proTaskSubTime : proTaskSubTimeList){ + proTaskSubTime.setRealEndTime(time); + proTaskSubTime.setComplatedStatus(2); + taskSubTimeDao.updateByPrimaryKeySelective(proTaskSubTime); + } + } + } + /** * 添加清单（任务） */ @@ -379,4 +402,13 @@ public class TaskSubTimeService implements ITaskSubTimeService { } return taskDetail; } + + /** + * 清空项目下所有任务的实际开始结束时间，和运行状态 + * @param projectId + */ + @Override + public void clearTaskRealTime(Long projectId) { + taskSubTimeDao.clearTaskRealTime(projectId); + } } diff --git a/tall/src/main/java/com/ccsens/tall/service/UserService.java b/tall/src/main/java/com/ccsens/tall/service/UserService.java index b5662700..b91c063a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -1126,11 +1126,11 @@ public class UserService implements IUserService { } @Override - public UserVo.TokenBean getUserInfoAndToken(WebConstant.CLIENT_TYPE clientType, UserVo.UserSign userSignVo, Map theMap) throws Exception { + public UserVo.TokenBean getUserInfoAndToken(WebConstant.CLIENT_TYPE clientType, WebConstant.IDENTIFY_TYPE identifyType,UserVo.UserSign userSignVo, Map theMap) throws Exception { UserVo.TokenBean tokenBean = generateToken(clientType, userSignVo.getUserId(), theMap); //获取手机号 - String phone = getPhone(userSignVo.getUserId()); + String phone = getPhoneByRegisterType(userSignVo.getUserId(),identifyType); //获取账号 String account = selectAccountByPhone(phone); //获取用户的基本信息、 @@ -1150,6 +1150,25 @@ public class UserService implements IUserService { return tokenBean; } + private String getPhoneByRegisterType(Long userId, WebConstant.IDENTIFY_TYPE identifyType) { + SysAuthExample authExample = new SysAuthExample(); + authExample.createCriteria().andUserIdEqualTo(userId).andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value); + List sysAuthList = authDao.selectByExample(authExample); + if (CollectionUtil.isNotEmpty(sysAuthList)) { + return sysAuthList.get(0).getIdentifier(); + } else { + SysAuthExample authExampleType = new SysAuthExample(); + authExampleType.createCriteria().andUserIdEqualTo(userId).andIdentifyTypeEqualTo((byte) identifyType.value); + List sysAuthList1 = authDao.selectByExample(authExampleType); + if (CollectionUtil.isNotEmpty(sysAuthList1)){ + if(sysAuthList1.get(0).getRegisterType() == 1){ + return "1"; + } + } + return null; + } + } + private SysWx getSysWx(String unionId) { SysWx sysWx = null; SysWxExample sysWxExample = new SysWxExample(); @@ -1458,4 +1477,60 @@ public class UserService implements IUserService { tokenBean.setToken(tokenR.toString()); return tokenBean; } + + @Override + public UserVo.Account systemRegister(UserDto.UserSignupSystem userSignup) { + UserVo.Account account = new UserVo.Account(); + //1.添加user + SysUser user = new SysUser(); + user.setId(snowflake.nextId()); + userDao.insertSelective(user); + //自动添加账号密码 + String accountName = null; + String password = null; + if(StrUtil.isNotEmpty(userSignup.getAccount())){ + accountName = userSignup.getAccount(); + SysAuthExample sysAuthExample = new SysAuthExample(); + sysAuthExample.createCriteria().andIdentifierEqualTo(accountName).andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Account.value); + List authList = authDao.selectByExample(sysAuthExample); + if(CollectionUtil.isNotEmpty(authList)){ + throw new BaseException(CodeEnum.ALREADY_EXIST_ACCOUNT); + } + }else { + accountName = "USER_" + RandomStringUtils.random(8, WebConstant.RANDOM_STR); + } + //检查账号是否存在 + boolean flag = true; + int i = 0; + while (flag){ + SysAuthExample sysAuthExample = new SysAuthExample(); + sysAuthExample.createCriteria().andIdentifierEqualTo(accountName + (i==0 ? "" : "_"+i)).andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Account.value); + List authList1 = authDao.selectByExample(sysAuthExample); + if(CollectionUtil.isEmpty(authList1)){ + flag = false; + }else { + i++; + } + } + accountName = accountName + (i==0 ? "" : "_"+i); + + if(StrUtil.isNotEmpty(userSignup.getPassword())){ + password = userSignup.getPassword(); + }else { + password = "123456"; + } + SysAuth accountAuth = new SysAuth(); + accountAuth.setId(snowflake.nextId()); + accountAuth.setUserId(user.getId()); + accountAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.Account.value); + accountAuth.setIdentifier(accountName); + accountAuth.setSalt(ShiroKit.getRandomSalt(6)); + accountAuth.setCredential(ShiroKit.md5(password, accountAuth.getSalt())); + accountAuth.setRegisterType((byte) 1); + authDao.insertSelective(accountAuth); + + account.setId(user.getId()); + account.setUsername(accountAuth.getIdentifier()); + return account; + } } diff --git a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java index 2a7bc7ed..fdb795c2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java +++ b/tall/src/main/java/com/ccsens/tall/service/WbsSubSheetService.java @@ -47,13 +47,15 @@ public class WbsSubSheetService implements IWbsSubSheetService { private ProPluginSigninFuzzyDao pluginSigninFuzzyDao; @Autowired private ProPluginConfigDao proPluginConfigDao; + @Autowired + private SysRobotDao sysRobotDao; /** * 读取子任务表 */ @Override public void getSubTask(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, - List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) { + List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) throws Exception { XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); Long startTime = parentTaskDetail.getBeginTime(); if (ObjectUtil.isNotNull(subTaskSheet)) { @@ -141,7 +143,7 @@ public class WbsSubSheetService implements IWbsSubSheetService { } else { throw new BaseException(CodeEnum.WBS_NOT_SUB_TASK); } - parentTaskDetail.setRecStatus((byte) 2); + parentTaskDetail.setRecStatus((byte) 3); } /** @@ -149,7 +151,7 @@ public class WbsSubSheetService implements IWbsSubSheetService { */ @Override public void getSubTaskMt(XSSFWorkbook xssfWorkbook, String sheetName, ProTaskDetail parentTaskDetail, - List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) { + List taskDetails, List proMembers, String deliverCell, Map> hasGroupMap) throws Exception { List taskNameList = new ArrayList<>(); XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); @@ -232,7 +234,7 @@ public class WbsSubSheetService implements IWbsSubSheetService { * @param taskDetails */ @Override - public void getSigninSheet(Long projectId, XSSFWorkbook xssfWorkbook, List taskDetails) { + public void getSigninSheet(Long projectId, XSSFWorkbook xssfWorkbook, List taskDetails) throws Exception { XSSFSheet signSheet = xssfWorkbook.getSheet("签到信息表"); if (ObjectUtil.isNotNull(signSheet)) { int fuzzyStart = 0; @@ -394,7 +396,7 @@ public class WbsSubSheetService implements IWbsSubSheetService { * @param taskDetails */ @Override - public void getPluginConfig(Long id, XSSFWorkbook xssfWorkbook, List taskDetails) { + public void getPluginConfig(Long id, XSSFWorkbook xssfWorkbook, List taskDetails) throws Exception { XSSFSheet pluginConfigSheet = xssfWorkbook.getSheet("插件配置"); if (ObjectUtil.isNotNull(pluginConfigSheet)) { for (int i = 2; i <= pluginConfigSheet.getLastRowNum(); i++) { @@ -452,4 +454,35 @@ public class WbsSubSheetService implements IWbsSubSheetService { } } } + + /** + * 读取智能助手表 + * @param projectId + * @param xssfWorkbook + */ + @Override + public void getRoBotSheet(Long projectId, XSSFWorkbook xssfWorkbook) { + XSSFSheet robotSheet = xssfWorkbook.getSheet("插件配置"); + if(ObjectUtil.isNotNull(robotSheet)){ + for (int i = 1; i <= robotSheet.getLastRowNum(); i++) { + String robotName = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(0)); + String webHookPath = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(1)); + String messageType = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(2)); + if(StrUtil.isNotEmpty(webHookPath)){ + SysRobotExample sysRobotExample = new SysRobotExample(); + sysRobotExample.createCriteria().andWebHookEqualTo(webHookPath); + List sysRobotList = sysRobotDao.selectByExample(sysRobotExample); + if(CollectionUtil.isNotEmpty(sysRobotList)){ + SysRobot sysRobot = sysRobotList.get(0); + SysProjectRobot sysProjectRobot = new SysProjectRobot(); + sysProjectRobot.setId(snowflake.nextId()); + sysProjectRobot.setRobotId(sysRobot.getId()); + sysProjectRobot.setProjectId(projectId); + }else { + + } + } + } + } + } } diff --git a/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java b/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java index 22cca2fc..981f8bf8 100644 --- a/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java +++ b/tall/src/main/java/com/ccsens/tall/util/TaskUtil.java @@ -3,6 +3,7 @@ package com.ccsens.tall.util; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.service.IProTaskDetailService; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -15,6 +16,7 @@ import java.util.List; * @author: wu huijuan * @create: 2019/11/15 16:57 */ +@Slf4j @Component public class TaskUtil { @@ -36,6 +38,7 @@ public class TaskUtil { } public static Task splitTask(List taskDetails, long start, long end,Integer process) { + log.info("传入判断是否是全局：{}",taskDetails); Task task = new Task(); List globalTask = new ArrayList<>(); List commonTask = new ArrayList<>(); @@ -79,6 +82,7 @@ public class TaskUtil { beginMin = detail.getBeginTime() < beginMin ? detail.getBeginTime() : beginMin; endMax = detail.getEndTime() > endMax ? detail.getEndTime() : endMax; } + log.info("判断是否是全局：{}",temp); } // //跨越全视窗的为全局任务 // for (TaskVo.NormalTask detail : temp) { @@ -91,6 +95,7 @@ public class TaskUtil { task.setGlobalTask(globalTask); // task.setCommonTask(commonTask); task.setCommonTask(temp); + log.info("判断是否是全局返回：{}",task); return task; } diff --git a/tall/src/main/java/com/ccsens/tall/web/ExcelController.java b/tall/src/main/java/com/ccsens/tall/web/ExcelController.java index 65fcae71..1d03de32 100644 --- a/tall/src/main/java/com/ccsens/tall/web/ExcelController.java +++ b/tall/src/main/java/com/ccsens/tall/web/ExcelController.java @@ -1,8 +1,10 @@ package com.ccsens.tall.web; +import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.service.IExcelService; +import com.ccsens.tall.service.IExportWbsService; import com.ccsens.util.JsonResponse; import com.ccsens.util.UploadFileUtil_Servlet3; import com.ccsens.util.WebConstant; @@ -12,22 +14,22 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; import java.io.File; +import java.util.List; -@Api(tags = "导入Excel创建项目API" , description = "") +@Api(tags = "Excel" , description = "") @RestController @RequestMapping("/projects") public class ExcelController { @Autowired private IExcelService excelService; + @Autowired + private IExportWbsService exportWbsService; @ApiOperation(value = "导入WBS",notes = "文件大小不能超过20M，支持后缀:.xls|.xlsx") @ApiImplicitParams({ @@ -47,4 +49,40 @@ public class ExcelController { return JsonResponse.newInstance().ok(projectInfo); } + @ApiOperation(value = "导出wbs", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/wbs", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse exportWbs(HttpServletRequest request, + @RequestParam(required = true) Long projectId) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + String wbsPath = exportWbsService.exportWbs(projectId); + return JsonResponse.newInstance().ok(wbsPath); + } + + @ApiOperation(value = "导出项目清单", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/export/list", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse exportChecklist(HttpServletRequest request, + @RequestParam(required = false) Long projectId, + @RequestParam(required = false) Long roleId, + @RequestParam(required = false) Long startTime, + @RequestParam(required = false) Long endTime) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + String wbsPath = exportWbsService.exportChecklist(currentUserId,projectId,roleId,startTime,endTime); + return JsonResponse.newInstance().ok(wbsPath); + } + + @ApiOperation(value = "导出MVP", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/export/mvp", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse exportMVP(HttpServletRequest request, + @RequestParam(required = false) Long projectId) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + String wbsPath = exportWbsService.exportDeliver(currentUserId,projectId); +// String s = "https://test.tall.wiki/gateway/tall/v1.0/uploads//exportWbs/2020-05-07/1588833118577.xlsx"; + return JsonResponse.newInstance().ok(wbsPath); + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/PluginController.java b/tall/src/main/java/com/ccsens/tall/web/PluginController.java index db5ca7c7..50d3e3f0 100644 --- a/tall/src/main/java/com/ccsens/tall/web/PluginController.java +++ b/tall/src/main/java/com/ccsens/tall/web/PluginController.java @@ -1,18 +1,21 @@ package com.ccsens.tall.web; +import com.ccsens.tall.bean.dto.PluginDto; +import com.ccsens.tall.bean.dto.TaskDto; import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.service.ISysPluginService; +import com.ccsens.tall.service.ITaskPluginService; import com.ccsens.util.JsonResponse; import com.ccsens.util.WebConstant; import io.jsonwebtoken.Claims; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -21,6 +24,8 @@ import java.util.List; @RestController @RequestMapping("/plugins") public class PluginController { + @Autowired + private ITaskPluginService taskPluginService; @Autowired private ISysPluginService sysPluginService; @@ -69,4 +74,38 @@ public class PluginController { return taskDetailId; } + + + @ApiOperation(value = "评论", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "comment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse addComment(HttpServletRequest request, + @ApiParam @Validated @RequestBody PluginDto.AddCommentPlugin addCommentPlugin) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + PluginVo.CommentInfo commentInfo = taskPluginService.addComment(currentUserId,addCommentPlugin); + return JsonResponse.newInstance().ok(commentInfo); + } + + @ApiOperation(value = "查找任务下的评论", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "comment", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> getComment(HttpServletRequest request, + @RequestParam(required = true) Long taskId) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + List commentInfoList = taskPluginService.getComment(currentUserId,taskId); + return JsonResponse.newInstance().ok(commentInfoList); + } + + @ApiOperation(value = "删除评论", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "delComment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse deleteComment(HttpServletRequest request, + @RequestParam(required = true) Long commentId) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + taskPluginService.deleteComment(currentUserId,commentId); + return JsonResponse.newInstance().ok(); + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/ProjectController.java b/tall/src/main/java/com/ccsens/tall/web/ProjectController.java index 7fa07ba3..6b954176 100644 --- a/tall/src/main/java/com/ccsens/tall/web/ProjectController.java +++ b/tall/src/main/java/com/ccsens/tall/web/ProjectController.java @@ -101,10 +101,10 @@ public class ProjectController { @ApiImplicitParam(name = "page", value = "页数", required = true, paramType = "query") }) @RequestMapping(value = "/{id}/tasks", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) - public JsonResponse getTasksByRoleId(HttpServletRequest request, - @PathVariable("id") Long projectId, - @RequestParam(required = true) Long roleId, Integer page, - Long startTime, Long endTime, Integer process) throws Exception{ + public JsonResponse getTasksByRoleId(HttpServletRequest request, + @PathVariable("id") Long projectId, + @RequestParam(required = true) Long roleId, Integer page, + Long startTime, Long endTime, Integer process) throws Exception{ Integer pageSize = 10; page = page == null ? 1 : page; process = process == null ? 0 : process; @@ -140,9 +140,9 @@ public class ProjectController { @ApiImplicitParams({ }) @RequestMapping(value = "forever", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> getForever(HttpServletRequest request) throws Exception { + public JsonResponse> getForever(HttpServletRequest request, @RequestParam(required = false) String domainName) throws Exception { - List forever = projectService.getForever(); + List forever = projectService.getForever(domainName); return JsonResponse.newInstance().ok(forever); } @@ -180,6 +180,8 @@ public class ProjectController { return JsonResponse.newInstance().ok(projectByKeyList); } + + //============================================================== @ApiOperation(value = "删除项目(修改状态)", notes = "") @ApiImplicitParams({ diff --git a/tall/src/main/java/com/ccsens/tall/web/TaskController.java b/tall/src/main/java/com/ccsens/tall/web/TaskController.java index 0d994247..f6d45c1f 100644 --- a/tall/src/main/java/com/ccsens/tall/web/TaskController.java +++ b/tall/src/main/java/com/ccsens/tall/web/TaskController.java @@ -1,5 +1,6 @@ package com.ccsens.tall.web; +import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.dto.TaskDto; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.service.IProTaskDetailService; @@ -107,6 +108,18 @@ public class TaskController { return JsonResponse.newInstance().ok(taskDetailByKeyList); } + @ApiOperation(value = "清空项目下的任务实际运行时间及状态",notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "clearTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse clearTaskRealTime(HttpServletRequest request, + @ApiParam @Validated @RequestBody ProjectDto.ProjectIdDto projectId) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + subTimeService.clearTaskRealTime(projectId.getProjectId()); + return JsonResponse.newInstance().ok(); + } + + //============================================================== @ApiOperation(value = "添加清单（任务）",notes = "") diff --git a/tall/src/main/java/com/ccsens/tall/web/UserController.java b/tall/src/main/java/com/ccsens/tall/web/UserController.java index 26e49892..a7bcb5b1 100644 --- a/tall/src/main/java/com/ccsens/tall/web/UserController.java +++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java @@ -93,7 +93,7 @@ public class UserController { if (ObjectUtil.isNotNull(userSignVo)) { Map theMap = CollectionUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); - UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, userSignVo, theMap); + UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, identify_type,userSignVo, theMap); return JsonResponse.newInstance().ok(tokenBean); } else { @@ -124,20 +124,11 @@ public class UserController { //3.生成token(access_token,refresh_token) if (ObjectUtil.isNotNull(userSignVo)) { WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1); + WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3); Map theMap = CollectionUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); - UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, userSignVo, theMap); - -// Map theMap = CollectionUtil.newHashMap(); -// theMap.put("authId", String.valueOf(userSignVo.getAuthId())); -// UserVo.TokenBean tokenBean = userService.generateToken(client_type, userSignVo.getUserId(), theMap); -// //获取手机号 -// String phone = userService.getPhone(userSignVo.getUserId()); -// String account = userService.selectAccountByPhone(phone); -// tokenBean.setId(userSignVo.getUserId()); -// tokenBean.setPhone(phone); -// tokenBean.setAccount(account); + UserVo.TokenBean tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap); return JsonResponse.newInstance().ok(tokenBean); } else { @@ -145,6 +136,17 @@ public class UserController { } } + @ApiOperation(value = "/注册（不需要手机号）", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/signup/system", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse systemRegister(HttpServletRequest request, + @ApiParam @Validated @RequestBody(required = true) UserDto.UserSignupSystem userSignup) throws Exception { + + UserVo.Account account = userService.systemRegister(userSignup); + return JsonResponse.newInstance().ok(account); + } + @ApiOperation(value = "/检查账号是否被注册", notes = "") @ApiImplicitParams({ }) @@ -188,9 +190,10 @@ public class UserController { UserVo.TokenBean tokenBean = null; if (ObjectUtil.isNotNull(userSignVo)) { WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1); + WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3); Map theMap = CollectionUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); - tokenBean = userService.getUserInfoAndToken(clientType, userSignVo, theMap); + tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap); } return JsonResponse.newInstance().ok(tokenBean); } @@ -207,9 +210,10 @@ public class UserController { UserVo.TokenBean tokenBean = null; if (ObjectUtil.isNotNull(userSignVo)) { WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1); + WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3); Map theMap = CollectionUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); - tokenBean = userService.getUserInfoAndToken(clientType, userSignVo, theMap); + tokenBean = userService.getUserInfoAndToken(clientType,identifyType, userSignVo, theMap); } return JsonResponse.newInstance().ok(tokenBean); } @@ -268,9 +272,10 @@ public class UserController { UserVo.TokenBean tokenBean = null; if (ObjectUtil.isNotNull(userSignVo)) { WebConstant.CLIENT_TYPE clientType = WebConstant.CLIENT_TYPE.valueOf(1); + WebConstant.IDENTIFY_TYPE identifyType = WebConstant.IDENTIFY_TYPE.valueOf(3); Map theMap = CollectionUtil.newHashMap(); theMap.put("authId", String.valueOf(userSignVo.getAuthId())); - tokenBean = userService.getUserInfoAndToken(clientType, userSignVo, theMap); + tokenBean = userService.getUserInfoAndToken(clientType, identifyType,userSignVo, theMap); } return JsonResponse.newInstance().ok(tokenBean); } diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 1d881c2f..c88e995d 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: util-dev,common \ No newline at end of file + active: test + include: util-test,common diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml index e06735e2..5280ef5f 100644 --- a/tall/src/main/resources/mapper_dao/DeliverDao.xml +++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml @@ -63,6 +63,15 @@ + + + + + + + + + + SELECT + s.id as sId, + s.name as projectName, + t.id as tId, + t.name as taskName, + t.begin_time as taskBeginTime, + t.end_time as taskEndTime, + t.cycle as taskCycle, + d.id as deliverId, + d.`name` as deliverName + FROM + t_pro_task_detail t LEFT JOIN t_sys_project s on t.project_id = s.id + LEFT JOIN t_pro_task_deliver d on d.task_detail_id = t.id + WHERE + t.rec_status = 0 + and + t.`level` in (2,3) + and + t.project_id = #{projectId} + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProMemberDao.xml b/tall/src/main/resources/mapper_dao/ProMemberDao.xml index c8dad008..c6040326 100644 --- a/tall/src/main/resources/mapper_dao/ProMemberDao.xml +++ b/tall/src/main/resources/mapper_dao/ProMemberDao.xml @@ -86,4 +86,40 @@ m.project_id = #{projectId} + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml index 82328ffb..3e2f1a57 100644 --- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml @@ -154,4 +154,20 @@ + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProRoleExcludeDao.xml b/tall/src/main/resources/mapper_dao/ProRoleExcludeDao.xml new file mode 100644 index 00000000..5fe6fa25 --- /dev/null +++ b/tall/src/main/resources/mapper_dao/ProRoleExcludeDao.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProTaskCommentDao.xml b/tall/src/main/resources/mapper_dao/ProTaskCommentDao.xml new file mode 100644 index 00000000..06eac376 --- /dev/null +++ b/tall/src/main/resources/mapper_dao/ProTaskCommentDao.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/ProTaskShowDao.xml b/tall/src/main/resources/mapper_dao/ProTaskShowDao.xml new file mode 100644 index 00000000..a41d5533 --- /dev/null +++ b/tall/src/main/resources/mapper_dao/ProTaskShowDao.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/SysPluginDao.xml b/tall/src/main/resources/mapper_dao/SysPluginDao.xml index f13c6fe1..404a50c7 100644 --- a/tall/src/main/resources/mapper_dao/SysPluginDao.xml +++ b/tall/src/main/resources/mapper_dao/SysPluginDao.xml @@ -46,4 +46,53 @@ and description like concat('%',#{key},'%') + + + + UPDATE + t_pro_task_plugin p join t_pro_plugin_config pc + ON p.task_detail_id = pc.task_id + SET + p.rec_status=2, + pc.rec_status=2 + WHERE + p.task_detail_id = #{taskId} + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index d2b0aa76..b6b6f290 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -54,6 +54,12 @@ - SELECT + SELECT + *, + GROUP_CONCAT(t.p_id ORDER BY t.p_id) as pId, + GROUP_CONCAT(t.spName ORDER BY t.p_id) as pName, + GROUP_CONCAT(t.spDescription ORDER BY t.spid) as pDescription + FROM + (SELECT d.id as tDetailId, s.id as tSubTimeId, d.name as tName, @@ -295,23 +348,27 @@ d.virtual as tVirtual, d.delay as tDelay, d.has_group as tHasGroup, - GROUP_CONCAT(p.id ORDER BY p.id) as pId, - GROUP_CONCAT(sp.name ORDER BY sp.id) as pName, - GROUP_CONCAT(sp.description ORDER BY sp.id) as pDescription + sp.name as spName, + p.id as p_id, + sp.description as spDescription, + sp.id as spid FROM t_pro_task_sub_time s LEFT JOIN t_pro_task_detail d ON s.task_detail_id = d.id LEFT JOIN t_pro_task_plugin p ON p.task_detail_id = d.id LEFT JOIN t_sys_plugin sp ON sp.id = p.plugin_id WHERE d.rec_status = 0 + and + (p.rec_status = 0 OR p.rec_status IS NULL) AND d.parent_id = #{parentId} AND s.begin_time < #{endTime} AND s.end_time > #{startTime} - group by s.task_detail_id - ORDER BY s.begin_time + group by s.task_detail_id,sp.id + ORDER BY s.begin_time)t + GROUP BY t.tSubTimeId limit 0,1 @@ -348,17 +405,79 @@ limit 0,1 - - DELETE - d, - s, - sm - FROM + + + update t_pro_task_detail d LEFT JOIN t_pro_task_sub_time s ON s.task_detail_id = d.id LEFT JOIN t_pro_sub_time_member sm ON sm.task_sub_time_id = s.id + set + d.rec_status=2, + s.rec_status=2, + sm.rec_status=2 WHERE d.id = #{detailId} - + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml b/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml new file mode 100644 index 00000000..246eddad --- /dev/null +++ b/tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml @@ -0,0 +1,31 @@ + + + + + + + + UPDATE + t_pro_task_sub_time s LEFT JOIN t_pro_task_detail d on s.task_detail_id = d.id LEFT JOIN t_sys_project p on d.project_id = p.id + SET + s.real_begin_time = 0, + s.real_end_time = 0, + s.complated_status = 0 + WHERE + p.id = #{projectId} + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProShowMapper.xml b/tall/src/main/resources/mapper_raw/ProShowMapper.xml index 9641bae7..f980e2b9 100644 --- a/tall/src/main/resources/mapper_raw/ProShowMapper.xml +++ b/tall/src/main/resources/mapper_raw/ProShowMapper.xml @@ -6,14 +6,15 @@ - - - + + + + @@ -74,8 +75,8 @@ - id, project_id, slide, filter, time_show, duration, is_show_mvp, create_task, show_shortcuts, - created_at, updated_at, rec_status + id, project_id, slide, filter, is_show_mvp, create_task, created_at, updated_at, + rec_status, time_show, duration, show_shortcuts, select_task_type @@ -219,21 +226,12 @@ filter = #{record.filter,jdbcType=TINYINT}, - - time_show = #{record.timeShow,jdbcType=VARCHAR}, - - - duration = #{record.duration,jdbcType=TINYINT}, - is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT}, create_task = #{record.createTask,jdbcType=TINYINT}, - - show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, @@ -243,6 +241,18 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + time_show = #{record.timeShow,jdbcType=VARCHAR}, + + + duration = #{record.duration,jdbcType=TINYINT}, + + + show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT}, + + + select_task_type = #{record.selectTaskType,jdbcType=TINYINT}, + @@ -254,14 +264,15 @@ project_id = #{record.projectId,jdbcType=BIGINT}, slide = #{record.slide,jdbcType=TINYINT}, filter = #{record.filter,jdbcType=TINYINT}, - time_show = #{record.timeShow,jdbcType=VARCHAR}, - duration = #{record.duration,jdbcType=TINYINT}, is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT}, create_task = #{record.createTask,jdbcType=TINYINT}, - show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + time_show = #{record.timeShow,jdbcType=VARCHAR}, + duration = #{record.duration,jdbcType=TINYINT}, + show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT}, + select_task_type = #{record.selectTaskType,jdbcType=TINYINT} @@ -278,21 +289,12 @@ filter = #{filter,jdbcType=TINYINT}, - - time_show = #{timeShow,jdbcType=VARCHAR}, - - - duration = #{duration,jdbcType=TINYINT}, - is_show_mvp = #{isShowMvp,jdbcType=TINYINT}, create_task = #{createTask,jdbcType=TINYINT}, - - show_shortcuts = #{showShortcuts,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, @@ -302,6 +304,18 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + time_show = #{timeShow,jdbcType=VARCHAR}, + + + duration = #{duration,jdbcType=TINYINT}, + + + show_shortcuts = #{showShortcuts,jdbcType=TINYINT}, + + + select_task_type = #{selectTaskType,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -310,14 +324,15 @@ set project_id = #{projectId,jdbcType=BIGINT}, slide = #{slide,jdbcType=TINYINT}, filter = #{filter,jdbcType=TINYINT}, - time_show = #{timeShow,jdbcType=VARCHAR}, - duration = #{duration,jdbcType=TINYINT}, is_show_mvp = #{isShowMvp,jdbcType=TINYINT}, create_task = #{createTask,jdbcType=TINYINT}, - show_shortcuts = #{showShortcuts,jdbcType=TINYINT}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + time_show = #{timeShow,jdbcType=VARCHAR}, + duration = #{duration,jdbcType=TINYINT}, + show_shortcuts = #{showShortcuts,jdbcType=TINYINT}, + select_task_type = #{selectTaskType,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProTaskCommentMapper.xml b/tall/src/main/resources/mapper_raw/ProTaskCommentMapper.xml new file mode 100644 index 00000000..842a10b8 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProTaskCommentMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, task_sub_time_id, time, description, created_at, updated_at, rec_status, + projectId + + + + + delete from t_pro_task_comment + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_comment + + + + + + insert into t_pro_task_comment (id, user_id, task_sub_time_id, + time, description, created_at, + updated_at, rec_status, projectId + ) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, + #{time,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{projectid,jdbcType=BIGINT} + ) + + + insert into t_pro_task_comment + + + id, + + + user_id, + + + task_sub_time_id, + + + time, + + + description, + + + created_at, + + + updated_at, + + + rec_status, + + + projectId, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{taskSubTimeId,jdbcType=BIGINT}, + + + #{time,jdbcType=BIGINT}, + + + #{description,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{projectid,jdbcType=BIGINT}, + + + + + + update t_pro_task_comment + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + + + time = #{record.time,jdbcType=BIGINT}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + projectId = #{record.projectid,jdbcType=BIGINT}, + + + + + + + + update t_pro_task_comment + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, + time = #{record.time,jdbcType=BIGINT}, + description = #{record.description,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + projectId = #{record.projectid,jdbcType=BIGINT} + + + + + + update t_pro_task_comment + + + user_id = #{userId,jdbcType=BIGINT}, + + + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + + + time = #{time,jdbcType=BIGINT}, + + + description = #{description,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + projectId = #{projectid,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_comment + set user_id = #{userId,jdbcType=BIGINT}, + task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, + time = #{time,jdbcType=BIGINT}, + description = #{description,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + projectId = #{projectid,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/ProTaskShowMapper.xml b/tall/src/main/resources/mapper_raw/ProTaskShowMapper.xml new file mode 100644 index 00000000..b357d127 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/ProTaskShowMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_id, task_detail_id, time_show, duration, create_task, show_hardware, + show_deliver, show_money, created_at, updated_at, rec_status + + + + + delete from t_pro_task_show + where id = #{id,jdbcType=BIGINT} + + + delete from t_pro_task_show + + + + + + insert into t_pro_task_show (id, project_id, task_detail_id, + time_show, duration, create_task, + show_hardware, show_deliver, show_money, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{taskDetailId,jdbcType=BIGINT}, + #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, + #{showHardware,jdbcType=TINYINT}, #{showDeliver,jdbcType=TINYINT}, #{showMoney,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_pro_task_show + + + id, + + + project_id, + + + task_detail_id, + + + time_show, + + + duration, + + + create_task, + + + show_hardware, + + + show_deliver, + + + show_money, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{taskDetailId,jdbcType=BIGINT}, + + + #{timeShow,jdbcType=VARCHAR}, + + + #{duration,jdbcType=TINYINT}, + + + #{createTask,jdbcType=TINYINT}, + + + #{showHardware,jdbcType=TINYINT}, + + + #{showDeliver,jdbcType=TINYINT}, + + + #{showMoney,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_pro_task_show + + + id = #{record.id,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + + + time_show = #{record.timeShow,jdbcType=VARCHAR}, + + + duration = #{record.duration,jdbcType=TINYINT}, + + + create_task = #{record.createTask,jdbcType=TINYINT}, + + + show_hardware = #{record.showHardware,jdbcType=TINYINT}, + + + show_deliver = #{record.showDeliver,jdbcType=TINYINT}, + + + show_money = #{record.showMoney,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_pro_task_show + set id = #{record.id,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + task_detail_id = #{record.taskDetailId,jdbcType=BIGINT}, + time_show = #{record.timeShow,jdbcType=VARCHAR}, + duration = #{record.duration,jdbcType=TINYINT}, + create_task = #{record.createTask,jdbcType=TINYINT}, + show_hardware = #{record.showHardware,jdbcType=TINYINT}, + show_deliver = #{record.showDeliver,jdbcType=TINYINT}, + show_money = #{record.showMoney,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_pro_task_show + + + project_id = #{projectId,jdbcType=BIGINT}, + + + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + + + time_show = #{timeShow,jdbcType=VARCHAR}, + + + duration = #{duration,jdbcType=TINYINT}, + + + create_task = #{createTask,jdbcType=TINYINT}, + + + show_hardware = #{showHardware,jdbcType=TINYINT}, + + + show_deliver = #{showDeliver,jdbcType=TINYINT}, + + + show_money = #{showMoney,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_pro_task_show + set project_id = #{projectId,jdbcType=BIGINT}, + task_detail_id = #{taskDetailId,jdbcType=BIGINT}, + time_show = #{timeShow,jdbcType=VARCHAR}, + duration = #{duration,jdbcType=TINYINT}, + create_task = #{createTask,jdbcType=TINYINT}, + show_hardware = #{showHardware,jdbcType=TINYINT}, + show_deliver = #{showDeliver,jdbcType=TINYINT}, + show_money = #{showMoney,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysAuthMapper.xml b/tall/src/main/resources/mapper_raw/SysAuthMapper.xml index fb775a5a..8cfef03b 100644 --- a/tall/src/main/resources/mapper_raw/SysAuthMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysAuthMapper.xml @@ -1,276 +1,291 @@ - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, user_id, identify_type, identifier, credential, salt, created_at, updated_at, - rec_status - - - - - delete from t_sys_auth - where id = #{id,jdbcType=BIGINT} - - - delete from t_sys_auth - - - - - - insert into t_sys_auth (id, user_id, identify_type, - identifier, credential, salt, - created_at, updated_at, rec_status - ) - values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{identifyType,jdbcType=TINYINT}, - #{identifier,jdbcType=VARCHAR}, #{credential,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, - #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} - ) - - - insert into t_sys_auth - - - id, - - - user_id, - - - identify_type, - - - identifier, - - - credential, - - - salt, - - - created_at, - - - updated_at, - - - rec_status, - - - - - #{id,jdbcType=BIGINT}, - - - #{userId,jdbcType=BIGINT}, - - - #{identifyType,jdbcType=TINYINT}, - - - #{identifier,jdbcType=VARCHAR}, - - - #{credential,jdbcType=VARCHAR}, - - - #{salt,jdbcType=VARCHAR}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - - - - update t_sys_auth - - - id = #{record.id,jdbcType=BIGINT}, - - - user_id = #{record.userId,jdbcType=BIGINT}, - - - identify_type = #{record.identifyType,jdbcType=TINYINT}, - - - identifier = #{record.identifier,jdbcType=VARCHAR}, - - - credential = #{record.credential,jdbcType=VARCHAR}, - - - salt = #{record.salt,jdbcType=VARCHAR}, - - - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{record.recStatus,jdbcType=TINYINT}, - - - - - - - - update t_sys_auth - set id = #{record.id,jdbcType=BIGINT}, - user_id = #{record.userId,jdbcType=BIGINT}, - identify_type = #{record.identifyType,jdbcType=TINYINT}, - identifier = #{record.identifier,jdbcType=VARCHAR}, - credential = #{record.credential,jdbcType=VARCHAR}, - salt = #{record.salt,jdbcType=VARCHAR}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} - - - - - - update t_sys_auth - - - user_id = #{userId,jdbcType=BIGINT}, - - - identify_type = #{identifyType,jdbcType=TINYINT}, - - - identifier = #{identifier,jdbcType=VARCHAR}, - - - credential = #{credential,jdbcType=VARCHAR}, - - - salt = #{salt,jdbcType=VARCHAR}, - - - created_at = #{createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{recStatus,jdbcType=TINYINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_sys_auth - set user_id = #{userId,jdbcType=BIGINT}, - identify_type = #{identifyType,jdbcType=TINYINT}, - identifier = #{identifier,jdbcType=VARCHAR}, - credential = #{credential,jdbcType=VARCHAR}, - salt = #{salt,jdbcType=VARCHAR}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, user_id, identify_type, identifier, credential, salt, created_at, updated_at, + rec_status, register_type + + + + + delete from t_sys_auth + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_auth + + + + + + insert into t_sys_auth (id, user_id, identify_type, + identifier, credential, salt, + created_at, updated_at, rec_status, + register_type) + values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{identifyType,jdbcType=TINYINT}, + #{identifier,jdbcType=VARCHAR}, #{credential,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, + #{registerType,jdbcType=TINYINT}) + + + insert into t_sys_auth + + + id, + + + user_id, + + + identify_type, + + + identifier, + + + credential, + + + salt, + + + created_at, + + + updated_at, + + + rec_status, + + + register_type, + + + + + #{id,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{identifyType,jdbcType=TINYINT}, + + + #{identifier,jdbcType=VARCHAR}, + + + #{credential,jdbcType=VARCHAR}, + + + #{salt,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + #{registerType,jdbcType=TINYINT}, + + + + + + update t_sys_auth + + + id = #{record.id,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + identify_type = #{record.identifyType,jdbcType=TINYINT}, + + + identifier = #{record.identifier,jdbcType=VARCHAR}, + + + credential = #{record.credential,jdbcType=VARCHAR}, + + + salt = #{record.salt,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + register_type = #{record.registerType,jdbcType=TINYINT}, + + + + + + + + update t_sys_auth + set id = #{record.id,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + identify_type = #{record.identifyType,jdbcType=TINYINT}, + identifier = #{record.identifier,jdbcType=VARCHAR}, + credential = #{record.credential,jdbcType=VARCHAR}, + salt = #{record.salt,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT}, + register_type = #{record.registerType,jdbcType=TINYINT} + + + + + + update t_sys_auth + + + user_id = #{userId,jdbcType=BIGINT}, + + + identify_type = #{identifyType,jdbcType=TINYINT}, + + + identifier = #{identifier,jdbcType=VARCHAR}, + + + credential = #{credential,jdbcType=VARCHAR}, + + + salt = #{salt,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + register_type = #{registerType,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_auth + set user_id = #{userId,jdbcType=BIGINT}, + identify_type = #{identifyType,jdbcType=TINYINT}, + identifier = #{identifier,jdbcType=VARCHAR}, + credential = #{credential,jdbcType=VARCHAR}, + salt = #{salt,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT}, + register_type = #{registerType,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysDomainMapper.xml b/tall/src/main/resources/mapper_raw/SysDomainMapper.xml index f5be06f1..568af1f2 100644 --- a/tall/src/main/resources/mapper_raw/SysDomainMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysDomainMapper.xml @@ -15,6 +15,7 @@ + @@ -76,7 +77,7 @@ id, domain_name, logo, company_name, system_name, backdrop_url, show_calendar, show_project_id, - caption, headline, created_at, updated_at, rec_status + caption, headline, created_at, updated_at, rec_status, forever_project_id @@ -253,6 +260,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + forever_project_id = #{record.foreverProjectId,jdbcType=VARCHAR}, + @@ -272,7 +282,8 @@ headline = #{record.headline,jdbcType=VARCHAR}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + forever_project_id = #{record.foreverProjectId,jdbcType=VARCHAR} @@ -316,6 +327,9 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + forever_project_id = #{foreverProjectId,jdbcType=VARCHAR}, + where id = #{id,jdbcType=BIGINT} @@ -332,7 +346,8 @@ headline = #{headline,jdbcType=VARCHAR}, created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + forever_project_id = #{foreverProjectId,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysMessageTypeMapper.xml b/tall/src/main/resources/mapper_raw/SysMessageTypeMapper.xml new file mode 100644 index 00000000..ee670851 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/SysMessageTypeMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, path, operate_type, template, description, created_at, updated_at, rec_status + + + + + delete from t_sys_message_type + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_message_type + + + + + + insert into t_sys_message_type (id, name, path, + operate_type, template, description, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, + #{operateType,jdbcType=TINYINT}, #{template,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_message_type + + + id, + + + name, + + + path, + + + operate_type, + + + template, + + + description, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{path,jdbcType=VARCHAR}, + + + #{operateType,jdbcType=TINYINT}, + + + #{template,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_message_type + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + path = #{record.path,jdbcType=VARCHAR}, + + + operate_type = #{record.operateType,jdbcType=TINYINT}, + + + template = #{record.template,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_message_type + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + path = #{record.path,jdbcType=VARCHAR}, + operate_type = #{record.operateType,jdbcType=TINYINT}, + template = #{record.template,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_message_type + + + name = #{name,jdbcType=VARCHAR}, + + + path = #{path,jdbcType=VARCHAR}, + + + operate_type = #{operateType,jdbcType=TINYINT}, + + + template = #{template,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_message_type + set name = #{name,jdbcType=VARCHAR}, + path = #{path,jdbcType=VARCHAR}, + operate_type = #{operateType,jdbcType=TINYINT}, + template = #{template,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysProjectMapper.xml b/tall/src/main/resources/mapper_raw/SysProjectMapper.xml index 361eea09..e543673b 100644 --- a/tall/src/main/resources/mapper_raw/SysProjectMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysProjectMapper.xml @@ -1,353 +1,353 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id, creator_id, parent_task_id, scene_id, name, description, begin_time, end_time, - address, published, template, created_at, updated_at, rec_status - - - - - delete from t_sys_project - where id = #{id,jdbcType=BIGINT} - - - delete from t_sys_project - - - - - - insert into t_sys_project (id, creator_id, parent_task_id, - scene_id, name, description, - begin_time, end_time, address, - published, template, created_at, - updated_at, rec_status) - values (#{id,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, #{parentTaskId,jdbcType=BIGINT}, - #{sceneId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{address,jdbcType=VARCHAR}, - #{published,jdbcType=TINYINT}, #{template,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, - #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) - - - insert into t_sys_project - - - id, - - - creator_id, - - - parent_task_id, - - - scene_id, - - - name, - - - description, - - - begin_time, - - - end_time, - - - address, - - - published, - - - template, - - - created_at, - - - updated_at, - - - rec_status, - - - - - #{id,jdbcType=BIGINT}, - - - #{creatorId,jdbcType=BIGINT}, - - - #{parentTaskId,jdbcType=BIGINT}, - - - #{sceneId,jdbcType=BIGINT}, - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{beginTime,jdbcType=BIGINT}, - - - #{endTime,jdbcType=BIGINT}, - - - #{address,jdbcType=VARCHAR}, - - - #{published,jdbcType=TINYINT}, - - - #{template,jdbcType=TINYINT}, - - - #{createdAt,jdbcType=TIMESTAMP}, - - - #{updatedAt,jdbcType=TIMESTAMP}, - - - #{recStatus,jdbcType=TINYINT}, - - - - - - update t_sys_project - - - id = #{record.id,jdbcType=BIGINT}, - - - creator_id = #{record.creatorId,jdbcType=BIGINT}, - - - parent_task_id = #{record.parentTaskId,jdbcType=BIGINT}, - - - scene_id = #{record.sceneId,jdbcType=BIGINT}, - - - name = #{record.name,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - begin_time = #{record.beginTime,jdbcType=BIGINT}, - - - end_time = #{record.endTime,jdbcType=BIGINT}, - - - address = #{record.address,jdbcType=VARCHAR}, - - - published = #{record.published,jdbcType=TINYINT}, - - - template = #{record.template,jdbcType=TINYINT}, - - - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{record.recStatus,jdbcType=TINYINT}, - - - - - - - - update t_sys_project - set id = #{record.id,jdbcType=BIGINT}, - creator_id = #{record.creatorId,jdbcType=BIGINT}, - parent_task_id = #{record.parentTaskId,jdbcType=BIGINT}, - scene_id = #{record.sceneId,jdbcType=BIGINT}, - name = #{record.name,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=VARCHAR}, - begin_time = #{record.beginTime,jdbcType=BIGINT}, - end_time = #{record.endTime,jdbcType=BIGINT}, - address = #{record.address,jdbcType=VARCHAR}, - published = #{record.published,jdbcType=TINYINT}, - template = #{record.template,jdbcType=TINYINT}, - created_at = #{record.createdAt,jdbcType=TIMESTAMP}, - updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} - - - - - - update t_sys_project - - - creator_id = #{creatorId,jdbcType=BIGINT}, - - - parent_task_id = #{parentTaskId,jdbcType=BIGINT}, - - - scene_id = #{sceneId,jdbcType=BIGINT}, - - - name = #{name,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - begin_time = #{beginTime,jdbcType=BIGINT}, - - - end_time = #{endTime,jdbcType=BIGINT}, - - - address = #{address,jdbcType=VARCHAR}, - - - published = #{published,jdbcType=TINYINT}, - - - template = #{template,jdbcType=TINYINT}, - - - created_at = #{createdAt,jdbcType=TIMESTAMP}, - - - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - - - rec_status = #{recStatus,jdbcType=TINYINT}, - - - where id = #{id,jdbcType=BIGINT} - - - update t_sys_project - set creator_id = #{creatorId,jdbcType=BIGINT}, - parent_task_id = #{parentTaskId,jdbcType=BIGINT}, - scene_id = #{sceneId,jdbcType=BIGINT}, - name = #{name,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - begin_time = #{beginTime,jdbcType=BIGINT}, - end_time = #{endTime,jdbcType=BIGINT}, - address = #{address,jdbcType=VARCHAR}, - published = #{published,jdbcType=TINYINT}, - template = #{template,jdbcType=TINYINT}, - created_at = #{createdAt,jdbcType=TIMESTAMP}, - updated_at = #{updatedAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} - where id = #{id,jdbcType=BIGINT} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, creator_id, parent_task_id, scene_id, name, description, begin_time, end_time, + address, published, template, created_at, updated_at, rec_status + + + + + delete from t_sys_project + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_project + + + + + + insert into t_sys_project (id, creator_id, parent_task_id, + scene_id, name, description, + begin_time, end_time, address, + published, template, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, #{parentTaskId,jdbcType=BIGINT}, + #{sceneId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{address,jdbcType=VARCHAR}, + #{published,jdbcType=TINYINT}, #{template,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_project + + + id, + + + creator_id, + + + parent_task_id, + + + scene_id, + + + name, + + + description, + + + begin_time, + + + end_time, + + + address, + + + published, + + + template, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{creatorId,jdbcType=BIGINT}, + + + #{parentTaskId,jdbcType=BIGINT}, + + + #{sceneId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{beginTime,jdbcType=BIGINT}, + + + #{endTime,jdbcType=BIGINT}, + + + #{address,jdbcType=VARCHAR}, + + + #{published,jdbcType=TINYINT}, + + + #{template,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_project + + + id = #{record.id,jdbcType=BIGINT}, + + + creator_id = #{record.creatorId,jdbcType=BIGINT}, + + + parent_task_id = #{record.parentTaskId,jdbcType=BIGINT}, + + + scene_id = #{record.sceneId,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + begin_time = #{record.beginTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + address = #{record.address,jdbcType=VARCHAR}, + + + published = #{record.published,jdbcType=TINYINT}, + + + template = #{record.template,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_project + set id = #{record.id,jdbcType=BIGINT}, + creator_id = #{record.creatorId,jdbcType=BIGINT}, + parent_task_id = #{record.parentTaskId,jdbcType=BIGINT}, + scene_id = #{record.sceneId,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + begin_time = #{record.beginTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + address = #{record.address,jdbcType=VARCHAR}, + published = #{record.published,jdbcType=TINYINT}, + template = #{record.template,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_project + + + creator_id = #{creatorId,jdbcType=BIGINT}, + + + parent_task_id = #{parentTaskId,jdbcType=BIGINT}, + + + scene_id = #{sceneId,jdbcType=BIGINT}, + + + name = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + begin_time = #{beginTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + address = #{address,jdbcType=VARCHAR}, + + + published = #{published,jdbcType=TINYINT}, + + + template = #{template,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_project + set creator_id = #{creatorId,jdbcType=BIGINT}, + parent_task_id = #{parentTaskId,jdbcType=BIGINT}, + scene_id = #{sceneId,jdbcType=BIGINT}, + name = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + begin_time = #{beginTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + address = #{address,jdbcType=VARCHAR}, + published = #{published,jdbcType=TINYINT}, + template = #{template,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysProjectRobotMapper.xml b/tall/src/main/resources/mapper_raw/SysProjectRobotMapper.xml new file mode 100644 index 00000000..3ab2abbd --- /dev/null +++ b/tall/src/main/resources/mapper_raw/SysProjectRobotMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, robot_id, project_id, created_at, updated_at, rec_status + + + + + delete from t_sys_project_robot + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_project_robot + + + + + + insert into t_sys_project_robot (id, robot_id, project_id, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{robotId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_project_robot + + + id, + + + robot_id, + + + project_id, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{robotId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_project_robot + + + id = #{record.id,jdbcType=BIGINT}, + + + robot_id = #{record.robotId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_project_robot + set id = #{record.id,jdbcType=BIGINT}, + robot_id = #{record.robotId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_project_robot + + + robot_id = #{robotId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_project_robot + set robot_id = #{robotId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysProjectRobotMessageMapper.xml b/tall/src/main/resources/mapper_raw/SysProjectRobotMessageMapper.xml new file mode 100644 index 00000000..87cc4f09 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/SysProjectRobotMessageMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, project_robot_id, message_id, all_message, created_at, updated_at, rec_status + + + + + delete from t_sys_project_robot_message + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_project_robot_message + + + + + + insert into t_sys_project_robot_message (id, project_robot_id, message_id, + all_message, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{projectRobotId,jdbcType=BIGINT}, #{messageId,jdbcType=BIGINT}, + #{allMessage,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_project_robot_message + + + id, + + + project_robot_id, + + + message_id, + + + all_message, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{projectRobotId,jdbcType=BIGINT}, + + + #{messageId,jdbcType=BIGINT}, + + + #{allMessage,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_project_robot_message + + + id = #{record.id,jdbcType=BIGINT}, + + + project_robot_id = #{record.projectRobotId,jdbcType=BIGINT}, + + + message_id = #{record.messageId,jdbcType=BIGINT}, + + + all_message = #{record.allMessage,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_project_robot_message + set id = #{record.id,jdbcType=BIGINT}, + project_robot_id = #{record.projectRobotId,jdbcType=BIGINT}, + message_id = #{record.messageId,jdbcType=BIGINT}, + all_message = #{record.allMessage,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_project_robot_message + + + project_robot_id = #{projectRobotId,jdbcType=BIGINT}, + + + message_id = #{messageId,jdbcType=BIGINT}, + + + all_message = #{allMessage,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_project_robot_message + set project_robot_id = #{projectRobotId,jdbcType=BIGINT}, + message_id = #{messageId,jdbcType=BIGINT}, + all_message = #{allMessage,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysRobotLogMapper.xml b/tall/src/main/resources/mapper_raw/SysRobotLogMapper.xml new file mode 100644 index 00000000..7d41b73f --- /dev/null +++ b/tall/src/main/resources/mapper_raw/SysRobotLogMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, robot_id, project_id, task_id, user_id, role_id, message_type_id, send_time, + complete, created_at, updated_at, rec_status + + + + + delete from t_sys_robot_log + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_robot_log + + + + + + insert into t_sys_robot_log (id, robot_id, project_id, + task_id, user_id, role_id, + message_type_id, send_time, complete, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{robotId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, + #{taskId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}, + #{messageTypeId,jdbcType=BIGINT}, #{sendTime,jdbcType=BIGINT}, #{complete,jdbcType=TINYINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_robot_log + + + id, + + + robot_id, + + + project_id, + + + task_id, + + + user_id, + + + role_id, + + + message_type_id, + + + send_time, + + + complete, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{robotId,jdbcType=BIGINT}, + + + #{projectId,jdbcType=BIGINT}, + + + #{taskId,jdbcType=BIGINT}, + + + #{userId,jdbcType=BIGINT}, + + + #{roleId,jdbcType=BIGINT}, + + + #{messageTypeId,jdbcType=BIGINT}, + + + #{sendTime,jdbcType=BIGINT}, + + + #{complete,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_robot_log + + + id = #{record.id,jdbcType=BIGINT}, + + + robot_id = #{record.robotId,jdbcType=BIGINT}, + + + project_id = #{record.projectId,jdbcType=BIGINT}, + + + task_id = #{record.taskId,jdbcType=BIGINT}, + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + message_type_id = #{record.messageTypeId,jdbcType=BIGINT}, + + + send_time = #{record.sendTime,jdbcType=BIGINT}, + + + complete = #{record.complete,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_robot_log + set id = #{record.id,jdbcType=BIGINT}, + robot_id = #{record.robotId,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + task_id = #{record.taskId,jdbcType=BIGINT}, + user_id = #{record.userId,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT}, + message_type_id = #{record.messageTypeId,jdbcType=BIGINT}, + send_time = #{record.sendTime,jdbcType=BIGINT}, + complete = #{record.complete,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_robot_log + + + robot_id = #{robotId,jdbcType=BIGINT}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + task_id = #{taskId,jdbcType=BIGINT}, + + + user_id = #{userId,jdbcType=BIGINT}, + + + role_id = #{roleId,jdbcType=BIGINT}, + + + message_type_id = #{messageTypeId,jdbcType=BIGINT}, + + + send_time = #{sendTime,jdbcType=BIGINT}, + + + complete = #{complete,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_robot_log + set robot_id = #{robotId,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + task_id = #{taskId,jdbcType=BIGINT}, + user_id = #{userId,jdbcType=BIGINT}, + role_id = #{roleId,jdbcType=BIGINT}, + message_type_id = #{messageTypeId,jdbcType=BIGINT}, + send_time = #{sendTime,jdbcType=BIGINT}, + complete = #{complete,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/SysRobotMapper.xml b/tall/src/main/resources/mapper_raw/SysRobotMapper.xml new file mode 100644 index 00000000..5cd1ccf4 --- /dev/null +++ b/tall/src/main/resources/mapper_raw/SysRobotMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, web_hook, client_type, created_at, updated_at, rec_status + + + + + delete from t_sys_robot + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_robot + + + + + + insert into t_sys_robot (id, name, web_hook, + client_type, created_at, updated_at, + rec_status) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{webHook,jdbcType=VARCHAR}, + #{clientType,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, + #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_robot + + + id, + + + name, + + + web_hook, + + + client_type, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{webHook,jdbcType=VARCHAR}, + + + #{clientType,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_robot + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + web_hook = #{record.webHook,jdbcType=VARCHAR}, + + + client_type = #{record.clientType,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_robot + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + web_hook = #{record.webHook,jdbcType=VARCHAR}, + client_type = #{record.clientType,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_robot + + + name = #{name,jdbcType=VARCHAR}, + + + web_hook = #{webHook,jdbcType=VARCHAR}, + + + client_type = #{clientType,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_robot + set name = #{name,jdbcType=VARCHAR}, + web_hook = #{webHook,jdbcType=VARCHAR}, + client_type = #{clientType,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/tall/src/main/resources/mybatis/mybatis-config.xml b/tall/src/main/resources/mybatis/mybatis-config.xml index 06ec6488..e5a218dd 100644 --- a/tall/src/main/resources/mybatis/mybatis-config.xml +++ b/tall/src/main/resources/mybatis/mybatis-config.xml @@ -39,6 +39,7 @@ + diff --git a/tall/src/main/resources/template/checklistTemplate.xlsx b/tall/src/main/resources/template/checklistTemplate.xlsx new file mode 100644 index 00000000..b8f4d530 Binary files /dev/null and b/tall/src/main/resources/template/checklistTemplate.xlsx differ diff --git a/tall/src/main/resources/template/mvpTemplate.xlsx b/tall/src/main/resources/template/mvpTemplate.xlsx new file mode 100644 index 00000000..880b13fb Binary files /dev/null and b/tall/src/main/resources/template/mvpTemplate.xlsx differ diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index a95a48e0..0e4f26bb 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -40,7 +40,7 @@ public enum CodeEnum { WBS_NOT_FIND_CHECKER_ROLE(28,"找不到检查人，请检查检查人的名称",true), WBS_DELAY_ERROR(29,"任务切换模式填写错误",true), WBS_SUB_TASK_ANALYSIS(30,"无法解析此子日程表",true), - WBS_NOT_SUB_TASK(31,"找不到对应的子日程表，请检查子日程表的名字是否正确",true), + WBS_NOT_SUB_TASK(31,"找不到对应的子表，请检查子表的名字是否正确",true), WBS_NOT_PLUGIN_SHEET(32,"未找到插件表",true), WBS_NOT_PLUGIN(33,"未找到对应的插件，请确认是否填写正确",true), PROJECT_DATE_FORMAT_ERROR(34,"输入的日期格式错误，有效日期格式 例：2019-01-01或2019-01",true), @@ -112,6 +112,8 @@ public enum CodeEnum { HEALTH_TYPE_ERROR(94,"您的健康状态异常，打卡失败。",true), NOT_HEALTH_RECORD(95,"您今天还未上报健康信息，请上报后再试。",true), SELECT_TIME_ERROR(96,"请输入正确的查询时间",true), + TASK_PREPARATION(97,"任务已经开始了，请勿重复操作",true), + NOT_COMMENT(98,"该评论不存在",true), ; public CodeEnum addMsg(String msg){ diff --git a/util/src/main/java/com/ccsens/util/ExcelUtil.java b/util/src/main/java/com/ccsens/util/ExcelUtil.java index 3ec64e68..e66f2c19 100644 --- a/util/src/main/java/com/ccsens/util/ExcelUtil.java +++ b/util/src/main/java/com/ccsens/util/ExcelUtil.java @@ -1,38 +1,82 @@ package com.ccsens.util; +import cn.hutool.core.date.DateException; import cn.hutool.core.util.ObjectUtil; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CreationHelper; -import org.apache.poi.ss.usermodel.FormulaEvaluator; -import org.apache.poi.ss.usermodel.Workbook; +import cn.hutool.core.util.StrUtil; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.NumberToTextConverter; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; public class ExcelUtil { //读取每个单元格的信息 +// public static String getCellValue(Cell cell) { +// String ret; +// if(ObjectUtil.isNull(cell)){ +// return ""; +// } +// +// switch (cell.getCellType()) { +// case Cell.CELL_TYPE_BLANK: +// ret = ""; +// break; +// case Cell.CELL_TYPE_BOOLEAN: +// ret = String.valueOf(cell.getBooleanCellValue()); +// break; +// case Cell.CELL_TYPE_ERROR: +// ret = null; +// break; +// case Cell.CELL_TYPE_FORMULA: +// Workbook wb = cell.getSheet().getWorkbook(); +// CreationHelper crateHelper = wb.getCreationHelper(); +// FormulaEvaluator evaluator = crateHelper.createFormulaEvaluator(); +// ret = getCellValue(evaluator.evaluateInCell(cell)); +// break; +// case Cell.CELL_TYPE_NUMERIC: +// if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) { +// Date theDate = cell.getDateCellValue(); +// ret = String.valueOf(theDate.getTime()); +// } else { +// ret = NumberToTextConverter.toText(cell.getNumericCellValue()); +// } +// break; +// case Cell.CELL_TYPE_STRING: +// ret = cell.getRichStringCellValue().getString(); +// break; +// default: +// ret = null; +// } +// +// return ret; +// } + public static String getCellValue(Cell cell) { String ret; if(ObjectUtil.isNull(cell)){ return ""; } - switch (cell.getCellType()) { - case Cell.CELL_TYPE_BLANK: + + switch (cell.getCellTypeEnum()) { + case BLANK: ret = ""; break; - case Cell.CELL_TYPE_BOOLEAN: + case BOOLEAN: ret = String.valueOf(cell.getBooleanCellValue()); break; - case Cell.CELL_TYPE_ERROR: + case ERROR: ret = null; break; - case Cell.CELL_TYPE_FORMULA: + case FORMULA: Workbook wb = cell.getSheet().getWorkbook(); CreationHelper crateHelper = wb.getCreationHelper(); FormulaEvaluator evaluator = crateHelper.createFormulaEvaluator(); ret = getCellValue(evaluator.evaluateInCell(cell)); break; - case Cell.CELL_TYPE_NUMERIC: + case NUMERIC: if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) { Date theDate = cell.getDateCellValue(); ret = String.valueOf(theDate.getTime()); @@ -40,8 +84,16 @@ public class ExcelUtil { ret = NumberToTextConverter.toText(cell.getNumericCellValue()); } break; - case Cell.CELL_TYPE_STRING: - ret = cell.getRichStringCellValue().getString(); + case STRING: + if(StrUtil.isEmpty(cell.getStringCellValue())){ + ret = cell.getStringCellValue(); + break; + } + try { + ret = String.valueOf(cn.hutool.core.date.DateUtil.parse(cell.getStringCellValue()).getTime()); + }catch (DateException e){ + ret = cell.getRichStringCellValue().getString(); + } break; default: ret = null; @@ -49,4 +101,5 @@ public class ExcelUtil { return ret; } + } diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index efbd2ded..145265c3 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -1,277 +1,466 @@ -package com.ccsens.util; - -import com.ccsens.util.exception.BaseException; -import lombok.extern.slf4j.Slf4j; -import org.apache.poi.POIXMLDocumentPart; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.*; -import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; -import org.springframework.stereotype.Component; - -import java.io.*; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * 导入导出excel - */ -@Slf4j -@Component -public class PoiUtil { - /** - * @param file - * @param sheetIndex - * @param dataIndex 数据从第几行开始（0） - * @return - */ - public static List readExce(File file, int sheetIndex, String sheetName, int dataIndex, boolean hasImg) throws Exception{ - if (!file.getPath().endsWith(".xls") && !file.getPath().endsWith(".xlsx")) { - log.info("文件不是excel类型:{}", file.getName()); - throw new BaseException(CodeEnum.FILE_FORMAT_ERROR); - } - - - log.info("导入解析开始，fileName:{}", file.getPath()); - List list = new ArrayList<>(); - - Sheet sheet = createSheet(file, sheetIndex, sheetName); - //读取放在首列的图片 - Map imgMap = null; - if (hasImg) { - imgMap = getImg(file, sheet); - } - //获取sheet的行数 - int rows = sheet.getPhysicalNumberOfRows(); - - //读取数据 - for (int i = 0; i < rows; i++) { - - Row row = getRow(sheet, i, dataIndex); - if (row == null) { - continue; - } - Object[] objects = new Object[row.getLastCellNum()]; - if (hasImg && imgMap != null) { - for (String key: imgMap.keySet()) { - if (key.startsWith(i+"-")) { - int index = Integer.parseInt(key.split("-")[1]); - objects[index] = imgMap.get(key); - } - } - } - for (int j = 0; j < row.getLastCellNum(); j++) { - Cell cell = row.getCell(j); - if (cell == null) { - continue; - } - if (objects[j] == null) { - objects[j] = getCallValue(cell); - } - - } - list.add(objects); - } - log.info("导入文件解析成功！"); - return list; - - } - - - public static String getCallValue(Cell cell) { - String cellValue = null; - // 判断excel单元格内容的格式，并对其进行转换，以便插入数据库 - switch (cell.getCellType()) { - case 0://number类型 - //时间类型也被认为是number类型，所以在读取数据时需进行判断 - if (DateUtil.isCellDateFormatted(cell)) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); - cellValue = sdf.format(cell.getDateCellValue()); - } else { - cellValue = new DecimalFormat("0").format(cell.getNumericCellValue()); - } - break; - case 1: - cellValue = cell.getStringCellValue(); - break; - case 2: - if (DateUtil.isCellDateFormatted(cell)) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); - cellValue = sdf.format(cell.getDateCellValue()); - } else { - cellValue = String.valueOf(cell.getNumericCellValue()); - } - break; - case 3: - cellValue = ""; - break; - case 4: - cellValue = String.valueOf(cell.getBooleanCellValue()); - break; - case 5: - cellValue = String.valueOf(cell.getErrorCellValue()); - break; - } - return cellValue; - } - - - - private PoiUtil() { - super(); - } - - /** - * 获取图片和位置 (xls) - * - * @param sheet - * @return - * @throws IOException - */ - public static Map getXlsPictures(HSSFSheet sheet) { - Map map = new HashMap<>(); - List list = sheet.getDrawingPatriarch().getChildren(); - for (HSSFShape shape : list) { - if (shape instanceof HSSFPicture) { - HSSFPicture picture = (HSSFPicture) shape; - HSSFClientAnchor cAnchor = picture.getClientAnchor(); - - // 行号-列号 - String key = cAnchor.getRow1() + "-" + cAnchor.getCol1(); - - HSSFPictureData pictureData = picture.getPictureData(); - - map.put(key, createImgPath(pictureData)); - } - } - return map; - } - - /** - * 将流转储为图片 - * - * @param pictureData - * @return - */ - private static String createImgPath(PictureData pictureData) { - //后缀 - String suffix = pictureData.suggestFileExtension(); - //图片 - byte[] data = pictureData.getData(); - String fileName = "/poi/img/" + cn.hutool.core.date.DateUtil.today() + "/"+ System.currentTimeMillis() + "." + suffix; - String path = PropUtil.path + fileName; - - FileOutputStream out = null; - try { - File file = new File(path); - if (!file.getParentFile().exists()) { - file.getParentFile().mkdirs(); - } - out = new FileOutputStream(path); - out.write(data); - return fileName; - } catch (IOException e) { - log.error("文件解析发生异常", e); - if (out != null) { - try { - out.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - return null; - } - - } - - /** - * 获取图片和位置 (xlsx) - * - * @param sheet - * @return - * @throws IOException - */ - public static Map getXlsxPictures(XSSFSheet sheet) { - Map map = new HashMap<>(); - List list = sheet.getRelations(); - for (POIXMLDocumentPart part : list) { - if (part instanceof XSSFDrawing) { - XSSFDrawing drawing = (XSSFDrawing) part; - List shapes = drawing.getShapes(); - for (XSSFShape shape : shapes) { - XSSFPicture picture = (XSSFPicture) shape; - XSSFClientAnchor anchor = picture.getPreferredSize(); - CTMarker marker = anchor.getFrom(); - String key = marker.getRow() + "-" + marker.getCol(); - map.put(key, createImgPath(picture.getPictureData())); - } - } - } - return map; - } - - /** - * 获取当前行 - */ - private static Row getRow(Sheet sheet, int i, int dataIndex) { - //过滤表头行 - if (i < dataIndex) { - return null; - } - //获取当前行的数据 - Row row = sheet.getRow(i); - return row; - } - - private static Map getImg(File file, Sheet sheet) { - Map imgMap; - if (file.getPath().endsWith(".xls")) { - imgMap = getXlsPictures((HSSFSheet) sheet); - } else { - imgMap = getXlsxPictures((XSSFSheet) sheet); - } - return imgMap; - - } - - /** - * 生成sheet - * - * @param file - * @param index - * @return - * @throws Exception - */ - private static Sheet createSheet(File file, int index, String sheetName) throws Exception { - InputStream inputStream = new FileInputStream(file); - Workbook workbook; - if (file.getPath().endsWith(".xls")) { - workbook = new HSSFWorkbook(inputStream); - } else { - workbook = new XSSFWorkbook(inputStream); - } - if (index < 0) { - return workbook.getSheet(sheetName); - } - return workbook.getSheetAt(index); - } - - public static void main(String[] args) throws Exception { - File file = new File("D:\\1.xlsx"); - List list = readExce(file, 0, null, 3, true); - for (Object[] arr : list) { - for (Object t : arr) { - System.out.print(t + "---"); - } - System.out.println("============"); - } - } - - - -} +package com.ccsens.util; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.ccsens.util.exception.BaseException; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.hssf.util.HSSFColor; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.*; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; +import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTColor; +import org.springframework.stereotype.Component; + +import java.io.*; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 导入导出excel + */ +@Slf4j +@Component +public class PoiUtil { + + @Data + public static class PoiUtilCell { + private String value = ""; + private int colspan = 1; + private int rowspan = 1; + /** + * 水平居中 + */ + private HorizontalAlignment style = HorizontalAlignment.CENTER; + /** + * 垂直居中 + */ + private VerticalAlignment verticalAlignment = VerticalAlignment.CENTER; + /** + * 行高 + */ + private Integer height = 666; + /** + * 列宽 + */ + private Integer wight = 18; + + /** + * 跳转的路径 + */ + private String path; + + public PoiUtilCell() { + } + + public PoiUtilCell(String value) { + this.value = value; + } + + + public PoiUtilCell(String value, int colspan, int rowspan) { + this.value = value; + this.colspan = colspan; + this.rowspan = rowspan; + } + + public PoiUtilCell(String value, Integer height, Integer wight) { + this.value = value; + this.height = height; + this.wight = wight; + } + + public PoiUtilCell(String value, int colspan, int rowspan, Integer height, Integer wight) { + this.value = value; + this.colspan = colspan; + this.rowspan = rowspan; + this.height = height; + this.wight = wight; + } + + } + + + /** + * 导出Excel + * + * @param sheetName sheet名称 + * @param rows 行 + * @param wb XSSFWorkbook对象 无则创建 + * @return + */ + public static Workbook exportWB(String sheetName, List> rows, Workbook wb) { + + // 第一步，创建一个XSSFWorkbook，对应一个Excel文件 + if (wb == null) { + wb = new XSSFWorkbook(); + } + if (rows == null) { + return wb; + } + // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet + Sheet sheet = wb.getSheet(sheetName); + if (ObjectUtil.isNull(sheet)) { + sheet = wb.createSheet(sheetName); + } + +// // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 +// HSSFRow row = sheet.createRow(0); + + // 第四步，创建单元格，并设置值表头 设置表头居中 + for (int i = 0; i < rows.size(); i++) { + List cells = rows.get(i); + for (int j = 0; j < cells.size(); j++) { + PoiUtilCell cell = cells.get(j); + //设置列宽 + if (ObjectUtil.isNotNull(cell.wight)) { + sheet.setColumnWidth(j, cell.wight * 256); + } + mergedRegion(sheet, i, j, cells.get(j)); + } + } + + //创建内容 + for (int i = 0; i < rows.size(); i++) { + Row row = sheet.getRow(i); + if (ObjectUtil.isNull(row)) { + row = sheet.createRow(i); + } + List cells = rows.get(i); + for (int j = 0; j < cells.size(); j++) { + CellStyle style = wb.createCellStyle(); + + //将内容按顺序赋给对应的列对象 + PoiUtilCell cell = cells.get(j); + Cell newCell = row.createCell(j); + //设置行高 + if (ObjectUtil.isNotNull(cell.height)) { + if (j == 0) { + row.setHeight(cell.height.shortValue()); + } + } + newCell.setCellValue(cell.value); + style.setAlignment(cell.style); + style.setVerticalAlignment(cell.verticalAlignment); + + //设置跳转路径 + if (StrUtil.isNotEmpty(cell.path)) { + XSSFCreationHelper createHelper = (XSSFCreationHelper) wb.getCreationHelper(); + XSSFHyperlink link = createHelper.createHyperlink(HyperlinkType.URL); + link.setAddress(cell.path); + newCell.setHyperlink(link); + //设置字体颜色 + Font font = wb.createFont(); + font.setColor(Font.COLOR_RED); + style.setFont(font); + } + newCell.setCellStyle(style); + } + } + return wb; + } + + /** + * 合并单元格 + * + * @param sheet + * @param rows + * @param cols + * @param cell + * @return + */ + private static void mergedRegion(Sheet sheet, int rows, int cols, PoiUtilCell cell) { + + int rowspan = cell.rowspan; + if (rowspan > 1) { + sheet.addMergedRegion(new CellRangeAddress(rows, rows + rowspan - 1, cols, cols)); + } + int colspan = cell.colspan; + + if (colspan > 1) { + sheet.addMergedRegion(new CellRangeAddress(rows, rows, cols, cols + colspan - 1)); + } + } + + + /** + * @param file + * @param sheetIndex + * @param dataIndex 数据从第几行开始（0） + * @return + */ + public static List readExce(File file, int sheetIndex, String sheetName, int dataIndex, boolean hasImg) throws Exception { + if (!file.getPath().endsWith(".xls") && !file.getPath().endsWith(".xlsx")) { + log.info("文件不是excel类型:{}", file.getName()); + throw new BaseException(CodeEnum.FILE_FORMAT_ERROR); + } + + + log.info("导入解析开始，fileName:{}", file.getPath()); + List list = new ArrayList<>(); + + Sheet sheet = createSheet(file, sheetIndex, sheetName); + //读取放在首列的图片 + Map imgMap = null; + if (hasImg) { + imgMap = getImg(file, sheet); + } + //获取sheet的行数 + int rows = sheet.getPhysicalNumberOfRows(); + + //读取数据 + for (int i = 0; i < rows; i++) { + + Row row = getRow(sheet, i, dataIndex); + if (row == null) { + continue; + } + Object[] objects = new Object[row.getLastCellNum()]; + if (hasImg && imgMap != null) { + for (String key : imgMap.keySet()) { + if (key.startsWith(i + "-")) { + int index = Integer.parseInt(key.split("-")[1]); + objects[index] = imgMap.get(key); + } + } + } + for (int j = 0; j < row.getLastCellNum(); j++) { + Cell cell = row.getCell(j); + if (cell == null) { + continue; + } + if (objects[j] == null) { + objects[j] = getCallValue(cell); + } + + } + list.add(objects); + } + log.info("导入文件解析成功！"); + return list; + + } + + + public static String getCallValue(Cell cell) { + String cellValue = null; + // 判断excel单元格内容的格式，并对其进行转换，以便插入数据库 + switch (cell.getCellType()) { + case 0://number类型 + //时间类型也被认为是number类型，所以在读取数据时需进行判断 + if (DateUtil.isCellDateFormatted(cell)) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); + cellValue = sdf.format(cell.getDateCellValue()); + } else { + cellValue = new DecimalFormat("0").format(cell.getNumericCellValue()); + } + break; + case 1: + cellValue = cell.getStringCellValue(); + break; + case 2: + if (DateUtil.isCellDateFormatted(cell)) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); + cellValue = sdf.format(cell.getDateCellValue()); + } else { + cellValue = String.valueOf(cell.getNumericCellValue()); + } + break; + case 3: + cellValue = ""; + break; + case 4: + cellValue = String.valueOf(cell.getBooleanCellValue()); + break; + case 5: + cellValue = String.valueOf(cell.getErrorCellValue()); + break; + } + return cellValue; + } + + + private PoiUtil() { + super(); + } + + /** + * 获取图片和位置 (xls) + * + * @param sheet + * @return + * @throws IOException + */ + public static Map getXlsPictures(HSSFSheet sheet) { + Map map = new HashMap<>(); + List list = sheet.getDrawingPatriarch().getChildren(); + for (HSSFShape shape : list) { + if (shape instanceof HSSFPicture) { + HSSFPicture picture = (HSSFPicture) shape; + HSSFClientAnchor cAnchor = picture.getClientAnchor(); + + // 行号-列号 + String key = cAnchor.getRow1() + "-" + cAnchor.getCol1(); + + HSSFPictureData pictureData = picture.getPictureData(); + + map.put(key, createImgPath(pictureData)); + } + } + return map; + } + + /** + * 将流转储为图片 + * + * @param pictureData + * @return + */ + private static String createImgPath(PictureData pictureData) { + //后缀 + String suffix = pictureData.suggestFileExtension(); + //图片 + byte[] data = pictureData.getData(); + String fileName = "/poi/img/" + cn.hutool.core.date.DateUtil.today() + "/" + System.currentTimeMillis() + "." + suffix; + String path = PropUtil.path + fileName; + + FileOutputStream out = null; + try { + File file = new File(path); + if (!file.getParentFile().exists()) { + file.getParentFile().mkdirs(); + } + out = new FileOutputStream(path); + out.write(data); + return fileName; + } catch (IOException e) { + log.error("文件解析发生异常", e); + if (out != null) { + try { + out.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + return null; + } + + } + + /** + * 获取图片和位置 (xlsx) + * + * @param sheet + * @return + * @throws IOException + */ + public static Map getXlsxPictures(XSSFSheet sheet) { + Map map = new HashMap<>(); + List list = sheet.getRelations(); + for (POIXMLDocumentPart part : list) { + if (part instanceof XSSFDrawing) { + XSSFDrawing drawing = (XSSFDrawing) part; + List shapes = drawing.getShapes(); + for (XSSFShape shape : shapes) { + XSSFPicture picture = (XSSFPicture) shape; + XSSFClientAnchor anchor = picture.getPreferredSize(); + CTMarker marker = anchor.getFrom(); + String key = marker.getRow() + "-" + marker.getCol(); + map.put(key, createImgPath(picture.getPictureData())); + } + } + } + return map; + } + + /** + * 获取当前行 + */ + private static Row getRow(Sheet sheet, int i, int dataIndex) { + //过滤表头行 + if (i < dataIndex) { + return null; + } + //获取当前行的数据 + Row row = sheet.getRow(i); + return row; + } + + private static Map getImg(File file, Sheet sheet) { + Map imgMap; + if (file.getPath().endsWith(".xls")) { + imgMap = getXlsPictures((HSSFSheet) sheet); + } else { + imgMap = getXlsxPictures((XSSFSheet) sheet); + } + return imgMap; + + } + + /** + * 生成sheet + * + * @param file + * @param index + * @return + * @throws Exception + */ + private static Sheet createSheet(File file, int index, String sheetName) throws Exception { + InputStream inputStream = new FileInputStream(file); + Workbook workbook; + if (file.getPath().endsWith(".xls")) { + workbook = new XSSFWorkbook(inputStream); + } else { + workbook = new XSSFWorkbook(inputStream); + } + if (index < 0) { + return workbook.getSheet(sheetName); + } + return workbook.getSheetAt(index); + } + + public static void main(String[] args) throws Exception { +// File file = new File("D:\\1.xlsx"); +// List list = readExce(file, 0, null, 3, true); +// for (Object[] arr : list) { +// for (Object t : arr) { +// System.out.print(t + "---"); +// } +// System.out.println("============"); +// } + List> list = new ArrayList<>(); + List cells = new ArrayList<>(); + cells.add(new PoiUtilCell("1", 5, 1)); + cells.add(new PoiUtilCell()); + cells.add(new PoiUtilCell()); + cells.add(new PoiUtilCell()); + cells.add(new PoiUtilCell()); + cells.add(new PoiUtilCell("2")); + list.add(cells); + List cells2 = new ArrayList<>(); + cells2.add(new PoiUtilCell("3", 1, 2)); + cells2.add(new PoiUtilCell("4")); + list.add(cells2); + List cells3 = new ArrayList<>(); + cells3.add(new PoiUtilCell("5")); + cells3.add(new PoiUtilCell("6")); + list.add(cells3); + + Workbook wbs = exportWB("wbs", list, null); + OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx")); + wbs.write(stream); + stream.close(); + } + + +} diff --git a/util/src/main/java/com/ccsens/util/WebConstant.java b/util/src/main/java/com/ccsens/util/WebConstant.java index f4893d02..8fe76f0e 100644 --- a/util/src/main/java/com/ccsens/util/WebConstant.java +++ b/util/src/main/java/com/ccsens/util/WebConstant.java @@ -72,6 +72,7 @@ public class WebConstant { public static final String UPLOAD_PATH_BASE = "/home/cloud/tall/uploads"; public static final String UPLOAD_PATH_BASE_HEALTH = "/home/cloud/health/uploads"; public static final String UPLOAD_PATH_BASE_MT_JUDGE = "mt"; + public static final String UPLOAD_PATH_BASE_WBS = "wbs"; public static final String UPLOAD_PATH_DELIVER = UPLOAD_PATH_BASE + File.separator + "delivers"; public static final String UPLOAD_PATH_DELIVER1 ="delivers"; @@ -127,6 +128,15 @@ public class WebConstant { this.value =value; this.phase = thePhase; } + public static TASK_DELAY valueOf(int value) { + switch (value) { + case 0: return SelfMotion; + case 1: return DelayManual; + case 2: return Manual; + default: return null; + } + } + } public enum TASK_LEVEL { Virtual(0,"虚拟任务"),FirstTask(1,"一级任务"),SecondTask(2,"二级任务"), SubTask(3,"子任务"); @@ -202,7 +212,7 @@ public class WebConstant { public enum EVENT_PROCESS { - Pending(0,"未开始"), Processing(1,"进行中"), Expired(2,"已过期"); + Pending(0,"未开始"), Processing(1,"进行中"), Expired(2,"已完成"); public int value; public String phase; diff --git a/util/src/test/java/com/ccsens/util/Base64Test.java b/util/src/test/java/com/ccsens/util/Base64Test.java index e17d7762..cafd9a33 100644 --- a/util/src/test/java/com/ccsens/util/Base64Test.java +++ b/util/src/test/java/com/ccsens/util/Base64Test.java @@ -1,7 +1,9 @@ package com.ccsens.util; import cn.hutool.core.codec.Base64; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.ccsens.util.wx.WxXcxUtil; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -34,4 +36,10 @@ public class Base64Test { } + @Test + public void test02() throws Exception { + String s = ""; + String[] projectIds = s.split(","); + System.out.println(projectIds.toString()); + } }