From dafb753b5e8c94f06a473194ebc5bd30e9b083bb Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 30 Nov 2023 12:45:48 +0800 Subject: [PATCH] fix --- .../controller/sm/ApiMenuController.java | 5 +- .../migration/V2023110300001_personmould.sql | 9 ++++ .../controller/ApiMenuController.java | 14 +----- .../com/iformall/domain/po/sm/ApiMenu.java | 5 ++ .../com/iformall/domain/vo/sm/ApiMenuVO.java | 48 ------------------- .../com/iformall/mapper/ApiMenuMapper.java | 4 -- .../iformall/service/sm/ApiMenuService.java | 6 +-- .../service/sm/impl/ApiMenuServiceImpl.java | 13 ++--- .../main/resources/mapper/ApiMenuMapper.xml | 41 ++-------------- 9 files changed, 26 insertions(+), 119 deletions(-) delete mode 100644 suimangService/src/main/java/com/iformall/domain/vo/sm/ApiMenuVO.java diff --git a/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java index f89d7e7..b990f18 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/sm/ApiMenuController.java @@ -9,7 +9,6 @@ import com.iformall.constant.SwaggerConstant; import com.iformall.domain.dto.sm.SaveApiMenuDTO; import com.iformall.domain.dto.sm.UpdateApiMenuDTO; import com.iformall.domain.po.sm.ApiMenu; -import com.iformall.domain.vo.sm.ApiMenuVO; import com.iformall.exception.BizException; import com.iformall.service.sm.ApiMenuService; import io.swagger.annotations.Api; @@ -30,14 +29,14 @@ public class ApiMenuController { @ApiVersion(group = SwaggerConstant.V_1_0_0) @ApiOperation("分页查询api菜单") @GetMapping("/page") - public R> pageApiMenu(ApiMenu ApiMenu, Integer pageNum, Integer pageSize) { + public R> pageApiMenu(ApiMenu ApiMenu, Integer pageNum, Integer pageSize) { return R.ok(apiMenuService.pageApiMenu(ApiMenu, pageNum, pageSize)); } @ApiVersion(group = SwaggerConstant.V_1_0_0) @ApiOperation("单个查询api菜单") @GetMapping("/get") - public R getApiMenu(Long id) { + public R getApiMenu(Long id) { if (id == null) { throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL); } diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql index 5dd4c3c..8d66f86 100644 --- a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -69,3 +69,12 @@ ADD COLUMN user_mould_video_id bigint NOT NULL COMMENT '视频记录ID'; ALTER TABLE `voice_language` ADD COLUMN trial_text varchar(100) COMMENT '试听文本内容'; + +UPDATE voice_language SET trial_text = '遂芒数字人,用人工智能创造无限可能!' WHERE id IN (38,39,43,45,55,77,96,107,123,140) +UPDATE voice_language SET trial_text = 'Metavatar, AI to create infinite possibilities!' WHERE id IN (144,26,86,118,29) +UPDATE voice_language SET trial_text = ' ¡¡ el hombre digital suimang crea infinitas posibilidades con inteligencia artificial!' WHERE id IN (61) +UPDATE voice_language SET trial_text = 'Manusia Digital Suimang, Membuat kemungkinan tak terhingga dengan Intelijen Seni!' WHERE id IN (11) +UPDATE voice_language SET trial_text = 'Manusia Digital Suimang, Mencipta kemungkinan tak terbatas dengan Intelligence Artificial!' WHERE id IN (5) + +ALTER TABLE `api_menu` +ADD COLUMN content text COMMENT '内容'; diff --git a/suimangCApi/src/main/java/com/iformall/controller/ApiMenuController.java b/suimangCApi/src/main/java/com/iformall/controller/ApiMenuController.java index 135bd6c..2ebc8f0 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/ApiMenuController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/ApiMenuController.java @@ -7,7 +7,6 @@ import com.iformall.common.R; import com.iformall.common.ResultData; import com.iformall.constant.SwaggerConstant; import com.iformall.domain.po.sm.ApiMenu; -import com.iformall.domain.vo.sm.ApiMenuVO; import com.iformall.domain.vo.sm.ListApiSubmenuVO; import com.iformall.exception.BizException; import com.iformall.service.sm.ApiMenuService; @@ -34,22 +33,11 @@ public class ApiMenuController { return R.ok(apiMenuService.listMenu()); } - @AuthIgnore - @ApiVersion(group = SwaggerConstant.V_1_0_0) - @ApiOperation("查询某个api菜单所有子菜单") - @GetMapping("/listSubmenu") - public R> listApiSubmenu(Long id) { - if (id == null) { - throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - return R.ok(apiMenuService.listApiSubmenu(id)); - } - @AuthIgnore @ApiVersion(group = SwaggerConstant.V_1_0_0) @ApiOperation("单个查询菜单详情") @GetMapping("/get") - public R getApiMenu(Long id) { + public R getApiMenu(Long id) { if (id == null) { throw new BizException(ErrorCode.SYS_PARAMETER_NOT_NULL); } diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java index 7c8658d..3ce00cd 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java @@ -54,6 +54,11 @@ public class ApiMenu extends BaseEntity { * 是否删除(0:未删除,1:删除) */ private Integer deleteFlag; + + /** + * 是否删除(0:未删除,1:删除) + */ + private String content; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/suimangService/src/main/java/com/iformall/domain/vo/sm/ApiMenuVO.java b/suimangService/src/main/java/com/iformall/domain/vo/sm/ApiMenuVO.java deleted file mode 100644 index b01ff0c..0000000 --- a/suimangService/src/main/java/com/iformall/domain/vo/sm/ApiMenuVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.iformall.domain.vo.sm; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; - -@ApiModel(value = "查询API菜单响应数据") -@Data -public class ApiMenuVO { - @ApiModelProperty("菜单id") - private Long id; - @ApiModelProperty("创建时间") - private Date createTime; - @ApiModelProperty("修改时间") - private Date updateTime; - @ApiModelProperty("是否叶子节点(0:否,1:是)") - private Integer leafFlag; - @ApiModelProperty("菜单名称") - private String name; - @ApiModelProperty("父菜单id") - private Long parentId; - @ApiModelProperty("状态(0:正常,1:锁定)") - private Integer status; - @ApiModelProperty("详情id") - private Long detailId; - @ApiModelProperty("是否付费(0:否,1:是)") - private Integer chargeFlag; - @ApiModelProperty("是否需用户授权(0:否,1:是)") - private Integer authFlag; - @ApiModelProperty("接口描述") - private String description; - @ApiModelProperty("平台地址") - private String platformUrl; - @ApiModelProperty("系统参数") - private String publicParam; - @ApiModelProperty("请求参数") - private String requestParam; - @ApiModelProperty("响应参数") - private String responseParam; - @ApiModelProperty("请求示例") - private String requestSample; - @ApiModelProperty("响应示例") - private String responseSample; - @ApiModelProperty("异常示例") - private String exceptionSample; -} diff --git a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java index 5745665..636e5fe 100644 --- a/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java +++ b/suimangService/src/main/java/com/iformall/mapper/ApiMenuMapper.java @@ -2,7 +2,6 @@ package com.iformall.mapper; import com.iformall.domain.po.sm.ApiMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.iformall.domain.vo.sm.ApiMenuVO; import com.iformall.domain.vo.sm.ListApiSubmenuVO; import java.util.List; @@ -16,9 +15,6 @@ public interface ApiMenuMapper extends BaseMapper { List listParentMenu(); - List listApiMenuAndDetail(ApiMenu apiMenu); - - List listSubmenu(Long id); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java b/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java index 35b4f06..318c112 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java +++ b/suimangService/src/main/java/com/iformall/service/sm/ApiMenuService.java @@ -5,7 +5,6 @@ import com.iformall.domain.dto.sm.SaveApiMenuDTO; import com.iformall.domain.dto.sm.UpdateApiMenuDTO; import com.iformall.domain.po.sm.ApiMenu; import com.baomidou.mybatisplus.extension.service.IService; -import com.iformall.domain.vo.sm.ApiMenuVO; import com.iformall.domain.vo.sm.ListApiSubmenuVO; import java.util.List; @@ -15,7 +14,7 @@ import java.util.List; */ public interface ApiMenuService extends IService { - PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize); + PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize); void saveApiMenu(SaveApiMenuDTO dto); @@ -23,9 +22,8 @@ public interface ApiMenuService extends IService { List listParentMenu(); - ApiMenuVO getApiMenu(Long id); + ApiMenu getApiMenu(Long id); List listMenu(); - List listApiSubmenu(Long id); } diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java index 94be98c..89c8351 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/ApiMenuServiceImpl.java @@ -9,7 +9,6 @@ import com.iformall.domain.dto.sm.SaveApiMenuDTO; import com.iformall.domain.dto.sm.UpdateApiMenuDTO; import com.iformall.domain.po.sm.ApiDetail; import com.iformall.domain.po.sm.ApiMenu; -import com.iformall.domain.vo.sm.ApiMenuVO; import com.iformall.domain.vo.sm.ListApiSubmenuVO; import com.iformall.mapper.ApiDetailMapper; import com.iformall.service.sm.ApiMenuService; @@ -33,15 +32,15 @@ public class ApiMenuServiceImpl extends ServiceImpl impl private ApiDetailMapper apiDetailMapper; @Override - public PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> apiMenuMapper.listApiMenuAndDetail(apiMenu)); + public PageInfo pageApiMenu(ApiMenu apiMenu, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> apiMenuMapper.listApiMenu(apiMenu)); } @Override - public ApiMenuVO getApiMenu(Long id) { + public ApiMenu getApiMenu(Long id) { ApiMenu apiMenu = new ApiMenu(); apiMenu.setId(id); - List vos = apiMenuMapper.listApiMenuAndDetail(apiMenu); + List vos = apiMenuMapper.listApiMenu(apiMenu); return !CollectionUtils.isEmpty(vos) ? vos.get(0) : null; } @@ -83,10 +82,6 @@ public class ApiMenuServiceImpl extends ServiceImpl impl return apiMenuMapper.listApiMenu(null); } - @Override - public List listApiSubmenu(Long id) { - return apiMenuMapper.listSubmenu(id); - } } diff --git a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml index ae2556b..f5765dd 100644 --- a/suimangService/src/main/resources/mapper/ApiMenuMapper.xml +++ b/suimangService/src/main/resources/mapper/ApiMenuMapper.xml @@ -13,17 +13,17 @@ + m.id,m.create_time,m.update_time, m.name,m.parent_id,m.status, - m.leaf_flag,m.delete_flag + m.leaf_flag,m.delete_flag,m.content - WHERE 1 = 1 - AND m.delete_flag = 0 + WHERE m.delete_flag = 0 AND m.`id` = #{id} @@ -53,39 +53,4 @@ m.delete_flag = 0 AND m.parent_id = 0 - - -