diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a6f00af..e858f64 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index a936d15..ea2d456 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -7,6 +7,7 @@ + diff --git a/Genius-common/pom.xml b/Genius-common/pom.xml index fb590b8..fbe915c 100644 --- a/Genius-common/pom.xml +++ b/Genius-common/pom.xml @@ -123,6 +123,16 @@ aliyun-sdk-oss 3.11.0 + + io.swagger + swagger-annotations + 1.6.3 + + + com.baomidou + mybatis-plus-boot-starter + 3.5.0 + diff --git a/Genius-common/src/main/java/com/bwie/common/domain/CostType.java b/Genius-common/src/main/java/com/bwie/common/domain/CostType.java new file mode 100644 index 0000000..39d9e9d --- /dev/null +++ b/Genius-common/src/main/java/com/bwie/common/domain/CostType.java @@ -0,0 +1,34 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author sikadi + * @since 2023-10-08 03:10:30 + */ +@Getter +@Setter +@TableName("t_cost_type") +@ApiModel(value = "CostType对象", description = "") +public class CostType { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("成本类型") + @TableField("cost_type_name") + private String costTypeName; + + +} diff --git a/Genius-common/src/main/java/com/bwie/common/domain/Project.java b/Genius-common/src/main/java/com/bwie/common/domain/Project.java new file mode 100644 index 0000000..47d213b --- /dev/null +++ b/Genius-common/src/main/java/com/bwie/common/domain/Project.java @@ -0,0 +1,83 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; +import java.util.List; + +/** + *

+ * + *

+ * + * @author sikadi + * @since 2023-10-08 02:57:22 + */ +@Getter +@Setter +@TableName("t_project") +@ApiModel(value = "Project对象", description = "") +public class Project { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("项目名称") + @TableField("project_name") + private String projectName; + + @ApiModelProperty("项目编号") + @TableField("project_card") + private String projectCard; + + @ApiModelProperty("项目客户方") + @TableField("project_client") + private String projectClient; + + @ApiModelProperty("项目立项时间") + @TableField("project_create_time") + private Date projectCreateTime; + + @ApiModelProperty("项目开工时间") + @TableField("project_start_time") + private Date projectStartTime; + + @ApiModelProperty("项目竣工时间") + @TableField("project_completed_time") + private Date projectCompletedTime; + + @ApiModelProperty("项目负责人") + @TableField("project_leader") + private String projectLeader; + + @ApiModelProperty("项目图片") + @TableField("project_image") + private String projectImage; + + @ApiModelProperty("0：待提交 1：待审核 2:审核通过 3:审核不通过") + @TableField("status") + private Integer status; + + @ApiModelProperty("成本类型集合") + @TableField("projectCostTypeList") + private List projectCostTypeList; + + @ApiModelProperty("总概算金额") + @TableField("imputedAmountSum") + private Double imputedAmountSum; + + @ApiModelProperty("总估算金额") + @TableField("estimatedAmountSum") + private Double estimatedAmountSum; + + + + +} diff --git a/Genius-common/src/main/java/com/bwie/common/domain/ProjectCostType.java b/Genius-common/src/main/java/com/bwie/common/domain/ProjectCostType.java new file mode 100644 index 0000000..a41ca19 --- /dev/null +++ b/Genius-common/src/main/java/com/bwie/common/domain/ProjectCostType.java @@ -0,0 +1,49 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author sikadi + * @since 2023-10-08 03:10:40 + */ +@Getter +@Setter +@TableName("t_project_cost_type") +@ApiModel(value = "ProjectCostType对象", description = "") +public class ProjectCostType { + + @TableId("id") + private Integer id; + + @ApiModelProperty("项目id") + @TableField("project_id") + private Integer projectId; + + @ApiModelProperty("项目成本类型id") + @TableField("cost_type_id") + private Integer costTypeId; + + @ApiModelProperty("估算金额") + @TableField("imputed_amount") + private Double imputedAmount; + + @ApiModelProperty("概算金额") + @TableField("estimated_amount") + private Double estimatedAmount; + + @ApiModelProperty("0:待审核 1：审核通过 2：审核不通过 估算=概算则审核通过") + @TableField("status") + private Integer status; + + +} diff --git a/Genius-common/src/main/java/com/bwie/common/domain/Role.java b/Genius-common/src/main/java/com/bwie/common/domain/Role.java new file mode 100644 index 0000000..0ccb9bd --- /dev/null +++ b/Genius-common/src/main/java/com/bwie/common/domain/Role.java @@ -0,0 +1,34 @@ +package com.bwie.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * + *

+ * + * @author sikadi + * @since 2023-10-08 03:10:09 + */ +@Getter +@Setter +@TableName("t_role") +@ApiModel(value = "Role对象", description = "") +public class Role { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("角色名称") + @TableField("role_name") + private String roleName; + + +} diff --git a/Genius-modules/Genius-project/.gitignore b/Genius-modules/Genius-project/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/Genius-modules/Genius-project/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/Genius-modules/Genius-project/pom.xml b/Genius-modules/Genius-project/pom.xml new file mode 100644 index 0000000..31e0c67 --- /dev/null +++ b/Genius-modules/Genius-project/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.bwie + Genius-modules + 1.0-SNAPSHOT + + + Genius-project + + + 8 + 8 + UTF-8 + + + diff --git a/Genius-modules/Genius-project/src/main/java/com/bwie/Main.java b/Genius-modules/Genius-project/src/main/java/com/bwie/Main.java new file mode 100644 index 0000000..1287888 --- /dev/null +++ b/Genius-modules/Genius-project/src/main/java/com/bwie/Main.java @@ -0,0 +1,7 @@ +package com.bwie; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/Genius-modules/Genius-user/pom.xml b/Genius-modules/Genius-user/pom.xml index 08c72e7..94daada 100644 --- a/Genius-modules/Genius-user/pom.xml +++ b/Genius-modules/Genius-user/pom.xml @@ -10,7 +10,6 @@ Genius-user - 8 8 @@ -18,13 +17,39 @@ + com.bwie - Genius-modules - 1.0-SNAPSHOT + Genius-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 - - diff --git a/Genius-modules/pom.xml b/Genius-modules/pom.xml index ef93020..baaca61 100644 --- a/Genius-modules/pom.xml +++ b/Genius-modules/pom.xml @@ -13,6 +13,7 @@ pom Genius-user + Genius-project @@ -20,42 +21,4 @@ 8 UTF-8 - - - - - - com.bwie - Genius-common - - - - org.springframework.boot - spring-boot-starter-web - - - - com.alibaba - druid-spring-boot-starter - 1.2.8 - - - - mysql - mysql-connector-java - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.2.2 - - - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.4.1 - - -