From 000d42fbf6fe94de22dd51cbb7b47ef13943c1e5 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 21 Jul 2020 18:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-util-test.yml | 4 +- .../com/ccsens/tall/aspect/RobotAspect.java | 2 - .../com/ccsens/tall/bean/dto/DomainDto.java | 65 ++ .../com/ccsens/tall/bean/po/DomainNav.java | 139 +++ .../ccsens/tall/bean/po/DomainNavExample.java | 901 ++++++++++++++++++ .../com/ccsens/tall/bean/po/SysDomain.java | 11 + .../ccsens/tall/bean/po/SysDomainExample.java | 60 ++ .../com/ccsens/tall/bean/vo/DomainVo.java | 31 +- .../ccsens/tall/persist/dao/DomainNavDao.java | 11 + .../ccsens/tall/persist/dao/SysDomainDao.java | 10 + .../tall/persist/mapper/DomainNavMapper.java | 30 + .../com/ccsens/tall/service/AsyncService.java | 3 + .../com/ccsens/tall/service/ExcelService.java | 23 +- .../ccsens/tall/service/IAsyncService.java | 1 + .../tall/service/ISysDomainService.java | 16 + .../com/ccsens/tall/service/IUserService.java | 2 +- .../ccsens/tall/service/SysDomainService.java | 42 +- .../com/ccsens/tall/service/UserService.java | 27 +- .../com/ccsens/tall/service/WpsService.java | 3 +- .../com/ccsens/tall/web/DomainController.java | 14 + .../com/ccsens/tall/web/UserController.java | 6 +- tall/src/main/resources/application-test.yml | 23 +- tall/src/main/resources/application.yml | 4 +- tall/src/main/resources/druid-test.yml | 8 +- .../resources/mapper_dao/SysDomainDao.xml | 22 + .../resources/mapper_raw/DomainNavMapper.xml | 306 ++++++ .../resources/mapper_raw/SysDomainMapper.xml | 27 +- 27 files changed, 1737 insertions(+), 54 deletions(-) create mode 100644 tall/src/main/java/com/ccsens/tall/bean/dto/DomainDto.java create mode 100644 tall/src/main/java/com/ccsens/tall/bean/po/DomainNav.java create mode 100644 tall/src/main/java/com/ccsens/tall/bean/po/DomainNavExample.java create mode 100644 tall/src/main/java/com/ccsens/tall/persist/dao/DomainNavDao.java create mode 100644 tall/src/main/java/com/ccsens/tall/persist/mapper/DomainNavMapper.java create mode 100644 tall/src/main/resources/mapper_dao/SysDomainDao.xml create mode 100644 tall/src/main/resources/mapper_raw/DomainNavMapper.xml diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index a52717f4..929fc03c 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -20,8 +20,8 @@ eureka: service-url: # 指定eureka server通信地址，注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ -# defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ - defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ + defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ +# defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ instance: # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server prefer-ip-address: true diff --git a/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java b/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java index 1c3f6a5e..32dc3edb 100644 --- a/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java +++ b/tall/src/main/java/com/ccsens/tall/aspect/RobotAspect.java @@ -24,8 +24,6 @@ import java.lang.reflect.Method; @Aspect @Component public class RobotAspect { - @Autowired - private IRobotService robotService; @Resource private IAsyncService asyncService; diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/DomainDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/DomainDto.java new file mode 100644 index 00000000..da80b8cb --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/DomainDto.java @@ -0,0 +1,65 @@ +package com.ccsens.tall.bean.dto; + +import com.ccsens.tall.bean.vo.DomainVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author 逗 + */ +@Data +public class DomainDto { + + @ApiModel("添加域配置信息") + @Data + public static class DomainInfo{ + @NotEmpty(message = "域名不能为空") + @ApiModelProperty("域名") + private String domainName; + @ApiModelProperty("Logo") + private String logo; + @ApiModelProperty("公司名") + private String companyName; + @ApiModelProperty("系统名") + private String systemName; + @ApiModelProperty("登陆背景图路径") + private String backdropUrl; + @ApiModelProperty("标题") + private String caption; + @ApiModelProperty("栏外标题") + private String headline; + @ApiModelProperty("是否显示日历 0不显示 1显示") + private Byte showCalendar; + @ApiModelProperty("不展示日历时。显示的项目的id") + private Long showProjectId; + @ApiModelProperty("常驻项目的id") + private Long foreverProjectId; + @ApiModelProperty("是否展示导航") + private Byte domainNav; + + @ApiModelProperty("域特有导航信息") + private List domainNavInfoList; + } + + @ApiModel("添加域导航信息") + @Data + public static class DomainNavInfo{ + @ApiModelProperty("首页") + private String text; + @ApiModelProperty("0 -> 内部链接, 1 -> 外部链接") + private Integer type; + @ApiModelProperty("导航对应的链接") + private String path; + @ApiModelProperty("参数") + private String params; + @ApiModelProperty("导航栏图标") + private String icon; + @ApiModelProperty("0 -> 左侧/上 1 -> 右侧/下") + private Integer position; + } +} diff --git a/tall/src/main/java/com/ccsens/tall/bean/po/DomainNav.java b/tall/src/main/java/com/ccsens/tall/bean/po/DomainNav.java new file mode 100644 index 00000000..027ce345 --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/DomainNav.java @@ -0,0 +1,139 @@ +package com.ccsens.tall.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class DomainNav implements Serializable { + private Long id; + + private Long domainId; + + private String text; + + private Byte type; + + private String path; + + private String params; + + private String icon; + + private Byte position; + + 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 getDomainId() { + return domainId; + } + + public void setDomainId(Long domainId) { + this.domainId = domainId; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text == null ? null : text.trim(); + } + + public Byte getType() { + return type; + } + + public void setType(Byte type) { + this.type = type; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path == null ? null : path.trim(); + } + + public String getParams() { + return params; + } + + public void setParams(String params) { + this.params = params == null ? null : params.trim(); + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon == null ? null : icon.trim(); + } + + public Byte getPosition() { + return position; + } + + public void setPosition(Byte position) { + this.position = position; + } + + 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(", domainId=").append(domainId); + sb.append(", text=").append(text); + sb.append(", type=").append(type); + sb.append(", path=").append(path); + sb.append(", params=").append(params); + sb.append(", icon=").append(icon); + sb.append(", position=").append(position); + 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/DomainNavExample.java b/tall/src/main/java/com/ccsens/tall/bean/po/DomainNavExample.java new file mode 100644 index 00000000..42478a7e --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/bean/po/DomainNavExample.java @@ -0,0 +1,901 @@ +package com.ccsens.tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class DomainNavExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DomainNavExample() { + 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 andDomainIdIsNull() { + addCriterion("domain_id is null"); + return (Criteria) this; + } + + public Criteria andDomainIdIsNotNull() { + addCriterion("domain_id is not null"); + return (Criteria) this; + } + + public Criteria andDomainIdEqualTo(Long value) { + addCriterion("domain_id =", value, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdNotEqualTo(Long value) { + addCriterion("domain_id <>", value, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdGreaterThan(Long value) { + addCriterion("domain_id >", value, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdGreaterThanOrEqualTo(Long value) { + addCriterion("domain_id >=", value, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdLessThan(Long value) { + addCriterion("domain_id <", value, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdLessThanOrEqualTo(Long value) { + addCriterion("domain_id <=", value, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdIn(List values) { + addCriterion("domain_id in", values, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdNotIn(List values) { + addCriterion("domain_id not in", values, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdBetween(Long value1, Long value2) { + addCriterion("domain_id between", value1, value2, "domainId"); + return (Criteria) this; + } + + public Criteria andDomainIdNotBetween(Long value1, Long value2) { + addCriterion("domain_id not between", value1, value2, "domainId"); + return (Criteria) this; + } + + public Criteria andTextIsNull() { + addCriterion("text is null"); + return (Criteria) this; + } + + public Criteria andTextIsNotNull() { + addCriterion("text is not null"); + return (Criteria) this; + } + + public Criteria andTextEqualTo(String value) { + addCriterion("text =", value, "text"); + return (Criteria) this; + } + + public Criteria andTextNotEqualTo(String value) { + addCriterion("text <>", value, "text"); + return (Criteria) this; + } + + public Criteria andTextGreaterThan(String value) { + addCriterion("text >", value, "text"); + return (Criteria) this; + } + + public Criteria andTextGreaterThanOrEqualTo(String value) { + addCriterion("text >=", value, "text"); + return (Criteria) this; + } + + public Criteria andTextLessThan(String value) { + addCriterion("text <", value, "text"); + return (Criteria) this; + } + + public Criteria andTextLessThanOrEqualTo(String value) { + addCriterion("text <=", value, "text"); + return (Criteria) this; + } + + public Criteria andTextLike(String value) { + addCriterion("text like", value, "text"); + return (Criteria) this; + } + + public Criteria andTextNotLike(String value) { + addCriterion("text not like", value, "text"); + return (Criteria) this; + } + + public Criteria andTextIn(List values) { + addCriterion("text in", values, "text"); + return (Criteria) this; + } + + public Criteria andTextNotIn(List values) { + addCriterion("text not in", values, "text"); + return (Criteria) this; + } + + public Criteria andTextBetween(String value1, String value2) { + addCriterion("text between", value1, value2, "text"); + return (Criteria) this; + } + + public Criteria andTextNotBetween(String value1, String value2) { + addCriterion("text not between", value1, value2, "text"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("type is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("type is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Byte value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Byte value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Byte value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Byte value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Byte value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("type not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Byte value1, Byte value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Byte value1, Byte value2) { + addCriterion("type not between", value1, value2, "type"); + 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 andParamsIsNull() { + addCriterion("params is null"); + return (Criteria) this; + } + + public Criteria andParamsIsNotNull() { + addCriterion("params is not null"); + return (Criteria) this; + } + + public Criteria andParamsEqualTo(String value) { + addCriterion("params =", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsNotEqualTo(String value) { + addCriterion("params <>", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsGreaterThan(String value) { + addCriterion("params >", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsGreaterThanOrEqualTo(String value) { + addCriterion("params >=", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsLessThan(String value) { + addCriterion("params <", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsLessThanOrEqualTo(String value) { + addCriterion("params <=", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsLike(String value) { + addCriterion("params like", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsNotLike(String value) { + addCriterion("params not like", value, "params"); + return (Criteria) this; + } + + public Criteria andParamsIn(List values) { + addCriterion("params in", values, "params"); + return (Criteria) this; + } + + public Criteria andParamsNotIn(List values) { + addCriterion("params not in", values, "params"); + return (Criteria) this; + } + + public Criteria andParamsBetween(String value1, String value2) { + addCriterion("params between", value1, value2, "params"); + return (Criteria) this; + } + + public Criteria andParamsNotBetween(String value1, String value2) { + addCriterion("params not between", value1, value2, "params"); + return (Criteria) this; + } + + public Criteria andIconIsNull() { + addCriterion("icon is null"); + return (Criteria) this; + } + + public Criteria andIconIsNotNull() { + addCriterion("icon is not null"); + return (Criteria) this; + } + + public Criteria andIconEqualTo(String value) { + addCriterion("icon =", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotEqualTo(String value) { + addCriterion("icon <>", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconGreaterThan(String value) { + addCriterion("icon >", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconGreaterThanOrEqualTo(String value) { + addCriterion("icon >=", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLessThan(String value) { + addCriterion("icon <", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLessThanOrEqualTo(String value) { + addCriterion("icon <=", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLike(String value) { + addCriterion("icon like", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotLike(String value) { + addCriterion("icon not like", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconIn(List values) { + addCriterion("icon in", values, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotIn(List values) { + addCriterion("icon not in", values, "icon"); + return (Criteria) this; + } + + public Criteria andIconBetween(String value1, String value2) { + addCriterion("icon between", value1, value2, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotBetween(String value1, String value2) { + addCriterion("icon not between", value1, value2, "icon"); + return (Criteria) this; + } + + public Criteria andPositionIsNull() { + addCriterion("position is null"); + return (Criteria) this; + } + + public Criteria andPositionIsNotNull() { + addCriterion("position is not null"); + return (Criteria) this; + } + + public Criteria andPositionEqualTo(Byte value) { + addCriterion("position =", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionNotEqualTo(Byte value) { + addCriterion("position <>", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionGreaterThan(Byte value) { + addCriterion("position >", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionGreaterThanOrEqualTo(Byte value) { + addCriterion("position >=", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionLessThan(Byte value) { + addCriterion("position <", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionLessThanOrEqualTo(Byte value) { + addCriterion("position <=", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionIn(List values) { + addCriterion("position in", values, "position"); + return (Criteria) this; + } + + public Criteria andPositionNotIn(List values) { + addCriterion("position not in", values, "position"); + return (Criteria) this; + } + + public Criteria andPositionBetween(Byte value1, Byte value2) { + addCriterion("position between", value1, value2, "position"); + return (Criteria) this; + } + + public Criteria andPositionNotBetween(Byte value1, Byte value2) { + addCriterion("position not between", value1, value2, "position"); + 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/SysDomain.java b/tall/src/main/java/com/ccsens/tall/bean/po/SysDomain.java index a52df7a9..52bc2604 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 @@ -32,6 +32,8 @@ public class SysDomain implements Serializable { private String foreverProjectId; + private Byte navigationBar; + private static final long serialVersionUID = 1L; public Long getId() { @@ -146,6 +148,14 @@ public class SysDomain implements Serializable { this.foreverProjectId = foreverProjectId == null ? null : foreverProjectId.trim(); } + public Byte getNavigationBar() { + return navigationBar; + } + + public void setNavigationBar(Byte navigationBar) { + this.navigationBar = navigationBar; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -166,6 +176,7 @@ public class SysDomain implements Serializable { sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); sb.append(", foreverProjectId=").append(foreverProjectId); + sb.append(", navigationBar=").append(navigationBar); 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 11d52065..1b0fda64 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 @@ -1024,6 +1024,66 @@ public class SysDomainExample { addCriterion("forever_project_id not between", value1, value2, "foreverProjectId"); return (Criteria) this; } + + public Criteria andNavigationBarIsNull() { + addCriterion("navigation_bar is null"); + return (Criteria) this; + } + + public Criteria andNavigationBarIsNotNull() { + addCriterion("navigation_bar is not null"); + return (Criteria) this; + } + + public Criteria andNavigationBarEqualTo(Byte value) { + addCriterion("navigation_bar =", value, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarNotEqualTo(Byte value) { + addCriterion("navigation_bar <>", value, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarGreaterThan(Byte value) { + addCriterion("navigation_bar >", value, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarGreaterThanOrEqualTo(Byte value) { + addCriterion("navigation_bar >=", value, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarLessThan(Byte value) { + addCriterion("navigation_bar <", value, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarLessThanOrEqualTo(Byte value) { + addCriterion("navigation_bar <=", value, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarIn(List values) { + addCriterion("navigation_bar in", values, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarNotIn(List values) { + addCriterion("navigation_bar not in", values, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarBetween(Byte value1, Byte value2) { + addCriterion("navigation_bar between", value1, value2, "navigationBar"); + return (Criteria) this; + } + + public Criteria andNavigationBarNotBetween(Byte value1, Byte value2) { + addCriterion("navigation_bar not between", value1, value2, "navigationBar"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { 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 ebbfa2f8..7c09a96a 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 @@ -1,15 +1,17 @@ package com.ccsens.tall.bean.vo; -import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.Getter; -import lombok.Setter; +import java.util.List; + +/** + * @author 逗 + */ @Data public class DomainVo { - @ApiModel + @ApiModel("根据名字查找域配置信息") @Data public static class DomainInfo{ @ApiModelProperty("配置信息的id") @@ -33,6 +35,27 @@ public class DomainVo { private int showCalendar; @ApiModelProperty("不展示日历时。显示的项目的id") private Long showProjectId; + @ApiModelProperty("是否展示导航") + private int domainNav; + + @ApiModelProperty("域特有导航信息") + private List domainNavInfoList; } + @ApiModel + @Data + public static class DomainNavInfo{ + @ApiModelProperty("首页") + private String text; + @ApiModelProperty("0 -> 内部链接, 1 -> 外部链接") + private Integer type; + @ApiModelProperty("导航对应的链接") + private String path; + @ApiModelProperty("参数") + private String params; + @ApiModelProperty("导航栏图标") + private String icon; + @ApiModelProperty("0 -> 左侧/上 1 -> 右侧/下") + private Integer position; + } } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/DomainNavDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/DomainNavDao.java new file mode 100644 index 00000000..dd50fa1c --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/DomainNavDao.java @@ -0,0 +1,11 @@ +package com.ccsens.tall.persist.dao; + +import com.ccsens.tall.persist.mapper.DomainNavMapper; +import org.springframework.stereotype.Repository; + +/** + * @author 逗 + */ +@Repository +public interface DomainNavDao extends DomainNavMapper { +} diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/SysDomainDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/SysDomainDao.java index a63c7137..846fc58e 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/SysDomainDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/SysDomainDao.java @@ -1,8 +1,18 @@ package com.ccsens.tall.persist.dao; +import com.ccsens.tall.bean.vo.DomainVo; import com.ccsens.tall.persist.mapper.SysDomainMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface SysDomainDao extends SysDomainMapper{ + /** + * 通过domainId查找导航信息 + * @param domainId + * @return + */ + List queryDomainNavByDomainId(@Param("domainId") Long domainId); } diff --git a/tall/src/main/java/com/ccsens/tall/persist/mapper/DomainNavMapper.java b/tall/src/main/java/com/ccsens/tall/persist/mapper/DomainNavMapper.java new file mode 100644 index 00000000..d31d5b6d --- /dev/null +++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/DomainNavMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.tall.persist.mapper; + +import com.ccsens.tall.bean.po.DomainNav; +import com.ccsens.tall.bean.po.DomainNavExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DomainNavMapper { + long countByExample(DomainNavExample example); + + int deleteByExample(DomainNavExample example); + + int deleteByPrimaryKey(Long id); + + int insert(DomainNav record); + + int insertSelective(DomainNav record); + + List selectByExample(DomainNavExample example); + + DomainNav selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") DomainNav record, @Param("example") DomainNavExample example); + + int updateByExample(@Param("record") DomainNav record, @Param("example") DomainNavExample example); + + int updateByPrimaryKeySelective(DomainNav record); + + int updateByPrimaryKey(DomainNav record); +} \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/service/AsyncService.java b/tall/src/main/java/com/ccsens/tall/service/AsyncService.java index 951a99af..26ceae7e 100644 --- a/tall/src/main/java/com/ccsens/tall/service/AsyncService.java +++ b/tall/src/main/java/com/ccsens/tall/service/AsyncService.java @@ -11,6 +11,7 @@ import com.ccsens.util.annotation.OperateType; import com.ccsens.util.wx.WxTemplateMessage; import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -25,8 +26,10 @@ import java.util.Map; @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class AsyncService implements IAsyncService{ + @Lazy @Resource private IRobotService robotService; + @Lazy @Resource private IProjectMessageService projectMessageService; 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 1b95efc1..5b40e005 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -71,6 +71,8 @@ public class ExcelService implements IExcelService { private IWpsService wpsService; @Resource private ProRoleDao proRoleDao; + @Resource + private ProPluginConfigDao proPluginConfigDao; @Override @@ -906,19 +908,23 @@ public class ExcelService implements IExcelService { } if(allMemberId != 0) { //添加日报 - saveMeetingTask("日报", "每天", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId()); + saveMeetingTask("日报", "每天", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId(), + "/home/report?type=\"day\""); //添加周报 - saveMeetingTask("周报", "每周一", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId()); + saveMeetingTask("周报", "每周一", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId(), + "/home/report?type=\"week\""); // TODO 添加季报 //添加月报 - saveMeetingTask("月报", "每月1号", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId()); + saveMeetingTask("月报", "每月1号", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId(), + "/home/report?type=\"month\""); //添加年报 - saveMeetingTask("年报", "每年第一天", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId()); + saveMeetingTask("年报", "每年第一天", taskDetails, sysProject, pmRoleId, allMemberId, firstTaskDetail.getId(), + "/home/report?type=\"year\""); } } private void saveMeetingTask(String name, String cycle, List taskDetails, SysProject sysProject, - Long checkerRoleId, Long executorRoleId,Long parentId) { + Long checkerRoleId, Long executorRoleId,Long parentId, String webPath) { ProTaskDetail dayMeeting = new ProTaskDetail(); dayMeeting.setId(snowflake.nextId()); dayMeeting.setName(name); @@ -933,6 +939,13 @@ public class ExcelService implements IExcelService { dayMeeting.setExecutorRole(executorRoleId); dayMeeting.setHasGroup((byte) 0); proTaskDetailService.saveTaskDetail(dayMeeting); + //添加任务配置（配置第三栏默认显示页面的路径） + ProPluginConfig proPluginConfig = new ProPluginConfig(); + proPluginConfig.setId(snowflake.nextId()); + proPluginConfig.setTaskId(dayMeeting.getId()); + proPluginConfig.setWebPath(webPath); + proPluginConfigDao.insertSelective(proPluginConfig); + taskDetails.add(dayMeeting); } diff --git a/tall/src/main/java/com/ccsens/tall/service/IAsyncService.java b/tall/src/main/java/com/ccsens/tall/service/IAsyncService.java index 51b4d7cd..16beaabd 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IAsyncService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IAsyncService.java @@ -11,6 +11,7 @@ import java.util.Map; /** * 异步方法 */ + public interface IAsyncService { void sendRobotMessage(OperateType operateType, RobotUtil.Message message); diff --git a/tall/src/main/java/com/ccsens/tall/service/ISysDomainService.java b/tall/src/main/java/com/ccsens/tall/service/ISysDomainService.java index 5b510ef3..a16ade18 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ISysDomainService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ISysDomainService.java @@ -1,7 +1,23 @@ package com.ccsens.tall.service; +import com.ccsens.tall.bean.dto.DomainDto; import com.ccsens.tall.bean.vo.DomainVo; +/** + * @author 逗 + */ public interface ISysDomainService { + /** + * 根据名字查找域配置 + * @param domainName 域名 + * @return 返回域的详细信息 + */ DomainVo.DomainInfo getDomainByName(String domainName); + + /** + * 添加域配置信息 + * @param domainInfo 域详细配置信息 + * @return 返回域配置信息 + */ + DomainVo.DomainInfo saveDomain(DomainDto.DomainInfo domainInfo); } 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 2582bcbe..93a82bb3 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IUserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IUserService.java @@ -86,7 +86,7 @@ public interface IUserService { UserVo.WxInfo updateUserInfo(Long currentUserId, UserDto.WxInfo userInfo); - void relievePhone(Long userId,String phone); + void relievePhone(Long userId,UserDto.WxBindingPhone phoneInfo); UserVo.UserSign changePhoneNotPassword(Long userId,UserDto.WxBindingPhone phoneInfo) throws Exception; 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 624088ca..28474e1f 100644 --- a/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java +++ b/tall/src/main/java/com/ccsens/tall/service/SysDomainService.java @@ -2,23 +2,33 @@ package com.ccsens.tall.service; import cn.hutool.core.bean.BeanUtil; 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.tall.bean.dto.DomainDto; +import com.ccsens.tall.bean.po.DomainNav; import com.ccsens.tall.bean.po.SysDomain; import com.ccsens.tall.bean.po.SysDomainExample; import com.ccsens.tall.bean.vo.DomainVo; +import com.ccsens.tall.persist.dao.DomainNavDao; import com.ccsens.tall.persist.dao.SysDomainDao; import com.ccsens.util.PropUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.sql.Struct; +import javax.annotation.Resource; import java.util.List; +/** + * @author 逗 + */ @Service public class SysDomainService implements ISysDomainService{ - @Autowired + @Resource private SysDomainDao sysDomainDao; + @Resource + private DomainNavDao domainNavDao; + @Resource + private Snowflake snowflake; /** * 根据域名获取域的配置信息 @@ -33,6 +43,12 @@ public class SysDomainService implements ISysDomainService{ if (CollectionUtil.isNotEmpty(domainList)) { domainInfo = new DomainVo.DomainInfo(); BeanUtil.copyProperties(domainList.get(0), domainInfo); + if(domainInfo.getDomainNav() != 0){ + List domainNavInfoList = sysDomainDao.queryDomainNavByDomainId(domainInfo.getId()); + if(CollectionUtil.isNotEmpty(domainNavInfoList)){ + domainInfo.setDomainNavInfoList(domainNavInfoList); + } + } } } if(ObjectUtil.isNull(domainInfo)){ @@ -48,4 +64,24 @@ public class SysDomainService implements ISysDomainService{ } return domainInfo; } + + @Override + public DomainVo.DomainInfo saveDomain(DomainDto.DomainInfo domainInfo) { + if(ObjectUtil.isNotNull(domainInfo)){ + SysDomain sysDomain = new SysDomain(); + BeanUtil.copyProperties(domainInfo, sysDomain); + sysDomain.setId(snowflake.nextId()); + sysDomain.setNavigationBar(domainInfo.getDomainNav()); + sysDomainDao.insertSelective(sysDomain); + if(CollectionUtil.isNotEmpty(domainInfo.getDomainNavInfoList())){ + domainInfo.getDomainNavInfoList().forEach(domainNavInfo -> { + DomainNav domainNav = new DomainNav(); + BeanUtil.copyProperties(domainNavInfo, domainNav); + domainNav.setId(snowflake.nextId()); + domainNavDao.insertSelective(domainNav); + }); + } + } + return getDomainByName(domainInfo.getDomainName()); + } } 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 4f3f08d0..1bd8cb45 100644 --- a/tall/src/main/java/com/ccsens/tall/service/UserService.java +++ b/tall/src/main/java/com/ccsens/tall/service/UserService.java @@ -1382,19 +1382,22 @@ public class UserService implements IUserService { * 解除已绑定的手机号 */ @Override - public void relievePhone(Long userId, String phone) { - SysAuthExample authExample = new SysAuthExample(); - authExample.createCriteria().andUserIdEqualTo(userId) - .andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) - .andIdentifierEqualTo(phone); - List authList = authDao.selectByExample(authExample); - if (CollectionUtil.isNotEmpty(authList)) { - SysAuth auth = authList.get(0); - auth.setRecStatus((byte) 2); - authDao.updateByPrimaryKeySelective(auth); - }else { - throw new BaseException(CodeEnum.PHONE_ERR); + public void relievePhone(Long userId, UserDto.WxBindingPhone phoneInfo) { + if(isSmsCodeCorrect(phoneInfo.getPhone(),phoneInfo.getSmsCode())){ + SysAuthExample authExample = new SysAuthExample(); + authExample.createCriteria().andUserIdEqualTo(userId) + .andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.Phone.value) + .andIdentifierEqualTo(phoneInfo.getPhone()); + List authList = authDao.selectByExample(authExample); + if (CollectionUtil.isNotEmpty(authList)) { + SysAuth auth = authList.get(0); + auth.setRecStatus((byte) 2); + authDao.updateByPrimaryKeySelective(auth); + }else { + throw new BaseException(CodeEnum.PHONE_ERR); + } } + } /** diff --git a/tall/src/main/java/com/ccsens/tall/service/WpsService.java b/tall/src/main/java/com/ccsens/tall/service/WpsService.java index cfd3665e..2c5cef10 100644 --- a/tall/src/main/java/com/ccsens/tall/service/WpsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/WpsService.java @@ -19,6 +19,7 @@ import com.ccsens.util.*; import com.ccsens.util.exception.BaseException; import io.jsonwebtoken.Claims; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -55,7 +56,7 @@ public class WpsService implements IWpsService { @Resource private Snowflake snowflake; @Resource - private AsyncService asyncService; + private IAsyncService asyncService; @Override public List queryVisitUrls(long businessId, byte businessType, String token, Map params) { diff --git a/tall/src/main/java/com/ccsens/tall/web/DomainController.java b/tall/src/main/java/com/ccsens/tall/web/DomainController.java index da910790..1fd3730a 100644 --- a/tall/src/main/java/com/ccsens/tall/web/DomainController.java +++ b/tall/src/main/java/com/ccsens/tall/web/DomainController.java @@ -1,5 +1,7 @@ package com.ccsens.tall.web; +import com.ccsens.tall.bean.dto.DomainDto; +import com.ccsens.tall.bean.dto.TaskDto; import com.ccsens.tall.bean.vo.DomainVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.service.ISysDomainService; @@ -11,6 +13,7 @@ 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.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -33,4 +36,15 @@ public class DomainController { DomainVo.DomainInfo domainInfo = domainService.getDomainByName(domainName); return JsonResponse.newInstance().ok(domainInfo); } + + @ApiOperation(value = "添加域配置",notes = "") + @ApiImplicitParams({ + @ApiImplicitParam(name = "saveDomain", value = "域名", required = true, paramType = "query") + }) + @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse saveDomain(HttpServletRequest request, + @Validated @RequestBody DomainDto.DomainInfo domainInfo) throws Exception { + DomainVo.DomainInfo domain = domainService.saveDomain(domainInfo); + return JsonResponse.newInstance().ok(domainInfo); + } } 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 d44d068e..4c4dc0c5 100644 --- a/tall/src/main/java/com/ccsens/tall/web/UserController.java +++ b/tall/src/main/java/com/ccsens/tall/web/UserController.java @@ -267,11 +267,11 @@ public class UserController { @ApiOperation(value = "解绑手机号", notes = "") @ApiImplicitParams({ }) - @RequestMapping(value = "/relievePhone", method = RequestMethod.DELETE, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/relievePhone", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse relievePhone(HttpServletRequest request, - @RequestParam String phone) throws Exception { + @ApiParam @Validated @RequestBody UserDto.WxBindingPhone phoneInfo) throws Exception { Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); - userService.relievePhone(currentUserId,phone); + userService.relievePhone(currentUserId,phoneInfo); return JsonResponse.newInstance().ok(); } diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index c2646761..81423ad4 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -11,8 +11,8 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: -# host: 127.0.0.1 - host: api.ccsens.com + host: 127.0.0.1 +# host: api.ccsens.com password: 111111 port: 5672 username: admin @@ -32,14 +32,17 @@ swagger: enable: true eureka: instance: -# ip-address: 192.168.0.99 - ip-address: 49.233.89.188 -#gatewayUrl: http://192.168.0.99/gateway/ -#notGatewayUrl: http://192.168.0.99/ -gatewayUrl: https://test.tall.wiki/gateway/ -notGatewayUrl: https://test.tall.wiki/ + ip-address: 192.168.0.99 +# ip-address: 49.233.89.188 +gatewayUrl: http://192.168.0.99/gateway/ +notGatewayUrl: http://192.168.0.99/ +#gatewayUrl: https://test.tall.wiki/gateway/ +#notGatewayUrl: https://test.tall.wiki/ wx: prefixUrl: https://www.tall.wiki/wxconfigurer-api/ +#file: +# domain: https://test.tall.wiki/gateway/tall/v1.0/ +# imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads file: - domain: https://test.tall.wiki/gateway/tall/v1.0/ - imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads \ No newline at end of file + domain: http://192.168.0.99/gateway/tall/v1.0/ + imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b2acd365..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 + active: test + include: util-test,common diff --git a/tall/src/main/resources/druid-test.yml b/tall/src/main/resources/druid-test.yml index 11227332..b52b019f 100644 --- a/tall/src/main/resources/druid-test.yml +++ b/tall/src/main/resources/druid-test.yml @@ -15,8 +15,8 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: -# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 +# password: + password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -28,8 +28,8 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 -# url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8 +# url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8 username: root validationQuery: SELECT 1 FROM DUAL env: CCSENS_TALL \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/SysDomainDao.xml b/tall/src/main/resources/mapper_dao/SysDomainDao.xml new file mode 100644 index 00000000..722da8dc --- /dev/null +++ b/tall/src/main/resources/mapper_dao/SysDomainDao.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_raw/DomainNavMapper.xml b/tall/src/main/resources/mapper_raw/DomainNavMapper.xml new file mode 100644 index 00000000..b9061faa --- /dev/null +++ b/tall/src/main/resources/mapper_raw/DomainNavMapper.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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, domain_id, text, type, path, params, icon, position, created_at, updated_at, + rec_status + + + + + delete from t_sys_domain_navigation_bar + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_domain_navigation_bar + + + + + + insert into t_sys_domain_navigation_bar (id, domain_id, text, + type, path, params, + icon, position, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{domainId,jdbcType=BIGINT}, #{text,jdbcType=VARCHAR}, + #{type,jdbcType=TINYINT}, #{path,jdbcType=VARCHAR}, #{params,jdbcType=VARCHAR}, + #{icon,jdbcType=VARCHAR}, #{position,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_sys_domain_navigation_bar + + + id, + + + domain_id, + + + text, + + + type, + + + path, + + + params, + + + icon, + + + position, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{domainId,jdbcType=BIGINT}, + + + #{text,jdbcType=VARCHAR}, + + + #{type,jdbcType=TINYINT}, + + + #{path,jdbcType=VARCHAR}, + + + #{params,jdbcType=VARCHAR}, + + + #{icon,jdbcType=VARCHAR}, + + + #{position,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_domain_navigation_bar + + + id = #{record.id,jdbcType=BIGINT}, + + + domain_id = #{record.domainId,jdbcType=BIGINT}, + + + text = #{record.text,jdbcType=VARCHAR}, + + + type = #{record.type,jdbcType=TINYINT}, + + + path = #{record.path,jdbcType=VARCHAR}, + + + params = #{record.params,jdbcType=VARCHAR}, + + + icon = #{record.icon,jdbcType=VARCHAR}, + + + position = #{record.position,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_domain_navigation_bar + set id = #{record.id,jdbcType=BIGINT}, + domain_id = #{record.domainId,jdbcType=BIGINT}, + text = #{record.text,jdbcType=VARCHAR}, + type = #{record.type,jdbcType=TINYINT}, + path = #{record.path,jdbcType=VARCHAR}, + params = #{record.params,jdbcType=VARCHAR}, + icon = #{record.icon,jdbcType=VARCHAR}, + position = #{record.position,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_domain_navigation_bar + + + domain_id = #{domainId,jdbcType=BIGINT}, + + + text = #{text,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=TINYINT}, + + + path = #{path,jdbcType=VARCHAR}, + + + params = #{params,jdbcType=VARCHAR}, + + + icon = #{icon,jdbcType=VARCHAR}, + + + position = #{position,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_domain_navigation_bar + set domain_id = #{domainId,jdbcType=BIGINT}, + text = #{text,jdbcType=VARCHAR}, + type = #{type,jdbcType=TINYINT}, + path = #{path,jdbcType=VARCHAR}, + params = #{params,jdbcType=VARCHAR}, + icon = #{icon,jdbcType=VARCHAR}, + position = #{position,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/SysDomainMapper.xml b/tall/src/main/resources/mapper_raw/SysDomainMapper.xml index 568af1f2..ffc262a9 100644 --- a/tall/src/main/resources/mapper_raw/SysDomainMapper.xml +++ b/tall/src/main/resources/mapper_raw/SysDomainMapper.xml @@ -16,6 +16,7 @@ + @@ -77,7 +78,7 @@ id, domain_name, logo, company_name, system_name, backdrop_url, show_calendar, show_project_id, - caption, headline, created_at, updated_at, rec_status, forever_project_id + caption, headline, created_at, updated_at, rec_status, forever_project_id, navigation_bar @@ -263,6 +272,9 @@ forever_project_id = #{record.foreverProjectId,jdbcType=VARCHAR}, + + navigation_bar = #{record.navigationBar,jdbcType=TINYINT}, + @@ -283,7 +295,8 @@ created_at = #{record.createdAt,jdbcType=TIMESTAMP}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, rec_status = #{record.recStatus,jdbcType=TINYINT}, - forever_project_id = #{record.foreverProjectId,jdbcType=VARCHAR} + forever_project_id = #{record.foreverProjectId,jdbcType=VARCHAR}, + navigation_bar = #{record.navigationBar,jdbcType=TINYINT} @@ -330,6 +343,9 @@ forever_project_id = #{foreverProjectId,jdbcType=VARCHAR}, + + navigation_bar = #{navigationBar,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -347,7 +363,8 @@ created_at = #{createdAt,jdbcType=TIMESTAMP}, updated_at = #{updatedAt,jdbcType=TIMESTAMP}, rec_status = #{recStatus,jdbcType=TINYINT}, - forever_project_id = #{foreverProjectId,jdbcType=VARCHAR} + forever_project_id = #{foreverProjectId,jdbcType=VARCHAR}, + navigation_bar = #{navigationBar,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file