From cebca286e5909035a9d6dc4fec6113e56414d155 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 12 Aug 2022 23:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 63 +------- .../service/api/impl/ApiServiceImpl.java | 24 --- .../broker/impl/BrokerServiceImpl.java | 2 + .../broker/impl/BrokerServiceMongoImpl.java | 153 ------------------ .../mybatis/mapper/api/api-mapper.xml | 30 ++-- .../mybatis/mapper/system/system-mapper.xml | 28 ++-- .../WgGatewayManageApplicationTests.java | 8 +- 7 files changed, 35 insertions(+), 273 deletions(-) delete mode 100644 src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java diff --git a/pom.xml b/pom.xml index ad7d420..24c9a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -67,11 +67,6 @@ 1.18.16 provided - - org.springframework.kafka - spring-kafka - - ink.wgink @@ -83,63 +78,7 @@ login-base 1.0-SNAPSHOT - - - ink.wgink - module-database - 1.0-SNAPSHOT - - - - org.ssssssss - magic-api-spring-boot-starter - 2.0.1 - - - - - org.springframework.boot - spring-boot-starter-data-mongodb - - - - - - org.springframework.session - spring-session-data-redis - - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - ink.wgink - mongo-login - 1.0-SNAPSHOT - - - - ink.wgink - mongo-menu - 1.0-SNAPSHOT - - - - ink.wgink - login-oauth2-server - 1.0-SNAPSHOT - - - ink.wgink - login-base - - - + diff --git a/src/main/java/ink/wgink/gatewaymanage/service/api/impl/ApiServiceImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/api/impl/ApiServiceImpl.java index 51144dd..779943f 100644 --- a/src/main/java/ink/wgink/gatewaymanage/service/api/impl/ApiServiceImpl.java +++ b/src/main/java/ink/wgink/gatewaymanage/service/api/impl/ApiServiceImpl.java @@ -7,7 +7,6 @@ import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; import ink.wgink.gatewaymanage.dao.api.IApiDao; import ink.wgink.gatewaymanage.enums.AuditStatusEnum; -import ink.wgink.gatewaymanage.enums.MessageSendStatusEnum; import ink.wgink.gatewaymanage.pojo.bos.api.ApiBO; import ink.wgink.gatewaymanage.pojo.dtos.api.ApiDTO; import ink.wgink.gatewaymanage.pojo.dtos.examine.ExamineDTO; @@ -28,7 +27,6 @@ import ink.wgink.util.date.DateUtil; import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Service; import java.util.*; @@ -51,9 +49,6 @@ public class ApiServiceImpl extends DefaultBaseService implements IApiService { private IClaimService claimService; @Autowired private IMessageService messageService; - @Autowired - private KafkaTemplate kafkaTemplate; - @Override public void save(ApiVO apiVO) { saveReturnId(apiVO); @@ -287,25 +282,6 @@ public class ApiServiceImpl extends DefaultBaseService implements IApiService { messageVO.setMessageTopic("apiPublish"); messageVO.setMessageBody(messageBody); messageVO.setSendTime(System.currentTimeMillis()); - kafkaTemplate.send("apiPublish", messageBody).addCallback(success -> { - // 消息发送到的topic - String topic = success.getRecordMetadata().topic(); - // 消息发送到的分区 - int partition = success.getRecordMetadata().partition(); - // 消息在分区内的offset - long offset = success.getRecordMetadata().offset(); - messageVO.setReceiveTime(System.currentTimeMillis()); - messageVO.setUsedTime(messageVO.getReceiveTime() - messageVO.getSendTime()); - messageVO.setSendStatus(MessageSendStatusEnum.SUCCESS.getValue()); - messageService.save(messageVO); - - System.out.println("发送消息成功:" + topic + "-" + partition + "-" + offset); - }, failure -> { - messageVO.setSendStatus(MessageSendStatusEnum.SUCCESS.getValue()); - messageService.save(messageVO); - - System.out.println("发送消息失败:" + failure.getMessage()); - }); } private void setSystemInfos(List apiDTOs) { diff --git a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java index 97ddc58..8a58a02 100644 --- a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java +++ b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java @@ -15,6 +15,7 @@ import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; @@ -26,6 +27,7 @@ import java.util.Map; * @Date: 2021-08-23 21:44:01 * @Version: 3.0 **/ +@Service public class BrokerServiceImpl extends DefaultBaseService implements IBrokerService { @Autowired diff --git a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java deleted file mode 100644 index f073f47..0000000 --- a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceMongoImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package ink.wgink.gatewaymanage.service.broker.impl; - -import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.gatewaymanage.pojo.bos.broker.BrokerBO; -import ink.wgink.gatewaymanage.pojo.dtos.broker.BrokerDTO; -import ink.wgink.gatewaymanage.pojo.pos.broker.BrokerPO; -import ink.wgink.gatewaymanage.pojo.vos.broker.BrokerVO; -import ink.wgink.gatewaymanage.service.broker.IBrokerService; -import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.util.UUIDUtil; -import ink.wgink.util.map.HashMapUtil; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Pageable; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: BrokerServiceMongoImpl - * @Description: 消息 - * @Author: wanggeng - * @Date: 2022/5/25 01:24 - * @Version: 1.0 - */ -@Service -public class BrokerServiceMongoImpl extends DefaultBaseService implements IBrokerService { - - private static final String COLLECTION_NAME = "broker"; - @Autowired - private MongoTemplate mongoTemplate; - - @Override - public void save(BrokerVO brokerVO) { - String brokerId = UUIDUtil.getUUID(); - Map params = HashMapUtil.beanToMap(brokerVO); - params.put("brokerId", brokerId); - setSaveInfo(params); - - BrokerDTO brokerDTO = new BrokerDTO(); - BeanUtils.copyProperties(brokerVO, brokerDTO); - brokerDTO.setBrokerId(brokerId); - mongoTemplate.save(brokerDTO, COLLECTION_NAME); - } - - @Override - public void save(String token, BrokerVO brokerVO) { - - } - - @Override - public String saveReturnId(BrokerVO brokerVO) { - return null; - } - - @Override - public String saveReturnId(String token, BrokerVO brokerVO) { - return null; - } - - @Override - public void remove(List ids) { - mongoTemplate.remove(Query.query(Criteria.where("brokerId").in(ids))); - } - - @Override - public void remove(String token, List ids) { - - } - - @Override - public void delete(List ids) { - - } - - @Override - public void update(String brokerId, BrokerVO brokerVO) { - BrokerDTO brokerDTO = new BrokerDTO(); - BeanUtils.copyProperties(brokerVO, brokerDTO); - brokerDTO.setBrokerId(brokerId); - mongoTemplate.remove(Query.query(Criteria.where("brokerId").is(brokerId)), COLLECTION_NAME); - mongoTemplate.save(brokerDTO, COLLECTION_NAME); - } - - @Override - public void update(String token, String brokerId, BrokerVO brokerVO) { - - } - - @Override - public BrokerDTO get(Map params) { - return null; - } - - @Override - public BrokerDTO get(String brokerId) { - return mongoTemplate.findOne(Query.query(Criteria.where("brokerId").is(brokerId)), BrokerDTO.class, COLLECTION_NAME); - } - - @Override - public BrokerBO getBO(Map params) { - return null; - } - - @Override - public BrokerBO getBO(String brokerId) { - return null; - } - - @Override - public BrokerPO getPO(Map params) { - return null; - } - - @Override - public BrokerPO getPO(String brokerId) { - return null; - } - - @Override - public List list(Map params) { - return mongoTemplate.findAll(BrokerDTO.class, COLLECTION_NAME); - } - - @Override - public List listBO(Map params) { - return null; - } - - @Override - public List listPO(Map params) { - return null; - } - - @Override - public SuccessResultList> listPage(ListPage page) { - Query query = new Query(); - long total = mongoTemplate.count(query, COLLECTION_NAME); - query.with(Pageable.ofSize(page.getRows()).withPage(page.getPage() - 1)); - List userLocationDTOs = mongoTemplate.find(query, BrokerDTO.class, COLLECTION_NAME); - return new SuccessResultList<>(userLocationDTOs, page.getPage(), total); - } - - @Override - public Integer count(Map params) { - return null; - } -} diff --git a/src/main/resources/mybatis/mapper/api/api-mapper.xml b/src/main/resources/mybatis/mapper/api/api-mapper.xml index 235d307..afb757a 100644 --- a/src/main/resources/mybatis/mapper/api/api-mapper.xml +++ b/src/main/resources/mybatis/mapper/api/api-mapper.xml @@ -2,7 +2,7 @@ - + @@ -119,7 +119,7 @@ - + INSERT INTO api_api( api_id, system_id, @@ -172,7 +172,7 @@ - + UPDATE api_api SET @@ -195,7 +195,7 @@ - + DELETE FROM api_api WHERE @@ -214,7 +214,7 @@ - + UPDATE api_api SET @@ -262,7 +262,7 @@ - + UPDATE api_api SET @@ -275,7 +275,7 @@ - SELECT t1.system_id, t1.title, @@ -301,7 +301,7 @@ - SELECT t1.api_id, t1.system_id, @@ -337,7 +337,7 @@ - SELECT t1.api_id, t1.system_id, @@ -373,7 +373,7 @@ - SELECT t1.api_id, t1.system_id, @@ -461,7 +461,7 @@ - SELECT t1.api_id, t1.system_id, @@ -514,7 +514,7 @@ - SELECT t1.api_id, t1.system_id, @@ -567,7 +567,7 @@ - SELECT COUNT(*) FROM @@ -577,7 +577,7 @@ - SELECT t1.audit_status, t1.audit_time, @@ -592,7 +592,7 @@ - SELECT api_id FROM diff --git a/src/main/resources/mybatis/mapper/system/system-mapper.xml b/src/main/resources/mybatis/mapper/system/system-mapper.xml index 3b86e86..fc36d40 100644 --- a/src/main/resources/mybatis/mapper/system/system-mapper.xml +++ b/src/main/resources/mybatis/mapper/system/system-mapper.xml @@ -2,7 +2,7 @@ - + @@ -93,7 +93,7 @@ - + INSERT INTO api_system( system_id, name, @@ -134,7 +134,7 @@ - + UPDATE api_system SET @@ -149,7 +149,7 @@ - + DELETE FROM api_system WHERE @@ -160,7 +160,7 @@ - + UPDATE api_system SET @@ -193,7 +193,7 @@ - + UPDATE api_system SET @@ -206,7 +206,7 @@ - SELECT t1.name, t1.summary, @@ -227,7 +227,7 @@ - SELECT t1.system_id, t1.name, @@ -257,7 +257,7 @@ - SELECT t1.system_id, t1.name, @@ -287,7 +287,7 @@ - SELECT t1.system_id, t1.name, @@ -347,7 +347,7 @@ - SELECT t1.system_id, t1.name, @@ -394,7 +394,7 @@ - SELECT t1.system_id, t1.name, @@ -441,7 +441,7 @@ - SELECT COUNT(*) FROM @@ -451,7 +451,7 @@ - SELECT t1.audit_status, t1.audit_time, diff --git a/src/test/java/ink/wgink/wggatewaymanage/WgGatewayManageApplicationTests.java b/src/test/java/ink/wgink/wggatewaymanage/WgGatewayManageApplicationTests.java index 4a9ef08..98c8eed 100644 --- a/src/test/java/ink/wgink/wggatewaymanage/WgGatewayManageApplicationTests.java +++ b/src/test/java/ink/wgink/wggatewaymanage/WgGatewayManageApplicationTests.java @@ -3,9 +3,7 @@ package ink.wgink.wggatewaymanage; import ink.wgink.gatewaymanage.WgGatewayManageApplication; import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.kafka.core.KafkaTemplate; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @@ -14,12 +12,12 @@ import org.springframework.test.context.junit4.SpringRunner; @ActiveProfiles("test") class WgGatewayManageApplicationTests { - @Autowired - private KafkaTemplate kafkaTemplate; +// @Autowired +// private KafkaTemplate kafkaTemplate; @Test void contextLoads() { - kafkaTemplate.send("tableSync", "{\"tableNumber\":\"C0001\",\"uid\":\"123\",\"action\":\"save\",\"data\":{\"case_code\":\"985\",\"case_description\":\"案件描述\"}}"); +// kafkaTemplate.send("tableSync", "{\"tableNumber\":\"C0001\",\"uid\":\"123\",\"action\":\"save\",\"data\":{\"case_code\":\"985\",\"case_description\":\"案件描述\"}}"); } }