jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2024-08-25 13:54:20 +08:00
parent d8f63fa43b
commit 589f8e7132
11 changed files with 106 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -178,13 +178,6 @@
<version>${yanzhu.version}</version> <version>${yanzhu.version}</version>
</dependency> </dependency>
<!-- 分布式事务 -->
<dependency>
<groupId>com.yanzhu</groupId>
<artifactId>yanzhu-common-seata</artifactId>
<version>${yanzhu.version}</version>
</dependency>
<!-- 日志记录 --> <!-- 日志记录 -->
<dependency> <dependency>
<groupId>com.yanzhu</groupId> <groupId>com.yanzhu</groupId>

1
yanzhu-common/pom.xml
View File

@ -12,7 +12,6 @@
<module>yanzhu-common-log</module> <module>yanzhu-common-log</module>
<module>yanzhu-common-core</module> <module>yanzhu-common-core</module>
<module>yanzhu-common-redis</module> <module>yanzhu-common-redis</module>
<module>yanzhu-common-seata</module>
<module>yanzhu-common-swagger</module> <module>yanzhu-common-swagger</module>
<module>yanzhu-common-security</module> <module>yanzhu-common-security</module>
<module>yanzhu-common-datascope</module> <module>yanzhu-common-datascope</module>

12
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoDepts.java
View File

