🎨 lov 重构

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/Vo/LovVo.java

@@ -22,6 +22,9 @@ import java.util.List;
 @ApiModel(value = "lov vo")
 public class LovVo {
 
+	@ApiModelProperty("标题")
+	private String title;
+
 	@ApiModelProperty("关键字，唯一，加载lov数据时通过关键字加载")
 	private String keyword;
 
@@ -48,18 +51,12 @@ public class LovVo {
 	@ApiModelProperty("是否需要多选")
 	private Boolean multiple;
 
-	@ApiModelProperty("是否需要搜索框")
-	private Boolean search;
-
 	@ApiModelProperty("是否需要返回数据, false则不会有确定按钮")
 	private Boolean ret;
 
 	@ApiModelProperty("返回数据的字段")
 	private String retField;
 
-	@ApiModelProperty("返回字段数据类型 1 String 2 Number")
-	private Integer retFieldDataType;
-
 	private List<LovBody> bodyList;
 
 	private List<LovSearch> searchList;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/dto/LovDTO.java

@@ -27,6 +27,9 @@ public class LovDTO {
 
 	private Long id;
 
+	@ApiModelProperty("标题")
+	private String title;
+
 	@ApiModelProperty("关键字，唯一，加载lov数据时通过关键字加载")
 	private String keyword;
 
@@ -53,9 +56,6 @@ public class LovDTO {
 	@ApiModelProperty("是否需要多选")
 	private Boolean multiple;
 
-	@ApiModelProperty("是否需要搜索框")
-	private Boolean search;
-
 	@ApiModelProperty("是否需要返回数据, false则不会有确定按钮")
 	private Boolean ret;
 
@@ -76,8 +76,7 @@ public class LovDTO {
 	public Lov toLov() {
 		return new Lov().setCreateTime(getCreateTime()).setFixedParams(getFixedParams()).setId(getId()).setKey(getKey())
 				.setKeyword(getKeyword()).setMethod(getMethod()).setMultiple(getMultiple()).setPosition(getPosition())
-				.setRet(getRet()).setRetField(getRetField()).setRetFieldDataType(getRetFieldDataType())
-				.setSearch(getSearch()).setUrl(getUrl());
+				.setRet(getRet()).setRetField(getRetField()).setTitle(getTitle()).setUrl(getUrl());
 	}
 
 }

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/Lov.java

@@ -31,6 +31,9 @@ public class Lov extends Model<Lov> {
 	@ApiModelProperty("编号")
 	private Long id;
 
+	@ApiModelProperty("标题")
+	private String title;
+
 	@ApiModelProperty("关键字，唯一，加载lov数据时通过关键字加载")
 	private String keyword;
 
@@ -57,18 +60,12 @@ public class Lov extends Model<Lov> {
 	@ApiModelProperty("是否需要多选")
 	private Boolean multiple;
 
-	@ApiModelProperty("是否需要搜索框")
-	private Boolean search;
-
 	@ApiModelProperty("是否需要返回数据, false则不会有确定按钮")
 	private Boolean ret;
 
 	@ApiModelProperty("返回数据的字段")
 	private String retField;
 
-	@ApiModelProperty("返回字段数据类型 1 String 2 Number")
-	private Integer retFieldDataType;
-
 	/**
 	 * 更新时间
 	 */

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java

@@ -36,12 +36,17 @@ public class LovServiceImpl extends ServiceImpl<LovMapper, Lov> implements LovSe
 
 	@Override
 	public IPage<Lov> selectPage(IPage<Lov> page, Lov entity) {
-		return baseMapper.selectPage(page,
-				Wrappers.<Lov>lambdaQuery()
-						.like(StrUtil.isNotEmpty(entity.getKeyword()), Lov::getKeyword, entity.getKeyword())
-						.eq(entity.getMethod() != null, Lov::getMethod, entity.getMethod())
-						.eq(entity.getPosition() != null, Lov::getPosition, entity.getPosition())
-						.like(StrUtil.isNotEmpty(entity.getUrl()), Lov::getUrl, entity.getUrl()));
+		return baseMapper.selectPage(page, Wrappers.<Lov>lambdaQuery()
+
+				.like(StrUtil.isNotEmpty(entity.getKeyword()), Lov::getKeyword, entity.getKeyword())
+
+				.eq(entity.getMethod() != null, Lov::getMethod, entity.getMethod())
+
+				.eq(entity.getPosition() != null, Lov::getPosition, entity.getPosition())
+
+				.like(StrUtil.isNotEmpty(entity.getUrl()), Lov::getUrl, entity.getUrl())
+
+				.like(StrUtil.isNotEmpty(entity.getTitle()), Lov::getTitle, entity.getTitle()));
 	}
 
 	@Override
@@ -128,8 +133,7 @@ public class LovServiceImpl extends ServiceImpl<LovMapper, Lov> implements LovSe
 		if (lov != null) {
 			LovVo vo = new LovVo().setKey(lov.getKey()).setFixedParams(lov.getFixedParams()).setMethod(lov.getMethod())
 					.setKeyword(lov.getKeyword()).setMultiple(lov.getMultiple()).setPosition(lov.getPosition())
-					.setRet(lov.getRet()).setSearch(lov.getSearch()).setUrl(lov.getUrl()).setRetField(lov.getRetField())
-					.setRetFieldDataType(lov.getRetFieldDataType());
+					.setRet(lov.getRet()).setTitle(lov.getTitle()).setUrl(lov.getUrl()).setRetField(lov.getRetField());
 			vo.setBodyList(bodyService.list(Wrappers.<LovBody>lambdaQuery().eq(LovBody::getKeyword, lov.getKeyword())));
 			vo.setSearchList(
 					searchService.list(Wrappers.<LovSearch>lambdaQuery().eq(LovSearch::getKeyword, lov.getKeyword())));

doc/update_sql/0.0.6.sql

@@ -115,3 +115,17 @@ INSERT INTO `sys_permission`(`id`, `title`, `code`, `path`, `router_name`, `comp
 INSERT INTO `sys_permission`(`id`, `title`, `code`, `path`, `router_name`, `component`, `redirect`, `target`, `parent_id`, `icon`, `sort`, `keep_alive`, `hidden`, `type`, `deleted`, `create_time`, `update_time`) VALUES (100702, '组织架构新增', 'sys:organization:add', NULL, NULL, NULL, NULL, NULL, 100700, NULL, 1, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
 INSERT INTO `sys_permission`(`id`, `title`, `code`, `path`, `router_name`, `component`, `redirect`, `target`, `parent_id`, `icon`, `sort`, `keep_alive`, `hidden`, `type`, `deleted`, `create_time`, `update_time`) VALUES (100703, '组织架构修改', 'sys:organization:edit', NULL, NULL, NULL, NULL, NULL, 100700, NULL, 2, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
 INSERT INTO `sys_permission`(`id`, `title`, `code`, `path`, `router_name`, `component`, `redirect`, `target`, `parent_id`, `icon`, `sort`, `keep_alive`, `hidden`, `type`, `deleted`, `create_time`, `update_time`) VALUES (100704, '组织架构删除', 'sys:organization:del', NULL, NULL, NULL, NULL, NULL, 100700, NULL, 3, 0, 0, 2, 0, '2019-10-13 22:00:24', NULL);
+
+
+-- lov 模块重构
+alter table `sys_lov`
+    add column `title` varchar(255) default '' comment '标题',
+    drop column `search`,
+    drop column `ret_field_data_type`
+;
+delete
+from `sys_dict`
+where `code` = 'lov_ret_data_type';
+delete
+from `sys_dict_item`
+where `dict_code` = 'lov_ret_data_type';