更新同步代码2

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/SysBaseConfigServiceImpl.java

@@ -192,35 +192,33 @@ public class SysBaseConfigServiceImpl extends ServiceImpl<SysBaseConfigMapper, S
     @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 = "";
-//        if (null == sysBaseConfigs || sysBaseConfigs.size() == 0){
-//            return new Result(ResultCode.FAIL);
-//        }else {
-//            rowId = sysBaseConfigs.get(0).getRowId();
-//        }
-//        List<SysBaseConfig> syncDate = sysBaseConfigMapper.selectSysBaseConfig(rowId);
+        System.out.println("paramsMap>>"+paramsMap.toString());
+        String chipId = paramsMap.get("chipId");
+        QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("chip_id",chipId);
+        List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(queryWrapper1);
+        Integer deviceType = eartagDeviceRegisters.get(0).getDeviceType();
 
+        //查询牧场信息
         QueryWrapper<BaseFarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
         List<BaseFarm> baseFarmList = baseFarmMapper.selectList(queryWrapper);
         // 应急写法
         BaseFarm baseFarm = baseFarmList.get(0);
+
         paramsMap.put("farmName",baseFarm.getFarmName());
         paramsMap.put("farmCode",baseFarm.getFarmCode());
         paramsMap.put("ip",baseFarm.getIp());
         paramsMap.put("port",baseFarm.getPort());
-        paramsMap.put("areaName",baseFarm.getAreaCode());
+        paramsMap.put("deviceType",String.valueOf(deviceType));
+        paramsMap.put("areaCode",baseFarm.getAreaCode());
         rabbitTemplate.convertAndSend(EXCHANGE_SYNC_SYS_CONFIG,ROUTING_KEY_SYNC_SYS_CONFIG,paramsMap);
         System.out.println("--------------------------------------- 发送设备请求原始数据 >>"+paramsMap);
         //更新同步时间
-        String chipId = paramsMap.get("chipId");
-        QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper1.eq("chip_id",chipId);
-        List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(queryWrapper1);
+//        String chipId = paramsMap.get("chipId");
+//        QueryWrapper<EartagDeviceRegister> queryWrapper1 = new QueryWrapper<>();
+//        queryWrapper1.eq("chip_id",chipId);
+//        List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(queryWrapper1);
         EartagDeviceRegister eartagDeviceRegister = eartagDeviceRegisters.get(0).setSyncTime(new DateUtil().getTimestamp());
         eartagDeviceRegisterMapper.updateById(eartagDeviceRegister);
         return new Result(ResultCode.SUCCESS);