diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/entity/model/LabelDO.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/entity/model/LabelDO.java
new file mode 100644
index 000000000..8d8b364d2
--- /dev/null
+++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/entity/model/LabelDO.java
@@ -0,0 +1,110 @@
+package io.github.pnoker.center.manager.entity.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ * 标签表
+ *
+ *
+ * @author Automatic Generated By Mybatis Plus
+ * @since 2023-11-02
+ */
+@Getter
+@Setter
+@TableName("dc3_label")
+public class LabelDO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 标签名称
+ */
+ @TableField("label_name")
+ private String labelName;
+
+ /**
+ * 标签颜色
+ */
+ @TableField("color")
+ private String color;
+
+ /**
+ * 实体类型标识
+ */
+ @TableField("entity_type_flag")
+ private Byte entityTypeFlag;
+
+ /**
+ * 使能标识
+ */
+ @TableField("enable_flag")
+ private Byte enableFlag;
+
+ /**
+ * 租户ID
+ */
+ @TableField("tenant_id")
+ private Long tenantId;
+
+ /**
+ * 描述
+ */
+ @TableField("remark")
+ private String remark;
+
+ /**
+ * 创建者ID
+ */
+ @TableField("creator_id")
+ private Long creatorId;
+
+ /**
+ * 创建者名称
+ */
+ @TableField("creator_name")
+ private String creatorName;
+
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+ /**
+ * 操作者ID
+ */
+ @TableField("operator_id")
+ private Long operatorId;
+
+ /**
+ * 操作者名称
+ */
+ @TableField("operator_name")
+ private String operatorName;
+
+ /**
+ * 操作时间
+ */
+ @TableField("operate_time")
+ private LocalDateTime operateTime;
+
+ /**
+ * 逻辑删除标识,0:未删除,1:已删除
+ */
+ @TableField("deleted")
+ private Byte deleted;
+}
diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/manager/LabelManager.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/manager/LabelManager.java
new file mode 100644
index 000000000..fa2b53948
--- /dev/null
+++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/manager/LabelManager.java
@@ -0,0 +1,16 @@
+package io.github.pnoker.center.manager.manager;
+
+import io.github.pnoker.center.manager.entity.model.LabelDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 标签表 服务类
+ *
+ *
+ * @author Automatic Generated By Mybatis Plus
+ * @since 2023-11-02
+ */
+public interface LabelManager extends IService {
+
+}
diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/manager/impl/LabelManagerImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/manager/impl/LabelManagerImpl.java
new file mode 100644
index 000000000..33f4a2bec
--- /dev/null
+++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/manager/impl/LabelManagerImpl.java
@@ -0,0 +1,20 @@
+package io.github.pnoker.center.manager.manager.impl;
+
+import io.github.pnoker.center.manager.entity.model.LabelDO;
+import io.github.pnoker.center.manager.mapper.LabelMapper;
+import io.github.pnoker.center.manager.manager.LabelManager;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 标签表 服务实现类
+ *
+ *
+ * @author Automatic Generated By Mybatis Plus
+ * @since 2023-11-02
+ */
+@Service
+public class LabelManagerImpl extends ServiceImpl implements LabelManager {
+
+}
diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/mapper/LabelMapper.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/mapper/LabelMapper.java
index 89bebdefc..b748d0d93 100644
--- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/mapper/LabelMapper.java
+++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/mapper/LabelMapper.java
@@ -1,31 +1,16 @@
-/*
- * Copyright 2016-present the IoT DC3 original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package io.github.pnoker.center.manager.mapper;
+import io.github.pnoker.center.manager.entity.model.LabelDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import io.github.pnoker.common.model.Label;
-import org.apache.ibatis.annotations.Mapper;
/**
- * Mapper
+ *
+ * 标签表 Mapper 接口
+ *
*
- * @author pnoker
- * @since 2022.1.0
+ * @author Automatic Generated By Mybatis Plus
+ * @since 2023-11-02
*/
-@Mapper
-public interface LabelMapper extends BaseMapper {
+public interface LabelMapper extends BaseMapper {
+
}
diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/LabelService.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/LabelService.java
index e5f624a2c..7519e69b5 100644
--- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/LabelService.java
+++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/LabelService.java
@@ -16,9 +16,9 @@
package io.github.pnoker.center.manager.service;
+import io.github.pnoker.center.manager.entity.model.LabelDO;
import io.github.pnoker.center.manager.entity.query.LabelPageQuery;
import io.github.pnoker.common.base.Service;
-import io.github.pnoker.common.model.Label;
/**
* Label Interface
@@ -26,7 +26,7 @@ import io.github.pnoker.common.model.Label;
* @author pnoker
* @since 2022.1.0
*/
-public interface LabelService extends Service {
+public interface LabelService extends Service {
/**
* 根据标签 NAME 查询
*
@@ -34,5 +34,5 @@ public interface LabelService extends Service {
* @param tenantId 租户ID
* @return Label
*/
- Label selectByName(String name, String tenantId);
+ LabelDO selectByName(String name, Long tenantId);
}
diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/LabelServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/LabelServiceImpl.java
index 6ec6206a0..0a587c85b 100644
--- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/LabelServiceImpl.java
+++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/LabelServiceImpl.java
@@ -16,24 +16,25 @@
package io.github.pnoker.center.manager.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.github.pnoker.center.manager.entity.query.LabelBindPageQuery;
+import io.github.pnoker.center.manager.entity.model.LabelBindDO;
+import io.github.pnoker.center.manager.entity.model.LabelDO;
import io.github.pnoker.center.manager.entity.query.LabelPageQuery;
-import io.github.pnoker.center.manager.mapper.LabelMapper;
-import io.github.pnoker.center.manager.service.LabelBindService;
+import io.github.pnoker.center.manager.manager.LabelBindManager;
+import io.github.pnoker.center.manager.manager.LabelManager;
import io.github.pnoker.center.manager.service.LabelService;
import io.github.pnoker.common.entity.common.Pages;
import io.github.pnoker.common.exception.*;
-import io.github.pnoker.common.model.Label;
-import io.github.pnoker.common.model.LabelBind;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
/**
* LabelService Impl
@@ -46,18 +47,18 @@ import javax.annotation.Resource;
public class LabelServiceImpl implements LabelService {
@Resource
- private LabelMapper labelMapper;
+ private LabelManager labelManager;
@Resource
- private LabelBindService labelBindService;
+ private LabelBindManager labelBindManager;
/**
* {@inheritDoc}
*/
@Override
- public void add(Label entityDO) {
+ public void add(LabelDO entityDO) {
selectByName(entityDO.getLabelName(), entityDO.getTenantId());
- if (labelMapper.insert(entityDO) < 1) {
+ if (!labelManager.save(entityDO)) {
throw new AddException("The label {} add failed", entityDO.getLabelName());
}
}
@@ -66,19 +67,19 @@ public class LabelServiceImpl implements LabelService {
* {@inheritDoc}
*/
@Override
- public void delete(String id) {
- LabelBindPageQuery labelBindPageQuery = new LabelBindPageQuery();
- labelBindPageQuery.setLabelId(id);
- Page labelBindPage = labelBindService.list(labelBindPageQuery);
- if (labelBindPage.getTotal() > 0) {
+ public void delete(Long id) {
+ LambdaQueryWrapper queryWrapper = Wrappers.query().lambda();
+ queryWrapper.eq(LabelBindDO::getLabelId, id);
+ List labelBindPage = labelBindManager.list(queryWrapper);
+ if (CollUtil.isNotEmpty(labelBindPage)) {
throw new ServiceException("The label already bound by the entity");
}
- Label label = selectById(id);
+ LabelDO label = selectById(id);
if (ObjectUtil.isNull(label)) {
throw new NotFoundException("The label does not exist");
}
- if (labelMapper.deleteById(id) < 1) {
+ if (!labelManager.removeById(id)) {
throw new DeleteException("The label delete failed");
}
}
@@ -87,10 +88,10 @@ public class LabelServiceImpl implements LabelService {
* {@inheritDoc}
*/
@Override
- public void update(Label entityDO) {
+ public void update(LabelDO entityDO) {
selectById(entityDO.getId());
entityDO.setOperateTime(null);
- if (labelMapper.updateById(entityDO) < 1) {
+ if (!labelManager.updateById(entityDO)) {
throw new UpdateException("The label update failed");
}
}
@@ -99,8 +100,8 @@ public class LabelServiceImpl implements LabelService {
* {@inheritDoc}
*/
@Override
- public Label selectById(String id) {
- Label label = labelMapper.selectById(id);
+ public LabelDO selectById(Long id) {
+ LabelDO label = labelManager.getById(id);
if (ObjectUtil.isNull(label)) {
throw new NotFoundException();
}
@@ -111,12 +112,12 @@ public class LabelServiceImpl implements LabelService {
* {@inheritDoc}
*/
@Override
- public Label selectByName(String name, String tenantId) {
- LambdaQueryWrapper queryWrapper = Wrappers.query().lambda();
- queryWrapper.eq(Label::getLabelName, name);
- queryWrapper.eq(Label::getTenantId, tenantId);
+ public LabelDO selectByName(String name, Long tenantId) {
+ LambdaQueryWrapper queryWrapper = Wrappers.query().lambda();
+ queryWrapper.eq(LabelDO::getLabelName, name);
+ queryWrapper.eq(LabelDO::getTenantId, tenantId);
queryWrapper.last("limit 1");
- Label label = labelMapper.selectOne(queryWrapper);
+ LabelDO label = labelManager.getOne(queryWrapper);
if (ObjectUtil.isNull(label)) {
throw new NotFoundException();
}
@@ -127,19 +128,19 @@ public class LabelServiceImpl implements LabelService {
* {@inheritDoc}
*/
@Override
- public Page list(LabelPageQuery queryDTO) {
+ public Page list(LabelPageQuery queryDTO) {
if (ObjectUtil.isNull(queryDTO.getPage())) {
queryDTO.setPage(new Pages());
}
- return labelMapper.selectPage(queryDTO.getPage().convert(), fuzzyQuery(queryDTO));
+ return labelManager.page(queryDTO.getPage().convert(), fuzzyQuery(queryDTO));
}
- private LambdaQueryWrapper fuzzyQuery(LabelPageQuery query) {
- LambdaQueryWrapper queryWrapper = Wrappers.query().lambda();
+ private LambdaQueryWrapper fuzzyQuery(LabelPageQuery query) {
+ LambdaQueryWrapper queryWrapper = Wrappers.query().lambda();
if (ObjectUtil.isNotNull(query)) {
- queryWrapper.like(CharSequenceUtil.isNotEmpty(query.getLabelName()), Label::getLabelName, query.getLabelName());
- queryWrapper.eq(CharSequenceUtil.isNotEmpty(query.getColor()), Label::getColor, query.getColor());
- queryWrapper.eq(CharSequenceUtil.isNotEmpty(query.getTenantId()), Label::getTenantId, query.getTenantId());
+ queryWrapper.like(CharSequenceUtil.isNotEmpty(query.getLabelName()), LabelDO::getLabelName, query.getLabelName());
+ queryWrapper.eq(CharSequenceUtil.isNotEmpty(query.getColor()), LabelDO::getColor, query.getColor());
+ queryWrapper.eq(CharSequenceUtil.isNotEmpty(query.getTenantId()), LabelDO::getTenantId, query.getTenantId());
}
return queryWrapper;
}
diff --git a/dc3-center/dc3-center-manager/src/main/resources/mapping/LabelMapper.xml b/dc3-center/dc3-center-manager/src/main/resources/mapping/LabelMapper.xml
new file mode 100644
index 000000000..856e41851
--- /dev/null
+++ b/dc3-center/dc3-center-manager/src/main/resources/mapping/LabelMapper.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, label_name, color, entity_type_flag, enable_flag, tenant_id, remark, creator_id, creator_name, create_time, operator_id, operator_name, operate_time, deleted
+
+
+