diff --git a/src/main/java/com/jg/project/about/domain/AboutPartThree.java b/src/main/java/com/jg/project/about/domain/AboutPartThree.java
index b150f07..e573ce8 100644
--- a/src/main/java/com/jg/project/about/domain/AboutPartThree.java
+++ b/src/main/java/com/jg/project/about/domain/AboutPartThree.java
@@ -32,9 +32,9 @@ public class AboutPartThree{
private static final long serialVersionUID=1L;
/** 主键 */
- @JSONField(serializeUsing = ToStringSerializer.class)
@ApiModelProperty("主键")
@TableId(value = "id" , type = IdType.ASSIGN_ID)
+ @JSONField(serializeUsing = ToStringSerializer.class)
private Long id;
/** 第一标题 */
@ApiModelProperty("第一标题")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a4fccc9..8985c33 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,7 +3,7 @@ jg:
# 名称
name: JG
# 版本
- version: 3.8.7
+ version: 4.0.0
# 版权年份
copyrightYear: 2024
# 文件路径 示例( Windows配置D:/jg/uploadPath,Linux配置 /home/jg/uploadPath)
diff --git a/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml b/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml
index fbe99a5..e8bbf94 100644
--- a/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml
+++ b/src/main/resources/mybatis/PartThree/AboutPartThreeMapper.xml
@@ -23,6 +23,8 @@
and title_two = #{titleTwo}
and remarks = #{remarks}
and icon = #{icon}
+ and id = #{id}
+
\ No newline at end of file
diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm
index 77dd67e..edc7108 100644
--- a/src/main/resources/vm/java/controller.java.vm
+++ b/src/main/resources/vm/java/controller.java.vm
@@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
-
+import com.jg.common.utils.QueryPage;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm
index 4ecac61..ae34dd5 100644
--- a/src/main/resources/vm/java/mapper.java.vm
+++ b/src/main/resources/vm/java/mapper.java.vm
@@ -3,6 +3,7 @@ package ${packageName}.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import ${packageName}.domain.${ClassName};
+import java.util.List;
/**
* ${functionName}Mapper接口
*
@@ -11,7 +12,7 @@ import ${packageName}.domain.${ClassName};
*/
public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
/**
- * 查询${functionName}列表
+ * 查询${functionName}分页列表
*
* @param ${className} ${functionName}
* @return ${functionName}集合
diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm
index 3b40beb..5e7e2d6 100644
--- a/src/main/resources/vm/java/service.java.vm
+++ b/src/main/resources/vm/java/service.java.vm
@@ -3,7 +3,7 @@ package ${packageName}.service;
import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.extension.service.IService;
-
+import java.util.List;
/**
* ${functionName}Service接口
*
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface I${ClassName}Service extends IService<${ClassName}> {
/**
- * 查询${functionName}列表
+ * 查询${functionName}分页列表
*
* @param ${className} ${functionName}
* @return ${functionName}集合
diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm
index 8568b56..ac2195a 100644
--- a/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/src/main/resources/vm/java/serviceImpl.java.vm
@@ -5,7 +5,7 @@ import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
import org.springframework.stereotype.Service;
-
+import java.util.List;
import javax.annotation.Resource;
/**
@@ -21,14 +21,14 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
private ${ClassName}Mapper ${className}Mapper;
/**
- * 查询${functionName}
+ * 查询${functionName}分页列表
*
- * @param ${pkColumn.javaField} ${functionName}主键
+ * @param ${className} ${functionName}
* @return ${functionName}
*/
@Override
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+ public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
{
- return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+ return ${className}Mapper.select${ClassName}List(${className});
}
}
diff --git a/src/main/resources/vm/js/api.js.vm b/src/main/resources/vm/js/api.js.vm
index a1c6e32..d7c878d 100644
--- a/src/main/resources/vm/js/api.js.vm
+++ b/src/main/resources/vm/js/api.js.vm
@@ -1,5 +1,13 @@
import request from '@/utils/request'
+// 查询${functionName}分列表
+export function listPage${BusinessName}(data) {
+ return request({
+ url: '/${moduleName}/listPage',
+ method: 'post',
+ data: data
+ })
+}
// 查询${functionName}列表
export function list${BusinessName}() {
return request({
@@ -7,7 +15,6 @@ export function list${BusinessName}() {
method: 'get',
})
}
-
// 查询${functionName}详细
export function get${BusinessName}(${pkColumn.javaField}) {
return request({
diff --git a/src/main/resources/vm/vue/index.vue.vm b/src/main/resources/vm/vue/index.vue.vm
index 6296014..16c0756 100644
--- a/src/main/resources/vm/vue/index.vue.vm
+++ b/src/main/resources/vm/vue/index.vue.vm
@@ -100,16 +100,6 @@
v-hasPermi="['${moduleName}:${businessName}:remove']"
>删除
-
- 导出
-
@@ -353,7 +343,7 @@
diff --git a/src/main/resources/vm/vue/v3/index.vue.vm b/src/main/resources/vm/vue/v3/index.vue.vm
index 8b25665..bfd9b7a 100644
--- a/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/src/main/resources/vm/vue/v3/index.vue.vm
@@ -96,15 +96,6 @@
v-hasPermi="['${moduleName}:${businessName}:remove']"
>删除
-
- 导出
-
@@ -579,12 +570,5 @@ function handle${subClassName}SelectionChange(selection) {
}
#end
-/** 导出按钮操作 */
-function handleExport() {
- proxy.download('${moduleName}/${businessName}/export', {
- ...queryParams.value
- }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
getList();
diff --git a/src/main/resources/vm/xml/mapper.xml.vm b/src/main/resources/vm/xml/mapper.xml.vm
index d7b2468..cf810a4 100644
--- a/src/main/resources/vm/xml/mapper.xml.vm
+++ b/src/main/resources/vm/xml/mapper.xml.vm
@@ -23,4 +23,36 @@
select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+
+
\ No newline at end of file
diff --git a/target/classes/application.yml b/target/classes/application.yml
index a4fccc9..8985c33 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -3,7 +3,7 @@ jg:
# 名称
name: JG
# 版本
- version: 3.8.7
+ version: 4.0.0
# 版权年份
copyrightYear: 2024
# 文件路径 示例( Windows配置D:/jg/uploadPath,Linux配置 /home/jg/uploadPath)
diff --git a/target/classes/com/jg/project/about/domain/AboutPartThree.class b/target/classes/com/jg/project/about/domain/AboutPartThree.class
index 392c871..a24c834 100644
Binary files a/target/classes/com/jg/project/about/domain/AboutPartThree.class and b/target/classes/com/jg/project/about/domain/AboutPartThree.class differ
diff --git a/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml b/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml
index fbe99a5..e8bbf94 100644
--- a/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml
+++ b/target/classes/mybatis/PartThree/AboutPartThreeMapper.xml
@@ -23,6 +23,8 @@
and title_two = #{titleTwo}
and remarks = #{remarks}
and icon = #{icon}
+ and id = #{id}
+
\ No newline at end of file
diff --git a/target/classes/vm/java/controller.java.vm b/target/classes/vm/java/controller.java.vm
index 77dd67e..edc7108 100644
--- a/target/classes/vm/java/controller.java.vm
+++ b/target/classes/vm/java/controller.java.vm
@@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
-
+import com.jg.common.utils.QueryPage;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/target/classes/vm/java/mapper.java.vm b/target/classes/vm/java/mapper.java.vm
index 4ecac61..ae34dd5 100644
--- a/target/classes/vm/java/mapper.java.vm
+++ b/target/classes/vm/java/mapper.java.vm
@@ -3,6 +3,7 @@ package ${packageName}.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import ${packageName}.domain.${ClassName};
+import java.util.List;
/**
* ${functionName}Mapper接口
*
@@ -11,7 +12,7 @@ import ${packageName}.domain.${ClassName};
*/
public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
/**
- * 查询${functionName}列表
+ * 查询${functionName}分页列表
*
* @param ${className} ${functionName}
* @return ${functionName}集合
diff --git a/target/classes/vm/java/service.java.vm b/target/classes/vm/java/service.java.vm
index 3b40beb..5e7e2d6 100644
--- a/target/classes/vm/java/service.java.vm
+++ b/target/classes/vm/java/service.java.vm
@@ -3,7 +3,7 @@ package ${packageName}.service;
import ${packageName}.domain.${ClassName};
import com.baomidou.mybatisplus.extension.service.IService;
-
+import java.util.List;
/**
* ${functionName}Service接口
*
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface I${ClassName}Service extends IService<${ClassName}> {
/**
- * 查询${functionName}列表
+ * 查询${functionName}分页列表
*
* @param ${className} ${functionName}
* @return ${functionName}集合
diff --git a/target/classes/vm/java/serviceImpl.java.vm b/target/classes/vm/java/serviceImpl.java.vm
index 8568b56..ac2195a 100644
--- a/target/classes/vm/java/serviceImpl.java.vm
+++ b/target/classes/vm/java/serviceImpl.java.vm
@@ -5,7 +5,7 @@ import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
import org.springframework.stereotype.Service;
-
+import java.util.List;
import javax.annotation.Resource;
/**
@@ -21,14 +21,14 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
private ${ClassName}Mapper ${className}Mapper;
/**
- * 查询${functionName}
+ * 查询${functionName}分页列表
*
- * @param ${pkColumn.javaField} ${functionName}主键
+ * @param ${className} ${functionName}
* @return ${functionName}
*/
@Override
- public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+ public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
{
- return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+ return ${className}Mapper.select${ClassName}List(${className});
}
}
diff --git a/target/classes/vm/js/api.js.vm b/target/classes/vm/js/api.js.vm
index a1c6e32..d7c878d 100644
--- a/target/classes/vm/js/api.js.vm
+++ b/target/classes/vm/js/api.js.vm
@@ -1,5 +1,13 @@
import request from '@/utils/request'
+// 查询${functionName}分列表
+export function listPage${BusinessName}(data) {
+ return request({
+ url: '/${moduleName}/listPage',
+ method: 'post',
+ data: data
+ })
+}
// 查询${functionName}列表
export function list${BusinessName}() {
return request({
@@ -7,7 +15,6 @@ export function list${BusinessName}() {
method: 'get',
})
}
-
// 查询${functionName}详细
export function get${BusinessName}(${pkColumn.javaField}) {
return request({
diff --git a/target/classes/vm/vue/index.vue.vm b/target/classes/vm/vue/index.vue.vm
index 6296014..16c0756 100644
--- a/target/classes/vm/vue/index.vue.vm
+++ b/target/classes/vm/vue/index.vue.vm
@@ -100,16 +100,6 @@
v-hasPermi="['${moduleName}:${businessName}:remove']"
>删除
-
- 导出
-
@@ -353,7 +343,7 @@
diff --git a/target/classes/vm/vue/v3/index.vue.vm b/target/classes/vm/vue/v3/index.vue.vm
index 8b25665..bfd9b7a 100644
--- a/target/classes/vm/vue/v3/index.vue.vm
+++ b/target/classes/vm/vue/v3/index.vue.vm
@@ -96,15 +96,6 @@
v-hasPermi="['${moduleName}:${businessName}:remove']"
>删除
-
- 导出
-
@@ -579,12 +570,5 @@ function handle${subClassName}SelectionChange(selection) {
}
#end
-/** 导出按钮操作 */
-function handleExport() {
- proxy.download('${moduleName}/${businessName}/export', {
- ...queryParams.value
- }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
getList();
diff --git a/target/classes/vm/xml/mapper.xml.vm b/target/classes/vm/xml/mapper.xml.vm
index d7b2468..cf810a4 100644
--- a/target/classes/vm/xml/mapper.xml.vm
+++ b/target/classes/vm/xml/mapper.xml.vm
@@ -23,4 +23,36 @@
select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
+
+
\ No newline at end of file