From db5c3621e266847fdca5f767fc2ec0d6625aa39b Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Tue, 31 Dec 2024 15:50:39 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9=202=E3=80=81=E5=95=86=E5=93=81/?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=97=E8=A1=A8=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CarrentConfigController.java | 2 +- .../modules/carrentConfig/entity/CarrentConfig.java | 20 ++++++++++---------- .../carrentConfig/mapper/CarrentConfigMapper.java | 2 +- .../carrentConfig/service/ICarrentConfigService.java | 2 +- .../service/impl/CarrentConfigServiceImpl.java | 2 +- .../modules/carrentConfig/vue/CarrentConfigList.vue | 12 ++++++------ .../carrentConfig/vue/modules/CarrentConfigForm.vue | 12 ++++++------ .../modules/carrentConfig/vue3/CarrentConfig.data.ts | 14 +++++++------- .../modules/apiService/impl/GoodsServiceImpl.java | 2 ++ .../modules/apiService/impl/NewsServiceImpl.java | 1 + 10 files changed, 36 insertions(+), 33 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java index d459bd5..f15530b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/controller/CarrentConfigController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-31 * @Version: V1.0 */ @Api(tags="系统配置表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java index 11c5085..d07e45a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/entity/CarrentConfig.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-31 * @Version: V1.0 */ @Data @@ -47,16 +47,16 @@ public class CarrentConfig implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**参数编码*/ - @Excel(name = "参数编码", width = 15) - @ApiModelProperty(value = "参数编码") + /**配置编码*/ + @Excel(name = "配置编码", width = 15) + @ApiModelProperty(value = "配置编码") private java.lang.String paramCode; - /**参数值*/ - @Excel(name = "参数值", width = 15) - @ApiModelProperty(value = "参数值") + /**配置内容*/ + @Excel(name = "配置内容", width = 15) + @ApiModelProperty(value = "配置内容") private java.lang.String paramValue; - /**参数描述*/ - @Excel(name = "参数描述", width = 15) - @ApiModelProperty(value = "参数描述") + /**配置描述*/ + @Excel(name = "配置描述", width = 15) + @ApiModelProperty(value = "配置描述") private java.lang.String paramDescribe; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java index ef805ab..f56fa7c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/mapper/CarrentConfigMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-31 * @Version: V1.0 */ public interface CarrentConfigMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java index ba06d0f..0300a06 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/ICarrentConfigService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-31 * @Version: V1.0 */ public interface ICarrentConfigService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java index bf509c6..216a140 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/service/impl/CarrentConfigServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 系统配置表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-31 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue index 1a53bec..9ef2f7b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/CarrentConfigList.vue @@ -122,17 +122,17 @@ } }, { - title:'参数编码', + title:'配置编码', align:"center", dataIndex: 'paramCode' }, { - title:'参数值', + title:'配置内容', align:"center", dataIndex: 'paramValue' }, { - title:'参数描述', + title:'配置描述', align:"center", dataIndex: 'paramDescribe' }, @@ -170,9 +170,9 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'paramCode',text:'参数编码',dictCode:''}) - fieldList.push({type:'Text',value:'paramValue',text:'参数值',dictCode:''}) - fieldList.push({type:'string',value:'paramDescribe',text:'参数描述',dictCode:''}) + fieldList.push({type:'string',value:'paramCode',text:'配置编码',dictCode:''}) + fieldList.push({type:'Text',value:'paramValue',text:'配置内容',dictCode:''}) + fieldList.push({type:'string',value:'paramDescribe',text:'配置描述',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue index f0f9b6e..4498d15 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue/modules/CarrentConfigForm.vue @@ -4,18 +4,18 @@ - - + + - - + + - - + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.data.ts index 3ac38c1..295419c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentConfig/vue3/CarrentConfig.data.ts @@ -5,17 +5,17 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '参数编码', + title: '配置编码', align:"center", dataIndex: 'paramCode' }, { - title: '参数值', + title: '配置内容', align:"center", dataIndex: 'paramValue' }, { - title: '参数描述', + title: '配置描述', align:"center", dataIndex: 'paramDescribe' }, @@ -26,17 +26,17 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '参数编码', + label: '配置编码', field: 'paramCode', component: 'Input', }, { - label: '参数值', + label: '配置内容', field: 'paramValue', - component: 'Input', + component: 'InputTextArea',//TODO 注意string转换问题 }, { - label: '参数描述', + label: '配置描述', field: 'paramDescribe', component: 'Input', }, diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java index 1cd7b7f..86b03e9 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java @@ -67,6 +67,8 @@ public class GoodsServiceImpl implements GoodsService { //关联用户id query.eq(CarrentGoods::getUserId, hanHaiMember.getId()); } + //按创建时间倒序排列 + query.orderByDesc(CarrentGoods::getCreateTime); //获取商品列表 pageList = query.page(page); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java index b2356dc..bcab338 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NewsServiceImpl.java @@ -33,6 +33,7 @@ public class NewsServiceImpl implements NewsService { //获取新闻列表 pageList = carrentNewsService .lambdaQuery() + .orderByDesc(CarrentNews::getCreateTime) .page(page); //判断执行结果