@ -22,6 +22,10 @@ public class ProProjectInfoDepts extends BaseEntity
@Excel(name = "项目主键") @Excel(name = "项目主键")
private Long projectId; private Long projectId;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
/** 参建单位类型 */ /** 参建单位类型 */
@Excel(name = "参建单位类型") @Excel(name = "参建单位类型")
private String deptType; private String deptType;
@ -93,6 +97,14 @@ public class ProProjectInfoDepts extends BaseEntity
return isDel; return isDel;
} }
public String getProjectName() {
return projectName;
}
public void setProjectName(String projectName) {
this.projectName = projectName;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

12
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSetting.java
View File

@ -22,6 +22,10 @@ public class ProProjectInfoSetting extends BaseEntity
@Excel(name = "项目主键") @Excel(name = "项目主键")
private Long projectId; private Long projectId;
/** 项目名称 */
@Excel(name = "项目名称")
private String projectName;
/** 显示名称 */ /** 显示名称 */
@Excel(name = "显示名称") @Excel(name = "显示名称")
private String orgName; private String orgName;
@ -119,6 +123,14 @@ public class ProProjectInfoSetting extends BaseEntity
return isDel; return isDel;
} }
public String getProjectName() {
return projectName;
}
public void setProjectName(String projectName) {
this.projectName = projectName;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

17
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ProProjectInfoDepts" id="ProProjectInfoDeptsResult"> <resultMap type="ProProjectInfoDepts" id="ProProjectInfoDeptsResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="projectId" column="project_id" /> <result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="deptType" column="dept_type" /> <result property="deptType" column="dept_type" />
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name" />
<result property="deptCode" column="dept_code" /> <result property="deptCode" column="dept_code" />
@ -19,23 +20,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectProProjectInfoDeptsVo"> <sql id="selectProProjectInfoDeptsVo">
select id, project_id, dept_type, dept_name, dept_code, is_del, create_by, create_time, update_by, update_time, remark from pro_project_info_depts select pd.id, pd.project_id, pi.project_name, pd.dept_type, pd.dept_name, pd.dept_code, pd.is_del, pd.create_by, pd.create_time, pd.update_by, pd.update_time, pd.remark from pro_project_info_depts pd
left join pro_project_info pi on pi.id = pd.project_id
</sql> </sql>
<select id="selectProProjectInfoDeptsList" parameterType="ProProjectInfoDepts" resultMap="ProProjectInfoDeptsResult"> <select id="selectProProjectInfoDeptsList" parameterType="ProProjectInfoDepts" resultMap="ProProjectInfoDeptsResult">
<include refid="selectProProjectInfoDeptsVo"/> <include refid="selectProProjectInfoDeptsVo"/>
<where> <where>
<if test="projectId != null "> and project_id = #{projectId}</if> <if test="projectId != null "> and pd.project_id = #{projectId}</if>
<if test="deptType != null and deptType != ''"> and dept_type = #{deptType}</if> <if test="deptType != null and deptType != ''"> and pd.dept_type = #{deptType}</if>
<if test="deptName != null and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if> <if test="deptName != null and deptName != ''"> and pd.dept_name like concat('%', #{deptName}, '%')</if>
<if test="deptCode != null and deptCode != ''"> and dept_code = #{deptCode}</if> <if test="projectName != null and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if>
<if test="isDel != null "> and is_del = #{isDel}</if> <if test="deptCode != null and deptCode != ''"> and pd.dept_code = #{deptCode}</if>
<if test="isDel != null "> and pd.is_del = #{isDel}</if>
</where> </where>
</select> </select>
<select id="selectProProjectInfoDeptsById" parameterType="Long" resultMap="ProProjectInfoDeptsResult"> <select id="selectProProjectInfoDeptsById" parameterType="Long" resultMap="ProProjectInfoDeptsResult">
<include refid="selectProProjectInfoDeptsVo"/> <include refid="selectProProjectInfoDeptsVo"/>
where id = #{id} where pd.id = #{id}
</select> </select>
<insert id="insertProProjectInfoDepts" parameterType="ProProjectInfoDepts" useGeneratedKeys="true" keyProperty="id"> <insert id="insertProProjectInfoDepts" parameterType="ProProjectInfoDepts" useGeneratedKeys="true" keyProperty="id">

17
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSettingMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ProProjectInfoSetting" id="ProProjectInfoSettingResult"> <resultMap type="ProProjectInfoSetting" id="ProProjectInfoSettingResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="projectId" column="project_id" /> <result property="projectId" column="project_id" />
<result property="projectName" column="project_name" />
<result property="orgName" column="org_name" /> <result property="orgName" column="org_name" />
<result property="orgLogo" column="org_logo" /> <result property="orgLogo" column="org_logo" />
<result property="orgImage" column="org_image" /> <result property="orgImage" column="org_image" />
@ -21,25 +22,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectProProjectInfoSettingVo"> <sql id="selectProProjectInfoSettingVo">
select id, project_id, org_name, org_logo, org_image, org_video, org_plane, is_del, create_by, create_time, update_by, update_time, remark from pro_project_info_setting select ps.id, ps.project_id, pi.project_name, ps.org_name, ps.org_logo, ps.org_image, ps.org_video, ps.org_plane, ps.is_del, ps.create_by, ps.create_time, ps.update_by, ps.update_time, ps.remark from pro_project_info_setting ps
left join pro_project_info pi on pi.id = ps.project_id
</sql> </sql>
<select id="selectProProjectInfoSettingList" parameterType="ProProjectInfoSetting" resultMap="ProProjectInfoSettingResult"> <select id="selectProProjectInfoSettingList" parameterType="ProProjectInfoSetting" resultMap="ProProjectInfoSettingResult">
<include refid="selectProProjectInfoSettingVo"/> <include refid="selectProProjectInfoSettingVo"/>
<where> <where>
<if test="projectId != null "> and project_id = #{projectId}</if> <if test="projectId != null "> and ps.project_id = #{projectId}</if>
<if test="orgName != null and orgName != ''"> and org_name like concat('%', #{orgName}, '%')</if> <if test="orgName != null and orgName != ''"> and ps.org_name like concat('%', #{orgName}, '%')</if>
<if test="orgLogo != null and orgLogo != ''"> and org_logo = #{orgLogo}</if> <if test="projectName != null and projectName != ''"> and pi.project_name like concat('%', #{projectName}, '%')</if>
<if test="orgImage != null and orgImage != ''"> and org_image = #{orgImage}</if> <if test="isDel != null "> and ps.is_del = #{isDel}</if>
<if test="orgVideo != null and orgVideo != ''"> and org_video = #{orgVideo}</if>
<if test="orgPlane != null and orgPlane != ''"> and org_plane = #{orgPlane}</if>
<if test="isDel != null "> and is_del = #{isDel}</if>
</where> </where>
</select> </select>
<select id="selectProProjectInfoSettingById" parameterType="Long" resultMap="ProProjectInfoSettingResult"> <select id="selectProProjectInfoSettingById" parameterType="Long" resultMap="ProProjectInfoSettingResult">
<include refid="selectProProjectInfoSettingVo"/> <include refid="selectProProjectInfoSettingVo"/>
where id = #{id} where ps.id = #{id}
</select> </select>
<insert id="insertProProjectInfoSetting" parameterType="ProProjectInfoSetting" useGeneratedKeys="true" keyProperty="id"> <insert id="insertProProjectInfoSetting" parameterType="ProProjectInfoSetting" useGeneratedKeys="true" keyProperty="id">

27
yanzhu-common/yanzhu-common-seata/pom.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.yanzhu</groupId>
<artifactId>yanzhu-common</artifactId>
<version>3.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>yanzhu-common-seata</artifactId>
<description>
yanzhu-common-seata分布式事务
</description>
<dependencies>
<!-- SpringBoot Seata -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId>
</dependency>
</dependencies>
</project>

7
yanzhu-modules/yanzhu-flowable/pom.xml
View File

@ -84,13 +84,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
<version>1.5.2</version>
<scope>compile</scope>
</dependency>
<!-- YanZhu Common Swagger --> <!-- YanZhu Common Swagger -->
<dependency> <dependency>
<groupId>com.yanzhu</groupId> <groupId>com.yanzhu</groupId>

60
yanzhu-modules/yanzhu-manage/pom.xml
View File

@ -93,4 +93,64 @@
</dependencies> </dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- docker-maven-plugin插件(不带Dockerfile文件) -->
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.0</version>
<configuration>
<!--用于指定镜像名称-->
<imageName>${project.build.finalName}</imageName>
<imageTags>latest</imageTags>
<!--用于指定基础镜像，相当于Dockerfile中的FROM指令-->
<baseImage>openjdk:latest</baseImage>
<!--相当于Dockerfile的ENTRYPOINT指令-->
<entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
<!--是否跳过docker build-->
<!--<skipDockerBuild>true</skipDockerBuild>-->
<dockerHost>${configuration.docker-two-Host}</dockerHost>
<resources>
<resource>
<targetPath>/</targetPath>
<!--用于指定需要复制的根目录，${project.build.directory}表示target目录-->
<directory>${project.build.directory}</directory>
<!--用于指定需要复制的文件。${project.build.finalName}.jar指的是打包后的jar包文件。-->
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
<executions>
<execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<!--如果不设置resource 会导致application.yml中的@@找不到pom文件中的配置-->
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project> </project>

7
yanzhu-modules/yanzhu-system/pom.xml
View File

@ -83,13 +83,6 @@
<artifactId>yanzhu-common-datascope</artifactId> <artifactId>yanzhu-common-datascope</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
<version>1.5.2</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

40
yanzhu-ui-vue3/src/views/manage/proProjectInfoSetting/index.vue
View File

@ -1,40 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目主键" prop="projectId"> <el-form-item label="项目名称" prop="projectName">
<el-input <el-input
v-model="queryParams.projectId" v-model="queryParams.projectName"
placeholder="请输入项目主键" placeholder="请输入项目名称"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="显示名称" prop="orgName">
<el-input
v-model="queryParams.orgName"
placeholder="请输入显示名称"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="显示LOGO" prop="orgLogo">
<el-input
v-model="queryParams.orgLogo"
placeholder="请输入显示LOGO"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="删除标识" prop="isDel">
<el-select v-model="queryParams.isDel" placeholder="请选择删除标识" clearable>
<el-option
v-for="dict in sys_is_del"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -187,13 +161,7 @@ const data = reactive({
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
projectId: null, projectName: null,
orgName: null,
orgLogo: null,
orgImage: null,
orgVideo: null,
orgPlane: null,
isDel: null,
}, },
rules: { rules: {
} }