From f4e06be2e50d54a956ccd26c93661c4ab9d19bf6 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 14:25:24 +0800
Subject: [PATCH] ci:补充提交
---
screen-manage/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java | 2 ++
screen-manage/src/main/java/com/moral/api/entity/SysDictType.java | 1 +
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 13 +++----------
screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml | 14 ++++++++++++++
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 5 +----
5 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java b/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java
index 7044853..7ddf74a 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/SysDictType.java
@@ -46,6 +46,7 @@
/*
* 1������������������������������ 0���������������
* */
+ @TableField("`system`")
private Integer system;
/**
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index 9f80360..15541c2 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -1,8 +1,9 @@
-/*
package com.moral.api.kafka.consumer;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
import com.moral.api.service.*;
+import com.moral.constant.KafkaConstants;
+import com.moral.constant.RedisConstants;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +13,9 @@
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.moral.constant.KafkaConstants;
-import com.moral.constant.RedisConstants;
@@ -224,4 +218,3 @@
}
}
}
-*/
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java
index 6aba1c5..9d7fb7a 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/SysDictTypeMapper.java
@@ -2,6 +2,7 @@
import com.moral.api.entity.SysDictType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +14,5 @@
*/
public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
+ SysDictType listOne(@Param("name") String name);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index ac59a90..fcdce43 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -124,10 +124,7 @@
//������������������������
SysDictType sysDictType = form.formConvertEntity();
//������name������������������
- QueryWrapper<SysDictType> existNameWrapper = new QueryWrapper<>();
- existNameWrapper.eq("name",sysDictType.getName());
- existNameWrapper.eq("is_delete",Constants.NOT_DELETE);
- SysDictType existType = sysDictTypeMapper.selectOne(existNameWrapper);
+ SysDictType existType = sysDictTypeMapper.listOne(sysDictType.getName());
if(!ObjectUtils.isEmpty(existType)){
dto.setCode(ResponseCodeEnum.DICTTYPE_EXIST.getCode());
dto.setMsg(ResponseCodeEnum.DICTTYPE_EXIST.getMsg());
diff --git a/screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml b/screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml
index 6eaedd4..a177096 100644
--- a/screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml
+++ b/screen-manage/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -12,4 +12,18 @@
<result column="is_delete" property="isDelete" />
</resultMap>
+ <select id="listOne" resultType="com.moral.api.entity.SysDictType">
+ SELECT
+ t.id,
+ t.name,
+ t.desc,
+ t.system,
+ t.create_time,
+ t.update_time,
+ t.is_delete
+ FROM
+ sys_dict_type t
+ WHERE
+ t.name =#{name} AND is_delete = '0'
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0