|
@@ -1,8 +1,6 @@
|
|
package com.huimv.eartag2.manage2.service.impl;
|
|
package com.huimv.eartag2.manage2.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.lang.func.VoidFunc0;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
import com.huimv.eartag2.common.utils.Result;
|
|
import com.huimv.eartag2.common.utils.Result;
|
|
import com.huimv.eartag2.common.utils.ResultCode;
|
|
import com.huimv.eartag2.common.utils.ResultCode;
|
|
import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
|
|
import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
|
|
@@ -11,14 +9,10 @@ import com.huimv.eartag2.manage2.service.SysBaseConfigService;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.huimv.eartag2.manage2.vo.SysBaseConfigVo;
|
|
import com.huimv.eartag2.manage2.vo.SysBaseConfigVo;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
-import org.springframework.data.domain.PageRequest;
|
|
|
|
-import org.springframework.data.domain.Pageable;
|
|
|
|
|
|
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
-import javax.persistence.MapsId;
|
|
|
|
-import javax.persistence.criteria.Order;
|
|
|
|
-import javax.persistence.criteria.Predicate;
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -36,6 +30,9 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
|
|
@Resource
|
|
@Resource
|
|
private SysBaseConfigMapper sysBaseConfigMapper;
|
|
private SysBaseConfigMapper sysBaseConfigMapper;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ RabbitTemplate rabbitTemplate;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Result add(List<Map<String, String>> mapList) {
|
|
public Result add(List<Map<String, String>> mapList) {
|
|
//SysBaseConfigEntity
|
|
//SysBaseConfigEntity
|
|
@@ -150,6 +147,30 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
|
|
return new Result(ResultCode.SUCCESS,sysBaseConfigVo);
|
|
return new Result(ResultCode.SUCCESS,sysBaseConfigVo);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //同步牧场配置消息
|
|
|
|
+ public final static String QUEUE_SYNC_SYS_CONFIG = "topic.syncSysConfig.queue";
|
|
|
|
+ public final static String EXCHANGE_SYNC_SYS_CONFIG = "topic.syncSysConfig.exchange";
|
|
|
|
+ public final static String ROUTING_KEY_SYNC_SYS_CONFIG = "topic.syncSysConfig.routeKey";
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Result syncCong(Map<String,String> paramsMap) {
|
|
|
|
+ String farmCode = paramsMap.get("farmId");
|
|
|
|
+ //查询牧场信息
|
|
|
|
+ QueryWrapper<SysBaseConfig> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq(StringUtils.isNotBlank(farmCode),"config_value", farmCode);
|
|
|
|
+ List<SysBaseConfig> sysBaseConfigs = sysBaseConfigMapper.selectList(queryWrapper);
|
|
|
|
+ String rowId = sysBaseConfigs.get(0).getRowId();
|
|
|
|
+ List<SysBaseConfig> syncDate = sysBaseConfigMapper.selectSysBaseConfig(rowId);
|
|
|
|
+ SysBaseConfigVo sysBaseConfigVo = convertSysBaseConfigVo(syncDate);
|
|
|
|
+ paramsMap.put("farmName",sysBaseConfigVo.getFarmName());
|
|
|
|
+ paramsMap.put("farmCode",sysBaseConfigVo.getFarmCode());
|
|
|
|
+ paramsMap.put("ip",sysBaseConfigVo.getIp());
|
|
|
|
+ paramsMap.put("port",sysBaseConfigVo.getPort());
|
|
|
|
+ rabbitTemplate.convertAndSend(EXCHANGE_SYNC_SYS_CONFIG,ROUTING_KEY_SYNC_SYS_CONFIG,paramsMap);
|
|
|
|
+ System.out.println("--------------------------------------- 发送设备请求原始数据 >>"+paramsMap);
|
|
|
|
+ return new Result(ResultCode.SUCCESS);
|
|
|
|
+ }
|
|
|
|
+
|
|
private SysBaseConfigVo convertSysBaseConfigVo(List<SysBaseConfig> list){
|
|
private SysBaseConfigVo convertSysBaseConfigVo(List<SysBaseConfig> list){
|
|
Map<String, String> map = list.stream().collect(Collectors.toMap(SysBaseConfig::getConfigKey, SysBaseConfig::getConfigValue));
|
|
Map<String, String> map = list.stream().collect(Collectors.toMap(SysBaseConfig::getConfigKey, SysBaseConfig::getConfigValue));
|
|
SysBaseConfigVo sysBaseConfigVo = new SysBaseConfigVo();
|
|
SysBaseConfigVo sysBaseConfigVo = new SysBaseConfigVo();
|